anydi 0.39.3__py3-none-any.whl → 0.41.0__py3-none-any.whl

anydi/_container.py

@@ -14,7 +14,7 @@ from collections import defaultdict
 from collections.abc import AsyncIterator, Iterable, Iterator, Sequence
 from contextvars import ContextVar
 from types import ModuleType
-from typing import Annotated, Any, Callable, TypeVar, Union, cast, overload
+from typing import Annotated, Any, Callable, TypeVar, cast, overload
 
 from typing_extensions import Concatenate, ParamSpec, Self, final, get_args, get_origin
 
@@ -94,18 +94,18 @@ class Container:
         testing: bool = False,
         logger: logging.Logger | None = None,
     ) -> None:
-        self._providers: dict[type[Any], Provider] = {}
+        self._providers: dict[Any, Provider] = {}
         self._strict = strict
-        self._default_scope = default_scope
+        self._default_scope: Scope = default_scope
         self._testing = testing
         self._logger = logger or logging.getLogger(__name__)
-        self._resources: dict[str, list[type[Any]]] = defaultdict(list)
+        self._resources: dict[str, list[Any]] = defaultdict(list)
         self._singleton_context = InstanceContext()
         self._request_context_var: ContextVar[InstanceContext | None] = ContextVar(
             "request_context", default=None
         )
-        self._override_instances: dict[type[Any], Any] = {}
-        self._unresolved_interfaces: set[type[Any]] = set()
+        self._override_instances: dict[Any, Any] = {}
+        self._unresolved_interfaces: set[Any] = set()
         self._inject_cache: dict[Callable[..., Any], Callable[..., Any]] = {}
 
         # Register providers
@@ -364,8 +364,8 @@ class Container:
             )
 
         unresolved_parameter = None
-        parameters = []
-        scopes = {}
+        parameters: list[inspect.Parameter] = []
+        scopes: dict[Scope, Provider] = {}
 
         for parameter in signature.parameters.values():
             if parameter.annotation is inspect.Parameter.empty:
@@ -490,7 +490,10 @@ class Container:
                 call = interface
             if inspect.isclass(call) and not is_builtin_type(call):
                 # Try to get defined scope
-                scope = getattr(interface, "__scope__", parent_scope)
+                if hasattr(call, "__scope__"):
+                    scope = getattr(call, "__scope__")
+                else:
+                    scope = parent_scope
                 return self._register_provider(call, scope, interface, **defaults)
             raise
 
@@ -510,9 +513,11 @@ class Container:
     def _parameter_has_default(
         self, parameter: inspect.Parameter, /, **defaults: Any
     ) -> bool:
-        return (defaults and parameter.name in defaults) or (
-            not self.strict and parameter.default is not inspect.Parameter.empty
+        has_default_in_kwargs = parameter.name in defaults if defaults else False
+        has_non_strict_default = not self.strict and (
+            parameter.default is not inspect.Parameter.empty
         )
+        return has_default_in_kwargs or has_non_strict_default
 
     ############################
     # Instance Methods
@@ -522,7 +527,7 @@ class Container:
     def resolve(self, interface: type[T]) -> T: ...
 
     @overload
-    def resolve(self, interface: T) -> T: ...
+    def resolve(self, interface: T) -> T: ...  # type: ignore
 
     def resolve(self, interface: type[T]) -> T:
         """Resolve an instance by interface."""
@@ -942,7 +947,7 @@ class Container:
 
     def _get_injected_params(self, call: Callable[..., Any]) -> dict[str, Any]:
         """Get the injected parameters of a callable object."""
-        injected_params = {}
+        injected_params: dict[str, Any] = {}
         for parameter in get_typed_parameters(call):
             if not is_marker(parameter.default):
                 continue
@@ -1007,6 +1012,10 @@ class Container:
                     scope=decorator_args.scope,
                     override=decorator_args.override,
                 )(obj)
+        else:
+            raise TypeError(
+                "The module must be a callable, a module type, or a module instance."
+            )
 
     ############################
     # Scanner Methods
@@ -1022,10 +1031,10 @@ class Container:
         """Scan packages or modules for decorated members and inject dependencies."""
         dependencies: list[ScannedDependency] = []
 
-        if isinstance(packages, Iterable) and not isinstance(packages, str):
-            scan_packages: Iterable[ModuleType | str] = packages
+        if isinstance(packages, ModuleType | str):
+            scan_packages: Iterable[ModuleType | str] = [packages]
         else:
