modern-di-litestar 1.0.0a1__py3-none-any.whl → 2.0.0__py3-none-any.whl

modern_di_litestar/main.py

@@ -7,31 +7,41 @@ from litestar.config.app import AppConfig
 from litestar.di import Provide
 from litestar.params import Dependency
 from litestar.plugins import InitPlugin
-from modern_di import AsyncContainer, providers
-from modern_di import Scope as DIScope
+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)
 
 
-def fetch_di_container(app_: litestar.Litestar) -> AsyncContainer:
-    return typing.cast(AsyncContainer, app_.state.di_container)
+litestar_request = providers.ContextProvider(scope=Scope.REQUEST, context_type=litestar.Request)
+litestar_websocket = providers.ContextProvider(scope=Scope.SESSION, 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_)
-    async with container:
+    try:
         yield
+    finally:
+        await container.close_async()
 
 
 class ModernDIPlugin(InitPlugin):
     __slots__ = ("container",)
 
-    def __init__(self, container: AsyncContainer) -> None:
+    def __init__(self, container: Container) -> None:
         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)
         app_config.lifespan.append(_lifespan_manager)
@@ -40,7 +50,7 @@ class ModernDIPlugin(InitPlugin):
 
 async def build_di_container(
     request: litestar.Request[typing.Any, typing.Any, typing.Any],
-) -> typing.AsyncIterator[AsyncContainer]:
+) -> typing.AsyncIterator[Container]:
     context: dict[type[typing.Any], typing.Any] = {}
     scope: DIScope | None
     if isinstance(request, litestar.WebSocket):
@@ -49,9 +59,11 @@ async def build_di_container(
     else:
         context[litestar.Request] = request
         scope = DIScope.REQUEST
-    container: AsyncContainer = fetch_di_container(request.app)
-    async with container.build_child_container(context=context, scope=scope) as request_container:
-        yield request_container
+    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)
@@ -59,12 +71,11 @@ class _Dependency(typing.Generic[T_co]):
     dependency: providers.AbstractProvider[T_co] | type[T_co]
 
     async def __call__(
-        self, di_container: typing.Annotated[AsyncContainer | None, Dependency(skip_validation=True)] = None
+        self, di_container: typing.Annotated[Container, Dependency(skip_validation=True)]
     ) -> T_co | None:
-        assert di_container
         if isinstance(self.dependency, providers.AbstractProvider):
-            return await di_container.resolve_provider(self.dependency)
-        return await di_container.resolve(dependency_type=self.dependency)
+            return di_container.resolve_provider(self.dependency)
+        return di_container.resolve(dependency_type=self.dependency)
 
 
 def FromDI(dependency: providers.AbstractProvider[T_co] | type[T_co]) -> Provide:  # noqa: N802

{modern_di_litestar-1.0.0a1.dist-info → modern_di_litestar-2.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modern-di-litestar
-Version: 1.0.0a1
+Version: 2.0.0
 Summary: Modern-DI integration for LiteStar
 Project-URL: repository, https://github.com/modern-python/modern-di
 Project-URL: docs, https://modern-di.readthedocs.io
@@ -11,11 +11,12 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 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.0.dist-info/RECORD

@@ -0,0 +1,6 @@
+modern_di_litestar/__init__.py,sha256=9uFGF-DoOfFkMYBDC4HkrJfLkEwNDSKTgSIThCKPyjM,157
+modern_di_litestar/main.py,sha256=6JfuoGjjt8O_moxkFywzKTwN7MCWeSswI2xe4SVpCXk,2808
+modern_di_litestar/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+modern_di_litestar-2.0.0.dist-info/METADATA,sha256=bdrRLJKjFS_upz4uAGkJkhqQEhBMEME-vFYz11YLQxE,989
+modern_di_litestar-2.0.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+modern_di_litestar-2.0.0.dist-info/RECORD,,

{modern_di_litestar-1.0.0a1.dist-info → modern_di_litestar-2.0.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

modern_di_litestar-1.0.0a1.dist-info/RECORD

@@ -1,6 +0,0 @@
-modern_di_litestar/__init__.py,sha256=9uFGF-DoOfFkMYBDC4HkrJfLkEwNDSKTgSIThCKPyjM,157
-modern_di_litestar/main.py,sha256=1Lf8vqfv8IqP4xKeicIboLAt62aesypKaXXIx_MrBqI,2477
-modern_di_litestar/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-modern_di_litestar-1.0.0a1.dist-info/METADATA,sha256=5eqyBlYD8lnhWryKOJV6mSwLcNwNWY4-cd2RYPhfbBw,940
-modern_di_litestar-1.0.0a1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-modern_di_litestar-1.0.0a1.dist-info/RECORD,,