modern-di-litestar 2.0.0a0__tar.gz → 2.0.0a2__tar.gz

{modern_di_litestar-2.0.0a0 → modern_di_litestar-2.0.0a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modern-di-litestar
-Version: 2.0.0a0
+Version: 2.0.0a2
 Summary: Modern-DI integration for LiteStar
 Project-URL: repository, https://github.com/modern-python/modern-di
 Project-URL: docs, https://modern-di.readthedocs.io
@@ -16,7 +16,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Typing :: Typed
 Requires-Python: <4,>=3.10
 Requires-Dist: litestar
-Requires-Dist: modern-di>=1.0.0alpha1
+Requires-Dist: modern-di>=2.0.0alpha1
 Description-Content-Type: text/markdown
 
 "Modern-DI-LiteStar"

{modern_di_litestar-2.0.0a0 → modern_di_litestar-2.0.0a2}/modern_di_litestar/main.py

@@ -1,3 +1,4 @@
+import contextlib
 import dataclasses
 import typing
 
@@ -7,16 +8,30 @@ from litestar.di import Provide
 from litestar.params import Dependency
 from litestar.plugins import InitPlugin
 from modern_di import Container, providers
+from modern_di.scope import Scope
 from modern_di.scope import Scope as DIScope
 
 
 T_co = typing.TypeVar("T_co", covariant=True)
 
 
+litestar_request = providers.ContextProvider(scope=Scope.REQUEST, context_type=litestar.Request)
+litestar_websocket = providers.ContextProvider(scope=Scope.REQUEST, context_type=litestar.WebSocket)
+
+
 def fetch_di_container(app_: litestar.Litestar) -> Container:
     return typing.cast(Container, app_.state.di_container)
 
 
+@contextlib.asynccontextmanager
+async def _lifespan_manager(app_: litestar.Litestar) -> typing.AsyncIterator[None]:
+    container = fetch_di_container(app_)
+    try:
+        yield
+    finally:
+        await container.close_async()
+
+
 class ModernDIPlugin(InitPlugin):
     __slots__ = ("container",)
 
@@ -24,14 +39,18 @@ class ModernDIPlugin(InitPlugin):
         self.container = container
 
     def on_app_init(self, app_config: AppConfig) -> AppConfig:
+        self.container.providers_registry.add_providers(
+            litestar_request=litestar_request, litestar_websocket=litestar_websocket
+        )
         app_config.state.di_container = self.container
-        app_config.dependencies["di_container"] = Provide(build_di_container, sync_to_thread=False)
+        app_config.dependencies["di_container"] = Provide(build_di_container)
+        app_config.lifespan.append(_lifespan_manager)
         return app_config
 
 
-def build_di_container(
+async def build_di_container(
     request: litestar.Request[typing.Any, typing.Any, typing.Any],
-) -> Container:
+) -> typing.AsyncIterator[Container]:
     context: dict[type[typing.Any], typing.Any] = {}
     scope: DIScope | None
     if isinstance(request, litestar.WebSocket):
@@ -40,7 +59,11 @@ def build_di_container(
     else:
         context[litestar.Request] = request
         scope = DIScope.REQUEST
-    return fetch_di_container(request.app).build_child_container(context=context, scope=scope)
+    container = fetch_di_container(request.app).build_child_container(context=context, scope=scope)
+    try:
+        yield container
+    finally:
+        await container.close_async()
 
 
 @dataclasses.dataclass(slots=True, frozen=True)

{modern_di_litestar-2.0.0a0 → modern_di_litestar-2.0.0a2}/pyproject.toml

@@ -15,8 +15,8 @@ classifiers = [
     "Typing :: Typed",
     "Topic :: Software Development :: Libraries",
 ]
-dependencies = ["litestar", "modern-di>=1.0.0alpha1"]
-version = "2.0.0a0"
+dependencies = ["litestar", "modern-di>=2.0.0alpha1"]
+version = "2.0.0a2"
 
 [project.urls]
 repository = "https://github.com/modern-python/modern-di"