anydi 0.52.0__py3-none-any.whl → 0.53.0__py3-none-any.whl

anydi/_container.py

@@ -25,8 +25,6 @@ from ._scope import ALLOWED_SCOPES, Scope
 from ._typing import (
     NOT_SET,
     Event,
-    get_typed_annotation,
-    get_typed_parameters,
     is_async_context_manager,
     is_context_manager,
     is_event_type,
@@ -264,9 +262,7 @@ class Container:
         self._validate_provider_scope(scope, name, kind)
 
         # Get the signature
-        globalns = getattr(call, "__globals__", {})
-        module = getattr(call, "__module__", None)
-        signature = inspect.signature(call, globals=globalns)
+        signature = inspect.signature(call, eval_str=True)
 
         # Detect the interface
         if interface is NOT_SET:
@@ -277,9 +273,6 @@ class Container:
                 if interface is inspect.Signature.empty:
                     interface = None
 
-        if isinstance(interface, str):
-            interface = get_typed_annotation(interface, globalns, module)
-
         # If the callable is an iterator, return the actual type
         if is_iterator_type(interface) or is_iterator_type(get_origin(interface)):
             if args := get_args(interface):
@@ -320,10 +313,6 @@ class Container:
                     f"are not allowed in the provider `{name}`."
                 )
 
-            parameter = parameter.replace(
-                annotation=get_typed_annotation(parameter.annotation, globalns, module)
-            )
-
             try:
                 sub_provider = self._get_or_register_provider(parameter.annotation)
             except LookupError as exc:
@@ -777,7 +766,7 @@ class Container:
     def _get_injected_params(self, call: Callable[..., Any]) -> dict[str, Any]:
         """Get the injected parameters of a callable object."""
         injected_params: dict[str, Any] = {}
-        for parameter in get_typed_parameters(call):
+        for parameter in inspect.signature(call, eval_str=True).parameters.values():
             interface, should_inject = self.validate_injected_parameter(
                 parameter, call=call
             )

anydi/_scan.py

@@ -9,7 +9,7 @@ from types import ModuleType
 from typing import TYPE_CHECKING, Any
 
 from ._decorators import is_injectable
-from ._typing import get_typed_parameters, is_inject_marker
+from ._typing import is_inject_marker
 
 if TYPE_CHECKING:
     from ._container import Container
@@ -103,8 +103,8 @@ class Scanner:
         # 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_inject_marker(param.default):
+            for parameter in inspect.signature(member).parameters.values():
+                if is_inject_marker(parameter.default):
                     return True
 
         return False

anydi/_typing.py

@@ -3,9 +3,11 @@
 from __future__ import annotations
 
 import inspect
-from collections.abc import AsyncIterator, Callable, Iterator
+from collections.abc import AsyncIterator, Iterator
 from types import NoneType
-from typing import Any, ForwardRef
+from typing import Any
+
+from typing_extensions import Sentinel
 
 
 def is_context_manager(obj: Any) -> bool:
@@ -28,47 +30,7 @@ def is_iterator_type(tp: Any) -> bool:
     return tp in (Iterator, AsyncIterator)
 
 
-def get_typed_annotation(
-    annotation: Any, globalns: dict[str, Any], module: Any = None
-) -> Any:
-    """Get the typed annotation of a callable object."""
-    if isinstance(annotation, str):
-        ref = ForwardRef(annotation, module=module)
-        annotation = ref._evaluate(globalns, globalns, recursive_guard=frozenset())  # type: ignore[reportDeprecated]
-    return annotation
-
-
-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)
-    return [
-        parameter.replace(
-            annotation=get_typed_annotation(
-                parameter.annotation, globalns, module=module
-            )
-        )
-        for parameter in inspect.signature(obj).parameters.values()
-    ]
-
-
-class _Sentinel:
-    __slots__ = ("_name",)
-
-    def __init__(self, name: str) -> None:
-        self._name = name
-
-    def __repr__(self) -> str:
-        return f"<{self._name}>"
-
-    def __eq__(self, other: object) -> bool:
-        return self is other
-
-    def __hash__(self) -> int:
-        return id(self)
-
-
-NOT_SET = _Sentinel("NOT_SET")
+NOT_SET = Sentinel("NOT_SET")
 
 
 class InjectMarker:

anydi/ext/fastapi.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import inspect
 from collections.abc import Iterator
 from typing import Annotated, Any, cast
 
@@ -11,7 +12,7 @@ from fastapi.routing import APIRoute
 from starlette.requests import Request
 
 from anydi._container import Container
-from anydi._typing import InjectMarker, get_typed_parameters
+from anydi._typing import InjectMarker
 
 from .starlette.middleware import RequestScopedMiddleware
 
@@ -39,7 +40,7 @@ def install(app: FastAPI, container: Container) -> None:
             call, *params = dependant.cache_key
             if not call:
                 continue  # pragma: no cover
-            for parameter in get_typed_parameters(call):
+            for parameter in inspect.signature(call, eval_str=True).parameters.values():
                 container.validate_injected_parameter(parameter, call=call)
 
 

anydi/ext/faststream.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import inspect
 from typing import Any, cast
 
 from fast_depends.dependencies import Depends
@@ -9,7 +10,7 @@ from faststream import ContextRepo
 from faststream.broker.core.usecase import BrokerUsecase
 
 from anydi import Container
-from anydi._typing import InjectMarker, get_typed_parameters
+from anydi._typing import InjectMarker
 
 
 def install(broker: BrokerUsecase[Any, Any], container: Container) -> None:
