add settings to ioc

Author: lesnik512

app/__main__.py

@@ -1,10 +1,11 @@
 import granian
 from granian.constants import Interfaces, Loops
 
-from app.settings import settings
+from app import ioc
 
 
 if __name__ == "__main__":
+    settings = ioc.IOCContainer.settings.sync_resolve()
     granian.Granian(
         target="app.application:application",
         address="0.0.0.0",  # noqa: S104

app/application.py

@@ -1,27 +1,23 @@
 from fastapi import FastAPI
 from that_depends.providers import DIContextMiddleware
 
-from app import exceptions
+from app import exceptions, ioc
 from app.api.decks import ROUTER
 from app.exceptions import DatabaseValidationError
-from app.settings import settings
 
 
 def get_app() -> FastAPI:
+    settings = ioc.IOCContainer.settings.sync_resolve()
     _app = FastAPI(
         title=settings.service_name,
         debug=settings.debug,
     )
-
     _app.include_router(ROUTER, prefix="/api")
-
     _app.add_middleware(DIContextMiddleware)
-
     _app.add_exception_handler(
         DatabaseValidationError,
         exceptions.database_validation_exception_handler,  # type: ignore[arg-type]
     )
-
     return _app
 
 

app/db/resource.py

@@ -3,13 +3,13 @@
 
 from sqlalchemy.ext import asyncio as sa
 
-from app.settings import settings
+from app.settings import Settings
 
 
 logger = logging.getLogger(__name__)
 
 
-async def create_sa_engine() -> typing.AsyncIterator[sa.AsyncEngine]:
+async def create_sa_engine(settings: Settings) -> typing.AsyncIterator[sa.AsyncEngine]:
     logger.info("Initializing SQLAlchemy engine")
     engine = sa.create_async_engine(
         url=settings.db_dsn,

app/ioc.py

@@ -5,10 +5,13 @@
 
 from app.db.resource import create_sa_engine, create_session
 from app.repositories.decks import CardsRepository, DecksRepository
+from app.settings import Settings
 
 
 class IOCContainer(BaseContainer):
-    database_engine = providers.AsyncResource(create_sa_engine)
+    settings = providers.Singleton(Settings)
+
+    database_engine = providers.AsyncResource(create_sa_engine, settings=typing.cast(Settings, settings))
     session = providers.AsyncContextResource(create_session, engine=typing.cast(AsyncEngine, database_engine))
 
     decks_repo = providers.Factory(DecksRepository, session=session)

app/settings.py

@@ -32,6 +32,3 @@ def db_dsn(self) -> URL:
             self.db_port,
             self.db_database,
         )
-
-
-settings = Settings()

migrations/env.py

@@ -3,11 +3,12 @@
 from alembic import context
 from sqlalchemy import URL, create_engine
 
+from app import ioc
 from app.models import METADATA
-from app.settings import settings
 
 
 def get_dsn() -> URL:
+    settings = ioc.IOCContainer.settings.sync_resolve()
     db_dsn = settings.db_dsn
     return db_dsn.set(drivername="postgresql")