anydi 0.42.0__py3-none-any.whl → 0.43.0__py3-none-any.whl

anydi/_container.py

@@ -11,12 +11,13 @@ import uuid
 from collections import defaultdict
 from collections.abc import AsyncIterator, Iterable, Iterator
 from contextvars import ContextVar
-from typing import Annotated, Any, Callable, TypeVar, cast, overload
+from typing import Any, Callable, TypeVar, cast, overload
 
 from typing_extensions import ParamSpec, Self, get_args, get_origin
 
 from ._async import run_sync
 from ._context import InstanceContext
+from ._decorators import is_provided
 from ._module import ModuleDef, ModuleRegistrar
 from ._provider import (
     Provider,
@@ -441,17 +442,13 @@ class Container:
         except LookupError:
             if self.strict or interface is inspect.Parameter.empty:
                 raise
-            if get_origin(interface) is Annotated and (args := get_args(interface)):
-                call = args[0]
-            else:
-                call = interface
-            if inspect.isclass(call) and not is_builtin_type(call):
+            if inspect.isclass(interface) and not is_builtin_type(interface):
                 # Try to get defined scope
-                if hasattr(call, "__scope__"):
-                    scope = getattr(call, "__scope__")
+                if is_provided(interface):
+                    scope = interface.__provided__["scope"]
                 else:
                     scope = parent_scope
-                return self._register_provider(call, scope, interface, **defaults)
+                return self._register_provider(interface, scope, interface, **defaults)
             raise
 
     def _set_provider(self, provider: Provider) -> None:
@@ -793,8 +790,8 @@ class Container:
             return cast(Callable[P, T], self._inject_cache[call])
 
         injected_params = self._get_injected_params(call)
-
         if not injected_params:
+            self._inject_cache[call] = call
             return call
 
         if inspect.iscoroutinefunction(call):

anydi/_decorators.py

@@ -1,22 +1,41 @@
 from collections.abc import Iterable
-from typing import Callable, Concatenate, ParamSpec, TypedDict, TypeVar, overload
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Concatenate,
+    ParamSpec,
+    Protocol,
+    TypedDict,
+    TypeGuard,
+    TypeVar,
+    overload,
+)
+
+if TYPE_CHECKING:
+    from ._module import Module
+
 
-from ._module import Module
 from ._scope import Scope
 
 T = TypeVar("T")
 P = ParamSpec("P")
 
 ClassT = TypeVar("ClassT", bound=type)
-ModuleT = TypeVar("ModuleT", bound=Module)
+ModuleT = TypeVar("ModuleT", bound="Module")
+
+
+class ProvidedMetadata(TypedDict):
+    """Metadata for classes marked as provided by AnyDI."""
+
+    scope: Scope
 
 
 def provided(*, scope: Scope) -> Callable[[ClassT], ClassT]:
     """Decorator for marking a class as provided by AnyDI with a specific scope."""
 
     def decorator(cls: ClassT) -> ClassT:
-        cls.__provided__ = True
-        cls.__scope__ = scope
+        cls.__provided__ = ProvidedMetadata(scope=scope)
         return cls
 
     return decorator
@@ -28,6 +47,14 @@ request = provided(scope="request")
 singleton = provided(scope="singleton")
 
 
+class Provided(Protocol):
+    __provided__: ProvidedMetadata
+
+
+def is_provided(cls: Any) -> TypeGuard[type[Provided]]:
+    return hasattr(cls, "__provided__")
+
+
 class ProviderMetadata(TypedDict):
     scope: Scope
     override: bool
@@ -49,8 +76,15 @@ def provider(
     return decorator
 
 
+class Provider(Protocol):
+    __provider__: ProviderMetadata
+
+
+def is_provider(obj: Callable[..., Any]) -> TypeGuard[Provider]:
+    return hasattr(obj, "__provider__")
+
+
 class InjectableMetadata(TypedDict):
-    wrapped: bool
     tags: Iterable[str] | None
 
 
@@ -71,10 +105,18 @@ def injectable(
     """Decorator for marking a function or method as requiring dependency injection."""
 
     def decorator(inner: Callable[P, T]) -> Callable[P, T]:
-        inner.__injectable__ = InjectableMetadata(wrapped=True, tags=tags)  # type: ignore
+        inner.__injectable__ = InjectableMetadata(tags=tags)  # type: ignore
         return inner
 
     if func is None:
         return decorator
 
     return decorator(func)
+
+
+class Injectable(Protocol):
+    __injectable__: InjectableMetadata
+
+
+def is_injectable(obj: Callable[..., Any]) -> TypeGuard[Injectable]:
+    return hasattr(obj, "__injectable__")

anydi/_module.py

@@ -4,9 +4,10 @@ import importlib
 import inspect
 from typing import TYPE_CHECKING, Any, Callable
 
+from ._decorators import ProviderMetadata, is_provider
+
 if TYPE_CHECKING:
     from ._container import Container
-    from ._decorators import ProviderMetadata
 
 
 class ModuleMeta(type):
@@ -14,9 +15,9 @@ class ModuleMeta(type):
 
     def __new__(cls, name: str, bases: tuple[type, ...], attrs: dict[str, Any]) -> Any:
         attrs["providers"] = [
-            (name, getattr(value, "__provider__"))
+            (name, value.__provider__)
             for name, value in attrs.items()
-            if hasattr(value, "__provider__")
+            if is_provider(value)
         ]
         return super().__new__(cls, name, bases, attrs)
 

anydi/_scan.py

@@ -6,9 +6,9 @@ import pkgutil
 from collections.abc import Iterable
 from dataclasses import dataclass
 from types import ModuleType
-from typing import TYPE_CHECKING, Any, Union
+from typing import TYPE_CHECKING, Any, Callable, Union
 
-from ._decorators import InjectableMetadata
+from ._decorators import is_injectable
 from ._typing import get_typed_parameters, is_marker
 
 if TYPE_CHECKING:
@@ -73,9 +73,8 @@ class Scanner:
 
         return dependencies
 
-    @staticmethod
     def _scan_module(
-        module: ModuleType, *, tags: Iterable[str]
+        self, module: ModuleType, *, tags: Iterable[str]
     ) -> list[ScannedDependency]:
         """Scan a module for decorated members."""
         dependencies: list[ScannedDependency] = []
@@ -84,27 +83,28 @@ class Scanner:
             if getattr(member, "__module__", None) != module.__name__:
                 continue
 
-            metadata: InjectableMetadata = getattr(
-                member,
-                "__injectable__",
-                InjectableMetadata(wrapped=False, tags=[]),
-            )
-
-            should_include = False
-            if metadata["wrapped"]:
-                should_include = True
-            elif tags and metadata["tags"]:
-                should_include = bool(set(metadata["tags"]) & set(tags))
-            elif tags and not metadata["tags"]:
-                continue  # tags are provided but member has none
-
-            if not should_include:
-                for param in get_typed_parameters(member):
-                    if is_marker(param.default):
-                        should_include = True
-                        break
-
-            if should_include:
+            if self._should_include_member(member, tags=tags):
                 dependencies.append(ScannedDependency(member=member, module=module))
 
         return dependencies
+
+    @staticmethod
+    def _should_include_member(
+        member: Callable[..., Any], *, tags: Iterable[str]
+    ) -> bool:
+        """Determine if a member should be included based on tags or marker defaults."""
+
+        if is_injectable(member):
+            member_tags = set(member.__injectable__["tags"] or [])
+            if tags:
+                return bool(set(tags) & member_tags)
+            return True  # No tags passed → include all injectables
+
+        # If no tags are passed and not explicitly injectable,
+        # check for parameter markers
+        if not tags:
+            for param in get_typed_parameters(member):
+                if is_marker(param.default):
+                    return True
+
+        return False

anydi/ext/django/_utils.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from collections.abc import Iterator
-from functools import wraps
 from typing import Annotated, Any
 
 from django.conf import settings
@@ -9,7 +8,6 @@ from django.core.cache import BaseCache, caches
 from django.db import connections
 from django.db.backends.base.base import BaseDatabaseWrapper
 from django.urls import URLPattern, URLResolver, get_resolver
-from typing_extensions import get_origin
 
 from anydi import Container
 
@@ -29,14 +27,11 @@ def register_settings(
             continue
 
         container.register(
-            Annotated[Any, f"{prefix}{setting_name}"],
+            Annotated[type(setting_value), f"{prefix}{setting_name}"],
             _get_setting_value(setting_value),
             scope="singleton",
         )
 
-    # Patch AnyDI to resolve Any types for annotated settings
-    _patch_any_typed_annotated(container, prefix=prefix)
-
 
 def register_components(container: Container) -> None:
     """Register Django components into the container."""
@@ -91,38 +86,3 @@ def iter_urlpatterns(
 
 def _get_setting_value(value: Any) -> Any:
     return lambda: value
-
-
-def _any_typed_interface(interface: Any, prefix: str) -> Any:
-    origin = get_origin(interface)
-    if origin is not Annotated:
-        return interface  # pragma: no cover
-    named = interface.__metadata__[-1]
-
-    if isinstance(named, str) and named.startswith(prefix):
-        _, setting_name = named.rsplit(prefix, maxsplit=1)
-        return Annotated[Any, f"{prefix}{setting_name}"]
-    return interface
-
-
-def _patch_any_typed_annotated(container: Container, *, prefix: str) -> None:
-    def _patch_resolve(resolve: Any) -> Any:
-        @wraps(resolve)
-        def wrapper(interface: Any) -> Any:
-            return resolve(_any_typed_interface(interface, prefix))
-
-        return wrapper
-
-    def _patch_aresolve(resolve: Any) -> Any:
-        @wraps(resolve)
-        async def wrapper(interface: Any) -> Any:
-            return await resolve(_any_typed_interface(interface, prefix))
-
-        return wrapper
-
-    container.resolve = _patch_resolve(  # type: ignore
-        container.resolve
-    )
-    container.aresolve = _patch_aresolve(  # type: ignore
-        container.aresolve
-    )

{anydi-0.42.0.dist-info → anydi-0.43.0.dist-info}/METADATA

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

{anydi-0.42.0.dist-info → anydi-0.43.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 anydi/__init__.py,sha256=UH3N0LIw4ysoV0_EFgtDNioxEQxOmeytYbJnS8MXIXM,532
 anydi/_async.py,sha256=KhRd3RmZFcwNDzrMm8ctA1gwrg-6m_7laECTYsZdF5k,1445
-anydi/_container.py,sha256=Ap8PnH6ym7GTjBv9r2cmJkJCEY5XpzMXIkJYXXwJkrY,31611
+anydi/_container.py,sha256=sftWiHUTJBMQelglSbThn-Y0IeYw15vZnmC7sFqDpxQ,31529
 anydi/_context.py,sha256=_Xy8cTpRskb4cxTd-Fe-5NnIZyBe1DnovkofhdeUfmw,3020
-anydi/_decorators.py,sha256=b5FPT86pnJX8moKGaOgMclZYNXIkLhWXB_7jg1nogX0,2110
-anydi/_module.py,sha256=DK--YVzvK1KpCbqJnfdB99_vEcjsqS6Xhqk7NNClqGs,2596
+anydi/_decorators.py,sha256=F3yBeGQSz1EsulZaEvYn3cd6FEjJRMoyA6u1QCbEwcs,2813
+anydi/_module.py,sha256=QPvP27JndZkwl-FYUZWscJm6yfkNzjwoFGURyDhb6Pc,2582
 anydi/_provider.py,sha256=ig2ecn-STmFGcpkLE5A5OM35XHtU2NsxFVrGp2CvuvM,2123
-anydi/_scan.py,sha256=ADA_gjsVLP7q43qU03bsTchEJwbpckknmDCLLMf7wss,3623
+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
@@ -19,7 +19,7 @@ anydi/ext/pytest_plugin.py,sha256=57Y1G4MOpwV43Fib88JGeRI8jACcj5Jy8R-7ZT0SZJs,47
 anydi/ext/django/__init__.py,sha256=QI1IABCVgSDTUoh7M9WMECKXwB3xvh04HfQ9TOWw1Mk,223
 anydi/ext/django/_container.py,sha256=cxVoYQG16WP0S_Yv4TnLwuaaT7NVEOhLWO-YdALJUb4,418
 anydi/ext/django/_settings.py,sha256=Z0RlAuXoO73oahWeMkK10w8c-4uCBde-DBpeKTV5USY,853
-anydi/ext/django/_utils.py,sha256=sYibOAo2ildVLppIM5EFI_SyGmJy4_IGJLuzKMYvLgs,3933
+anydi/ext/django/_utils.py,sha256=N1DZlY5RHxbb7TUWH-BWWC78GzUX_a1oYEZ8hT8WgaE,2663
 anydi/ext/django/apps.py,sha256=mfOLUQ1i-B4e3f5NPitbRVuVUlm4QoFzuJVXsI8zGWA,2791
 anydi/ext/django/middleware.py,sha256=5OUdp0OWRozyW338Sq04BDhacaFlyUTTOduS_7EwCTA,854
 anydi/ext/django/ninja/__init__.py,sha256=4J0zoHPK9itbTVrjjvLX6Ftrsb2ND8bITqNDIJzEhks,520
@@ -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.42.0.dist-info/METADATA,sha256=1Di-jvpUvC5xYuUb7T1GlcJbN3X0TepPAwaquSmc5HI,4957
-anydi-0.42.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-anydi-0.42.0.dist-info/entry_points.txt,sha256=Nklo9f3Oe4AkNsEgC4g43nCJ-23QDngZSVDNRMdaILI,43
-anydi-0.42.0.dist-info/licenses/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.42.0.dist-info/RECORD,,
+anydi-0.43.0.dist-info/METADATA,sha256=QwACa2m9ugixipKP81nR-jASIqmk9c2W_Y3LNPYvW58,4957
+anydi-0.43.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+anydi-0.43.0.dist-info/entry_points.txt,sha256=Nklo9f3Oe4AkNsEgC4g43nCJ-23QDngZSVDNRMdaILI,43
+anydi-0.43.0.dist-info/licenses/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.43.0.dist-info/RECORD,,