anydi 0.39.3__tar.gz → 0.41.0__tar.gz

{anydi-0.39.3 → anydi-0.41.0}/.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Static type checking
         run: uv run mypy anydi tests
       - name: Code formatting
-        run: uv run ruff check anydi tests && uv run ruff format anydi tests --check
+        run: uv run ruff check && uv run ruff format --check
 
   tests:
     name: Run unit tests ${{ matrix.name }}

{anydi-0.39.3 → anydi-0.41.0}/Makefile

@@ -6,12 +6,12 @@ help:
 
 lint: ## Run code linters
 	uv run mypy anydi tests
-	uv run ruff check anydi tests
-	uv run ruff format anydi tests --check
+	uv run ruff check
+	uv run ruff format --check
 
 fmt: ## Run code formatters
-	uv run ruff check anydi tests --fix
-	uv run ruff format anydi tests
+	uv run ruff check --fix
+	uv run ruff format
 
 test:  ## Run unit tests
 	uv run pytest -vv tests --ignore=tests/ext/test_pytest_plugin.py --cov=anydi -p no:anydi -p no:testanydi

{anydi-0.39.3 → anydi-0.41.0}/PKG-INFO

@@ -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 → anydi-0.41.0}/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-0.39.3 → anydi-0.41.0}/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-0.39.3 → anydi-0.41.0}/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-0.39.3 → anydi-0.41.0}/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-0.39.3 → anydi-0.41.0}/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-0.39.3 → anydi-0.41.0}/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-0.39.3 → anydi-0.41.0}/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 → anydi-0.41.0}/docs/examples/basic.md

@@ -86,9 +86,9 @@ from app.models import User
 from app.repositories import UserRepository
 
 
-@dataclass
 class UserService:
-    user_repository: UserRepository
+    def __init__(self, user_repository: UserRepository) -> None:
+        self.user_repository = user_repository
 
     def get_users(self) -> List[User]:
         return self.user_repository.all()

{anydi-0.39.3 → anydi-0.41.0}/docs/extensions/fastapi.md

@@ -144,15 +144,15 @@ from anydi import Container
 from anydi.ext.fastapi import Inject, RequestScopedMiddleware
 
 
-@dataclass
+@dataclass(kw_only=True)
 class User:
     id: str
     email: str
 
 
-@dataclass
 class UserService:
-    request: Request
+    def __init__(self, request: Request) -> None:
+        self.request = request
 
     async def get_user(self, user_id: str) -> User:
         # Use request headers, IP, etc., from the Request object as needed

{anydi-0.39.3 → anydi-0.41.0}/docs/usage.md

@@ -153,22 +153,21 @@ assert not container.is_resolved(int)
 Consider a scenario with class dependencies:
 
 ```python
-from dataclasses import dataclass
-
 class Database:
     def connect(self) -> None:
         print("connect")
     def disconnect(self) -> None:
         print("disconnect")
 
-@dataclass
+
 class Repository:
-    db: Database
+    def __init__(self, db: Database) -> None:
+        self.db = db
 
 
-@dataclass
 class Service:
-    repo: Repository
+    def __init__(self, repo: Repository) -> None:
+        self.repo = repo
 ```
 
 You can instantiate these classes without manually registering each one:
@@ -746,17 +745,17 @@ class Item:
     name: str
 
 
-@dataclass(kw_only=True)
 class Repository:
-    items: list[Item] = field(default_factory=list)
+    def __init__(self) -> None:
+        self.items: list[Item] = []
 
     def all(self) -> list[Item]:
         return self.items
 
 
-@dataclass(kw_only=True)
 class Service:
-    repo: Repository
+    def __init__(self, repo: Repository) -> None:
+        self.repo = repo
 
     def get_items(self) -> list[Item]:
         return self.repo.all()

