Update app/db/database.py

app/db/database.py

@@ -1,9 +1,10 @@
 from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession, async_sessionmaker
 from sqlalchemy.orm import declarative_base
 from ..core.config import settings
+from sqlalchemy import text
 import contextlib
 
-# Create async engine for FastAPI
+# Create async engine
 async_engine = create_async_engine(
     settings.DATABASE_URL,
     echo=True,
@@ -12,31 +13,42 @@ async_engine = create_async_engine(
 )
 
 # Create async session factory
-AsyncSessionLocal = async_sessionmaker(
+async_session_maker = async_sessionmaker(
     bind=async_engine,
     class_=AsyncSession,
     expire_on_commit=False
 )
 
-# Create declarative base for models
+# Declarative base for models
 Base = declarative_base()
 
-# Database dependency for FastAPI routes
+# FastAPI dependency for DB access
 async def get_db():
-    async with AsyncSessionLocal() as session:
+    async with async_session_maker() as session:
         try:
             yield session
         finally:
             await session.close()
 
-# Database access for background tasks and services
+# Verify DB connection
+async def verify_connection():
+    async with async_session_maker() as session:
+        try:
+            await session.execute(text("SELECT 1"))
+        except Exception as e:
+            raise ConnectionError(f"Database connection verification failed: {str(e)}")
+
+# Init DB (called during app startup)
+async def init_db():
+    await verify_connection()
+
+# Optional: Custom DB access class
 class Database:
     def __init__(self):
-        self._session_factory = AsyncSessionLocal
+        self._session_factory = async_session_maker
 
     @contextlib.asynccontextmanager
     async def session(self):
-        """Get a database session with automatic commit/rollback"""
         session = self._session_factory()
         try:
             yield session
@@ -48,18 +60,7 @@ class Database:
             await session.close()
 
     async def get_session(self):
-        """Get a session for manual management"""
         return self._session_factory()
 
-from sqlalchemy import text
-
-async def verify_connection():
-    async with async_session_maker() as session:
-        try:
-            await session.execute(text("SELECT 1"))
-        except Exception as e:
-            raise ConnectionError(f"Database connection verification failed: {str(e)}")
-
-
-# Create singleton instance for database access
+# Singleton DB instance
 db = Database()