anydi 0.45.1__tar.gz → 0.46.0rc1__tar.gz

{anydi-0.45.1 → anydi-0.46.0rc1}/PKG-INFO

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

{anydi-0.45.1 → anydi-0.46.0rc1}/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-0.45.1 → anydi-0.46.0rc1}/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-0.45.1 → anydi-0.46.0rc1}/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-0.45.1 → anydi-0.46.0rc1}/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-0.45.1 → anydi-0.46.0rc1}/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-0.45.1 → anydi-0.46.0rc1}/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-0.45.1 → anydi-0.46.0rc1}/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-0.45.1 → anydi-0.46.0rc1}/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-0.45.1 → anydi-0.46.0rc1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "anydi"
-version = "0.45.1"
+version = "0.46.0rc1"
 description = "Dependency Injection library"
 authors = [{ name = "Anton Ruhlov", email = "antonruhlov@gmail.com" }]
 requires-python = "~=3.9"
@@ -137,7 +137,7 @@ omit = [
 ]
 
 [tool.bumpversion]
-current_version = "0.45.1"
+current_version = "0.46.0rc1"
 parse = """(?x)
     (?P<major>0|[1-9]\\d*)\\.
     (?P<minor>0|[1-9]\\d*)\\.

{anydi-0.45.1 → anydi-0.46.0rc1}/tests/ext/fastapi/test_ext.py

@@ -14,7 +14,6 @@ def test_inject_param_missing_interface() -> None:
         _ = param.interface
 
 
-@pytest.mark.skip(reason="disable until strict is enforced")
 def test_install_without_annotation() -> None:
     container = Container()
 

{anydi-0.45.1 → anydi-0.46.0rc1}/tests/ext/faststream/test_ext.py

@@ -14,7 +14,6 @@ def test_inject_param_missing_interface() -> None:
         _ = param.interface
 
 
-@pytest.mark.skip(reason="disable until strict is enforced")
 def test_install_without_annotation() -> None:
     container = Container()
 

{anydi-0.45.1 → anydi-0.46.0rc1}/tests/test_container.py

@@ -1420,7 +1420,6 @@ class TestContainerInjector:
 
         assert result == "service ident = 1000"
 
-    @pytest.mark.skip(reason="disable until strict is enforced")
     def test_inject_missing_annotation(self, container: Container) -> None:
         def handler(name=auto) -> str:  # type: ignore
             return name  # type: ignore
@@ -1431,7 +1430,7 @@ class TestContainerInjector:
             container.inject(handler)
 
     @pytest.mark.skip(reason="disable until strict is enforced")
-    def test_inject_unknown_dependency_using_strict_mode(self) -> None:
+    def test_inject_unknown_dependency(self) -> None:
         container = Container()
 
         def handler(message: str = auto) -> None:

{anydi-0.45.1 → anydi-0.46.0rc1}/uv.lock

@@ -13,7 +13,7 @@ wheels = [
 
 [[package]]
 name = "anydi"
-version = "0.45.1"
+version = "0.46.0rc1"
 source = { editable = "." }
 dependencies = [
     { name = "anyio" },