anydi 0.44.1__py3-none-any.whl → 0.45.1__py3-none-any.whl

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/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
@@ -18,6 +18,8 @@ T = TypeVar("T")
 
 
 class TestContainer(Container):
+    __test__ = False
+
     def __init__(
         self,
         *,
@@ -65,18 +67,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 +89,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 +103,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.1.dist-info → anydi-0.45.1.dist-info}/METADATA

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

{anydi-0.44.1.dist-info → anydi-0.45.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 anydi/__init__.py,sha256=UH3N0LIw4ysoV0_EFgtDNioxEQxOmeytYbJnS8MXIXM,532
 anydi/_async.py,sha256=KhRd3RmZFcwNDzrMm8ctA1gwrg-6m_7laECTYsZdF5k,1445
-anydi/_container.py,sha256=lc4sT0kMgPUgJOxKEaJcNCuVZ8Lc4tS-6POOTumrCmM,30946
+anydi/_container.py,sha256=pclsUVpXDPhacgdBl1_MZ9pV4AUc6a3jBVQOHLniW-4,31047
 anydi/_context.py,sha256=_Xy8cTpRskb4cxTd-Fe-5NnIZyBe1DnovkofhdeUfmw,3020
 anydi/_decorators.py,sha256=F3yBeGQSz1EsulZaEvYn3cd6FEjJRMoyA6u1QCbEwcs,2813
 anydi/_module.py,sha256=QPvP27JndZkwl-FYUZWscJm6yfkNzjwoFGURyDhb6Pc,2582
@@ -9,7 +9,7 @@ anydi/_scan.py,sha256=WOdsPaoRZPYw4kBzoBXyWhkiwuxY8_UjHfa0c9QFyLc,3639
 anydi/_scope.py,sha256=PFHjPb2-n0vhRo9mvD_craTFfoJBzR3y-N3_0apL5Q0,258
 anydi/_typing.py,sha256=m7KnVenDE1E420IeYz2Ocw6dhddmSFbuBBgkOXtl9pA,3709
 anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi/testing.py,sha256=J7W5m4nRxi8XW99pi5gqHLXfwCC0AqAtemIA1Li3x8c,5856
+anydi/testing.py,sha256=ex9grqKpQmmJWwhIVnzq6aHaUAGLu2-7fwLyYTUuKHE,5678
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/_utils.py,sha256=QthoO0Nxv_nI-yQ9kGSi9jLLT5N71BxOgFNXwLQ5DQ0,2073
 anydi/ext/fastapi.py,sha256=q7q1hF5v4dpV3YM4L1CVuD20bXC7f5S7e1apAfekkG0,2448
@@ -27,8 +27,8 @@ anydi/ext/django/ninja/_operation.py,sha256=wk5EOjLY3KVIHk9jMCGsFsja9-dQmMOpLpHX
 anydi/ext/django/ninja/_signature.py,sha256=UVLmKpYvH1fNb9C7ffP50KCmh0BE6unHegfss5dvpVU,2261
 anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/starlette/middleware.py,sha256=MxnzshAs-CMvjJp0r457k52MzBL8O4KAuClnF6exBdU,803
-anydi-0.44.1.dist-info/METADATA,sha256=z2h5a-aEnFi-mMpUnsXTJuJAQ_KSllQS6rliMo0RofE,4957
-anydi-0.44.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-anydi-0.44.1.dist-info/entry_points.txt,sha256=Nklo9f3Oe4AkNsEgC4g43nCJ-23QDngZSVDNRMdaILI,43
-anydi-0.44.1.dist-info/licenses/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.44.1.dist-info/RECORD,,
+anydi-0.45.1.dist-info/METADATA,sha256=aup2n3aXxNUsWObdd6COZTXiPs8U_jXGiRvi9hB2CmM,4957
+anydi-0.45.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+anydi-0.45.1.dist-info/entry_points.txt,sha256=Nklo9f3Oe4AkNsEgC4g43nCJ-23QDngZSVDNRMdaILI,43
+anydi-0.45.1.dist-info/licenses/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.45.1.dist-info/RECORD,,