anydi 0.58.0__tar.gz → 0.59.0__tar.gz

{anydi-0.58.0 → anydi-0.59.0}/PKG-INFO

@@ -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.59.0/anydi/ext/faststream.py

@@ -0,0 +1,74 @@
+"""AnyDI FastStream extension."""
+
+from __future__ import annotations
+
+import inspect
+from functools import cached_property
+from typing import TYPE_CHECKING, Any, cast
+
+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
+
+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:
+    """Get the AnyDI container from a FastStream broker."""
+    return cast(Container, getattr(broker, "_container"))  # noqa
+
+
+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__(self._dependency, use_cache=True, cast=True, cast_result=True)
+        ProvideMarker.__init__(self)
+
+    async def _dependency(self, context: ContextRepo) -> Any:
+        container = get_container_from_context(context)
+        return await container.aresolve(self.interface)
+
+
+# Configure Inject() and Provide[T] to use FastStream-specific marker
+set_provide_factory(_ProvideMarker)
+
+
+def _get_broker_handlers(broker: BrokerUsecase[Any, Any]) -> list[Any]:
+    return [subscriber.calls[0].handler for subscriber in broker.subscribers]
+
+
+def install(broker: BrokerUsecase[Any, Any], container: Container) -> None:
+    """Install AnyDI into a FastStream broker."""
+    broker._container = container  # type: ignore
+    for handler in _get_broker_handlers(broker):
+        call = handler._original_call  # noqa
+        for parameter in inspect.signature(call, eval_str=True).parameters.values():
+            container.validate_injected_parameter(parameter, call=call)

{anydi-0.58.0 → anydi-0.59.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "anydi"
-version = "0.58.0"
+version = "0.59.0"
 description = "Dependency Injection library"
 authors = [{ name = "Anton Ruhlov", email = "antonruhlov@gmail.com" }]
 requires-python = ">=3.10.0, <3.15"
@@ -58,7 +58,7 @@ dev = [
     "starlette>=0.37.2",
     "fastapi>=0.100.0",
     "httpx>=0.26.0",
-    "faststream>=0.5.10,<0.6",
+    "faststream>=0.6,<0.7",
     "redis>=5.0.4,<6",
     "pydantic-settings>=2.4.0,<3",
 ]

anydi-0.58.0/anydi/ext/faststream.py

@@ -1,52 +0,0 @@
-"""AnyDI FastStream extension."""
-
-from __future__ import annotations
-
-import inspect
-from typing import Any, cast
-
-from fast_depends.dependencies import Depends
-from faststream import ContextRepo
-from faststream.broker.core.usecase import BrokerUsecase
-
-from anydi import Container
-from anydi._types import Inject, ProvideMarker, set_provide_factory
-
-__all__ = ["install", "get_container", "Inject"]
-
-
-def get_container(broker: BrokerUsecase[Any, Any]) -> Container:
-    """Get the AnyDI container from a FastStream broker."""
-    return cast(Container, getattr(broker, "_container"))  # noqa
-
-
-class _ProvideMarker(Depends, ProvideMarker):
-    def __init__(self) -> None:
-        super().__init__(dependency=self._dependency, use_cache=True, cast=True)
-        ProvideMarker.__init__(self)
-
-    async def _dependency(self, context: ContextRepo) -> Any:
-        container = get_container(context.get("broker"))
-        return await container.aresolve(self.interface)
-
-
-# Configure Inject() and Provide[T] to use FastStream-specific marker
-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
-    ]
-
-
-def install(broker: BrokerUsecase[Any, Any], container: Container) -> None:
-    """Install AnyDI into a FastStream broker."""
-    broker._container = container  # type: ignore
-    for handler in _get_broker_handlers(broker):
-        call = handler._original_call  # noqa
-        for parameter in inspect.signature(call, eval_str=True).parameters.values():
-            container.validate_injected_parameter(parameter, call=call)