-            scan_packages = cast(Iterable[Union[ModuleType, str]], [packages])
+            scan_packages = packages
 
         for package in scan_packages:
             dependencies.extend(self._scan_package(package, tags=tags))
@@ -1117,19 +1126,19 @@ class Container:
 
 def transient(target: T) -> T:
     """Decorator for marking a class as transient scope."""
-    setattr(target, "__scope__", "transient")
+    target.__scope__ = "transient"
     return target
 
 
 def request(target: T) -> T:
     """Decorator for marking a class as request scope."""
-    setattr(target, "__scope__", "request")
+    target.__scope__ = "request"
     return target
 
 
 def singleton(target: T) -> T:
     """Decorator for marking a class as singleton scope."""
-    setattr(target, "__scope__", "singleton")
+    target.__scope__ = "singleton"
     return target
 
 
@@ -1141,11 +1150,7 @@ def provider(
     def decorator(
         target: Callable[Concatenate[M, P], T],
     ) -> Callable[Concatenate[M, P], T]:
-        setattr(
-            target,
-            "__provider__",
-            ProviderDecoratorArgs(scope=scope, override=override),
-        )
+        target.__provider__ = ProviderDecoratorArgs(scope=scope, override=override)  # type: ignore
         return target
 
     return decorator

anydi/_context.py

@@ -16,17 +16,17 @@ class InstanceContext:
     __slots__ = ("_instances", "_stack", "_async_stack", "_lock", "_async_lock")
 
     def __init__(self) -> None:
-        self._instances: dict[type[Any], Any] = {}
+        self._instances: dict[Any, Any] = {}
         self._stack = contextlib.ExitStack()
         self._async_stack = contextlib.AsyncExitStack()
         self._lock = threading.RLock()
         self._async_lock = AsyncRLock()
 
-    def get(self, interface: type[Any]) -> Any | None:
+    def get(self, interface: Any) -> Any | None:
         """Get an instance from the context."""
         return self._instances.get(interface)
 
-    def set(self, interface: type[Any], value: Any) -> None:
+    def set(self, interface: Any, value: Any) -> None:
         """Set an instance in the context."""
         self._instances[interface] = value
 
@@ -38,16 +38,16 @@ class InstanceContext:
         """Enter the context asynchronously."""
         return await self._async_stack.enter_async_context(cm)
 
-    def __setitem__(self, interface: type[Any], value: Any) -> None:
+    def __setitem__(self, interface: Any, value: Any) -> None:
         self._instances[interface] = value
 
-    def __getitem__(self, interface: type[Any]) -> Any:
+    def __getitem__(self, interface: Any) -> Any:
         return self._instances[interface]
 
-    def __contains__(self, interface: type[Any]) -> bool:
+    def __contains__(self, interface: Any) -> bool:
         return interface in self._instances
 
-    def __delitem__(self, interface: type[Any]) -> None:
+    def __delitem__(self, interface: Any) -> None:
         self._instances.pop(interface, None)
 
     def __enter__(self) -> Self:
@@ -78,9 +78,9 @@ class InstanceContext:
         exc_tb: TracebackType | None,
     ) -> bool:
         """Exit the context asynchronously."""
-        return await run_async(
-            self.__exit__, exc_type, exc_val, exc_tb
-        ) or await self._async_stack.__aexit__(exc_type, exc_val, exc_tb)
+        sync_exit = await run_async(self.__exit__, exc_type, exc_val, exc_tb)
+        async_exit = await self._async_stack.__aexit__(exc_type, exc_val, exc_tb)
+        return bool(sync_exit) or bool(async_exit)
 
     async def aclose(self) -> None:
         """Close the scoped context asynchronously."""

anydi/_types.py

@@ -8,7 +8,7 @@ from functools import cached_property
 from types import ModuleType
 from typing import Annotated, Any, Callable, NamedTuple, Union
 
-import wrapt
+import wrapt  # type: ignore
 from typing_extensions import Literal, Self, TypeAlias
 
 Scope = Literal["transient", "singleton", "request"]
@@ -43,9 +43,9 @@ def is_event_type(obj: Any) -> bool:
     return inspect.isclass(obj) and issubclass(obj, Event)
 
 
