modern-di-faststream 0.6.0__tar.gz → 1.0.0a0__tar.gz

{modern_di_faststream-0.6.0 → modern_di_faststream-1.0.0a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modern-di-faststream
-Version: 0.6.0
+Version: 1.0.0a0
 Summary: Modern-DI integration for FastStream
 Project-URL: repository, https://github.com/modern-python/modern-di
 Project-URL: docs, https://modern-di.readthedocs.io
@@ -15,7 +15,7 @@ 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
 Description-Content-Type: text/markdown
 
 "Modern-DI-FastStream"

{modern_di_faststream-0.6.0 → modern_di_faststream-1.0.0a0}/modern_di_faststream/main.py

@@ -7,7 +7,7 @@ import faststream
 import modern_di
 from faststream.asgi import AsgiFastStream
 from faststream.types import DecodedMessage
-from modern_di import AsyncContainer, Scope, providers
+from modern_di import AsyncContainer, providers
 
 
 T_co = typing.TypeVar("T_co", covariant=True)
@@ -65,15 +65,12 @@ def fetch_di_container(app_: faststream.FastStream | AsgiFastStream) -> AsyncCon
 
 def setup_di(
     app: faststream.FastStream | AsgiFastStream,
-    scope: Scope = Scope.APP,
-    container: AsyncContainer | None = None,
+    container: AsyncContainer,
 ) -> AsyncContainer:
     if not app.broker:
         msg = "Broker must be defined to setup DI"
         raise RuntimeError(msg)
 
-    if not container:
-        container = AsyncContainer(scope=scope)
     app.context.set_global("di_container", container)
     app.on_startup(container.enter)
     app.after_shutdown(container.close)
@@ -83,12 +80,16 @@ def setup_di(
 
 @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.AsyncContainer = context.get("request_container")
-        return await request_container.resolve_provider(self.dependency)
+        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.6.0 → modern_di_faststream-1.0.0a0}/pyproject.toml

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