{anydi-0.39.3 → anydi-0.41.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "anydi"
-version = "0.39.3"
+version = "0.41.0"
 description = "Dependency Injection library"
 authors = [{ name = "Anton Ruhlov", email = "antonruhlov@gmail.com" }]
 requires-python = "~=3.9"
@@ -37,7 +37,7 @@ classifiers = [
     "Programming Language :: Python :: 3 :: Only",
 ]
 dependencies = [
-    "typing-extensions>=4.12.1,<5",
+    "typing-extensions>=4.13.2,<5",
     "anyio>=3.7.1",
     "wrapt>=1.17.0,<2",
 ]
@@ -51,11 +51,12 @@ anydi = "anydi.ext.pytest_plugin"
 [dependency-groups]
 dev = [
     "mypy[faster-cache]>=1.15.0,<2",
-    "ruff>=0.9.4,<1.0",
-    "pytest>=8.3.1,<9",
+    "ruff>=0.11.10,<1.0",
+    "pytest>=8.4.0,<9",
     "pytest-cov>=6.0.0,<7",
-    "fastapi>=0.100.0,<0.101",
-    "httpx>=0.26.0,<0.27",
+    "starlette>=0.37.2",
+    "fastapi>=0.100.0",
+    "httpx>=0.26.0",
     "django~=4.2",
     "django-stubs>=5.1.1,<6",
     "django-ninja>=1.1.0,<2",
@@ -63,7 +64,8 @@ dev = [
     "faststream>=0.5.10,<0.6",
     "redis>=5.0.4,<6",
     "pydantic-settings>=2.4.0,<3",
-    "bump-my-version>=0.31.1",
+    "bump-my-version>=1.1.4",
+    "pyright>=1.1.401",
 ]
 docs = [
     "mkdocs>=1.4.2,<2",
@@ -77,6 +79,10 @@ build-backend = "hatchling.build"
 [tool.ruff]
 line-length = 88
 target-version = "py39"
+include = [
+    "anydi/**/*.py",
+    "tests/**/*.py",
+]
 
 [tool.ruff.lint]
 select = ["A", "B", "C", "E", "F", "I", "W", "TID252", "T20", "UP", "FURB", "PT"]
@@ -89,15 +95,19 @@ forced-separate = ["tests", "app"]
 [tool.ruff.lint.pydocstyle]
 convention = "google"
 
+[tool.pyright]
+include = [
+    "anydi/**/*.py",
+    "tests/**/*.py",
+]
+strict = [
+    "anydi/*.py",
+]
+typeCheckingMode = "standard"
+
 [tool.mypy]
 strict = true
-
-[[tool.mypy.overrides]]
-module = [
-    "django.*",
-    "wrapt.*",
-]
-ignore_missing_imports = true
+warn_unused_ignores = false
 
 [[tool.mypy.overrides]]
 module = [
@@ -136,7 +146,7 @@ omit = [
 ]
 
 [tool.bumpversion]
-current_version = "0.39.3"
+current_version = "0.41.0"
 parse = """(?x)
     (?P<major>0|[1-9]\\d*)\\.
     (?P<minor>0|[1-9]\\d*)\\.

{anydi-0.39.3 → anydi-0.41.0}/tests/test_container.py

@@ -1557,30 +1557,6 @@ class TestContainerInjector:
 
         assert result == "service ident = 1000"
 
-    def test_inject_dataclass(self, container: Container) -> None:
-        @container.provider(scope="singleton")
-        def ident_provider() -> str:
-            return "1000"
-
-        @container.provider(scope="singleton")
-        def service_provider(ident: str) -> Service:
-            return Service(ident=ident)
-
-        @container.inject
-        @dataclass
-        class Handler:
-            name: str
-            service: Service = auto
-
-            def handle(self) -> str:
-                return f"{self.name} = {self.service.ident}"
-
-        handler = Handler(name="service ident")
-
-        result = handler.handle()
-
-        assert result == "service ident = 1000"
-
     async def test_inject_with_sync_and_async_resources(
         self, container: Container
     ) -> None:
@@ -1894,6 +1870,13 @@ class TestContainerModule:
             Annotated[str, "dep2"],
         ]
 
+    def test_register_module_invlid_path(self, container: Container) -> None:
+        with pytest.raises(
+            TypeError,
+            match="The module must be a callable, a module type, or a module instance.",
+        ):
+            container.register_module("anydi.Container")
+
 
 class TestContainerScanning:
     def test_scan(self, container: Container) -> None: