anydi 0.25.0a2__tar.gz → 0.25.2__tar.gz

{anydi-0.25.0a2 → anydi-0.25.2}/PKG-INFO

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

{anydi-0.25.0a2 → anydi-0.25.2}/anydi/_container.py

@@ -47,6 +47,7 @@ from ._utils import (
     get_full_qualname,
     get_typed_parameters,
     get_typed_return_annotation,
+    has_resource_origin,
     is_builtin_type,
 )
 
@@ -723,7 +724,9 @@ class Container:
                 f"Missing `{get_full_qualname(obj)}` provider return annotation."
             )
 
-        if get_origin(annotation) in (get_origin(Iterator), get_origin(AsyncIterator)):
+        origin = get_origin(annotation)
+
+        if has_resource_origin(origin):
             args = get_args(annotation)
             if args:
                 return args[0]

{anydi-0.25.0a2 → anydi-0.25.2}/anydi/_utils.py

@@ -6,9 +6,9 @@ import builtins
 import functools
 import inspect
 import sys
-from typing import Any, Callable, ForwardRef, TypeVar, cast
+from typing import Any, AsyncIterator, Callable, ForwardRef, Iterator, TypeVar, cast
 
-from typing_extensions import Annotated, ParamSpec, get_origin
+from typing_extensions import ParamSpec, get_args, get_origin
 
 try:
     import anyio  # noqa
@@ -33,27 +33,28 @@ P = ParamSpec("P")
 
 def get_full_qualname(obj: Any) -> str:
     """Get the fully qualified name of an object."""
-    origin = get_origin(obj)
-    if origin is Annotated:
-        metadata = ", ".join(
-            [
-                f'"{arg}"' if isinstance(arg, str) else str(arg)
-                for arg in obj.__metadata__
-            ]
-        )
-        return f"Annotated[{get_full_qualname(obj.__args__[0])}, {metadata}]]"
-
     qualname = getattr(obj, "__qualname__", None)
-    module_name = getattr(obj, "__module__", None)
+    module = getattr(obj, "__module__", None)
+
     if qualname is None:
         qualname = type(obj).__qualname__
 
-    if module_name is None:
-        module_name = type(obj).__module__
+    if module is None:
+        module = type(obj).__module__
 
-    if module_name == builtins.__name__:
+    if module == builtins.__name__:
         return qualname
-    return f"{module_name}.{qualname}"
+
+    origin = get_origin(obj)
+
+    if origin:
+        args = ", ".join(
+            get_full_qualname(arg) if not isinstance(arg, str) else f'"{arg}"'
+            for arg in get_args(obj)
+        )
+        return f"{get_full_qualname(origin)}[{args}]"
+
+    return f"{module}.{qualname}"
 
 
 def is_builtin_type(tp: type[Any]) -> bool:
@@ -61,17 +62,19 @@ def is_builtin_type(tp: type[Any]) -> bool:
     return tp.__module__ == builtins.__name__
 
 
-def make_forwardref(annotation: str, globalns: dict[str, Any]) -> Any:
-    """Create a forward reference from a string annotation."""
-    forward_ref = ForwardRef(annotation)
-    return evaluate_forwardref(forward_ref, globalns, globalns)
-
-
-def get_typed_annotation(annotation: Any, globalns: dict[str, Any]) -> Any:
+def get_typed_annotation(
+    annotation: Any,
+    globalns: dict[str, Any],
+    module: Any = None,
+    is_class: bool = False,
+) -> Any:
     """Get the typed annotation of a parameter."""
     if isinstance(annotation, str):
-        annotation = ForwardRef(annotation)
-        annotation = evaluate_forwardref(annotation, globalns, globalns)
+        if sys.version_info < (3, 9):
+            annotation = ForwardRef(annotation)
+        else:
+            annotation = ForwardRef(annotation, module=module, is_class=is_class)
+        annotation = evaluate_forwardref(annotation, globalns, {})
     return annotation
 
 
@@ -82,20 +85,40 @@ def get_typed_return_annotation(obj: Callable[..., Any]) -> Any:
     if annotation is inspect.Signature.empty:
         return None
     globalns = getattr(obj, "__globals__", {})
-    return get_typed_annotation(annotation, globalns)
+    module = getattr(obj, "__module__", None)
+    is_class = inspect.isclass(obj)
+    return get_typed_annotation(annotation, globalns, module=module, is_class=is_class)
 
 
 def get_typed_parameters(obj: Callable[..., Any]) -> list[inspect.Parameter]:
     """Get the typed parameters of a callable object."""
     globalns = getattr(obj, "__globals__", {})
