anydi 0.58.0__py3-none-any.whl → 0.59.0__py3-none-any.whl

anydi/ext/faststream.py

@@ -3,16 +3,27 @@
 from __future__ import annotations
 
 import inspect
-from typing import Any, cast
+from functools import cached_property
+from typing import TYPE_CHECKING, Any, cast
 
-from fast_depends.dependencies import Depends
-from faststream import ContextRepo
-from faststream.broker.core.usecase import BrokerUsecase
+from fast_depends.dependencies import Dependant
+from faststream import BaseMiddleware, ContextRepo, StreamMessage
 
 from anydi import Container
 from anydi._types import Inject, ProvideMarker, set_provide_factory
 
-__all__ = ["install", "get_container", "Inject"]
+if TYPE_CHECKING:
+    from faststream._internal.basic_types import AsyncFuncAny
+    from faststream._internal.broker import BrokerUsecase
+    from faststream._internal.types import AnyMsg
+
+__all__ = [
+    "install",
+    "get_container",
+    "get_container_from_context",
+    "Inject",
+    "RequestScopedMiddleware",
+]
 
 
 def get_container(broker: BrokerUsecase[Any, Any]) -> Container:
@@ -20,13 +31,29 @@ def get_container(broker: BrokerUsecase[Any, Any]) -> Container:
     return cast(Container, getattr(broker, "_container"))  # noqa
 
 
-class _ProvideMarker(Depends, ProvideMarker):
+def get_container_from_context(context: ContextRepo) -> Container:
+    return get_container(context.broker)
+
+
+class RequestScopedMiddleware(BaseMiddleware):
+    @cached_property
+    def container(self) -> Container:
+        return get_container_from_context(self.context)
+
+    async def consume_scope(
+        self, call_next: AsyncFuncAny, msg: StreamMessage[AnyMsg]
+    ) -> Any:
+        async with self.container.arequest_context():
+            return await call_next(msg)
+
+
+class _ProvideMarker(Dependant, ProvideMarker):
     def __init__(self) -> None:
-        super().__init__(dependency=self._dependency, use_cache=True, cast=True)
+        super().__init__(self._dependency, use_cache=True, cast=True, cast_result=True)
         ProvideMarker.__init__(self)
 
     async def _dependency(self, context: ContextRepo) -> Any:
-        container = get_container(context.get("broker"))
+        container = get_container_from_context(context)
         return await container.aresolve(self.interface)
 
 
@@ -35,12 +62,7 @@ set_provide_factory(_ProvideMarker)
 
 
 def _get_broker_handlers(broker: BrokerUsecase[Any, Any]) -> list[Any]:
-    if (handlers := getattr(broker, "handlers", None)) is not None:
-        return [handler.calls[0][0] for handler in handlers.values()]
-    return [
-        subscriber.calls[0].handler
-        for subscriber in broker._subscribers.values()  # noqa
-    ]
+    return [subscriber.calls[0].handler for subscriber in broker.subscribers]
 
 
 def install(broker: BrokerUsecase[Any, Any], container: Container) -> None:

{anydi-0.58.0.dist-info → anydi-0.59.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anydi
-Version: 0.58.0
+Version: 0.59.0
 Summary: Dependency Injection library
 Keywords: dependency injection,dependencies,di,async,asyncio,application
 Author: Anton Ruhlov

{anydi-0.58.0.dist-info → anydi-0.59.0.dist-info}/RECORD

@@ -12,14 +12,14 @@ anydi/_types.py,sha256=tLJS27j0lWJFd4fIIGlGbbfKBVTPTnWgPYqZlenktis,2939
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/django/__init__.py,sha256=Ve8lncLU9dPY_Vjt4zihPgsSxwAtFHACn0XvBM5JG8k,367
 anydi/ext/fastapi.py,sha256=TQoS1Vh9chV0Tj0qyxjgqoGTYEMC3jp0il9CDZCZLcc,2326
-anydi/ext/faststream.py,sha256=XT80r1FGL-xlU7r8urm9sNpUfl4OPMJseW4dade_fR4,1836
+anydi/ext/faststream.py,sha256=i6uXE21UawmTYDBqRv7yqDMc-lRiYSYf45sD87O2wX4,2442
 anydi/ext/pydantic_settings.py,sha256=jVJZ1wPaPpsxdNPlJj9yq282ebqLZ9tckWpZ0eIwWLg,1533
 anydi/ext/pytest_plugin.py,sha256=M54DkA-KxD9GqLnXdoCyn-Qur2c44MB6d0AgJuYCZ5w,16171
 anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/starlette/middleware.py,sha256=9CQtGg5ZzUz2gFSzJr8U4BWzwNjK8XMctm3n52M77Z0,792
 anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/testing.py,sha256=cHg3mMScZbEep9smRqSNQ81BZMQOkyugHe8TvKdPnEg,1347
-anydi-0.58.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-anydi-0.58.0.dist-info/entry_points.txt,sha256=AgOcQYM5KyS4D37QcYb00tiid0QA-pD1VrjHHq4QAps,44
-anydi-0.58.0.dist-info/METADATA,sha256=KE1cG2fc8ZyuoUBMhGP0pUqcUkr2z8ZOGjPVy3-ILV0,7901
-anydi-0.58.0.dist-info/RECORD,,
+anydi-0.59.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+anydi-0.59.0.dist-info/entry_points.txt,sha256=AgOcQYM5KyS4D37QcYb00tiid0QA-pD1VrjHHq4QAps,44
+anydi-0.59.0.dist-info/METADATA,sha256=Hp5PaKyiY5MTVyJiaUG7KH6B7n_74IXnxTUdRVypHUY,7901
+anydi-0.59.0.dist-info/RECORD,,