anydi 0.26.8a0__py3-none-any.whl → 0.27.0__py3-none-any.whl

anydi/_context.py

@@ -251,7 +251,7 @@ class ResourceScopedContext(ScopedContext):
             exc_val: The exception instance, if any.
             exc_tb: The traceback, if any.
         """
-        return self._stack.__exit__(exc_type, exc_val, exc_tb)
+        return self._stack.__exit__(exc_type, exc_val, exc_tb)  # type: ignore[return-value]
 
     @abc.abstractmethod
     def start(self) -> None:

anydi/ext/_utils.py

@@ -0,0 +1,89 @@
+"""AnyDI FastAPI extension."""
+
+from __future__ import annotations
+
+import inspect
+import logging
+from typing import Any, Callable
+
+from typing_extensions import Annotated, get_args, get_origin
+
+from anydi import Container
+from anydi._utils import get_full_qualname
+
+logger = logging.getLogger(__name__)
+
+
+class HasInterface:
+    _interface: Any = None
+
+    @property
+    def interface(self) -> Any:
+        if self._interface is None:
+            raise TypeError("Interface is not set.")
+        return self._interface
+
+    @interface.setter
+    def interface(self, interface: Any) -> None:
+        self._interface = interface
+
+
+def patch_annotated_parameter(parameter: inspect.Parameter) -> inspect.Parameter:
+    """Patch an annotated parameter to resolve the default value."""
+    if not (
+        get_origin(parameter.annotation) is Annotated
+        and parameter.default is parameter.empty
+    ):
+        return parameter
+
+    tp_origin, *tp_metadata = get_args(parameter.annotation)
+    default = tp_metadata[-1]
+
+    if not isinstance(default, HasInterface):
+        return parameter
+
+    if (num := len(tp_metadata[:-1])) == 0:
+        interface = tp_origin
+    elif num == 1:
+        interface = Annotated[tp_origin, tp_metadata[0]]
+    elif num == 2:
+        interface = Annotated[tp_origin, tp_metadata[0], tp_metadata[1]]
+    elif num == 3:
+        interface = Annotated[
+            tp_origin,
+            tp_metadata[0],
+            tp_metadata[1],
+            tp_metadata[2],
+        ]
+    else:
+        raise TypeError("Too many annotated arguments.")  # pragma: no cover
+    return parameter.replace(annotation=interface, default=default)
+
+
+def patch_call_parameter(
+    call: Callable[..., Any], parameter: inspect.Parameter, container: Container
+) -> None:
+    """Patch a parameter to inject dependencies using AnyDI.
+
+    Args:
+        call:  The call function.
+        parameter: The parameter to patch.
+        container: The AnyDI container.
+    """
+    parameter = patch_annotated_parameter(parameter)
+
+    if not isinstance(parameter.default, HasInterface):
+        return None
+
+    if not container.strict and not container.is_registered(parameter.annotation):
+        logger.debug(
+            f"Callable `{get_full_qualname(call)}` injected parameter "
+            f"`{parameter.name}` with an annotation of "
+            f"`{get_full_qualname(parameter.annotation)}` "
+            "is not registered. It will be registered at runtime with the "
+            "first call because it is running in non-strict mode."
+        )
+    else:
+        container._validate_injected_parameter(call, parameter)  # noqa
+
+    parameter.default.interface = parameter.annotation

anydi/ext/fastapi.py

@@ -2,19 +2,18 @@
 
 from __future__ import annotations
 
-import inspect
 import logging
-from typing import Any, Callable, Iterator, cast
+from typing import Any, Iterator, cast
 
 from fastapi import Depends, FastAPI, params
 from fastapi.dependencies.models import Dependant
 from fastapi.routing import APIRoute
 from starlette.requests import Request
-from typing_extensions import Annotated, get_args, get_origin
 
 from anydi import Container
-from anydi._utils import get_full_qualname, get_typed_parameters
+from anydi._utils import get_typed_parameters
 
+from ._utils import HasInterface, patch_call_parameter
 from .starlette.middleware import RequestScopedMiddleware
 
 __all__ = ["RequestScopedMiddleware", "install", "get_container", "Inject"]
@@ -48,7 +47,7 @@ def install(app: FastAPI, container: Container) -> None:
             if not call:
                 continue  # pragma: no cover
             for parameter in get_typed_parameters(call):
-                _patch_route_parameter(call, parameter, container)
+                patch_call_parameter(call, parameter, container)
 
 
 def get_container(request: Request) -> Container:
@@ -63,22 +62,11 @@ def get_container(request: Request) -> Container:
     return cast(Container, request.app.state.container)
 
 
-class Resolver(params.Depends):
+class Resolver(HasInterface, params.Depends):
     """Parameter dependency class for injecting dependencies using AnyDI."""
 
     def __init__(self) -> None:
         super().__init__(dependency=self._dependency, use_cache=True)
-        self._interface: Any = None
-
-    @property
-    def interface(self) -> Any:
-        if self._interface is None:
-            raise TypeError("Interface is not set.")
-        return self._interface
-
-    @interface.setter
-    def interface(self, interface: Any) -> None:
-        self._interface = interface
 
     async def _dependency(self, container: Container = Depends(get_container)) -> Any:
         return await container.aresolve(self.interface)
@@ -102,64 +90,3 @@ def _iter_dependencies(dependant: Dependant) -> Iterator[Dependant]:
     if dependant.dependencies:
         for sub_dependant in dependant.dependencies:
             yield from _iter_dependencies(sub_dependant)
-
-
-def _patch_route_parameter(
-    call: Callable[..., Any], parameter: inspect.Parameter, container: Container
-) -> None:
-    """Patch a parameter to inject dependencies using AnyDI.
-
-    Args:
-        call:  The call function.
-        parameter: The parameter to patch.
-        container: The AnyDI container.
-    """
-    parameter = _patch_annotated_parameter(parameter)
-
-    if not isinstance(parameter.default, Resolver):
-        return None
-
-    if not container.strict and not container.is_registered(parameter.annotation):
-        logger.debug(
-            f"Callable `{get_full_qualname(call)}` injected parameter "
-            f"`{parameter.name}` with an annotation of "
-            f"`{get_full_qualname(parameter.annotation)}` "
-            "is not registered. It will be registered at runtime with the "
-            "first call because it is running in non-strict mode."
-        )
-    else:
-        container._validate_injected_parameter(call, parameter)  # noqa
-
-    parameter.default.interface = parameter.annotation
-
-
-def _patch_annotated_parameter(parameter: inspect.Parameter) -> inspect.Parameter:
-    """Patch an annotated parameter to resolve the default value."""
-    if not (
-        get_origin(parameter.annotation) is Annotated
-        and parameter.default is parameter.empty
-    ):
-        return parameter
-
-    tp_origin, *tp_metadata = get_args(parameter.annotation)
-    default = tp_metadata[-1]
-
-    if not isinstance(default, Resolver):
-        return parameter
-
-    if (num := len(tp_metadata[:-1])) == 0:
-        interface = tp_origin
-    elif num == 1:
-        interface = Annotated[tp_origin, tp_metadata[0]]
-    elif num == 2:
-        interface = Annotated[tp_origin, tp_metadata[0], tp_metadata[1]]
-    elif num == 3:
-        interface = Annotated[
-            tp_origin,
-            tp_metadata[0],
-            tp_metadata[1],
-            tp_metadata[2],
-        ]
-    else:
-        raise TypeError("Too many annotated arguments.")  # pragma: no cover
-    return parameter.replace(annotation=interface, default=default)

anydi/ext/faststream.py

@@ -0,0 +1,65 @@
+"""AnyDI FastStream extension."""
+
+from __future__ import annotations
+
+import logging
+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._utils import get_typed_parameters
+
+from ._utils import HasInterface, patch_call_parameter
+
+logger = logging.getLogger(__name__)
+
+
+def install(broker: BrokerUsecase[Any, Any], container: Container) -> None:
+    """Install AnyDI into a FastStream broker.
+
+    Args:
+        broker: The broker.
+        container: The container.
+
+    This function installs the AnyDI container into a FastStream broker by attaching
+    it to the broker. It also patches the broker handlers to inject the required
+    dependencies using AnyDI.
+    """
+    broker._container = container  # type: ignore[attr-defined]
+
+    for handler in _get_broken_handlers(broker):
+        call = handler._original_call  # noqa
+        for parameter in get_typed_parameters(call):
+            patch_call_parameter(call, parameter, container)
+
+
+def _get_broken_handlers(broker: BrokerUsecase[Any, Any]) -> list[Any]:
+    if hasattr(broker, "handlers"):
+        return [handler.calls[0][0] for handler in broker.handlers.values()]
+    # faststream > 0.5.0
+    return [
+        subscriber.calls[0].handler
+        for subscriber in broker._subscribers.values()  # noqa
+    ]
+
+
+def get_container(broker: BrokerUsecase[Any, Any]) -> Container:
+    return cast(Container, getattr(broker, "_container"))  # noqa
+
+
+class Resolver(HasInterface, Depends):
+    """Parameter dependency class for injecting dependencies using AnyDI."""
+
+    def __init__(self) -> None:
+        super().__init__(dependency=self._dependency, use_cache=True, cast=True)
+
+    async def _dependency(self, context: ContextRepo) -> Any:
+        container = get_container(context.get("broker"))
+        return await container.aresolve(self.interface)
+
+
+def Inject() -> Any:  # noqa
+    return Resolver()

{anydi-0.26.8a0.dist-info → anydi-0.27.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anydi
-Version: 0.26.8a0
+Version: 0.27.0
 Summary: Dependency Injection library
 Home-page: https://github.com/antonrh/anydi
 License: MIT
@@ -32,8 +32,8 @@ Provides-Extra: async
 Provides-Extra: docs
 Requires-Dist: anyio (>=3.6.2,<4.0.0) ; extra == "async"
 Requires-Dist: mkdocs (>=1.4.2,<2.0.0) ; extra == "docs"
-Requires-Dist: mkdocs-material (>=9.1.13,<10.0.0) ; extra == "docs"
-Requires-Dist: typing-extensions (>=4.8.0,<5.0.0)
+Requires-Dist: mkdocs-material (>=9.5.21,<10.0.0) ; extra == "docs"
+Requires-Dist: typing-extensions (>=4.12.1,<5.0.0)
 Project-URL: Repository, https://github.com/antonrh/anydi
 Description-Content-Type: text/markdown
 

{anydi-0.26.8a0.dist-info → anydi-0.27.0.dist-info}/RECORD

@@ -1,12 +1,13 @@
 anydi/__init__.py,sha256=aeaBp5vq09sG-e9sqqs9qpUtUIDNfOdFPrlAfE5Ku9E,584
 anydi/_container.py,sha256=-vpiYl2Tx2QK9wl74DiF5qLFRudJ3e78TqEyuyOrthE,29055
-anydi/_context.py,sha256=qqaPVv-nnpHQL5R9wFL6-709eyAt9ZnzZov79NPEHIc,11865
+anydi/_context.py,sha256=_hJ1Cf2amgAr4uLvgk2KtGWMo0p7JFM_db1_YbWweHI,11895
 anydi/_logger.py,sha256=UpubJUnW83kffFxkhUlObm2DmZX1Pjqoz9YFKS-JOPg,52
 anydi/_module.py,sha256=E1TfLud_Af-MPB83PxIzHVA1jlDW2FGaRP_il1a6y3Y,3675
 anydi/_scanner.py,sha256=cyEk-K2Q8ssZStq8GrxMeEcCuAZMw-RXrjlgWEevKCs,6667
 anydi/_types.py,sha256=i8xFxz8pmFj7SGqwOwae_P9VtiRie6DVLwfaLibLwhc,3653
 anydi/_utils.py,sha256=TzUZRTNaXu78Uzv9NCNLSM5s9TgEIiXtXgr1HhsfHac,4017
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+anydi/ext/_utils.py,sha256=2kxLPTMM9Ro3s6-knbqYzONlqRB3hMcwZFFRQGHcFUg,2691
 anydi/ext/django/__init__.py,sha256=QI1IABCVgSDTUoh7M9WMECKXwB3xvh04HfQ9TOWw1Mk,223
 anydi/ext/django/_container.py,sha256=cxVoYQG16WP0S_Yv4TnLwuaaT7NVEOhLWO-YdALJUb4,418
 anydi/ext/django/_settings.py,sha256=cKzFBGtPCsexZ2ZcInubBukIebhxzNfa3F0KuwoZYaA,844
@@ -16,13 +17,14 @@ anydi/ext/django/middleware.py,sha256=iVHWtE829khMY-BXbNNt0g2FrIApKprna7dCG9ObEi
 anydi/ext/django/ninja/__init__.py,sha256=kW3grUgWp_nkWSG_-39ADHMrZLGNcj9TsJ9OW8iWWrk,546
 anydi/ext/django/ninja/_operation.py,sha256=wSWa7D73XTVlOibmOciv2l6JHPe1ERZcXrqI8W-oO2w,2696
 anydi/ext/django/ninja/_signature.py,sha256=2cSzKxBIxXLqtwNuH6GSlmjVJFftoGmleWfyk_NVEWw,2207
-anydi/ext/fastapi.py,sha256=kVUKVKtqCx1Nfnm1oh2BMyB0G7qQKPw6OGfxFlqUqtc,5305
+anydi/ext/fastapi.py,sha256=vhfSyovXuCjvSkx6AiLOTNU975i8wDg72C5fqXQiFLw,2896
+anydi/ext/faststream.py,sha256=L4rkWYIO4ZZuWH-8M8NT6_J0bT0Dz_EWO3B6Oj1iFBI,2024
 anydi/ext/pytest_plugin.py,sha256=3OWphc4nEzla46_8KR7LXtwGns5eol_YlUWfTf4Cr2Q,3952
 anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/starlette/middleware.py,sha256=Ni0BQaPjs_Ha6zcLZYYJ3-XkslTCnL9aCSa06rnRDMI,1139
 anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi-0.26.8a0.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.26.8a0.dist-info/METADATA,sha256=S3mIlHTg2I5Oy4kQm8wKb-iQRgFHa9wbdmLadWQPAes,5112
-anydi-0.26.8a0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-anydi-0.26.8a0.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
-anydi-0.26.8a0.dist-info/RECORD,,
+anydi-0.27.0.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.27.0.dist-info/METADATA,sha256=zazVcW9x_zEq3W2q7We5DMLMuJoNWH1I5JOzVsfTb_g,5111
+anydi-0.27.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+anydi-0.27.0.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
+anydi-0.27.0.dist-info/RECORD,,