modern-di-litestar 2.0.0__py3-none-any.whl → 2.0.0a0__py3-none-any.whl

modern_di_litestar/main.py

@@ -1,4 +1,3 @@
-import contextlib
 import dataclasses
 import typing
 
@@ -8,30 +7,16 @@ 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.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_)
-    try:
-        yield
-    finally:
-        await container.close_async()
-
-
 class ModernDIPlugin(InitPlugin):
     __slots__ = ("container",)
 
@@ -39,18 +24,14 @@ 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)
-        app_config.lifespan.append(_lifespan_manager)
+        app_config.dependencies["di_container"] = Provide(build_di_container, sync_to_thread=False)
         return app_config
 
 
-async def build_di_container(
+def build_di_container(
     request: litestar.Request[typing.Any, typing.Any, typing.Any],
-) -> typing.AsyncIterator[Container]:
+) -> Container:
     context: dict[type[typing.Any], typing.Any] = {}
     scope: DIScope | None
     if isinstance(request, litestar.WebSocket):
@@ -59,11 +40,7 @@ async def build_di_container(
     else:
         context[litestar.Request] = request
         scope = DIScope.REQUEST
-    container = fetch_di_container(request.app).build_child_container(context=context, scope=scope)
-    try:
-        yield container
-    finally:
-        await container.close_async()
+    return fetch_di_container(request.app).build_child_container(context=context, scope=scope)
 
 
 @dataclasses.dataclass(slots=True, frozen=True)

{modern_di_litestar-2.0.0.dist-info → modern_di_litestar-2.0.0a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modern-di-litestar
-Version: 2.0.0
+Version: 2.0.0a0
 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>=2.0.0alpha1
+Requires-Dist: modern-di>=1.0.0alpha1
 Description-Content-Type: text/markdown
 
 "Modern-DI-LiteStar"

modern_di_litestar-2.0.0a0.dist-info/RECORD

@@ -0,0 +1,6 @@
+modern_di_litestar/__init__.py,sha256=9uFGF-DoOfFkMYBDC4HkrJfLkEwNDSKTgSIThCKPyjM,157
+modern_di_litestar/main.py,sha256=ZOVBp9tywNuhRGfwsHqaANMXuo5nO0dCRATVwv__dJ4,2022
+modern_di_litestar/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+modern_di_litestar-2.0.0a0.dist-info/METADATA,sha256=DPtVkr-DkjN0AamQNuznkmeGKd-J9AZgoiMtI5QK0_A,991
+modern_di_litestar-2.0.0a0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+modern_di_litestar-2.0.0a0.dist-info/RECORD,,

modern_di_litestar-2.0.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-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,,