modern-di-litestar 1.1.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
 
@@ -7,40 +6,32 @@ 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 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)
-
-
-@contextlib.asynccontextmanager
-async def _lifespan_manager(app_: litestar.Litestar) -> typing.AsyncIterator[None]:
-    container = fetch_di_container(app_)
-    async with container:
-        yield
+def fetch_di_container(app_: litestar.Litestar) -> Container:
+    return typing.cast(Container, app_.state.di_container)
 
 
 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:
         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[AsyncContainer]:
+) -> Container:
     context: dict[type[typing.Any], typing.Any] = {}
     scope: DIScope | None
     if isinstance(request, litestar.WebSocket):
@@ -49,9 +40,7 @@ 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
+    return fetch_di_container(request.app).build_child_container(context=context, scope=scope)
 
 
 @dataclasses.dataclass(slots=True, frozen=True)
@@ -59,12 +48,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.1.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: 1.1.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

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-1.1.0.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.1.0.dist-info/METADATA,sha256=Ivm8hV4Psij5dCAqYYd3go3a2PxVbSf46AuDx9VOqac,989
-modern_di_litestar-1.1.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-modern_di_litestar-1.1.0.dist-info/RECORD,,