anydi 0.26.2__py3-none-any.whl → 0.26.2a0__py3-none-any.whl

anydi/ext/pytest_plugin.py

@@ -6,6 +6,7 @@ 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
 
 
@@ -23,6 +24,12 @@ 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"
@@ -64,15 +71,17 @@ 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
-                or interface in _anydi_unresolved
-                or parameter.name in registered_fixtures
-            ):
+            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:
                 continue
             yield parameter.name, interface
 
@@ -95,18 +104,17 @@ 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:
-            request.node.funcargs[argname] = container.resolve(interface)
-        except Exception:  # noqa
+            # Resolve the instance
+            instance = container.resolve(interface)
+        except LookupError:
             _anydi_unresolved.append(interface)
+            continue
+        request.node.funcargs[argname] = instance
 
 
 @pytest.fixture(autouse=True)
@@ -124,15 +132,14 @@ 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:
-            request.node.funcargs[argname] = await container.aresolve(interface)
-        except Exception:  # noqa
+            # Resolve the instance
+            instance = await container.aresolve(interface)
+        except LookupError:
             _anydi_unresolved.append(interface)
+            continue
+        request.node.funcargs[argname] = instance

{anydi-0.26.2.dist-info → anydi-0.26.2a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anydi
-Version: 0.26.2
+Version: 0.26.2a0
 Summary: Dependency Injection library
 Home-page: https://github.com/antonrh/anydi
 License: MIT

{anydi-0.26.2.dist-info → anydi-0.26.2a0.dist-info}/RECORD

@@ -17,12 +17,12 @@ 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=kVUKVKtqCx1Nfnm1oh2BMyB0G7qQKPw6OGfxFlqUqtc,5305
-anydi/ext/pytest_plugin.py,sha256=pFLcfxGtJfGSqtk7sPrrHFSKOaZoKZTWt5X8CT0ydmA,4242
+anydi/ext/pytest_plugin.py,sha256=AQVBsyEGoQdOvXpa2TlEPYMapzL7a-oKoVcvMnQ5Epk,4477
 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.2.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.26.2.dist-info/METADATA,sha256=t-t-Yma46l0AtxjL_qr-RJtMjdqGRVWjLO1VDzULZX4,5160
-anydi-0.26.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-anydi-0.26.2.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
-anydi-0.26.2.dist-info/RECORD,,
+anydi-0.26.2a0.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.26.2a0.dist-info/METADATA,sha256=fpgusceJ8gJiULDDjConkYXkWEiG4GHrMgWGZ_8YDQk,5162
+anydi-0.26.2a0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+anydi-0.26.2a0.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
+anydi-0.26.2a0.dist-info/RECORD,,