anydi 0.45.0__py3-none-any.whl → 0.46.0__py3-none-any.whl

anydi/__init__.py

@@ -5,10 +5,10 @@ from ._decorators import injectable, provided, provider, request, singleton, tra
 from ._module import Module
 from ._provider import ProviderDef as Provider
 from ._scope import Scope
-from ._typing import Marker
+from ._typing import InjectMarker
 
 # Alias for dependency auto marker
-auto = Marker()
+auto = InjectMarker()
 
 
 __all__ = [

anydi/_container.py

@@ -31,8 +31,8 @@ from ._typing import (
     is_builtin_type,
     is_context_manager,
     is_event_type,
+    is_inject_marker,
     is_iterator_type,
-    is_marker,
     is_none_type,
     type_repr,
 )
@@ -806,29 +806,34 @@ class Container:
         """Get the injected parameters of a callable object."""
         injected_params: dict[str, Any] = {}
         for parameter in get_typed_parameters(call):
-            if not is_marker(parameter.default):
-                continue
-            self._validate_injected_parameter(call, parameter)
-            injected_params[parameter.name] = parameter.annotation
+            interface, should_inject = self._validate_injected_parameter(
+                parameter, call=call
+            )
+            if should_inject:
+                injected_params[parameter.name] = interface
         return injected_params
 
     def _validate_injected_parameter(
-        self, call: Callable[..., Any], parameter: inspect.Parameter
-    ) -> None:
+        self, parameter: inspect.Parameter, *, call: Callable[..., Any]
+    ) -> tuple[Any, bool]:
         """Validate an injected parameter."""
-        # TODO: temporary disable until strict is enforced
-        return None
+        interface, should_inject = parameter.annotation, False
+        if is_inject_marker(parameter.default):
+            if parameter.annotation is inspect.Parameter.empty:
+                raise TypeError(
+                    f"Missing `{type_repr(call)}` "
+                    f"parameter `{parameter.name}` annotation."
+                )
+            should_inject = True
 
-        if parameter.annotation is inspect.Parameter.empty:
-            raise TypeError(
-                f"Missing `{type_repr(call)}` parameter `{parameter.name}` annotation."
-            )
+        return interface, should_inject
 
-        if not self.has_provider_for(parameter.annotation):
+        # TODO: temporary disable until strict is enforced
+        if not self.has_provider_for(interface):
             raise LookupError(
                 f"`{type_repr(call)}` has an unknown dependency parameter "
                 f"`{parameter.name}` with an annotation of "
-                f"`{type_repr(parameter.annotation)}`."
+                f"`{type_repr(interface)}`."
             )
 
     ############################

anydi/_scan.py

@@ -9,7 +9,7 @@ from types import ModuleType
 from typing import TYPE_CHECKING, Any, Callable, Union
 
 from ._decorators import is_injectable
-from ._typing import get_typed_parameters, is_marker
+from ._typing import get_typed_parameters, is_inject_marker
 
 if TYPE_CHECKING:
     from ._container import Container
@@ -104,7 +104,7 @@ class Scanner:
         # check for parameter markers
         if not tags:
             for param in get_typed_parameters(member):
-                if is_marker(param.default):
+                if is_inject_marker(param.default):
                     return True
 
         return False

anydi/_typing.py

@@ -93,8 +93,8 @@ def get_typed_parameters(obj: Callable[..., Any]) -> list[inspect.Parameter]:
     ]
 
 
-class _Marker:
-    """A marker class for marking dependencies."""
+class _InjectMarker:
+    """A marker object for declaring injectable dependencies."""
 
     __slots__ = ()
 
@@ -102,13 +102,12 @@ class _Marker:
         return self
 
 
-def Marker() -> Any:
-    return _Marker()
+def InjectMarker() -> Any:
+    return _InjectMarker()
 
 
-def is_marker(obj: Any) -> bool:
-    """Checks if an object is a marker."""
-    return isinstance(obj, _Marker)
+def is_inject_marker(obj: Any) -> bool:
+    return isinstance(obj, _InjectMarker)
 
 
 class Event:

anydi/ext/_utils.py

@@ -8,13 +8,17 @@ from typing import Annotated, Any, Callable
 
 from typing_extensions import get_args, get_origin
 
-from anydi._container import Container
+from anydi import Container
+from anydi._typing import _InjectMarker
 
 logger = logging.getLogger(__name__)
 
 
-class HasInterface:
-    _interface: Any = None
+class HasInterface(_InjectMarker):
+    __slots__ = ("_interface",)
+
+    def __init__(self, interface: Any = None) -> None:
+        self._interface = interface
 
     @property
     def interface(self) -> Any:
