small updates

Author: lesnik512

app/api/decks.py

@@ -15,7 +15,7 @@
 
 @ROUTER.get("/decks/")
 async def list_decks(
-    decks_service: DecksService = FromDI(ioc.IOCContainer.decks_service),
+    decks_service: DecksService = FromDI(ioc.Dependencies.decks_service),
 ) -> schemas.Decks:
     objects = await decks_service.list()
     return typing.cast(schemas.Decks, {"items": objects})
@@ -24,7 +24,7 @@ async def list_decks(
 @ROUTER.get("/decks/{deck_id}/")
 async def get_deck(
     deck_id: int,
-    decks_service: DecksService = FromDI(ioc.IOCContainer.decks_service),
+    decks_service: DecksService = FromDI(ioc.Dependencies.decks_service),
 ) -> schemas.Deck:
     instance = await decks_service.get_one_or_none(
         models.Deck.id == deck_id,
@@ -40,7 +40,7 @@ async def get_deck(
 async def update_deck(
     deck_id: int,
     data: schemas.DeckCreate,
-    decks_service: DecksService = FromDI(ioc.IOCContainer.decks_service),
+    decks_service: DecksService = FromDI(ioc.Dependencies.decks_service),
 ) -> schemas.Deck:
     try:
         instance = await decks_service.update(data=data.model_dump(), item_id=deck_id)
@@ -53,7 +53,7 @@ async def update_deck(
 @ROUTER.post("/decks/")
 async def create_deck(
     data: schemas.DeckCreate,
-    decks_service: DecksService = FromDI(ioc.IOCContainer.decks_service),
+    decks_service: DecksService = FromDI(ioc.Dependencies.decks_service),
 ) -> schemas.Deck:
     instance = await decks_service.create(data)
     return typing.cast(schemas.Deck, instance)
@@ -62,7 +62,7 @@ async def create_deck(
 @ROUTER.get("/decks/{deck_id}/cards/")
 async def list_cards(
     deck_id: int,
-    cards_service: CardsService = FromDI(ioc.IOCContainer.cards_service),
+    cards_service: CardsService = FromDI(ioc.Dependencies.cards_service),
 ) -> schemas.Cards:
     objects = await cards_service.list(models.Card.deck_id == deck_id)
     return typing.cast(schemas.Cards, {"items": objects})
@@ -71,7 +71,7 @@ async def list_cards(
 @ROUTER.get("/cards/{card_id}/")
 async def get_card(
     card_id: int,
-    cards_service: CardsService = FromDI(ioc.IOCContainer.cards_service),
+    cards_service: CardsService = FromDI(ioc.Dependencies.cards_service),
 ) -> schemas.Card:
     instance = await cards_service.get_one_or_none(models.Card.id == card_id)
     if not instance:
@@ -83,7 +83,7 @@ async def get_card(
 async def create_cards(
     deck_id: int,
     data: list[schemas.CardCreate],
-    cards_service: CardsService = FromDI(ioc.IOCContainer.cards_service),
+    cards_service: CardsService = FromDI(ioc.Dependencies.cards_service),
 ) -> schemas.Cards:
     objects = await cards_service.create_many(
         data=[models.Card(**card.model_dump(), deck_id=deck_id) for card in data],
@@ -95,7 +95,7 @@ async def create_cards(
 async def update_cards(
     deck_id: int,
     data: list[schemas.Card],
-    cards_service: CardsService = FromDI(ioc.IOCContainer.cards_service),
+    cards_service: CardsService = FromDI(ioc.Dependencies.cards_service),
 ) -> schemas.Cards:
     objects = await cards_service.upsert_many(
         data=[models.Card(**card.model_dump(exclude={"deck_id"}), deck_id=deck_id) for card in data],

app/application.py

@@ -35,7 +35,7 @@ def __init__(self) -> None:
     @contextlib.asynccontextmanager
     async def lifespan_manager(self, _: fastapi.FastAPI) -> typing.AsyncIterator[dict[str, typing.Any]]:
         async with self.di_container:
-            await ioc.IOCContainer.async_resolve_creators(self.di_container)
+            await ioc.Dependencies.async_resolve_creators(self.di_container)
             yield {}
 
 

app/ioc.py

@@ -4,7 +4,7 @@
 from app.resources.db import create_sa_engine, create_session
 
 
-class IOCContainer(BaseGraph):
+class Dependencies(BaseGraph):
     database_engine = providers.Resource(Scope.APP, create_sa_engine)
     session = providers.Resource(Scope.REQUEST, create_session, engine=database_engine.cast)
 

pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "fast-api-sqlalchemy-template"
+name = "fastapi-sqlalchemy-template"
 version = "0"
 description = "Async template on FastAPI and SQLAlchemy 2"
 readme = "README.md"

tests/conftest.py

@@ -27,11 +27,11 @@ async def di_container() -> modern_di.Container:
 @pytest.fixture(autouse=True)
 async def db_session(di_container: modern_di.Container) -> typing.AsyncIterator[AsyncSession]:
     async with di_container:
-        engine = await ioc.IOCContainer.database_engine.async_resolve(di_container)
+        engine = await ioc.Dependencies.database_engine.async_resolve(di_container)
         connection = await engine.connect()
         transaction = await connection.begin()
         await connection.begin_nested()
-        ioc.IOCContainer.database_engine.override(connection, di_container)
+        ioc.Dependencies.database_engine.override(connection, di_container)
 
         try:
             yield AsyncSession(connection, expire_on_commit=False, autoflush=False)

tests/test_main.py

@@ -25,4 +25,4 @@ async def test_session() -> None:
         modern_di.Container(scope=modern_di.Scope.APP) as container,
         container.build_child_container(scope=modern_di.Scope.REQUEST) as request_container,
     ):
-        await ioc.IOCContainer.session.async_resolve(request_container)
+        await ioc.Dependencies.session.async_resolve(request_container)