@@ -23,7 +24,7 @@ def install(broker: BrokerUsecase[Any, Any], container: Container) -> None:
 
     for handler in _get_broken_handlers(broker):
         call = handler._original_call  # noqa
-        for parameter in get_typed_parameters(call):
+        for parameter in inspect.signature(call, eval_str=True).parameters.values():
             container.validate_injected_parameter(parameter, call=call)
 
 

anydi/ext/pytest_plugin.py

@@ -9,7 +9,6 @@ import pytest
 from anyio.pytest_plugin import extract_backend_and_options, get_runner
 
 from anydi import Container
-from anydi._typing import get_typed_parameters
 
 logger = logging.getLogger(__name__)
 
@@ -61,7 +60,9 @@ def _anydi_injected_parameter_iterator(
     )
 
     def _iterator() -> Iterator[tuple[str, inspect.Parameter]]:
-        for parameter in get_typed_parameters(request.function):
+        for parameter in inspect.signature(
+            request.function, eval_str=True
+        ).parameters.values():
             interface = parameter.annotation
             if (
                 interface is inspect.Parameter.empty

{anydi-0.52.0.dist-info → anydi-0.53.0.dist-info}/METADATA

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

{anydi-0.52.0.dist-info → anydi-0.53.0.dist-info}/RECORD

@@ -1,24 +1,24 @@
 anydi/__init__.py,sha256=KjjYm-1yAFxiPYaMs1WRJMtxE0q_vdX7ZRLQR1fFGs8,567
 anydi/_async.py,sha256=lrKTrqMC81POFbea3kaC9KkY3sp0DaenuVPvwOg88xA,1472
-anydi/_container.py,sha256=t-5BcjsuKnaJ8Wmk9ZXXQN90NQhrVl41bLjObG0wYTY,31940
+anydi/_container.py,sha256=a_HH_gYwWcruub7pEpA0rCe6MqLc7D5pp9lRgrrbxLs,31554
 anydi/_context.py,sha256=_Xy8cTpRskb4cxTd-Fe-5NnIZyBe1DnovkofhdeUfmw,3020
 anydi/_decorators.py,sha256=yxY876_2fzC30UIb4-4mR-J5ToQN3BH61E2cFH-iX8Y,2809
 anydi/_module.py,sha256=2kN5uEXLd2Dsc58gz5IWK43wJewr_QgIVGSO3iWp798,2609
 anydi/_provider.py,sha256=BWW4nXJ5r-0tCgS91kLWzYbrGv1v1oIm8BSt1cyYkDc,2150
-anydi/_scan.py,sha256=SoB9uugaZVqBIW2IMKQGbu9YGaWHT3BhKWrDpiQaINE,3634
+anydi/_scan.py,sha256=BLayc0NY_NYicr-ApX7Ztco9sd0izSZKGB-pUktui_s,3637
 anydi/_scope.py,sha256=PFHjPb2-n0vhRo9mvD_craTFfoJBzR3y-N3_0apL5Q0,258
-anydi/_typing.py,sha256=LXOmWua-UimL9te8Ye3u3MCLiA7EzNhDuacw4kgnxP4,2877
+anydi/_typing.py,sha256=I0Qt3Ec6ki6ZXf0Krm-LUIPRvzvyUUHfKdvmQijBErQ,1718
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/django/__init__.py,sha256=Ve8lncLU9dPY_Vjt4zihPgsSxwAtFHACn0XvBM5JG8k,367
-anydi/ext/fastapi.py,sha256=L9VGPHGy23se1sflmJqTE7LNfQuElVdYEogoT1f5-4A,2324
-anydi/ext/faststream.py,sha256=Dy81Vf34CP6pEIbZ-41vh_-Dn6Qc-rcf14U5poebjxI,1905
+anydi/ext/fastapi.py,sha256=pdYumpXMAw2VjlDlb8u3R_RQi6htRieiZKsSA-9BSdA,2349
+anydi/ext/faststream.py,sha256=CEuGjVZRbgSjkeV1rSp6xWggGYoKnBDeo3PiPgKtxuc,1930
 anydi/ext/pydantic_settings.py,sha256=0GQjw7QpQlT5p6GxFClXYdtc6J42PClmAnRWPEzMjvY,1488
-anydi/ext/pytest_plugin.py,sha256=yqaFPzYD88HEmqc2URsBtp2FUktORhUxWfs0hJja1IU,4732
+anydi/ext/pytest_plugin.py,sha256=amQT0GQuBrpvhchJyBy1IfqnTwFHKpUotGfOAxltL58,4739
 anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/starlette/middleware.py,sha256=MxnzshAs-CMvjJp0r457k52MzBL8O4KAuClnF6exBdU,803
 anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/testing.py,sha256=gbQnJ6qFaQ5qbUwFWfSJ67SKhxLuPzwLGidistsmHk8,5519
-anydi-0.52.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-anydi-0.52.0.dist-info/entry_points.txt,sha256=AgOcQYM5KyS4D37QcYb00tiid0QA-pD1VrjHHq4QAps,44
-anydi-0.52.0.dist-info/METADATA,sha256=GvHhlEF-L72OAvA-6fuFzjUnvOlvM16T8MpZXT1vSbA,5022
-anydi-0.52.0.dist-info/RECORD,,
+anydi-0.53.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+anydi-0.53.0.dist-info/entry_points.txt,sha256=AgOcQYM5KyS4D37QcYb00tiid0QA-pD1VrjHHq4QAps,44
+anydi-0.53.0.dist-info/METADATA,sha256=ZIUAp0tDmkV0sHCaYZvwAzBGQPasiMFXondsFUibcgM,5022
+anydi-0.53.0.dist-info/RECORD,,