anydi 0.67.0__py3-none-any.whl → 0.67.1__py3-none-any.whl

anydi/_container.py

@@ -390,28 +390,27 @@ class Container:
         name = type_repr(call)
         kind = ProviderKind.from_call(call)
         is_class = kind == ProviderKind.CLASS
-        is_resource = kind in (ProviderKind.GENERATOR, ProviderKind.ASYNC_GENERATOR)
+        is_coroutine = kind == ProviderKind.COROUTINE
+        is_generator = kind == ProviderKind.GENERATOR
+        is_async_generator = kind == ProviderKind.ASYNC_GENERATOR
+        is_resource = is_generator or is_async_generator
 
-        # Validate scope if it provided
+        # Validate scope
         self._validate_provider_scope(scope, name, is_resource)
 
-        # Get the signature
+        # Get signature and detect interface
         signature = inspect.signature(call, eval_str=True)
 
-        # Detect the interface
         if interface is NOT_SET:
-            if is_class:
-                interface = call
-            else:
-                interface = signature.return_annotation
-                if interface is inspect.Signature.empty:
-                    interface = None
+            interface = call if is_class else signature.return_annotation
+            if interface is inspect.Signature.empty:
+                interface = None
 
-        # If the callable is an iterator, return the actual type
-        if is_iterator_type(interface) or is_iterator_type(get_origin(interface)):
+        # Handle iterator types for resources
+        interface_origin = get_origin(interface)
+        if is_iterator_type(interface) or is_iterator_type(interface_origin):
             if args := get_args(interface):
                 interface = args[0]
-                # If the callable is a generator, return the resource type
                 if is_none_type(interface):
                     interface = type(f"Event_{uuid.uuid4().hex}", (Event,), {})
             else:
@@ -420,24 +419,22 @@ class Container:
                     "without actual type argument."
                 )
 
-        # None interface is not allowed
+        # Validate interface
         if is_none_type(interface):
             raise TypeError(f"Missing `{name}` provider return annotation.")
 
-        # Check for existing provider
         if interface in self._providers and not override:
             raise LookupError(
                 f"The provider interface `{type_repr(interface)}` already registered."
             )
 
-        unresolved_parameter = None
-        unresolved_exc: LookupError | None = None
+        # Process parameters
         parameters: list[ProviderParameter] = []
         scope_provider: dict[Scope, Provider] = {}
-
-        # Precompute constant checks
+        unresolved_parameter = None
+        unresolved_exc: LookupError | None = None
         is_scoped = scope not in ("singleton", "transient")
-        has_defaults = defaults is not None
+        scope_hierarchy = self._scopes.get(scope, ()) if scope != "transient" else ()
 
         for parameter in signature.parameters.values():
             if parameter.annotation is inspect.Parameter.empty:
@@ -451,20 +448,15 @@ class Container:
                     f"are not allowed in the provider `{name}`."
                 )
 
-            default = (
-                parameter.default
-                if parameter.default is not inspect.Parameter.empty
-                else NOT_SET
-            )
-            has_default = default is not NOT_SET
+            has_default = parameter.default is not inspect.Parameter.empty
+            default = parameter.default if has_default else NOT_SET
 
             try:
                 sub_provider = self._get_or_register_provider(parameter.annotation)
             except LookupError as exc:
-                if (has_defaults and parameter.name in defaults) or has_default:
+                if (defaults and parameter.name in defaults) or has_default:
                     continue
