update modern-di

Author: lesnik512

app/application.py

@@ -1,6 +1,3 @@
-import contextlib
-import typing
-
 import litestar
 import modern_di_litestar
 from advanced_alchemy.exceptions import DuplicateKeyError
@@ -12,34 +9,25 @@
 from app.settings import settings
 
 
-class AppBuilder:
-    def __init__(self) -> None:
-        self.app: litestar.Litestar = litestar.Litestar(
-            debug=settings.debug,
-            lifespan=[self.lifespan_manager],
-            exception_handlers={
-                DuplicateKeyError: exceptions.duplicate_key_error_handler,
-            },
-            route_handlers=[ROUTER],
-            dependencies={
-                **modern_di_litestar.prepare_di_dependencies(),
-                "decks_service": modern_di_litestar.FromDI(ioc.Dependencies.decks_service),
-                "cards_service": modern_di_litestar.FromDI(ioc.Dependencies.cards_service),
-            },
-            openapi_config=OpenAPIConfig(
-                title="Litestar Example",
-                description="Example of Litestar with Scalar OpenAPI docs",
-                version="0.0.1",
-                render_plugins=[SwaggerRenderPlugin()],
-            ),
-        )
-        self.di_container = modern_di_litestar.setup_di(self.app)
-
-    @contextlib.asynccontextmanager
-    async def lifespan_manager(self, _: litestar.Litestar | None) -> typing.AsyncIterator[None]:
-        async with self.di_container:
-            await ioc.Dependencies.async_resolve_creators(self.di_container)
-            yield
+def build_app() -> litestar.Litestar:
+    return litestar.Litestar(
+        debug=settings.debug,
+        exception_handlers={
+            DuplicateKeyError: exceptions.duplicate_key_error_handler,
+        },
+        route_handlers=[ROUTER],
+        plugins=[modern_di_litestar.ModernDIPlugin()],
+        dependencies={
+            "decks_service": modern_di_litestar.FromDI(ioc.Dependencies.decks_service),
+            "cards_service": modern_di_litestar.FromDI(ioc.Dependencies.cards_service),
+        },
+        openapi_config=OpenAPIConfig(
+            title="Litestar Example",
+            description="Example of Litestar with Scalar OpenAPI docs",
+            version="0.0.1",
+            render_plugins=[SwaggerRenderPlugin()],
+        ),
+    )
 
 
-application = AppBuilder().app
+application = build_app()

tests/test_main.py

@@ -1,24 +1,17 @@
 import runpy
 from unittest import mock
 
-import litestar
 import modern_di
 import pytest
 
 from app import ioc
-from app.application import AppBuilder
 
 
 def test_main(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr("granian.Granian", mock.Mock())
     runpy.run_module("app.__main__", run_name="__main__")
 
 
-async def test_app_lifespan() -> None:
-    async with AppBuilder().lifespan_manager(litestar.Litestar()):
-        pass
-
-
 async def test_session() -> None:
     async with (
         modern_di.Container(scope=modern_di.Scope.APP) as container,