Store settings in request

src/climsoft_api/api/statistics/router.py

@@ -3,9 +3,11 @@
 
 from climsoft_api.db import engine
 from climsoft_api.utils.response import get_error_response
-from fastapi import APIRouter
+from fastapi import APIRouter, Depends
 from opencdms.models.climsoft.v4_1_1_core import TARGET_TABLES
 from sqlalchemy import text
+from sqlalchemy.orm import Session
+from climsoft_api.api import deps
 
 
 router = APIRouter()
@@ -47,16 +49,16 @@ class ClimsoftTables(str, enum.Enum):
     "/statistics",
 )
 # async def get_statistics_for_all_climsoft_tables(table: ClimsoftTables):
-async def get_statistics_for_all_climsoft_tables():
+async def get_statistics_for_all_climsoft_tables(
+    db_session: Session = Depends(deps.get_session)
+):
     try:
         stats = {}
         for _table in TARGET_TABLES:
-            with engine.connect() as connection:
-                result = connection.execute(
-                    text(f"SELECT COUNT(*) as count FROM {_table};")
-                )
-                count = [row['count'] for row in result][0]
-            stats[_table] = count
+            result = db_session.execute(
+                text(f"SELECT COUNT(*) as count FROM {_table};")
+            )
+            stats[_table] = [row['count'] for row in result][0]
         return stats
     except TypeError:
         raise

src/climsoft_api/main.py

@@ -8,11 +8,13 @@
 from fastapi.staticfiles import StaticFiles
 from starlette.middleware.base import BaseHTTPMiddleware
 from climsoft_api.api import api_routers
-
+from sqlalchemy import create_engine
+from sqlalchemy.engine import Engine
+from sqlalchemy.orm import sessionmaker
 # load controllers
 
 
-def get_app():
+def get_app(config=None):
     app = FastAPI(docs_url="/")
     app.add_middleware(BaseHTTPMiddleware, dispatch=LocalizationMiddleware())
     if settings.MOUNT_STATIC:
@@ -28,6 +30,9 @@ def get_app():
 
     @app.middleware("http")
     async def db_session_middleware(request: Request, call_next):
+        if config is not None and config.get("DATABASE_URI"):
+            engine: Engine = create_engine(config.get("DATABASE_URI"))
+            SessionLocal = sessionmaker(bind=engine, autocommit=False, autoflush=False)
         try:
             request.state.get_session = SessionLocal
             response = await call_next(request)
@@ -38,8 +43,8 @@ async def db_session_middleware(request: Request, call_next):
     return app
 
 
-def get_app_with_routers():
-    app = get_app()
+def get_app_with_routers(config=None):
+    app = get_app(config)
     for router in api_routers:
         app.include_router(**router.dict())