Spaces:
Runtime error
Runtime error
deploy: update
Browse files- .env.example +3 -1
- backend/config_local.py +1 -1
- backend/core/config.py +6 -0
- backend/services/asset_service.py +9 -11
.env.example
CHANGED
|
@@ -7,7 +7,9 @@ LLM_FALLBACK_MODEL=open-mistral-7b
|
|
| 7 |
# Token budget per session — 0 = no limit (Item 17)
|
| 8 |
MAX_TOKENS_PER_SESSION=0
|
| 9 |
|
| 10 |
-
|
|
|
|
|
|
|
| 11 |
SUPABASE_URL=https://akrvdknpkzedwpadglfu.supabase.co
|
| 12 |
SUPABASE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImFrcnZka25wa3plZHdwYWRnbGZ1Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzM4MTUwNDEsImV4cCI6MjA4OTM5MTA0MX0.t_0NtRBBg3cY6umSgB_GXWk_8Cy8qJ-XPt3CWQ--wCo
|
| 13 |
SUPABASE_STORAGE_BUCKET=assets
|
|
|
|
| 7 |
# Token budget per session — 0 = no limit (Item 17)
|
| 8 |
MAX_TOKENS_PER_SESSION=0
|
| 9 |
|
| 10 |
+
# For LOCAL dev: postgresql://postgres:[PASSWORD]@db.akrvdknpkzedwpadglfu.supabase.co:5432/postgres
|
| 11 |
+
# For HUGGING FACE: use the Pooler URL (port 6543) from Supabase Dashboard > Settings > Database > Connection Pooling
|
| 12 |
+
DATABASE_URL=postgresql://postgres.[PROJECT-REF]:[PASSWORD]@aws-0-[REGION].pooler.supabase.com:6543/postgres
|
| 13 |
SUPABASE_URL=https://akrvdknpkzedwpadglfu.supabase.co
|
| 14 |
SUPABASE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImFrcnZka25wa3plZHdwYWRnbGZ1Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzM4MTUwNDEsImV4cCI6MjA4OTM5MTA0MX0.t_0NtRBBg3cY6umSgB_GXWk_8Cy8qJ-XPt3CWQ--wCo
|
| 15 |
SUPABASE_STORAGE_BUCKET=assets
|
backend/config_local.py
CHANGED
|
@@ -4,7 +4,7 @@ LLM_MODEL = "mistral-large-latest"
|
|
| 4 |
LLM_FALLBACK_MODEL = "open-mistral-7b"
|
| 5 |
MAX_TOKENS_PER_SESSION = 0
|
| 6 |
|
| 7 |
-
DATABASE_URL = "postgresql://postgres:FPgZeZ0aT3ENxyav@
|
| 8 |
SUPABASE_URL = "https://akrvdknpkzedwpadglfu.supabase.co"
|
| 9 |
SUPABASE_KEY = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImFrcnZka25wa3plZHdwYWRnbGZ1Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzM4MTUwNDEsImV4cCI6MjA4OTM5MTA0MX0.t_0NtRBBg3cY6umSgB_GXWk_8Cy8qJ-XPt3CWQ--wCo"
|
| 10 |
SUPABASE_STORAGE_BUCKET = "assets"
|
|
|
|
| 4 |
LLM_FALLBACK_MODEL = "open-mistral-7b"
|
| 5 |
MAX_TOKENS_PER_SESSION = 0
|
| 6 |
|
| 7 |
+
DATABASE_URL = "postgresql://postgres.akrvdknpkzedwpadglfu:FPgZeZ0aT3ENxyav@aws-1-ap-northeast-1.pooler.supabase.com:6543/postgres"
|
| 8 |
SUPABASE_URL = "https://akrvdknpkzedwpadglfu.supabase.co"
|
| 9 |
SUPABASE_KEY = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImFrcnZka25wa3plZHdwYWRnbGZ1Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzM4MTUwNDEsImV4cCI6MjA4OTM5MTA0MX0.t_0NtRBBg3cY6umSgB_GXWk_8Cy8qJ-XPt3CWQ--wCo"
|
| 10 |
SUPABASE_STORAGE_BUCKET = "assets"
|
backend/core/config.py
CHANGED
|
@@ -35,6 +35,12 @@ class Settings:
|
|
| 35 |
|
| 36 |
ENCRYPTION_KEY: str = _cfg("ENCRYPTION_KEY", "")
|
| 37 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 38 |
@property
|
| 39 |
def allowed_origins_list(self) -> list[str]:
|
| 40 |
return [o.strip() for o in self.ALLOWED_ORIGINS.split(",") if o.strip()]
|
|
|
|
| 35 |
|
| 36 |
ENCRYPTION_KEY: str = _cfg("ENCRYPTION_KEY", "")
|
| 37 |
|
| 38 |
+
# Supabase — read from config_local.py first, then env vars
|
| 39 |
+
SUPABASE_URL: str = _cfg("SUPABASE_URL", "")
|
| 40 |
+
SUPABASE_KEY: str = _cfg("SUPABASE_KEY", "")
|
| 41 |
+
SUPABASE_SERVICE_ROLE_KEY: str = _cfg("SUPABASE_SERVICE_ROLE_KEY", "")
|
| 42 |
+
SUPABASE_STORAGE_BUCKET: str = _cfg("SUPABASE_STORAGE_BUCKET", "assets")
|
| 43 |
+
|
| 44 |
@property
|
| 45 |
def allowed_origins_list(self) -> list[str]:
|
| 46 |
return [o.strip() for o in self.ALLOWED_ORIGINS.split(",") if o.strip()]
|
backend/services/asset_service.py
CHANGED
|
@@ -7,6 +7,7 @@ from sqlalchemy.orm import Session
|
|
| 7 |
|
| 8 |
from ..database import Asset, Collection, SpecDocument
|
| 9 |
from .storage import LocalStorageProvider, SupabaseStorageProvider
|
|
|
|
| 10 |
|
| 11 |
# MIME types allowed per category (used for magic-byte validation)
|
| 12 |
_ALLOWED_MIMES: dict[str, set[str]] = {
|
|
@@ -37,24 +38,21 @@ def _validate_magic(header: bytes, category: str, filename: str) -> tuple[bool,
|
|
| 37 |
mime = kind.mime
|
| 38 |
return mime in _ALLOWED_MIMES.get(category, set()), mime
|
| 39 |
|
| 40 |
-
# Load
|
| 41 |
-
SUPABASE_URL =
|
| 42 |
-
#
|
| 43 |
-
# We check common names and skip placeholders
|
| 44 |
def get_valid_key():
|
| 45 |
-
for
|
| 46 |
-
|
| 47 |
-
|
| 48 |
-
return val
|
| 49 |
return None
|
| 50 |
|
| 51 |
SUPABASE_KEY = get_valid_key()
|
| 52 |
-
SUPABASE_BUCKET =
|
| 53 |
|
| 54 |
if SUPABASE_URL and SUPABASE_KEY:
|
| 55 |
storage = SupabaseStorageProvider(SUPABASE_URL, SUPABASE_KEY, SUPABASE_BUCKET)
|
| 56 |
-
|
| 57 |
-
key_type = "Service Role Key" if os.getenv("SUPABASE_SERVICE_ROLE_KEY") else "API Key"
|
| 58 |
print(f"[STORAGE] Using Supabase Storage (Bucket: {SUPABASE_BUCKET}) with {key_type}")
|
| 59 |
else:
|
| 60 |
storage = LocalStorageProvider()
|
|
|
|
| 7 |
|
| 8 |
from ..database import Asset, Collection, SpecDocument
|
| 9 |
from .storage import LocalStorageProvider, SupabaseStorageProvider
|
| 10 |
+
from backend.core.config import settings
|
| 11 |
|
| 12 |
# MIME types allowed per category (used for magic-byte validation)
|
| 13 |
_ALLOWED_MIMES: dict[str, set[str]] = {
|
|
|
|
| 38 |
mime = kind.mime
|
| 39 |
return mime in _ALLOWED_MIMES.get(category, set()), mime
|
| 40 |
|
| 41 |
+
# Load Supabase config from settings (sourced from config_local.py or env vars)
|
| 42 |
+
SUPABASE_URL = settings.SUPABASE_URL
|
| 43 |
+
# Prefer Service Role Key for storage operations (bypass RLS)
|
|
|
|
| 44 |
def get_valid_key():
|
| 45 |
+
for key_val in [settings.SUPABASE_SERVICE_ROLE_KEY, settings.SUPABASE_KEY]:
|
| 46 |
+
if key_val and "your-service-role-key" not in key_val and "your_service_role_key" not in key_val:
|
| 47 |
+
return key_val
|
|
|
|
| 48 |
return None
|
| 49 |
|
| 50 |
SUPABASE_KEY = get_valid_key()
|
| 51 |
+
SUPABASE_BUCKET = settings.SUPABASE_STORAGE_BUCKET
|
| 52 |
|
| 53 |
if SUPABASE_URL and SUPABASE_KEY:
|
| 54 |
storage = SupabaseStorageProvider(SUPABASE_URL, SUPABASE_KEY, SUPABASE_BUCKET)
|
| 55 |
+
key_type = "Service Role Key" if settings.SUPABASE_SERVICE_ROLE_KEY else "API Key"
|
|
|
|
| 56 |
print(f"[STORAGE] Using Supabase Storage (Bucket: {SUPABASE_BUCKET}) with {key_type}")
|
| 57 |
else:
|
| 58 |
storage = LocalStorageProvider()
|