anydi 0.26.1__tar.gz → 0.26.2a0__tar.gz

{anydi-0.26.1 → anydi-0.26.2a0}/PKG-INFO

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

{anydi-0.26.1 → anydi-0.26.2a0}/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-0.26.1 → anydi-0.26.2a0}/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"
@@ -63,13 +70,18 @@ def _anydi_injected_parameter_iterator(
     request: pytest.FixtureRequest,
     _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):
-            if (
-                ((interface := parameter.annotation) is parameter.empty)
-                or interface in _anydi_unresolved
-                or parameter.name in request.node.funcargs
-            ):
+            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:
                 continue
             yield parameter.name, interface
 
@@ -92,11 +104,10 @@ 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
+        # 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)
@@ -121,11 +132,10 @@ 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
+        # 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)

{anydi-0.26.1 → anydi-0.26.2a0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "anydi"
-version = "0.26.1"
+version = "0.26.2a0"
 description = "Dependency Injection library"
 authors = ["Anton Ruhlov <antonruhlov@gmail.com>"]
 license = "MIT"