anydi 0.24.2__tar.gz → 0.24.3__tar.gz

{anydi-0.24.2 → anydi-0.24.3}/PKG-INFO

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

{anydi-0.24.2 → anydi-0.24.3}/anydi/_container.py

@@ -43,7 +43,12 @@ from ._logger import logger
 from ._module import Module, ModuleRegistry
 from ._scanner import Scanner
 from ._types import AnyInterface, Interface, Provider, Scope, is_marker
-from ._utils import get_full_qualname, get_signature, is_builtin_type
+from ._utils import (
+    get_full_qualname,
+    get_typed_parameters,
+    get_typed_return_annotation,
+    is_builtin_type,
+)
 
 T = TypeVar("T", bound=Any)
 P = ParamSpec("P")
@@ -327,7 +332,7 @@ class Container:
         """
         related_providers = []
 
-        for parameter in provider.parameters.values():
+        for parameter in provider.parameters:
             if parameter.annotation is inspect._empty:  # noqa
                 raise TypeError(
                     f"Missing provider `{provider}` "
@@ -366,7 +371,7 @@ class Container:
             The auto scope, or None if the auto scope cannot be detected.
         """
         has_transient, has_request, has_singleton = False, False, False
-        for parameter in get_signature(obj).parameters.values():
+        for parameter in get_typed_parameters(obj):
             sub_provider = self._get_or_register_provider(parameter.annotation)
             if not has_transient and sub_provider.scope == "transient":
                 has_transient = True
@@ -711,9 +716,9 @@ class Container:
         Raises:
             TypeError: If the provider return annotation is missing or invalid.
         """
-        annotation = get_signature(obj).return_annotation
+        annotation = get_typed_return_annotation(obj)
 
-        if annotation is inspect._empty:  # noqa
+        if annotation is None:
             raise TypeError(
                 f"Missing `{get_full_qualname(obj)}` provider return annotation."
             )
@@ -741,7 +746,7 @@ class Container:
                 of the injected parameters.
         """
         injected_params = {}
-        for parameter in get_signature(obj).parameters.values():
+        for parameter in get_typed_parameters(obj):
             if not is_marker(parameter.default):
                 continue
             try:

{anydi-0.24.2 → anydi-0.24.3}/anydi/_context.py

@@ -97,7 +97,7 @@ class ScopedContext(abc.ABC):
             The arguments for the provider.
         """
         args, kwargs = [], {}
-        for parameter in provider.parameters.values():
+        for parameter in provider.parameters:
             instance = self.container.resolve(parameter.annotation)
             if parameter.kind == parameter.POSITIONAL_ONLY:
                 args.append(instance)
@@ -117,7 +117,7 @@ class ScopedContext(abc.ABC):
             The arguments for the provider.
         """
         args, kwargs = [], {}
-        for parameter in provider.parameters.values():
+        for parameter in provider.parameters:
             instance = await self.container.aresolve(parameter.annotation)
             if parameter.kind == parameter.POSITIONAL_ONLY:
                 args.append(instance)

{anydi-0.24.2 → anydi-0.24.3}/anydi/_scanner.py

