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

anydi/_container.py

@@ -225,7 +225,7 @@ class Container:
                 scoped_context.delete(interface)
 
         # Cleanup provider references
-        self._providers.pop(interface, None)
+        self._delete_provider(interface)
 
     def _get_provider(self, interface: AnyInterface) -> Provider:
         """Get provider by interface.
@@ -288,6 +288,16 @@ class Container:
         if provider.is_resource:
             self._providers_cache[provider.scope].append(interface)
 
+    def _delete_provider(self, interface: AnyInterface) -> None:
+        """Delete a provider by interface.
+
+        Args:
+            interface: The interface for which to delete the provider.
+        """
+        provider = self._providers.pop(interface, None)
+        if provider is not None and provider.is_resource:
+            self._providers_cache[provider.scope].remove(interface)
+
     def _validate_provider_scope(self, provider: Provider) -> None:
         """Validate the scope of a provider.
 

anydi/ext/pytest_plugin.py

@@ -63,12 +63,15 @@ def _anydi_injected_parameter_iterator(
     request: pytest.FixtureRequest,
     _anydi_unresolved: list[str],
 ) -> Callable[[], Iterator[tuple[str, Any]]]:
+    registered_fixtures = request.session._fixturemanager._arg2fixturedefs  # noqa
+
     def _iterator() -> Iterator[tuple[str, inspect.Parameter]]:
         for parameter in get_typed_parameters(request.function):
+            interface = parameter.annotation
             if (
-                ((interface := parameter.annotation) is parameter.empty)
+                interface is parameter.empty
                 or interface in _anydi_unresolved
-                or parameter.name in request.node.funcargs
+                or parameter.name in registered_fixtures
             ):
                 continue
             yield parameter.name, interface
@@ -92,18 +95,18 @@ def _anydi_inject(
     container = cast(Container, request.getfixturevalue("anydi_setup_container"))
 
     for argname, interface in _anydi_injected_parameter_iterator():
-        try:
-            # Release the instance if it was already resolved
+        # 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)
-        except LookupError:
-            pass
+
         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)
@@ -121,15 +124,15 @@ async def _anydi_ainject(
     container = cast(Container, request.getfixturevalue("anydi_setup_container"))
 
     for argname, interface in _anydi_injected_parameter_iterator():
-        try:
-            # Release the instance if it was already resolved
+        # 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)
-        except LookupError:
-            pass
+
         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.26.1.dist-info → anydi-0.26.2.dist-info}/METADATA

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

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

@@ -1,5 +1,5 @@
 anydi/__init__.py,sha256=aeaBp5vq09sG-e9sqqs9qpUtUIDNfOdFPrlAfE5Ku9E,584
-anydi/_container.py,sha256=IhfucOoAPYpMY9A0uHcqa1EOzE3_0TsExR-ZehZrZ6U,29246
+anydi/_container.py,sha256=iVmVlnhK3qfcSCvDZsbD23x2REBtBD26abqKJuLGyHs,29631
 anydi/_context.py,sha256=e0VX0fiflzW_2O9w3HvUH3YRCwXHsruQjf3Lu-zXgDw,10815
 anydi/_logger.py,sha256=UpubJUnW83kffFxkhUlObm2DmZX1Pjqoz9YFKS-JOPg,52
 anydi/_module.py,sha256=E1TfLud_Af-MPB83PxIzHVA1jlDW2FGaRP_il1a6y3Y,3675
@@ -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=nDNqjblVQufLha6P8J8hZw4Q0EuwC71bOI_bdaGm-OQ,4043
+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.26.1.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.26.1.dist-info/METADATA,sha256=hkpiTSYLFIydo8Xt_-Yp864RBbtPh8XLE_gNhiCUuYE,5160
-anydi-0.26.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-anydi-0.26.1.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
-anydi-0.26.1.dist-info/RECORD,,
+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,,