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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modern-di-faststream
-Version: 2.0.0a0
+Version: 2.0.0a2
 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.0a0 → modern_di_faststream-2.0.0a2}/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 Container, 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
 
@@ -40,11 +44,14 @@ class _DiMiddleware(faststream.BaseMiddleware, typing.Generic[P]):
         request_container = self.di_container.build_child_container(
             scope=modern_di.Scope.REQUEST, context={faststream.StreamMessage: msg}
         )
-        with self.faststream_context.scope("request_container", request_container):
-            return typing.cast(
-                typing.AsyncIterator[DecodedMessage],
-                await call_next(msg),
-            )
+        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
 
@@ -71,6 +78,7 @@ def setup_di(
         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.broker.add_middleware(_DIMiddlewareFactory(container))
     return container

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

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