modern-di-faststream 0.5.2__py3-none-any.whl → 1.0.0__py3-none-any.whl

modern_di_faststream/main.py

@@ -1,5 +1,4 @@
 import dataclasses
-import enum
 import typing
 from collections.abc import Awaitable, Callable
 from importlib.metadata import version
@@ -8,7 +7,7 @@ import faststream
 import modern_di
 from faststream.asgi import AsgiFastStream
 from faststream.types import DecodedMessage
-from modern_di import Container, Scope, providers
+from modern_di import AsyncContainer, providers
 
 
 T_co = typing.TypeVar("T_co", covariant=True)
@@ -21,7 +20,7 @@ _OLD_MIDDLEWARES = int(_major) == 0 and int(_minor) < 6  # noqa: PLR2004
 class _DIMiddlewareFactory:
     __slots__ = ("di_container",)
 
-    def __init__(self, di_container: Container) -> None:
+    def __init__(self, di_container: AsyncContainer) -> None:
         self.di_container = di_container
 
     def __call__(self, *args: P.args, **kwargs: P.kwargs) -> "_DiMiddleware[P]":
@@ -29,7 +28,7 @@ class _DIMiddlewareFactory:
 
 
 class _DiMiddleware(faststream.BaseMiddleware, typing.Generic[P]):
-    def __init__(self, di_container: Container, *args: P.args, **kwargs: P.kwargs) -> None:
+    def __init__(self, di_container: AsyncContainer, *args: P.args, **kwargs: P.kwargs) -> None:
         self.di_container = di_container
         super().__init__(*args, **kwargs)  # type: ignore[arg-type]
 
@@ -39,7 +38,7 @@ class _DiMiddleware(faststream.BaseMiddleware, typing.Generic[P]):
         msg: faststream.StreamMessage[typing.Any],
     ) -> typing.AsyncIterator[DecodedMessage]:
         async with self.di_container.build_child_container(
-            scope=modern_di.Scope.REQUEST, context={"message": msg}
+            scope=modern_di.Scope.REQUEST, context={faststream.StreamMessage: msg}
         ) as request_container:
             with self.faststream_context.scope("request_container", request_container):
                 return typing.cast(
@@ -53,41 +52,44 @@ class _DiMiddleware(faststream.BaseMiddleware, typing.Generic[P]):
         def faststream_context(self) -> faststream.ContextRepo:
             return typing.cast(faststream.ContextRepo, faststream.context)  # type: ignore[attr-defined]
 
-    else:  # pragma: no cover
+    else:
 
         @property
         def faststream_context(self) -> faststream.ContextRepo:
             return self.context
 
 
-def fetch_di_container(app_: faststream.FastStream | AsgiFastStream) -> Container:
-    return typing.cast(Container, app_.context.get("di_container"))
+def fetch_di_container(app_: faststream.FastStream | AsgiFastStream) -> AsyncContainer:
+    return typing.cast(AsyncContainer, app_.context.get("di_container"))
 
 
 def setup_di(
-    app: faststream.FastStream | AsgiFastStream, scope: enum.IntEnum = Scope.APP, container: Container | None = None
-) -> Container:
+    app: faststream.FastStream | AsgiFastStream,
+    container: AsyncContainer,
+) -> AsyncContainer:
     if not app.broker:
         msg = "Broker must be defined to setup DI"
         raise RuntimeError(msg)
 
-    if not container:
-        container = Container(scope=scope)
     app.context.set_global("di_container", container)
-    app.on_startup(container.async_enter)
-    app.after_shutdown(container.async_close)
+    app.on_startup(container.enter)
+    app.after_shutdown(container.close)
     app.broker.add_middleware(_DIMiddlewareFactory(container))
     return container
 
 
 @dataclasses.dataclass(slots=True, frozen=True)
 class Dependency(typing.Generic[T_co]):
-    dependency: providers.AbstractProvider[T_co]
+    dependency: providers.AbstractProvider[T_co] | type[T_co]
 
     async def __call__(self, context: faststream.ContextRepo) -> T_co:
-        request_container: modern_di.Container = context.get("request_container")
-        return await self.dependency.async_resolve(request_container)
+        request_container: modern_di.AsyncContainer = 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)
 
 
-def FromDI(dependency: providers.AbstractProvider[T_co], *, use_cache: bool = True, cast: bool = False) -> T_co:  # noqa: N802
+def FromDI(  # noqa: N802
+    dependency: providers.AbstractProvider[T_co] | type[T_co], *, use_cache: bool = True, cast: bool = False
+) -> T_co:
     return typing.cast(T_co, faststream.Depends(dependency=Dependency(dependency), use_cache=use_cache, cast=cast))

{modern_di_faststream-0.5.2.dist-info → modern_di_faststream-1.0.0.dist-info}/METADATA

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

modern_di_faststream-1.0.0.dist-info/RECORD

@@ -0,0 +1,6 @@
+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.0.dist-info/METADATA,sha256=jNQ1aJEHuaKGmv57uTIdTsoA0LQQlp6OqnYCo0q-few,1008
+modern_di_faststream-1.0.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+modern_di_faststream-1.0.0.dist-info/RECORD,,

{modern_di_faststream-0.5.2.dist-info → modern_di_faststream-1.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_faststream-0.5.2.dist-info/RECORD

@@ -1,6 +0,0 @@
-modern_di_faststream/__init__.py,sha256=ENQRyE_73MsxFjo608cUUb5EN1pFPC5HkS5Z3wZ5IC0,132
-modern_di_faststream/main.py,sha256=fbdpzBVedcrCi7iUZOGqTd-nwhJwbWg3gcJVcrpPKxI,3385
-modern_di_faststream/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-modern_di_faststream-0.5.2.dist-info/METADATA,sha256=bhr7r0Yxofg1tPe8Pid0eXk0vStw8aWuc3JRspPvS4s,953
-modern_di_faststream-0.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-modern_di_faststream-0.5.2.dist-info/RECORD,,