update modern-di-fastapi

Author: lesnik512

app/api/decks.py

@@ -2,7 +2,7 @@
 
 import fastapi
 from advanced_alchemy.exceptions import NotFoundError
-from modern_di_fastapi import FromDI
+from modern_di_fastapi import Provide
 from sqlalchemy import orm
 from starlette import status
 
@@ -15,7 +15,7 @@
 
 @ROUTER.get("/decks/")
 async def list_decks(
-    decks_service: DecksService = FromDI(ioc.IOCContainer.decks_service),
+    decks_service: DecksService = Provide(ioc.IOCContainer.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 = Provide(ioc.IOCContainer.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 = Provide(ioc.IOCContainer.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 = Provide(ioc.IOCContainer.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 = Provide(ioc.IOCContainer.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 = Provide(ioc.IOCContainer.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 = Provide(ioc.IOCContainer.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 = Provide(ioc.IOCContainer.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

@@ -2,7 +2,6 @@
 import typing
 
 import fastapi
-import modern_di
 import modern_di_fastapi
 from advanced_alchemy.exceptions import DuplicateKeyError, ForeignKeyError
 
@@ -21,10 +20,8 @@ def __init__(self) -> None:
             title=settings.service_name,
             debug=settings.debug,
             lifespan=self.lifespan_manager,
-            dependencies=[fastapi.Depends(modern_di_fastapi.enter_di_request_scope)],
         )
-        self.di_container = modern_di.Container(scope=modern_di.Scope.APP)
-        modern_di_fastapi.save_di_container(self.app, self.di_container)
+        self.di_container = modern_di_fastapi.setup_di(self.app)
         include_routers(self.app)
         self.app.add_exception_handler(
             ForeignKeyError,