@@ -65,9 +69,9 @@ def patch_call_parameter(
     """Patch a parameter to inject dependencies using AnyDI."""
     parameter = patch_annotated_parameter(parameter)
 
-    if not isinstance(parameter.default, HasInterface):
-        return None
-
-    container._validate_injected_parameter(call, parameter)  # noqa
-
-    parameter.default.interface = parameter.annotation
+    interface, should_inject = container._validate_injected_parameter(
+        parameter, call=call
+    )  # noqa
+    if should_inject:
+        parameter.default.interface = interface
+    return None

anydi/ext/django/ninja/_signature.py

@@ -11,7 +11,8 @@ from ninja.signature.details import (
 )
 from ninja.signature.utils import get_path_param_names, get_typed_signature
 
-from anydi._typing import is_marker  # noqa
+from anydi._typing import is_inject_marker  # noqa
+from anydi.ext.django import container
 
 
 class ViewSignature(BaseViewSignature):
@@ -45,8 +46,10 @@ class ViewSignature(BaseViewSignature):
                 self.response_arg = name
                 continue
 
-            # Skip default values that are anydi dependency markers
-            if is_marker(arg.default):
+            interface, should_inject = container._validate_injected_parameter(
+                arg, call=self.view_func
+            )
+            if should_inject:
                 self.dependencies.append((name, arg.annotation))
                 continue
 

anydi/ext/fastapi.py

@@ -49,11 +49,12 @@ def get_container(request: Request) -> Container:
     return cast(Container, request.app.state.container)
 
 
-class Resolver(HasInterface, params.Depends):
+class Resolver(params.Depends, HasInterface):
     """Parameter dependency class for injecting dependencies using AnyDI."""
 
     def __init__(self) -> None:
         super().__init__(dependency=self._dependency, use_cache=True)
+        HasInterface.__init__(self)
 
     async def _dependency(self, container: Container = Depends(get_container)) -> Any:
         return await container.aresolve(self.interface)

anydi/ext/faststream.py

@@ -43,11 +43,12 @@ def get_container(broker: BrokerUsecase[Any, Any]) -> Container:
     return cast(Container, getattr(broker, "_container"))  # noqa
 
 
-class Resolver(HasInterface, Depends):
+class Resolver(Depends, HasInterface):
     """Parameter dependency class for injecting dependencies using AnyDI."""
 
     def __init__(self) -> None:
         super().__init__(dependency=self._dependency, use_cache=True, cast=True)
+        HasInterface.__init__(self)
 
     async def _dependency(self, context: ContextRepo) -> Any:
         container = get_container(context.get("broker"))

anydi/testing.py

@@ -18,6 +18,8 @@ T = TypeVar("T")
 
 
 class TestContainer(Container):
+    __test__ = False
+
     def __init__(
         self,
         *,

{anydi-0.45.0.dist-info → anydi-0.46.0.dist-info}/METADATA

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

{anydi-0.45.0.dist-info → anydi-0.46.0.dist-info}/RECORD

@@ -1,19 +1,19 @@
-anydi/__init__.py,sha256=UH3N0LIw4ysoV0_EFgtDNioxEQxOmeytYbJnS8MXIXM,532
+anydi/__init__.py,sha256=GNKdoiDe1XNdMIGvI8UP43QSLOBbMQYyFpiicLlgZxI,544
 anydi/_async.py,sha256=KhRd3RmZFcwNDzrMm8ctA1gwrg-6m_7laECTYsZdF5k,1445
-anydi/_container.py,sha256=pclsUVpXDPhacgdBl1_MZ9pV4AUc6a3jBVQOHLniW-4,31047
+anydi/_container.py,sha256=EC06Uur6GOahFF5mhluGYX95woOnKv2Hcr7j1rs9xu8,31262
 anydi/_context.py,sha256=_Xy8cTpRskb4cxTd-Fe-5NnIZyBe1DnovkofhdeUfmw,3020
 anydi/_decorators.py,sha256=F3yBeGQSz1EsulZaEvYn3cd6FEjJRMoyA6u1QCbEwcs,2813
 anydi/_module.py,sha256=QPvP27JndZkwl-FYUZWscJm6yfkNzjwoFGURyDhb6Pc,2582
 anydi/_provider.py,sha256=ig2ecn-STmFGcpkLE5A5OM35XHtU2NsxFVrGp2CvuvM,2123
-anydi/_scan.py,sha256=WOdsPaoRZPYw4kBzoBXyWhkiwuxY8_UjHfa0c9QFyLc,3639
+anydi/_scan.py,sha256=nOpspmceVucdwf8nUv1QVFsz2sRVWCVUb0QTH9EbWr4,3653
 anydi/_scope.py,sha256=PFHjPb2-n0vhRo9mvD_craTFfoJBzR3y-N3_0apL5Q0,258
-anydi/_typing.py,sha256=m7KnVenDE1E420IeYz2Ocw6dhddmSFbuBBgkOXtl9pA,3709
+anydi/_typing.py,sha256=zSyE4JAnaBsJLZ3Zb3o9o02LgKePwBWzMwczdhmyG3U,3711
 anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi/testing.py,sha256=rKKvwjSKCg4MH7wp8InzG3tgCcQtLJ9ajHXIH_nnMIw,5656
+anydi/testing.py,sha256=ex9grqKpQmmJWwhIVnzq6aHaUAGLu2-7fwLyYTUuKHE,5678
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi/ext/_utils.py,sha256=QthoO0Nxv_nI-yQ9kGSi9jLLT5N71BxOgFNXwLQ5DQ0,2073
-anydi/ext/fastapi.py,sha256=q7q1hF5v4dpV3YM4L1CVuD20bXC7f5S7e1apAfekkG0,2448
-anydi/ext/faststream.py,sha256=DLZTfiGeZJCiwfmZTvVecaTlX84_jqClh6cgY2qMPJg,1910
+anydi/ext/_utils.py,sha256=EjOhBtze0tqWMjpTiBCSzaOyecHCRWygMDZbj4ZyAEA,2213
+anydi/ext/fastapi.py,sha256=QIC45I3sfE_cNVL27cilw7lwLEZhHPhxj0mtFdtKlIc,2484
+anydi/ext/faststream.py,sha256=Ewfj9hXbCSr5x7QWoLEORmc3uPcbr7PEcCcG1wM-6XM,1946
 anydi/ext/pydantic_settings.py,sha256=8IXXLuG_OvKbvKlBkBRQUHcXgbTpgQUxeWyoMcRIUQM,1488
 anydi/ext/pytest_plugin.py,sha256=IoP6XKuGLGLd2Xlpfttc3mI4pxCm2WQLE7x_a7asbv4,4732
 anydi/ext/django/__init__.py,sha256=QI1IABCVgSDTUoh7M9WMECKXwB3xvh04HfQ9TOWw1Mk,223
@@ -24,11 +24,11 @@ anydi/ext/django/apps.py,sha256=YLL1uU6dSQ3uf3GB0VHzPW_eLuB1j9h6pv8EdAutMqo,2725
 anydi/ext/django/middleware.py,sha256=5OUdp0OWRozyW338Sq04BDhacaFlyUTTOduS_7EwCTA,854
 anydi/ext/django/ninja/__init__.py,sha256=4J0zoHPK9itbTVrjjvLX6Ftrsb2ND8bITqNDIJzEhks,520
 anydi/ext/django/ninja/_operation.py,sha256=wk5EOjLY3KVIHk9jMCGsFsja9-dQmMOpLpHXciqxQdk,2680
-anydi/ext/django/ninja/_signature.py,sha256=UVLmKpYvH1fNb9C7ffP50KCmh0BE6unHegfss5dvpVU,2261
+anydi/ext/django/ninja/_signature.py,sha256=mseRTLZZdwdXCG-jdTe1l4WRacbKoa3kfEGWQ1aq3QY,2364
 anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/starlette/middleware.py,sha256=MxnzshAs-CMvjJp0r457k52MzBL8O4KAuClnF6exBdU,803
-anydi-0.45.0.dist-info/METADATA,sha256=q54mbfxsSFZ_hpaOqCyaMlW_njtsrY2XvhRL28DeHac,4957
-anydi-0.45.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-anydi-0.45.0.dist-info/entry_points.txt,sha256=Nklo9f3Oe4AkNsEgC4g43nCJ-23QDngZSVDNRMdaILI,43
-anydi-0.45.0.dist-info/licenses/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.45.0.dist-info/RECORD,,
+anydi-0.46.0.dist-info/METADATA,sha256=4C-I83UUd7PWkcDhIUm7Z1KfWqEDWyhoecoLgf6GlB4,4957
+anydi-0.46.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+anydi-0.46.0.dist-info/entry_points.txt,sha256=Nklo9f3Oe4AkNsEgC4g43nCJ-23QDngZSVDNRMdaILI,43
+anydi-0.46.0.dist-info/licenses/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.46.0.dist-info/RECORD,,