-                # For scoped (request/custom) dependencies, allow unresolved parameters
-                # that will be provided via context.set()
+                # For scoped dependencies, allow unresolved parameters via context.set()
                 if is_scoped:
                     self._resolver.add_unresolved(parameter.annotation)
                     parameters.append(
@@ -482,12 +474,11 @@ class Container:
                 unresolved_exc = exc
                 continue
 
-            # Store first provider for each scope
-            if sub_provider.scope not in scope_provider:
-                scope_provider[sub_provider.scope] = sub_provider
+            # Track scope providers for validation
+            scope_provider.setdefault(sub_provider.scope, sub_provider)
 
-            # For scoped dependencies with same scope: if auto-registered provider
-            # has unresolved parameters, defer to context.set() instead
+            # For scoped dependencies with same scope having unresolved params,
+            # defer to context.set() instead
             if (
                 is_scoped
                 and sub_provider.scope == scope
@@ -506,6 +497,15 @@ class Container:
                 )
                 continue
 
+            # Validate scope compatibility inline
+            if scope_hierarchy and sub_provider.scope not in scope_hierarchy:
+                raise ValueError(
+                    f"The provider `{name}` with a `{scope}` scope "
+                    f"cannot depend on `{sub_provider}` with a "
+                    f"`{sub_provider.scope}` scope. Please ensure all "
+                    "providers are registered with matching scopes."
+                )
+
             parameters.append(
                 ProviderParameter(
                     name=parameter.name,
@@ -517,21 +517,11 @@ class Container:
                 )
             )
 
-        # Check scope compatibility
-        # Transient scope can use any scoped dependencies
-        if scope != "transient":
-            for sub_provider in scope_provider.values():
-                if sub_provider.scope not in self._scopes.get(scope, []):
-                    raise ValueError(
-                        f"The provider `{name}` with a `{scope}` scope "
-                        f"cannot depend on `{sub_provider}` with a "
-                        f"`{sub_provider.scope}` scope. Please ensure all "
-                        "providers are registered with matching scopes."
-                    )
-
-        # Check for unresolved parameters
+        # Handle unresolved parameters
         if unresolved_parameter:
-            if scope not in ("singleton", "transient"):
+            if is_scoped:  # pragma: no cover
+                # Note: This branch is currently unreachable because
+                # unresolved_parameter is only set when is_scoped=False
                 self._resolver.add_unresolved(interface)
             else:
                 raise LookupError(
@@ -542,11 +532,7 @@ class Container:
                     f"attempting to use it."
                 ) from unresolved_exc
 
-        is_coroutine = kind == ProviderKind.COROUTINE
-        is_generator = kind == ProviderKind.GENERATOR
-        is_async_generator = kind == ProviderKind.ASYNC_GENERATOR
-        is_async = is_coroutine or is_async_generator
-
+        # Create and register provider
         provider = Provider(
             call=call,
             scope=scope,
@@ -557,13 +543,12 @@ class Container:
             is_coroutine=is_coroutine,
             is_generator=is_generator,
             is_async_generator=is_async_generator,
-            is_async=is_async,
+            is_async=is_coroutine or is_async_generator,
             is_resource=is_resource,
         )
 
         self._set_provider(provider)
 
-        # Clear cached resolvers when overriding
         if override:
             self._resolver.clear_caches()
 

anydi/_resolver.py

@@ -672,6 +672,8 @@ class Resolver:
 
     def _wrap_for_override(self, annotation: Any, value: Any) -> Any:
         """Hook for wrapping dependencies to enable override patching."""
+        if isinstance(value, InstanceProxy):
+            return value
         return InstanceProxy(value, interface=annotation)
 
     def _post_resolve_override(self, interface: Any, instance: Any) -> Any:  # noqa: C901

{anydi-0.67.0.dist-info → anydi-0.67.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anydi
-Version: 0.67.0
+Version: 0.67.1
 Summary: Dependency Injection library
 Keywords: dependency injection,dependencies,di,async,asyncio,application
 Author: Anton Ruhlov

{anydi-0.67.0.dist-info → anydi-0.67.1.dist-info}/RECORD

@@ -1,13 +1,13 @@
 anydi/__init__.py,sha256=KFX8OthKXwBuYDPCV61t-044DpJ88tAOzIxeUWRC5OA,633
 anydi/_async_lock.py,sha256=3dwZr0KthXFYha0XKMyXf8jMmGb1lYoNC0O5w29V9ic,1104
-anydi/_container.py,sha256=_gyNfAddQtp93tjCud2JZDvgoOAM2WuMx4qIvBs7IOs,29878
+anydi/_container.py,sha256=4bv3_fiDw6aPZ-bKjU5jmqeT66CvRnteHbosqMk5R0U,29408
 anydi/_context.py,sha256=-9QqeMWo9OpZVXZxZCQgIsswggl3Ch7lgx1KiFX_ezc,3752
 anydi/_decorators.py,sha256=J3W261ZAG7q4XKm4tbAv1wsWr9ysx9_5MUbUvSJB_MQ,2809
 anydi/_injector.py,sha256=1Ux71DhGxu3dLwPJP8gU73olI0pcZ3_tVaVzwKH7100,4411
 anydi/_marker.py,sha256=xVydjGdkxd_DqqwttnJZRkQbhpCTE9OnrhFmFJMlgvI,3415
 anydi/_module.py,sha256=2kN5uEXLd2Dsc58gz5IWK43wJewr_QgIVGSO3iWp798,2609
 anydi/_provider.py,sha256=OV1WFHTYv7W2U0XDk_Kql1r551Vhq8o-pUV5ep1HQcU,1574
-anydi/_resolver.py,sha256=ask0W63w4fi1cZFd-3Bq9ael6rkTG01E05TTv81eSII,31394
+anydi/_resolver.py,sha256=6pJS-9F0epCj7goVbc7GeGdpqe0woI3Blu-3dA3jeNs,31464
 anydi/_scanner.py,sha256=rbRkHzyd2zMu7AFLffN6_tZJcMaW9gy7E-lVdHLHYrs,4294
 anydi/_types.py,sha256=lsShY_-_CM2EFajeknAYXvLl-rHfopBT8udnK5_BtS4,1161
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -21,7 +21,7 @@ anydi/ext/starlette/middleware.py,sha256=n_JJ7BcG2Mg2M5HwM_SBboxZ-mnnD6WWJn4khq7
 anydi/ext/typer.py,sha256=z-sDd3jZMPTE2CyEuJ0f9uIJB43FjoLWbjpnkOvqSKA,6236
 anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/testing.py,sha256=cHg3mMScZbEep9smRqSNQ81BZMQOkyugHe8TvKdPnEg,1347
-anydi-0.67.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-anydi-0.67.0.dist-info/entry_points.txt,sha256=AgOcQYM5KyS4D37QcYb00tiid0QA-pD1VrjHHq4QAps,44
-anydi-0.67.0.dist-info/METADATA,sha256=Ave4jzjegADI3S02BtmeX-n42cKFtT9ehXROCTepXYw,8061
-anydi-0.67.0.dist-info/RECORD,,
+anydi-0.67.1.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+anydi-0.67.1.dist-info/entry_points.txt,sha256=AgOcQYM5KyS4D37QcYb00tiid0QA-pD1VrjHHq4QAps,44
+anydi-0.67.1.dist-info/METADATA,sha256=lqtZFxSRc7ohAAkAAdjcgxQDy7q5FTNP2MtBPZo3c4o,8061
+anydi-0.67.1.dist-info/RECORD,,