-class InstanceProxy(wrapt.ObjectProxy):  # type: ignore[misc]
+class InstanceProxy(wrapt.ObjectProxy):  # type: ignore
     def __init__(self, wrapped: Any, *, interface: type[Any]) -> None:
-        super().__init__(wrapped)
+        super().__init__(wrapped)  # type: ignore
         self._self_interface = interface
 
     @property

anydi/_utils.py

@@ -12,7 +12,7 @@ from collections.abc import AsyncIterator, Iterator
 from types import TracebackType
 from typing import Any, Callable, ForwardRef, TypeVar
 
-import anyio
+import anyio.to_thread
 from typing_extensions import ParamSpec, Self, get_args, get_origin
 
 try:

anydi/ext/django/ninja/_signature.py

@@ -53,8 +53,9 @@ class ViewSignature(BaseViewSignature):
             func_param = self._get_param_type(name, arg)
             self.params.append(func_param)
 
-        if hasattr(view_func, "_ninja_contribute_args"):
-            for p_name, p_type, p_source in view_func._ninja_contribute_args:  # noqa
+        ninja_contribute_args = getattr(view_func, "_ninja_contribute_args", None)
+        if ninja_contribute_args is not None:
+            for p_name, p_type, p_source in ninja_contribute_args:
                 self.params.append(
                     FuncParam(p_name, p_source.alias or p_name, p_source, p_type, False)
                 )

anydi/ext/faststream.py

@@ -30,8 +30,8 @@ def install(broker: BrokerUsecase[Any, Any], container: Container) -> None:
 
 
 def _get_broken_handlers(broker: BrokerUsecase[Any, Any]) -> list[Any]:
