modern-di-faststream 1.0.1__py3-none-any.whl → 2.0.0__py3-none-any.whl

modern_di_faststream/main.py

@@ -7,12 +7,16 @@ import faststream
 import modern_di
 from faststream.asgi import AsgiFastStream
 from faststream.types import DecodedMessage
-from modern_di import AsyncContainer, providers
+from modern_di import Container, Scope, providers
 
 
 T_co = typing.TypeVar("T_co", covariant=True)
 P = typing.ParamSpec("P")
 
+
+faststream_message = providers.ContextProvider(scope=Scope.REQUEST, context_type=faststream.StreamMessage)
+
+
 _major, _minor, *_ = version("faststream").split(".")
 _OLD_MIDDLEWARES = int(_major) == 0 and int(_minor) < 6  # noqa: PLR2004
 
@@ -20,7 +24,7 @@ _OLD_MIDDLEWARES = int(_major) == 0 and int(_minor) < 6  # noqa: PLR2004
 class _DIMiddlewareFactory:
     __slots__ = ("di_container",)
 
-    def __init__(self, di_container: AsyncContainer) -> None:
+    def __init__(self, di_container: Container) -> None:
         self.di_container = di_container
 
     def __call__(self, *args: P.args, **kwargs: P.kwargs) -> "_DiMiddleware[P]":
@@ -28,7 +32,7 @@ class _DIMiddlewareFactory:
 
 
 class _DiMiddleware(faststream.BaseMiddleware, typing.Generic[P]):
-    def __init__(self, di_container: AsyncContainer, *args: P.args, **kwargs: P.kwargs) -> None:
+    def __init__(self, di_container: Container, *args: P.args, **kwargs: P.kwargs) -> None:
         self.di_container = di_container
         super().__init__(*args, **kwargs)  # type: ignore[arg-type]
 
@@ -37,14 +41,17 @@ class _DiMiddleware(faststream.BaseMiddleware, typing.Generic[P]):
         call_next: Callable[[typing.Any], Awaitable[typing.Any]],
         msg: faststream.StreamMessage[typing.Any],
     ) -> typing.AsyncIterator[DecodedMessage]:
-        async with self.di_container.build_child_container(
+        request_container = self.di_container.build_child_container(
             scope=modern_di.Scope.REQUEST, context={faststream.StreamMessage: msg}
-        ) as request_container:
+        )
+        try:
             with self.faststream_context.scope("request_container", request_container):
                 return typing.cast(
                     typing.AsyncIterator[DecodedMessage],
                     await call_next(msg),
                 )
+        finally:
+            await request_container.close_async()
 
     if _OLD_MIDDLEWARES:  # pragma: no cover
 
@@ -59,21 +66,20 @@ class _DiMiddleware(faststream.BaseMiddleware, typing.Generic[P]):
             return self.context
 
 
-def fetch_di_container(app_: faststream.FastStream | AsgiFastStream) -> AsyncContainer:
-    return typing.cast(AsyncContainer, app_.context.get("di_container"))
+def fetch_di_container(app_: faststream.FastStream | AsgiFastStream) -> Container:
+    return typing.cast(Container, app_.context.get("di_container"))
 
 
 def setup_di(
     app: faststream.FastStream | AsgiFastStream,
-    container: AsyncContainer,
-) -> AsyncContainer:
+    container: Container,
+) -> Container:
     if not app.broker:
         msg = "Broker must be defined to setup DI"
         raise RuntimeError(msg)
 
+    container.providers_registry.add_providers(faststream_message=faststream_message)
     app.context.set_global("di_container", container)
-    app.on_startup(container.enter)
-    app.after_shutdown(container.close)
     app.broker.add_middleware(_DIMiddlewareFactory(container))
     return container
 
@@ -83,10 +89,10 @@ class Dependency(typing.Generic[T_co]):
     dependency: providers.AbstractProvider[T_co] | type[T_co]
 
     async def __call__(self, context: faststream.ContextRepo) -> T_co:
-        request_container: modern_di.AsyncContainer = context.get("request_container")
+        request_container: Container = context.get("request_container")
         if isinstance(self.dependency, providers.AbstractProvider):
-            return await request_container.resolve_provider(self.dependency)
-        return await request_container.resolve(dependency_type=self.dependency)
+            return request_container.resolve_provider(self.dependency)
+        return request_container.resolve(dependency_type=self.dependency)
 
 
 def FromDI(  # noqa: N802

{modern_di_faststream-1.0.1.dist-info → modern_di_faststream-2.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modern-di-faststream
-Version: 1.0.1
+Version: 2.0.0
 Summary: Modern-DI integration for FastStream
 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: faststream<1,>=0.5
-Requires-Dist: modern-di>=1.0.0alpha
+Requires-Dist: modern-di>=2.0.0alpha1
 Description-Content-Type: text/markdown
 
 "Modern-DI-FastStream"

modern_di_faststream-2.0.0.dist-info/RECORD

@@ -0,0 +1,6 @@
+modern_di_faststream/__init__.py,sha256=ENQRyE_73MsxFjo608cUUb5EN1pFPC5HkS5Z3wZ5IC0,132
+modern_di_faststream/main.py,sha256=LtvUtHAnzzb6vSTrZh5CZgQBmvcYQNJW5Z6cCxalazc,3601
+modern_di_faststream/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+modern_di_faststream-2.0.0.dist-info/METADATA,sha256=tREqboiDtpiY6Kz4ji6KyuTyDLrxu4nwkmurD8CehPU,1009
+modern_di_faststream-2.0.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+modern_di_faststream-2.0.0.dist-info/RECORD,,

modern_di_faststream-1.0.1.dist-info/RECORD

@@ -1,6 +0,0 @@
-modern_di_faststream/__init__.py,sha256=ENQRyE_73MsxFjo608cUUb5EN1pFPC5HkS5Z3wZ5IC0,132
-modern_di_faststream/main.py,sha256=-Sysi1rvq9mQvBNqvu3O0Lvn3EuDg2dCexOfRucRJZ4,3469
-modern_di_faststream/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-modern_di_faststream-1.0.1.dist-info/METADATA,sha256=ob52SZTD2oOCmbWFZ-iSkpPrxZDJYqrTCzFoaxj6SPs,1008
-modern_di_faststream-1.0.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-modern_di_faststream-1.0.1.dist-info/RECORD,,