anydi 0.44.0__tar.gz → 0.45.0__tar.gz

{anydi-0.44.0 → anydi-0.45.0}/PKG-INFO

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

{anydi-0.44.0 → anydi-0.45.0}/anydi/_container.py

@@ -399,9 +399,8 @@ class Container:
         self._set_provider(provider)
         return provider
 
-    def _validate_provider_scope(
-        self, scope: Scope, name: str, kind: ProviderKind
-    ) -> None:
+    @staticmethod
+    def _validate_provider_scope(scope: Scope, name: str, kind: ProviderKind) -> None:
         """Validate the provider scope."""
         if scope not in (allowed_scopes := get_args(Scope)):
             raise ValueError(
@@ -431,10 +430,8 @@ class Container:
     ) -> Provider:
         """Get or register a provider by interface."""
         try:
-            return self._get_provider(interface)
-        except LookupError:
-            if interface is inspect.Parameter.empty:
-                raise
+            return self._providers[interface]
+        except KeyError:
             if inspect.isclass(interface) and not is_builtin_type(interface):
                 # Try to get defined scope
                 if is_provided(interface):
@@ -442,7 +439,12 @@ class Container:
                 else:
                     scope = parent_scope
                 return self._register_provider(interface, scope, interface, **defaults)
-            raise
+            raise LookupError(
+                f"The provider interface `{type_repr(interface)}` is either not "
+                "registered, not provided, or not set in the scoped context. "
+                "Please ensure that the provider interface is properly registered and "
+                "that the class is decorated with a scope before attempting to use it."
+            ) from None
 
     def _set_provider(self, provider: Provider) -> None:
         """Set a provider by interface."""
@@ -528,40 +530,34 @@ class Container:
             del context[interface]
 
     def _resolve_or_create(
-        self, interface: type[T], create: bool, /, **defaults: Any
-    ) -> T:
+        self, interface: Any, create: bool, /, **defaults: Any
+    ) -> Any:
         """Internal method to handle instance resolution and creation."""
         provider = self._get_or_register_provider(interface, None, **defaults)
         if provider.scope == "transient":
-            instance = self._create_instance(provider, None, **defaults)
-        else:
-            context = self._get_instance_context(provider.scope)
-            with context.lock():
-                instance = (
-                    self._get_or_create_instance(provider, context)
-                    if not create
-                    else self._create_instance(provider, context, **defaults)
-                )
-
-        return cast(T, instance)
+            return self._create_instance(provider, None, **defaults)
+        context = self._get_instance_context(provider.scope)
+        with context.lock():
+            return (
+                self._get_or_create_instance(provider, context)
+                if not create
+                else self._create_instance(provider, context, **defaults)
+            )
 
     async def _aresolve_or_create(
-        self, interface: type[T], create: bool, /, **defaults: Any
-    ) -> T:
+        self, interface: Any, create: bool, /, **defaults: Any
+    ) -> Any:
         """Internal method to handle instance resolution and creation asynchronously."""
         provider = self._get_or_register_provider(interface, None, **defaults)
         if provider.scope == "transient":