-    if hasattr(broker, "handlers"):
-        return [handler.calls[0][0] for handler in broker.handlers.values()]
+    if (handlers := getattr(broker, "handlers", None)) is not None:
+        return [handler.calls[0][0] for handler in handlers.values()]
     # faststream > 0.5.0
     return [
         subscriber.calls[0].handler

anydi/ext/pytest_plugin.py

@@ -6,7 +6,6 @@ from collections.abc import Iterator
 from typing import Any, Callable, cast
 
 import pytest
-from _pytest.python import async_warn_and_skip
 from anyio.pytest_plugin import extract_backend_and_options, get_runner
 
 from anydi import Container
@@ -117,7 +116,12 @@ def _anydi_ainject(
 
     # Skip if the anyio backend is not available
     if "anyio_backend" not in request.fixturenames:
-        async_warn_and_skip(request.node.nodeid)
+        msg = (
+            "To run async test functions with `anyio`, "
+            "please configure the `anyio` pytest plugin.\n"
+            "See: https://anyio.readthedocs.io/en/stable/testing.html"
+        )
+        pytest.fail(msg, pytrace=False)
 
     async def _awrapper() -> None:
         # Setup the container

{anydi-0.39.3.dist-info → anydi-0.41.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anydi
-Version: 0.39.3
+Version: 0.41.0
 Summary: Dependency Injection library
 Project-URL: Repository, https://github.com/antonrh/anydi
 Author-email: Anton Ruhlov <antonruhlov@gmail.com>
@@ -29,7 +29,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Requires-Python: ~=3.9
 Requires-Dist: anyio>=3.7.1
-Requires-Dist: typing-extensions<5,>=4.12.1
+Requires-Dist: typing-extensions<5,>=4.13.2
 Requires-Dist: wrapt<2,>=1.17.0
 Description-Content-Type: text/markdown
 

{anydi-0.39.3.dist-info → anydi-0.41.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
 anydi/__init__.py,sha256=aAq10a1V_zQ3_Me3p_pll5d1O77PIgqotkOm3pshORI,495
-anydi/_container.py,sha256=UaNV4JcqOABkJ1FGNOQVclHjehEHXteFKOSSJxCl2As,41512
-anydi/_context.py,sha256=dlRvOFHbbIcg-q7g4TqJfytiSOERtbwTlCsdzXwo4GE,3012
-anydi/_types.py,sha256=ColGaOgF7Zqdh34N2JSWxr-8rt5bTVJomW0JqZASKHM,3631
-anydi/_utils.py,sha256=X_sSQFpRogHLh6Bxu0MdUthpc24jvnkHqdwKndQminA,4848
+anydi/_container.py,sha256=b8Ul94gIP1-F0f_FJoWM9kRyyB8Do7YEmFvpynv8Qu0,41783
+anydi/_context.py,sha256=pR97uMzafpuDe2jZcqnCShXmWp5bijzmNUOm6A6-NtY,3022
+anydi/_types.py,sha256=MwLBNhjqndCraEUCIfEpvgZEJOaVmKan3zAh8BbFa0Y,3657
+anydi/_utils.py,sha256=JHTp46uWdsWYJv4U1iU_twEnX__L3CEodK4yzhq3bHg,4858
 anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/_utils.py,sha256=U6sRqWzccWUu7eMhbXX1NrwcaxitQF9cO1KxnKF37gw,2566
 anydi/ext/fastapi.py,sha256=AEL3ubu-LxUPHMMt1YIn3En_JZC7nyBKmKxmhka3O3c,2436
-anydi/ext/faststream.py,sha256=qXnNGvAqWWp9kbhbQUE6EF_OPUiYQmtOH211_O7BI_0,1898
+anydi/ext/faststream.py,sha256=TBpN8DwZ4qOMVo_u1AgG5tAKcTMwJnV8eWavPMgb6lg,1923
 anydi/ext/pydantic_settings.py,sha256=8IXXLuG_OvKbvKlBkBRQUHcXgbTpgQUxeWyoMcRIUQM,1488
-anydi/ext/pytest_plugin.py,sha256=yR_vos8qt8uFS9uy_G_HJjNgudzJIXawrtpWnn3Pu_s,4613
+anydi/ext/pytest_plugin.py,sha256=4R93VpLePF65NuZqYF3ljjjG5cvJvrzoMguDqMzlT9s,4771
 anydi/ext/django/__init__.py,sha256=QI1IABCVgSDTUoh7M9WMECKXwB3xvh04HfQ9TOWw1Mk,223
 anydi/ext/django/_container.py,sha256=cxVoYQG16WP0S_Yv4TnLwuaaT7NVEOhLWO-YdALJUb4,418
 anydi/ext/django/_settings.py,sha256=Z0RlAuXoO73oahWeMkK10w8c-4uCBde-DBpeKTV5USY,853
@@ -18,11 +18,11 @@ anydi/ext/django/apps.py,sha256=mjbf_mDCpNSriGnILzhRIr8wFHLMEK8sUerbmRku6i0,2844
 anydi/ext/django/middleware.py,sha256=5OUdp0OWRozyW338Sq04BDhacaFlyUTTOduS_7EwCTA,854
 anydi/ext/django/ninja/__init__.py,sha256=kW3grUgWp_nkWSG_-39ADHMrZLGNcj9TsJ9OW8iWWrk,546
 anydi/ext/django/ninja/_operation.py,sha256=wSWa7D73XTVlOibmOciv2l6JHPe1ERZcXrqI8W-oO2w,2696
-anydi/ext/django/ninja/_signature.py,sha256=2cSzKxBIxXLqtwNuH6GSlmjVJFftoGmleWfyk_NVEWw,2207
+anydi/ext/django/ninja/_signature.py,sha256=uYrG2PFgG2IlXrM24rgDOtRBnrbKQeAMl6ErypRi8qs,2260
 anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/starlette/middleware.py,sha256=9CQtGg5ZzUz2gFSzJr8U4BWzwNjK8XMctm3n52M77Z0,792
-anydi-0.39.3.dist-info/METADATA,sha256=-SHLMMBhORUTW0dJxLdOgQMaNWEVjzq61SsWIfPslPg,4957
-anydi-0.39.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-anydi-0.39.3.dist-info/entry_points.txt,sha256=Nklo9f3Oe4AkNsEgC4g43nCJ-23QDngZSVDNRMdaILI,43
-anydi-0.39.3.dist-info/licenses/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.39.3.dist-info/RECORD,,
+anydi-0.41.0.dist-info/METADATA,sha256=G_AXPWt34pdLtXg2ADFd8GxednjSkyBWnQbCp_HrWrQ,4957
+anydi-0.41.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+anydi-0.41.0.dist-info/entry_points.txt,sha256=Nklo9f3Oe4AkNsEgC4g43nCJ-23QDngZSVDNRMdaILI,43
+anydi-0.41.0.dist-info/licenses/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.41.0.dist-info/RECORD,,