Update auth/database.py

auth/database.py

@@ -1,137 +1,125 @@
-"""
-database.py
-Enterprise Database Layer
-Basyx Whisper V10.1
-"""
-
 import os
-from typing import Generator
-
-from sqlalchemy import create_engine
+from sqlalchemy import create_engine, event
 from sqlalchemy.orm import sessionmaker, declarative_base, Session
+from sqlalchemy.engine import Engine
 from sqlalchemy.pool import QueuePool
+import logging
 
-from utils.logger import logger
-
+# ==============================
+# CONFIGURATION (STRICT)
+# ==============================
 
-# ==========================================================
-# REQUIRED ENVIRONMENT CONFIG
-# ==========================================================
-
-DATABASE_URL = os.environ.get("DATABASE_URL")
+DATABASE_URL = os.getenv("DATABASE_URL")
 
 if not DATABASE_URL:
-    raise RuntimeError("DATABASE_URL environment variable is required")
-
+    raise RuntimeError(
+        "DATABASE_URL is not set. "
+        "Provide a valid PostgreSQL connection string (Supabase or other)."
+    )
 
-# ==========================================================
-# ENGINE CONFIGURATION
-# ==========================================================
-
-"""
-Enterprise defaults:
-
-✔ connection pooling
-✔ stale connection recovery
-✔ multi-worker safe
-✔ production ready
-"""
+# ==============================
+# ENGINE CONFIG (PRODUCTION TUNED)
+# ==============================
 
 engine = create_engine(
     DATABASE_URL,
     poolclass=QueuePool,
+
+    # Connection pool tuning for video + AI workloads
     pool_size=10,
-    max_overflow=20,
-    pool_pre_ping=True,
+    max_overflow=25,
+    pool_timeout=30,
     pool_recycle=1800,
-    future=True,
+    pool_pre_ping=True,
+
+    # Required for Supabase/Postgres stability
+    connect_args={
+        "connect_timeout": 10,
+        "application_name": "basyx-whisper-v10",
+    },
+
     echo=False,
+    future=True,
 )
 
+# ==============================
+# SAFETY: PREVENT STALE CONNECTION FAILURES
+# ==============================
+
+@event.listens_for(Engine, "engine_connect")
+def validate_connection(connection, branch):
+    if branch:
+        return
+    try:
+        connection.scalar("SELECT 1")
+    except Exception:
+        raise RuntimeError("Database connection validation failed")
+
 
-# ==========================================================
+# ==============================
 # SESSION FACTORY
-# ==========================================================
+# ==============================
 
 SessionLocal = sessionmaker(
-    autocommit=False,
-    autoflush=False,
     bind=engine,
+    autoflush=False,
+    autocommit=False,
     expire_on_commit=False,
     class_=Session,
+    future=True,
 )
 
-
-# ==========================================================
-# BASE MODEL CLASS
-# ==========================================================
+# ==============================
+# BASE MODEL
+# ==============================
 
 Base = declarative_base()
 
+# ==============================
+# DEPENDENCY (FASTAPI SAFE)
+# ==============================
 
-# ==========================================================
-# FASTAPI DEPENDENCY
-# ==========================================================
-
-def get_db() -> Generator[Session, None, None]:
+def get_db():
     """
-    FastAPI dependency injection:
-
-    Example:
-        db: Session = Depends(get_db)
+    FastAPI dependency:
+    Ensures safe transactional session lifecycle per request.
     """
-
     db = SessionLocal()
-
     try:
         yield db
-    except Exception:
-        logger.exception("Database session failure")
+        db.commit()
+    except Exception as e:
         db.rollback()
         raise
     finally:
         db.close()
 
 
-# ==========================================================
-# DATABASE INITIALIZATION
-# ==========================================================
+# ==============================
+# MANUAL SESSION (WORKER SAFE)
+# ==============================
 
-def init_db() -> None:
+def get_db_session() -> Session:
     """
-    Create tables safely.
-
-    Import models BEFORE create_all
-    to register metadata.
+    For background workers, queues, and async threads.
+    Must be manually closed.
     """
-
-    try:
-        import auth.models  # noqa
-        import models       # optional global models
-
-        Base.metadata.create_all(bind=engine)
-
-        logger.info("Database initialized successfully")
-
-    except Exception:
-        logger.exception("Database initialization failed")
-        raise
+    return SessionLocal()
 
 
-# ==========================================================
+# ==============================
 # HEALTH CHECK
-# ==========================================================
+# ==============================
 
-def db_healthcheck() -> dict:
+def check_db_connection() -> bool:
     """
-    Used by /api/health
+    Lightweight DB connectivity check.
+    Safe for startup validation and health endpoints.
     """
-
     try:
         with engine.connect() as conn:
-            conn.execute("SELECT 1")
-        return {"database": "connected"}
-
+            conn.exec_driver_sql("SELECT 1")
+        return True
     except Exception as e:
-        logger.exception("Database healthcheck failed")
-        return {"database": "error", "detail": str(e)}
+        logging.error(f"DB health check failed: {e}")
+        return False