-            instance = await self._acreate_instance(provider, None, **defaults)
-        else:
-            context = self._get_instance_context(provider.scope)
-            async with context.alock():
-                instance = (
-                    await self._aget_or_create_instance(provider, context)
-                    if not create
-                    else await self._acreate_instance(provider, context, **defaults)
-                )
-
-        return cast(T, instance)
+            return await self._acreate_instance(provider, None, **defaults)
+        context = self._get_instance_context(provider.scope)
+        async with context.alock():
+            return (
+                await self._aget_or_create_instance(provider, context)
+                if not create
+                else await self._acreate_instance(provider, context, **defaults)
+            )
 
     def _get_or_create_instance(
         self, provider: Provider, context: InstanceContext
@@ -652,10 +648,9 @@ class Container:
         """Retrieve the arguments for a provider."""
         provided_kwargs = {}
         for parameter in provider.parameters:
-            instance, _ = self._get_provider_instance(
+            provided_kwargs[parameter.name] = self._get_provider_instance(
                 provider, parameter, context, **defaults
             )
-            provided_kwargs[parameter.name] = instance
         return {**defaults, **provided_kwargs}
 
     def _get_provider_instance(
@@ -665,12 +660,12 @@ class Container:
         context: InstanceContext | None,
         /,
         **defaults: Any,
-    ) -> tuple[Any, bool]:
+    ) -> Any:
         """Retrieve an instance of a dependency from the scoped context."""
 
         # Try to get instance from defaults
         if parameter.name in defaults:
-            return defaults[parameter.name], True
+            return defaults[parameter.name]
 
         # Try to get instance from context
         elif context and parameter.annotation in context:
@@ -683,8 +678,8 @@ class Container:
             except LookupError:
                 if parameter.default is inspect.Parameter.empty:
                     raise
-                return parameter.default, True
-        return instance, False
+                return parameter.default
+        return instance
 
     async def _aget_provided_kwargs(
         self, provider: Provider, context: InstanceContext | None, /, **defaults: Any
@@ -692,10 +687,9 @@ class Container:
         """Asynchronously retrieve the arguments for a provider."""
         provided_kwargs = {}
         for parameter in provider.parameters:
-            instance, _ = await self._aget_provider_instance(
+            provided_kwargs[parameter.name] = await self._aget_provider_instance(
                 provider, parameter, context, **defaults
             )
-            provided_kwargs[parameter.name] = instance
         return {**defaults, **provided_kwargs}
 
     async def _aget_provider_instance(
@@ -705,12 +699,12 @@ class Container:
         context: InstanceContext | None,
         /,
         **defaults: Any,
-    ) -> tuple[Any, bool]:
+    ) -> Any:
         """Asynchronously retrieve an instance of a dependency from the context."""
 
         # Try to get instance from defaults
         if parameter.name in defaults:
-            return defaults[parameter.name], True
+            return defaults[parameter.name]
 
         # Try to get instance from context
         elif context and parameter.annotation in context:
@@ -723,20 +717,20 @@ class Container:
             except LookupError:
                 if parameter.default is inspect.Parameter.empty:
                     raise
-                return parameter.default, True
-        return instance, False
+                return parameter.default
+        return instance
 
     def _resolve_parameter(
         self, provider: Provider, parameter: inspect.Parameter
     ) -> Any:
         self._validate_resolvable_parameter(provider, parameter)
-        return self.resolve(parameter.annotation)
+        return self._resolve_or_create(parameter.annotation, False)
 
     async def _aresolve_parameter(
         self, provider: Provider, parameter: inspect.Parameter
     ) -> Any:
         self._validate_resolvable_parameter(provider, parameter)
-        return await self.aresolve(parameter.annotation)
+        return await self._aresolve_or_create(parameter.annotation, False)
 
     def _validate_resolvable_parameter(
         self, provider: Provider, parameter: inspect.Parameter
@@ -822,6 +816,9 @@ class Container:
         self, call: Callable[..., Any], parameter: inspect.Parameter
     ) -> None:
         """Validate an injected parameter."""
+        # TODO: temporary disable until strict is enforced
+        return None
+
         if parameter.annotation is inspect.Parameter.empty:
             raise TypeError(
                 f"Missing `{type_repr(call)}` parameter `{parameter.name}` annotation."

{anydi-0.44.0 → anydi-0.45.0}/anydi/ext/django/_utils.py

@@ -62,15 +62,16 @@ def register_components(container: Container) -> None:
 def inject_urlpatterns(container: Container, *, urlconf: str) -> None:
     """Auto-inject the container into views."""
     resolver = get_resolver(urlconf)
+    injected_urlpatterns = []
     for pattern in iter_urlpatterns(resolver.url_patterns):
         # Skip already injected views
-        if hasattr(pattern.callback, "_injected"):
+        if pattern.lookup_str in injected_urlpatterns:
             continue
         # Skip django-ninja views
         if pattern.lookup_str.startswith("ninja."):
             continue  # pragma: no cover
         pattern.callback = container.inject(pattern.callback)
-        pattern.callback._injected = True  # type: ignore
+        injected_urlpatterns.append(pattern.lookup_str)
 
 
 def iter_urlpatterns(

{anydi-0.44.0 → anydi-0.45.0}/anydi/testing.py

@@ -2,7 +2,7 @@ import contextlib
 import inspect
 import logging
 from collections.abc import Iterable, Iterator, Sequence
-from typing import Any, TypeVar, cast
+from typing import Any, TypeVar
 
 import wrapt  # type: ignore
 from typing_extensions import Self
@@ -65,18 +65,18 @@ class TestContainer(Container):
             self._override_instances.pop(interface, None)
 
     def _resolve_or_create(
-        self, interface: type[T], create: bool, /, **defaults: Any
-    ) -> T:
+        self, interface: Any, create: bool, /, **defaults: Any
+    ) -> Any:
         """Internal method to handle instance resolution and creation."""
         instance = super()._resolve_or_create(interface, create, **defaults)
-        return cast(T, self._patch_resolver(interface, instance))
+        return self._patch_resolver(interface, instance)
 
     async def _aresolve_or_create(
-        self, interface: type[T], create: bool, /, **defaults: Any
-    ) -> T:
+        self, interface: Any, create: bool, /, **defaults: Any
+    ) -> Any:
         """Internal method to handle instance resolution and creation asynchronously."""
         instance = await super()._aresolve_or_create(interface, create, **defaults)
-        return cast(T, self._patch_resolver(interface, instance))
+        return self._patch_resolver(interface, instance)
 
     def _get_provider_instance(
         self,
@@ -87,12 +87,10 @@ class TestContainer(Container):
         **defaults: Any,
     ) -> Any:
         """Retrieve an instance of a dependency from the scoped context."""
-        instance, is_default = super()._get_provider_instance(
+        instance = super()._get_provider_instance(
             provider, parameter, context, **defaults
         )
-        if not is_default:
-            instance = InstanceProxy(instance, interface=parameter.annotation)
-        return instance, is_default
+        return InstanceProxy(instance, interface=parameter.annotation)
 
     async def _aget_provider_instance(
         self,
@@ -103,14 +101,12 @@ class TestContainer(Container):
         **defaults: Any,
     ) -> Any:
         """Asynchronously retrieve an instance of a dependency from the context."""
-        instance, is_default = await super()._aget_provider_instance(
+        instance = await super()._aget_provider_instance(
             provider, parameter, context, **defaults
         )
-        if not is_default:
-            instance = InstanceProxy(instance, interface=parameter.annotation)
-        return instance, is_default
+        return InstanceProxy(instance, interface=parameter.annotation)
 
-    def _patch_resolver(self, interface: type[Any], instance: Any) -> Any:
+    def _patch_resolver(self, interface: Any, instance: Any) -> Any:
         """Patch the test resolver for the instance."""
         if interface in self._override_instances:
             return self._override_instances[interface]

{anydi-0.44.0 → anydi-0.45.0}/docs/usage.md

@@ -178,7 +178,7 @@ from typing import Iterator
 
 from anydi import Container
 
-container = Container()  # Non-strict mode
+container = Container()
 
 @container.provider(scope="singleton")
 def db() -> Iterator[Database]:

{anydi-0.44.0 → anydi-0.45.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "anydi"
-version = "0.44.0"
+version = "0.45.0"
 description = "Dependency Injection library"
 authors = [{ name = "Anton Ruhlov", email = "antonruhlov@gmail.com" }]
 requires-python = "~=3.9"
@@ -137,7 +137,7 @@ omit = [
 ]
 
 [tool.bumpversion]
-current_version = "0.44.0"
+current_version = "0.45.0"
 parse = """(?x)
     (?P<major>0|[1-9]\\d*)\\.
     (?P<minor>0|[1-9]\\d*)\\.

{anydi-0.44.0 → anydi-0.45.0}/tests/ext/fastapi/test_ext.py

@@ -14,6 +14,7 @@ def test_inject_param_missing_interface() -> None:
         _ = param.interface
 
 
+@pytest.mark.skip(reason="disable until strict is enforced")
 def test_install_without_annotation() -> None:
     container = Container()
 
@@ -33,6 +34,7 @@ def test_install_without_annotation() -> None:
         install(app, container)
 
 
+@pytest.mark.skip(reason="disable until strict is enforced")
 def test_install_unknown_annotation() -> None:
     container = Container()
 

{anydi-0.44.0 → anydi-0.45.0}/tests/ext/faststream/test_ext.py

@@ -14,6 +14,7 @@ def test_inject_param_missing_interface() -> None:
         _ = param.interface
 
 
+@pytest.mark.skip(reason="disable until strict is enforced")
 def test_install_without_annotation() -> None:
     container = Container()
 
@@ -33,6 +34,7 @@ def test_install_without_annotation() -> None:
         install(broker, container)
 
 
+@pytest.mark.skip(reason="disable until strict is enforced")
 def test_install_unknown_annotation() -> None:
     container = Container()
 

{anydi-0.44.0 → anydi-0.45.0}/tests/test_container.py

@@ -962,9 +962,10 @@ class TestContainer:
         with pytest.raises(
             LookupError,
             match=(
-                "The provider interface for `str` has not been registered. Please "
-                "ensure that the provider interface is properly registered before "
-                "attempting to use it."
+                "The provider interface `str` is either not registered, not provided, "
+                "or not set in the scoped context. Please ensure that the provider "
+                "interface is properly registered and that the class is decorated "
+                "with a scope before attempting to use it."
             ),
         ):
             container.resolve(str)
@@ -1419,15 +1420,17 @@ class TestContainerInjector:
 
         assert result == "service ident = 1000"
 
+    @pytest.mark.skip(reason="disable until strict is enforced")
     def test_inject_missing_annotation(self, container: Container) -> None:
-        def handler(name=auto) -> str:  # type: ignore[no-untyped-def]
-            return name  # type: ignore[no-any-return]
+        def handler(name=auto) -> str:  # type: ignore
+            return name  # type: ignore
 
         with pytest.raises(
             TypeError, match="Missing `(.*?).handler` parameter `name` annotation."
         ):
             container.inject(handler)
 
+    @pytest.mark.skip(reason="disable until strict is enforced")
     def test_inject_unknown_dependency_using_strict_mode(self) -> None:
         container = Container()
 

{anydi-0.44.0 → anydi-0.45.0}/uv.lock

@@ -13,7 +13,7 @@ wheels = [
 
 [[package]]
 name = "anydi"
-version = "0.43.0"
+version = "0.45.0"
 source = { editable = "." }
 dependencies = [
     { name = "anyio" },