@@ -20,7 +20,7 @@ from typing import (
 from typing_extensions import NamedTuple, ParamSpec
 
 from ._types import is_marker
-from ._utils import get_signature
+from ._utils import get_typed_parameters
 
 if TYPE_CHECKING:
     from ._container import Container
@@ -157,10 +157,10 @@ class Scanner:
 
             # Get by Marker
             if inspect.isclass(member):
-                signature = get_signature(member.__init__)
+                parameters = get_typed_parameters(member.__init__)
             else:
-                signature = get_signature(member)
-            for parameter in signature.parameters.values():
+                parameters = get_typed_parameters(member)
+            for parameter in parameters:
                 if is_marker(parameter.default):
                     dependencies.append(
                         self._create_dependency(member=member, module=module)

{anydi-0.24.2 → anydi-0.24.3}/anydi/_types.py

@@ -1,11 +1,13 @@
+from __future__ import annotations
+
 import inspect
 from dataclasses import dataclass
 from functools import cached_property
-from typing import Any, Callable, Mapping, Type, TypeVar, Union
+from typing import Any, Callable, Type, TypeVar, Union
 
 from typing_extensions import Annotated, Literal, Self, TypeAlias
 
-from ._utils import get_full_qualname, get_signature
+from ._utils import get_full_qualname, get_typed_parameters
 
 Scope = Literal["transient", "singleton", "request"]
 
@@ -58,13 +60,13 @@ class Provider:
         return get_full_qualname(self.obj)
 
     @cached_property
-    def parameters(self) -> Mapping[str, inspect.Parameter]:
+    def parameters(self) -> list[inspect.Parameter]:
         """Returns the parameters of the provider as a mapping.
 
         Returns:
             The parameters of the provider.
         """
-        return get_signature(self.obj).parameters
+        return get_typed_parameters(self.obj)
 
     @cached_property
     def is_class(self) -> bool:

anydi-0.24.3/anydi/_utils.py

@@ -0,0 +1,111 @@
+"""Shared AnyDI utils module."""
+
+from __future__ import annotations
+
+import builtins
+import functools
+import inspect
+import sys
+from typing import Any, Callable, ForwardRef, TypeVar, cast
+
+from typing_extensions import Annotated, ParamSpec, get_origin
+
+try:
+    import anyio  # noqa
+except ImportError:
+    anyio = None  # type: ignore[assignment]
+
+
+if sys.version_info < (3, 9):  # pragma: nocover
+
+    def evaluate_forwardref(type_: ForwardRef, globalns: Any, localns: Any) -> Any:
+        return type_._evaluate(globalns, localns)  # noqa
+
+else:
+
+    def evaluate_forwardref(type_: ForwardRef, globalns: Any, localns: Any) -> Any:
+        return cast(Any, type_)._evaluate(globalns, localns, set())  # noqa
+
+
+T = TypeVar("T")
+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)
+    if qualname is None:
+        qualname = type(obj).__qualname__
+
+    if module_name is None:
+        module_name = type(obj).__module__
+
+    if module_name == builtins.__name__:
+        return qualname
+    return f"{module_name}.{qualname}"
+
+
+def is_builtin_type(tp: type[Any]) -> bool:
+    """Check if the given type is a built-in type."""
+    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:
+    """Get the typed annotation of a parameter."""
+    if isinstance(annotation, str):
+        annotation = ForwardRef(annotation)
+        annotation = evaluate_forwardref(annotation, globalns, globalns)
+    return annotation
+
+
+def get_typed_return_annotation(obj: Callable[..., Any]) -> Any:
+    """Get the typed return annotation of a callable object."""
+    signature = inspect.signature(obj)
+    annotation = signature.return_annotation
+    if annotation is inspect.Signature.empty:
+        return None
+    globalns = getattr(obj, "__globals__", {})
+    return get_typed_annotation(annotation, globalns)
+
+
+def get_typed_parameters(obj: Callable[..., Any]) -> list[inspect.Parameter]:
+    """Get the typed parameters of a callable object."""
+    globalns = getattr(obj, "__globals__", {})
+    return [
+        parameter.replace(
+            annotation=get_typed_annotation(parameter.annotation, globalns)
+        )
+        for name, parameter in inspect.signature(obj).parameters.items()
+    ]
+
+
+async def run_async(
+    func: Callable[P, T],
+    /,
+    *args: P.args,
+    **kwargs: P.kwargs,
+) -> T:
+    """Runs the given function asynchronously using the `anyio` library."""
+    if not anyio:
+        raise ImportError(
+            "`anyio` library is not currently installed. Please make sure to install "
+            "it first, or consider using `anydi[full]` instead."
+        )
+    return await anyio.to_thread.run_sync(functools.partial(func, *args, **kwargs))

{anydi-0.24.2 → anydi-0.24.3}/anydi/ext/fastapi.py

@@ -13,7 +13,7 @@ from starlette.requests import Request
 from typing_extensions import Annotated, get_args, get_origin
 
 from anydi import Container
-from anydi._utils import get_full_qualname, get_signature
+from anydi._utils import get_full_qualname, get_typed_parameters
 
 from .starlette.middleware import RequestScopedMiddleware
 
@@ -47,7 +47,7 @@ def install(app: FastAPI, container: Container) -> None:
             call, *params = dependant.cache_key
             if not call:
                 continue  # pragma: no cover
-            for parameter in get_signature(call).parameters.values():
+            for parameter in get_typed_parameters(call):
                 _patch_route_parameter(call, parameter, container)
 
 

{anydi-0.24.2 → anydi-0.24.3}/pyproject.toml

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

anydi-0.24.2/anydi/_utils.py

@@ -1,113 +0,0 @@
-"""Shared AnyDI utils module."""
-
-from __future__ import annotations
-
-import builtins
-import functools
-import inspect
-import sys
-from typing import Any, Callable, TypeVar
-
-from typing_extensions import Annotated, ParamSpec, get_origin
-
-try:
-    import anyio  # noqa
-except ImportError:
-    anyio = None  # type: ignore[assignment]
-
-
-T = TypeVar("T")
-P = ParamSpec("P")
-
-
-def get_full_qualname(obj: Any) -> str:
-    """Get the fully qualified name of an object.
-
-    This function returns the fully qualified name of the given object,
-    which includes both the module name and the object's qualname.
-
-    Args:
-        obj: The object for which to retrieve the fully qualified name.
-
-    Returns:
-        The fully qualified name of the 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)
-    if qualname is None:
-        qualname = type(obj).__qualname__
-
-    if module_name is None:
-        module_name = type(obj).__module__
-
-    if module_name == builtins.__name__:
-        return qualname
-    return f"{module_name}.{qualname}"
-
-
-def is_builtin_type(tp: type[Any]) -> bool:
-    """
-    Check if the given type is a built-in type.
-    Args:
-        tp (type): The type to check.
-    Returns:
-        bool: True if the type is a built-in type, False otherwise.
-    """
-    return tp.__module__ == builtins.__name__
-
-
-@functools.lru_cache(maxsize=None)
-def get_signature(obj: Callable[..., Any]) -> inspect.Signature:
-    """Get the signature of a callable object.
-
-    This function uses the `inspect.signature` function to retrieve the signature
-    of the given callable object. It applies an LRU cache decorator to improve
-    performance by caching the signatures of previously inspected objects.
-
-    Args:
-        obj: The callable object to inspect.
-
-    Returns:
-        The signature of the callable object.
-    """
-    signature_kwargs: dict[str, Any] = {}
-    if sys.version_info >= (3, 10):
-        signature_kwargs["eval_str"] = True
-    return inspect.signature(obj, **signature_kwargs)
-
-
-async def run_async(
-    func: Callable[P, T],
-    /,
-    *args: P.args,
-    **kwargs: P.kwargs,
-) -> T:
-    """Runs the given function asynchronously using the `anyio` library.
-
-    Args:
-        func: The function to run asynchronously.
-        args: The positional arguments to pass to the function.
-        kwargs: The keyword arguments to pass to the function.
-
-    Returns:
-        The result of the function.
-
-    Raises:
-        ImportError: If the `anyio` library is not installed.
-    """
-    if not anyio:
-        raise ImportError(
-            "`anyio` library is not currently installed. Please make sure to install "
-            "it first, or consider using `anydi[full]` instead."
-        )
-    return await anyio.to_thread.run_sync(functools.partial(func, *args, **kwargs))