anydi 0.37.4a0__py3-none-any.whl → 0.38.1__py3-none-any.whl

anydi/_container.py

@@ -504,6 +504,8 @@ class Container:
                     instance = self._create_instance(provider, context, **defaults)
             else:
                 instance = self._create_instance(provider, context, **defaults)
+        if self.testing:
+            instance = self._patch_test_resolver(provider.interface, instance)
         return cast(T, instance)
 
     async def acreate(self, interface: type[T], **defaults: Any) -> T:
@@ -520,6 +522,8 @@ class Container:
                     )
             else:
                 instance = await self._acreate_instance(provider, context, **defaults)
+        if self.testing:
+            instance = self._patch_test_resolver(provider.interface, instance)
         return cast(T, instance)
 
     def _get_or_create_instance(

anydi/ext/pytest_plugin.py

@@ -57,27 +57,20 @@ def _anydi_should_inject(request: pytest.FixtureRequest) -> bool:
     return marker is not None or inject_all
 
 
-@pytest.fixture(scope="session")
-def _anydi_unresolved() -> Iterator[list[Any]]:
-    unresolved: list[Any] = []
-    yield unresolved
-    unresolved.clear()
-
-
 @pytest.fixture
 def _anydi_injected_parameter_iterator(
     request: pytest.FixtureRequest,
-    _anydi_unresolved: list[str],
 ) -> Callable[[], Iterator[tuple[str, Any]]]:
-    registered_fixtures = request.session._fixturemanager._arg2fixturedefs  # noqa
+    fixturenames = set(request.node._fixtureinfo.initialnames) - set(
+        request.node._fixtureinfo.name2fixturedefs.keys()
+    )
 
     def _iterator() -> Iterator[tuple[str, inspect.Parameter]]:
         for parameter in get_typed_parameters(request.function):
             interface = parameter.annotation
             if (
                 interface is inspect.Parameter.empty
-                or interface in _anydi_unresolved
-                or parameter.name in registered_fixtures
+                or parameter.name not in fixturenames
             ):
                 continue
             yield parameter.name, interface
@@ -90,7 +83,6 @@ def _anydi_inject(
     request: pytest.FixtureRequest,
     _anydi_should_inject: bool,
     _anydi_injected_parameter_iterator: Callable[[], Iterator[tuple[str, Any]]],
-    _anydi_unresolved: list[str],
 ) -> None:
     """Inject dependencies into the test function."""
 
@@ -111,7 +103,6 @@ def _anydi_inject(
             logger.warning(
                 f"Failed to resolve dependency for argument '{argname}'.", exc_info=exc
             )
-            _anydi_unresolved.append(interface)
 
 
 @pytest.fixture(autouse=True)
@@ -119,7 +110,6 @@ def _anydi_ainject(
     request: pytest.FixtureRequest,
     _anydi_should_inject: bool,
     _anydi_injected_parameter_iterator: Callable[[], Iterator[tuple[str, Any]]],
-    _anydi_unresolved: list[str],
 ) -> None:
     """Inject dependencies into the test function."""
     if (
@@ -149,7 +139,6 @@ def _anydi_ainject(
                     f"Failed to resolve dependency for argument '{argname}'.",
                     exc_info=exc,
                 )
-                _anydi_unresolved.append(interface)
 
     anyio_backend = request.getfixturevalue("anyio_backend")
     backend_name, backend_options = extract_backend_and_options(anyio_backend)

{anydi-0.37.4a0.dist-info → anydi-0.38.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anydi
-Version: 0.37.4a0
+Version: 0.38.1
 Summary: Dependency Injection library
 Project-URL: Repository, https://github.com/antonrh/anydi
 Author-email: Anton Ruhlov <antonruhlov@gmail.com>

{anydi-0.37.4a0.dist-info → anydi-0.38.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 anydi/__init__.py,sha256=OfRg2EfXD65pHTGQKhfkABMwUhw5LvsuTQV_Tv4V4wk,501
-anydi/_container.py,sha256=yH1DsSQFkbfxGaDFs47nr-iXLE_Wwgv6QMTGWrRb8cE,38524
+anydi/_container.py,sha256=b2WKdDLwLj50u0DUOdAku2oYOKpw3UD7rCuytu2x_R4,38732
 anydi/_context.py,sha256=7LV_SL4QWkJeiG7_4D9PZ5lmU-MPzhofxC95zCgY9Gc,2651
 anydi/_provider.py,sha256=1IyxHO83NHjsPDHLDIZtW1pJ7i8VpWD3EM4T6duw9zA,7661
 anydi/_types.py,sha256=fdO4xNXtGMxVArmlfDkFYbyR895ixkBTW6V8lMceN7Q,1562
@@ -10,7 +10,7 @@ anydi/ext/_utils.py,sha256=U6sRqWzccWUu7eMhbXX1NrwcaxitQF9cO1KxnKF37gw,2566
 anydi/ext/fastapi.py,sha256=AEL3ubu-LxUPHMMt1YIn3En_JZC7nyBKmKxmhka3O3c,2436
 anydi/ext/faststream.py,sha256=qXnNGvAqWWp9kbhbQUE6EF_OPUiYQmtOH211_O7BI_0,1898
 anydi/ext/pydantic_settings.py,sha256=8IXXLuG_OvKbvKlBkBRQUHcXgbTpgQUxeWyoMcRIUQM,1488
-anydi/ext/pytest_plugin.py,sha256=ShGhiZnP1KyMHhnc9Ci1RKAuHVhw628OTS2P2BLEOfc,5001
+anydi/ext/pytest_plugin.py,sha256=25A93Yon0cr4y8CszQB7zOJRiAXW-ZwtO7_Ji8mqcXs,4639
 anydi/ext/django/__init__.py,sha256=QI1IABCVgSDTUoh7M9WMECKXwB3xvh04HfQ9TOWw1Mk,223
 anydi/ext/django/_container.py,sha256=cxVoYQG16WP0S_Yv4TnLwuaaT7NVEOhLWO-YdALJUb4,418
 anydi/ext/django/_settings.py,sha256=Z0RlAuXoO73oahWeMkK10w8c-4uCBde-DBpeKTV5USY,853
@@ -22,8 +22,8 @@ anydi/ext/django/ninja/_operation.py,sha256=wSWa7D73XTVlOibmOciv2l6JHPe1ERZcXrqI
 anydi/ext/django/ninja/_signature.py,sha256=2cSzKxBIxXLqtwNuH6GSlmjVJFftoGmleWfyk_NVEWw,2207
 anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/starlette/middleware.py,sha256=9CQtGg5ZzUz2gFSzJr8U4BWzwNjK8XMctm3n52M77Z0,792
-anydi-0.37.4a0.dist-info/METADATA,sha256=jhmqQRzY62zTNvZu6ud0UzoFmaLIH-yN9K0pHZz_dIc,4919
-anydi-0.37.4a0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-anydi-0.37.4a0.dist-info/entry_points.txt,sha256=Nklo9f3Oe4AkNsEgC4g43nCJ-23QDngZSVDNRMdaILI,43
-anydi-0.37.4a0.dist-info/licenses/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.37.4a0.dist-info/RECORD,,
+anydi-0.38.1.dist-info/METADATA,sha256=_DWptDh85lW1UwzL1AnIaCiB9THnpeaCI4AlupFYjG0,4917
+anydi-0.38.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+anydi-0.38.1.dist-info/entry_points.txt,sha256=Nklo9f3Oe4AkNsEgC4g43nCJ-23QDngZSVDNRMdaILI,43
+anydi-0.38.1.dist-info/licenses/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.38.1.dist-info/RECORD,,