anydi 0.27.0a1__py3-none-any.whl → 0.27.0a3__py3-none-any.whl

anydi/ext/faststream.py

@@ -26,12 +26,22 @@ def install(broker: BrokerUsecase[Any, Any], container: Container) -> None:
     """
     broker._container = container  # type: ignore[attr-defined]
 
-    for subscriber in broker._subscribers.values():  # noqa
-        call = subscriber.calls[0].handler._original_call  # noqa
+    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
 

anydi/ext/pytest_plugin.py

@@ -6,7 +6,6 @@ from typing import Any, Callable, Iterator, cast
 import pytest
 
 from anydi import Container
-from anydi._types import is_marker
 from anydi._utils import get_typed_parameters
 
 
@@ -24,12 +23,6 @@ def pytest_addoption(parser: pytest.Parser) -> None:
         type="bool",
         default=False,
     )
-    parser.addini(
-        "anydi_inject_auto",
-        help="Automatically inject dependencies",
-        type="bool",
-        default=True,
-    )
 
 
 CONTAINER_FIXTURE_NAME = "container"
@@ -71,17 +64,15 @@ def _anydi_injected_parameter_iterator(
     _anydi_unresolved: list[str],
 ) -> Callable[[], Iterator[tuple[str, Any]]]:
     registered_fixtures = request.session._fixturemanager._arg2fixturedefs  # noqa
-    inject_auto = cast(bool, request.config.getini("anydi_inject_auto"))
 
     def _iterator() -> Iterator[tuple[str, inspect.Parameter]]:
         for parameter in get_typed_parameters(request.function):
             interface = parameter.annotation
-            if interface is parameter.empty:
-                continue
-            if not inject_auto and is_marker(parameter.default):
-                yield parameter.name, interface
-                continue
-            if interface in _anydi_unresolved or parameter.name in registered_fixtures:
+            if (
+                interface is parameter.empty
+                or interface in _anydi_unresolved
+                or parameter.name in registered_fixtures
+            ):
                 continue
             yield parameter.name, interface
 
@@ -104,17 +95,18 @@ def _anydi_inject(
     container = cast(Container, request.getfixturevalue("anydi_setup_container"))
 
     for argname, interface in _anydi_injected_parameter_iterator():
+        # Skip if the interface is not registered
+        if container.strict and not container.is_registered(interface):
+            continue
+
         # Release the instance if it was already resolved
         if container.is_resolved(interface):
             container.release(interface)
 
         try:
-            # Resolve the instance
-            instance = container.resolve(interface)
-        except LookupError:
+            request.node.funcargs[argname] = container.resolve(interface)
+        except Exception:  # noqa
             _anydi_unresolved.append(interface)
-            continue
-        request.node.funcargs[argname] = instance
 
 
 @pytest.fixture(autouse=True)
@@ -132,14 +124,15 @@ async def _anydi_ainject(
     container = cast(Container, request.getfixturevalue("anydi_setup_container"))
 
     for argname, interface in _anydi_injected_parameter_iterator():
+        # Skip if the interface is not registered
+        if container.strict and not container.is_registered(interface):
+            continue
+
         # Release the instance if it was already resolved
         if container.is_resolved(interface):
             container.release(interface)
 
         try:
-            # Resolve the instance
-            instance = await container.aresolve(interface)
-        except LookupError:
+            request.node.funcargs[argname] = await container.aresolve(interface)
+        except Exception:  # noqa
             _anydi_unresolved.append(interface)
-            continue
-        request.node.funcargs[argname] = instance

{anydi-0.27.0a1.dist-info → anydi-0.27.0a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anydi
-Version: 0.27.0a1
+Version: 0.27.0a3
 Summary: Dependency Injection library
 Home-page: https://github.com/antonrh/anydi
 License: MIT
@@ -33,8 +33,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.27.0a1.dist-info → anydi-0.27.0a3.dist-info}/RECORD

@@ -18,13 +18,13 @@ anydi/ext/django/ninja/__init__.py,sha256=kW3grUgWp_nkWSG_-39ADHMrZLGNcj9TsJ9OW8
 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=vhfSyovXuCjvSkx6AiLOTNU975i8wDg72C5fqXQiFLw,2896
-anydi/ext/faststream.py,sha256=svMtqFVSRTpuf4H5yeozHWmrBXi_F8cevb5d2mo3m-E,1617
-anydi/ext/pytest_plugin.py,sha256=AQVBsyEGoQdOvXpa2TlEPYMapzL7a-oKoVcvMnQ5Epk,4477
+anydi/ext/faststream.py,sha256=Kuyqin6rKlOOM5x9BHIv-RF9i8zqU_kh4H6Xs0DLI20,1916
+anydi/ext/pytest_plugin.py,sha256=pFLcfxGtJfGSqtk7sPrrHFSKOaZoKZTWt5X8CT0ydmA,4242
 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.27.0a1.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.27.0a1.dist-info/METADATA,sha256=9k_8NOREjBfp2612k6n5nwFl3NfTWVQF8V9TrcNALh8,5162
-anydi-0.27.0a1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-anydi-0.27.0a1.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
-anydi-0.27.0a1.dist-info/RECORD,,
+anydi-0.27.0a3.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.27.0a3.dist-info/METADATA,sha256=egpilYh24GazI0UAdIzX2gEBcND55qHX259hKihoVBo,5163
+anydi-0.27.0a3.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+anydi-0.27.0a3.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
+anydi-0.27.0a3.dist-info/RECORD,,