+    module = getattr(obj, "__module__", None)
+    is_class = inspect.isclass(obj)
     return [
         parameter.replace(
-            annotation=get_typed_annotation(parameter.annotation, globalns)
+            annotation=get_typed_annotation(
+                parameter.annotation,
+                globalns,
+                module=module,
+                is_class=is_class,
+            )
         )
         for name, parameter in inspect.signature(obj).parameters.items()
     ]
 
 
+_resource_origins = (
+    get_origin(Iterator),
+    get_origin(AsyncIterator),
+)
+
+
+def has_resource_origin(origin: Any) -> bool:
+    """Check if the given origin is a resource origin."""
+    return origin in _resource_origins
+
+
 async def run_async(
     func: Callable[P, T],
     /,

{anydi-0.25.0a2 → anydi-0.25.2}/anydi/ext/django/_settings.py

@@ -11,7 +11,7 @@ class Settings(TypedDict):
     STRICT_MODE: bool
     REGISTER_SETTINGS: bool
     REGISTER_COMPONENTS: bool
-    INJECT_URLCONF: str | None
+    INJECT_URLCONF: str | Sequence[str] | None
     MODULES: Sequence[str]
     SCAN_PACKAGES: Sequence[str]
     PATCH_NINJA: bool

{anydi-0.25.0a2 → anydi-0.25.2}/anydi/ext/django/_utils.py

@@ -94,10 +94,14 @@ def inject_urlpatterns(container: anydi.Container, *, urlconf: str) -> None:
     """Auto-inject the container into views."""
     resolver = get_resolver(urlconf)
     for pattern in iter_urlpatterns(resolver.url_patterns):
+        # Skip already injected views
+        if hasattr(pattern.callback, "_injected"):
+            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[attr-defined]
 
 
 def iter_urlpatterns(

{anydi-0.25.0a2 → anydi-0.25.2}/anydi/ext/django/apps.py

@@ -33,7 +33,7 @@ class ContainerConfig(AppConfig):  # type: ignore[misc]
                 )
             except ImportError as exc:
                 raise ImproperlyConfigured(
-                    f"Cannot import container getter '{container_factory_path}'."
+                    f"Cannot import container factory '{container_factory_path}'."
                 ) from exc
             self.container = container_factory()
         else:
@@ -75,7 +75,10 @@ class ContainerConfig(AppConfig):  # type: ignore[misc]
 
         # Auto-injecting the container into views
         if urlconf := self.settings["INJECT_URLCONF"]:
-            inject_urlpatterns(self.container, urlconf=urlconf)
+            if isinstance(urlconf, str):
+                urlconf = [urlconf]
+            for u in urlconf:
+                inject_urlpatterns(self.container, urlconf=u)
 
         # Scan packages
         for scan_package in self.settings["SCAN_PACKAGES"]:

{anydi-0.25.0a2 → anydi-0.25.2}/anydi/ext/django/ninja/_signature.py

@@ -11,7 +11,7 @@ from ninja.signature.details import (
 )
 from ninja.signature.utils import get_path_param_names, get_typed_signature
 
-from anydi._types import Marker  # noqa
+from anydi._types import is_marker  # noqa
 
 
 class ViewSignature(BaseViewSignature):
@@ -46,7 +46,7 @@ class ViewSignature(BaseViewSignature):
                 continue
 
             # Skip default values that are anydi dependency markers
-            if isinstance(arg.default, Marker):
+            if is_marker(arg.default):
                 self.dependencies.append((name, arg.annotation))
                 continue
 

{anydi-0.25.0a2 → anydi-0.25.2}/anydi/ext/pytest_plugin.py

@@ -6,6 +6,7 @@ from typing import Any, Callable, Iterator, cast
 import pytest
 
 from anydi import Container
+from anydi._utils import get_typed_parameters
 
 
 def pytest_configure(config: pytest.Config) -> None:
@@ -63,14 +64,14 @@ def _anydi_injected_parameter_iterator(
     _anydi_unresolved: list[str],
 ) -> Callable[[], Iterator[tuple[str, Any]]]:
     def _iterator() -> Iterator[tuple[str, inspect.Parameter]]:
-        for name, parameter in inspect.signature(request.function).parameters.items():
+        for parameter in get_typed_parameters(request.function):
             if (
                 ((interface := parameter.annotation) is parameter.empty)
                 or interface in _anydi_unresolved
-                or name in request.node.funcargs
+                or parameter.name in request.node.funcargs
             ):
                 continue
-            yield name, interface
+            yield parameter.name, interface
 
     return _iterator
 

{anydi-0.25.0a2 → anydi-0.25.2}/pyproject.toml

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