anydi 0.50.0__tar.gz → 0.53.0__tar.gz

{anydi-0.50.0 → anydi-0.53.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anydi
-Version: 0.50.0
+Version: 0.53.0
 Summary: Dependency Injection library
 Keywords: dependency injection,dependencies,di,async,asyncio,application
 Author: Anton Ruhlov
@@ -140,6 +140,12 @@ anydi.ext.fastapi.install(app, container)
 
 ## Django Ninja Example
 
+### Install
+
+```sh
+pip install 'anydi-django[ninja]'
+```
+
 *container.py*
 
 ```python
@@ -161,7 +167,7 @@ def get_container() -> Container:
 ```python
 INSTALLED_APPS = [
     ...
-    "anydi.ext.django",
+    "anydi_django",
 ]
 
 ANYDI = {

{anydi-0.50.0 → anydi-0.53.0}/README.md

@@ -105,6 +105,12 @@ anydi.ext.fastapi.install(app, container)
 
 ## Django Ninja Example
 
+### Install
+
+```sh
+pip install 'anydi-django[ninja]'
+```
+
 *container.py*
 
 ```python
@@ -126,7 +132,7 @@ def get_container() -> Container:
 ```python
 INSTALLED_APPS = [
     ...
-    "anydi.ext.django",
+    "anydi_django",
 ]
 
 ANYDI = {

{anydi-0.50.0 → anydi-0.53.0}/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-0.50.0 → anydi-0.53.0}/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-0.50.0 → anydi-0.53.0}/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-0.53.0/anydi/ext/django/__init__.py

@@ -0,0 +1,8 @@
+raise ImportError(
+    "The Django extension requires additional dependencies.\n\n"
+    "Install one of the following extras:\n"
+    "  pip install 'anydi-django'         # for Django\n"
+    "  pip install 'anydi-django[ninja]'  # for Django Ninja\n\n"
+    "Then, instead of importing from 'anydi.ext.django', import directly from:\n"
+    "  import anydi_django\n"
+)

{anydi-0.50.0 → anydi-0.53.0}/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-0.50.0 → anydi-0.53.0}/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-0.50.0 → anydi-0.53.0}/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.50.0 → anydi-0.53.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "anydi"
-version = "0.50.0"
+version = "0.53.0"
 description = "Dependency Injection library"
 authors = [{ name = "Anton Ruhlov", email = "antonruhlov@gmail.com" }]
 requires-python = ">=3.10.0, <3.15"
@@ -51,17 +51,13 @@ anydi = "anydi.ext.pytest_plugin"
 [dependency-groups]
 dev = [
     "ruff>=0.14.0",
-    "pyright>=1.1.406",
+    "pyright>=1.1.407",
     "pytest>=8.4.0,<9",
-    "pytest-cov>=6.0.0,<7",
+    "pytest-cov>=7.0.0",
     "pytest-mock>=3.14.1",
     "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",
-    "pytest-django>=4.8.0,<5",
     "faststream>=0.5.10,<0.6",
     "redis>=5.0.4,<6",
     "pydantic-settings>=2.4.0,<3",
@@ -116,7 +112,6 @@ addopts = [
 ]
 xfail_strict = true
 junit_family = "xunit2"
-DJANGO_SETTINGS_MODULE = "tests.ext.django.settings"
 
 [tool.coverage.report]
 exclude_also = [
@@ -132,9 +127,3 @@ exclude_also = [
     "if has_signature_eval_str_arg",
     "if not anyio:",
 ]
-
-[tool.coverage.run]
-omit = [
-    "anydi/ext/django/ninja/_operation.py",
-    "anydi/ext/django/ninja/_signature.py",
-]

anydi-0.50.0/anydi/ext/django/__init__.py

@@ -1,9 +0,0 @@
-from ._container import container
-from ._utils import inject_urlpatterns, register_components, register_settings
-
-__all__ = [
-    "container",
-    "register_components",
-    "register_settings",
-    "inject_urlpatterns",
-]

anydi-0.50.0/anydi/ext/django/_container.py

@@ -1,18 +0,0 @@
-from typing import cast
-
-from django.apps.registry import apps
-from django.utils.functional import SimpleLazyObject
-
-import anydi
-
-from .apps import ContainerConfig
-
-__all__ = ["container"]
-
-
-def _get_container() -> anydi.Container:
-    app_config = cast(ContainerConfig, apps.get_app_config(ContainerConfig.label))
-    return app_config.container
-
-
-container = cast(anydi.Container, SimpleLazyObject(_get_container))

anydi-0.50.0/anydi/ext/django/_settings.py

@@ -1,37 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Sequence
-
-from django.conf import settings
-from typing_extensions import TypedDict
-
-
-class Settings(TypedDict):
-    CONTAINER_FACTORY: str | None
-    REGISTER_SETTINGS: bool
-    REGISTER_COMPONENTS: bool
-    INJECT_URLCONF: str | Sequence[str] | None
-    MODULES: Sequence[str]
-    SCAN_PACKAGES: Sequence[str]
-    PATCH_NINJA: bool
-
-
-DEFAULTS = Settings(
-    CONTAINER_FACTORY=None,
-    REGISTER_SETTINGS=False,
-    REGISTER_COMPONENTS=False,
-    MODULES=[],
-    PATCH_NINJA=False,
-    INJECT_URLCONF=None,
-    SCAN_PACKAGES=[],
-)
-
-
-def get_settings() -> Settings:
-    """Get the AnyDI settings from the Django settings."""
-    return Settings(
-        **{
-            **DEFAULTS,
-            **getattr(settings, "ANYDI", {}),
-        }
-    )

anydi-0.50.0/anydi/ext/django/_utils.py

@@ -1,89 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Iterator
-from typing import Annotated, Any
-
-from django.conf import settings
-from django.core.cache import BaseCache, caches
-from django.db import connections
-from django.db.backends.base.base import BaseDatabaseWrapper
-from django.urls import URLPattern, URLResolver, get_resolver
-
-from anydi import Container
-
-
-def register_settings(
-    container: Container, prefix: str = "django.conf.settings."
-) -> None:
-    """Register Django settings into the container."""
-
-    # Ensure prefix ends with a dot
-    if prefix[-1] != ".":
-        prefix += "."
-
-    for setting_name in dir(settings):
-        setting_value = getattr(settings, setting_name)
-        if not setting_name.isupper():
-            continue
-
-        container.register(
-            Annotated[type(setting_value), f"{prefix}{setting_name}"],
-            _get_setting_value(setting_value),
-            scope="singleton",
-        )
-
-
-def register_components(container: Container) -> None:
-    """Register Django components into the container."""
-
-    # Register caches
-    def _get_cache(cache_name: str) -> Any:
-        return lambda: caches[cache_name]
-
-    for cache_name in caches:
-        container.register(
-            Annotated[BaseCache, cache_name],
-            _get_cache(cache_name),
-            scope="singleton",
-        )
-
-    # Register database connections
-    def _get_connection(alias: str) -> Any:
-        return lambda: connections[alias]
-
-    for alias in connections:
-        container.register(
-            Annotated[BaseDatabaseWrapper, alias],
-            _get_connection(alias),
-            scope="singleton",
-        )
-
-
-def inject_urlpatterns(container: Container, *, urlconf: str) -> None:
-    """Auto-inject the container into views."""
-    resolver = get_resolver(urlconf)
-    injected_urlpatterns = []
-    for pattern in iter_urlpatterns(resolver.url_patterns):
-        # Skip already injected views
-        if pattern.lookup_str in injected_urlpatterns:
-            continue
-        # Skip django-ninja views
-        if pattern.lookup_str.startswith("ninja."):
-            continue  # pragma: no cover
-        pattern.callback = container.inject(pattern.callback)
-        injected_urlpatterns.append(pattern.lookup_str)
-
-
-def iter_urlpatterns(
-    urlpatterns: list[URLPattern | URLResolver],
-) -> Iterator[URLPattern]:
-    """Iterate over all views in urlpatterns."""
-    for url_pattern in urlpatterns:
-        if isinstance(url_pattern, URLResolver):
-            yield from iter_urlpatterns(url_pattern.url_patterns)
-        else:
-            yield url_pattern
-
-
-def _get_setting_value(value: Any) -> Any:
-    return lambda: value

anydi-0.50.0/anydi/ext/django/apps.py

@@ -1,89 +0,0 @@
-from __future__ import annotations
-
-import types
-from collections.abc import Callable
-from typing import cast
-
-from django.apps import AppConfig
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-from django.utils.module_loading import import_string
-
-import anydi
-from anydi.testing import TestContainer
-
-from ._settings import get_settings
-from ._utils import inject_urlpatterns, register_components, register_settings
-
-
-class ContainerConfig(AppConfig):
-    name = "anydi.ext.django"
-    label = "anydi_django"
-
-    def __init__(self, app_name: str, app_module: types.ModuleType | None) -> None:
-        super().__init__(app_name, app_module)
-        self.settings = get_settings()
-        # Create a container
-        container_factory_path = self.settings["CONTAINER_FACTORY"]
-        if container_factory_path:
-            try:
-                container_factory = cast(
-                    Callable[[], anydi.Container], import_string(container_factory_path)
-                )
-            except ImportError as exc:
-                raise ImproperlyConfigured(
-                    f"Cannot import container factory '{container_factory_path}'."
-                ) from exc
-            container = container_factory()
-        else:
-            container = anydi.Container()
-
-        # Use test container
-        testing = getattr(settings, "ANYDI_TESTING", False)
-        if testing:
-            container = TestContainer.from_container(container)
-
-        self.container = container
-
-    def ready(self) -> None:  # noqa: C901
-        # Register Django settings
-        if self.settings["REGISTER_SETTINGS"]:
-            register_settings(
-                self.container,
-                prefix=getattr(
-                    settings,
-                    "ANYDI_SETTINGS_PREFIX",
-                    "django.conf.settings.",
-                ),
-            )
-
-        # Register Django components
-        if self.settings["REGISTER_COMPONENTS"]:
-            register_components(self.container)
-
-        # Register modules
-        for module_path in self.settings["MODULES"]:
-            try:
-                module_cls = import_string(module_path)
-            except ImportError as exc:
-                raise ImproperlyConfigured(
-                    f"Cannot import module '{module_path}'."
-                ) from exc
-            self.container.register_module(module_cls)
-
-        # Patching the django-ninja framework if it installed
-        if self.settings["PATCH_NINJA"]:
-            from .ninja import patch_ninja
-
-            patch_ninja()
-
-        # Auto-injecting the container into views
-        if urlconf := self.settings["INJECT_URLCONF"]:
-            if isinstance(urlconf, str):
-                urlconf = [urlconf]
-            for u in urlconf:
-                inject_urlpatterns(self.container, urlconf=u)
-
-        # Scan packages
-        for scan_package in self.settings["SCAN_PACKAGES"]:
-            self.container.scan(scan_package)

anydi-0.50.0/anydi/ext/django/middleware.py

@@ -1,29 +0,0 @@
-from collections.abc import Callable
-from typing import Any
-
-from asgiref.sync import iscoroutinefunction
-from django.http import HttpRequest
-from django.utils.decorators import sync_and_async_middleware
-
-from ._container import container
-
-
-@sync_and_async_middleware
-def request_scoped_middleware(
-    get_response: Callable[..., Any],
-) -> Callable[..., Any]:
-    if iscoroutinefunction(get_response):
-
-        async def async_middleware(request: HttpRequest) -> Any:
-            async with container.arequest_context() as context:
-                context.set(HttpRequest, request)
-                return await get_response(request)
-
-        return async_middleware
-
-    def middleware(request: HttpRequest) -> Any:
-        with container.request_context() as context:
-            context.set(HttpRequest, request)
-            return get_response(request)
-
-    return middleware

anydi-0.50.0/anydi/ext/django/ninja/__init__.py

@@ -1,16 +0,0 @@
-try:
-    from ninja import operation
-except ImportError as exc:  # pragma: no cover
-    raise ImportError(
-        "'django-ninja' is not installed. "
-        "Please install it using 'pip install django-ninja'."
-    ) from exc
-
-from ._operation import AsyncOperation, Operation
-from ._signature import ViewSignature
-
-
-def patch_ninja() -> None:
-    operation.ViewSignature = ViewSignature  # type: ignore
-    operation.Operation = Operation  # type: ignore
-    operation.AsyncOperation = AsyncOperation  # type: ignore

anydi-0.50.0/anydi/ext/django/ninja/_operation.py

@@ -1,75 +0,0 @@
-from __future__ import annotations
-
-from typing import Any
-
-from django.http import HttpRequest, HttpResponseBase
-from ninja.operation import (
-    AsyncOperation as BaseAsyncOperation,  # noqa
-    Operation as BaseOperation,
-)
-
-from anydi.ext.django import container
-
-from ._signature import ViewSignature
-
-
-def _update_exc_args(exc: Exception) -> None:
-    if isinstance(exc, TypeError) and "required positional argument" in str(exc):
-        msg = "Did you fail to use functools.wraps() in a decorator?"
-        msg = f"{exc.args[0]}: {msg}" if exc.args else msg
-        exc.args = (msg,) + exc.args[1:]
-
-
-class Operation(BaseOperation):
-    signature: ViewSignature
-
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super().__init__(*args, **kwargs)
-        self.dependencies = self.signature.dependencies
-
-    def run(self, request: HttpRequest, **kw: Any) -> HttpResponseBase:
-        error = self._run_checks(request)
-        if error:
-            return error
-        try:
-            temporal_response = self.api.create_temporal_response(request)
-            values = self._get_values(request, kw, temporal_response)
-            values.update(self._get_dependencies())
-            result = self.view_func(request, **values)
-            return self._result_to_response(request, result, temporal_response)
-        except Exception as e:
-            _update_exc_args(e)
-            return self.api.on_exception(request, e)
-
-    def _get_dependencies(self) -> dict[str, Any]:
-        return {
-            name: container.resolve(interface) for name, interface in self.dependencies
-        }
-
-
-class AsyncOperation(BaseAsyncOperation):
-    signature: ViewSignature
-
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super().__init__(*args, **kwargs)
-        self.dependencies = self.signature.dependencies
-
-    async def run(self, request: HttpRequest, **kw: Any) -> HttpResponseBase:
-        error = await self._run_checks(request)
-        if error:
-            return error
-        try:
-            temporal_response = self.api.create_temporal_response(request)
-            values = self._get_values(request, kw, temporal_response)
-            values.update(await self._get_dependencies())
-            result = await self.view_func(request, **values)
-            return self._result_to_response(request, result, temporal_response)
-        except Exception as e:
-            _update_exc_args(e)
-            return self.api.on_exception(request, e)
-
-    async def _get_dependencies(self) -> dict[str, Any]:
-        return {
-            name: await container.aresolve(interface)
-            for name, interface in self.dependencies
-        }

anydi-0.50.0/anydi/ext/django/ninja/_signature.py

@@ -1,68 +0,0 @@
-from __future__ import annotations
-
-import inspect
-from collections.abc import Callable
-from typing import Any
-
-from django.http import HttpResponse
-from ninja.signature.details import (
-    FuncParam,  # noqa
-    ViewSignature as BaseViewSignature,
-)
-from ninja.signature.utils import get_path_param_names, get_typed_signature
-
-from anydi._typing import is_inject_marker  # noqa
-from anydi.ext.django import container
-
-
-class ViewSignature(BaseViewSignature):
-    def __init__(self, path: str, view_func: Callable[..., Any]) -> None:
-        self.view_func = view_func
-        self.signature = get_typed_signature(self.view_func)
-        self.path = path
-        self.path_params_names = get_path_param_names(path)
-        self.docstring = inspect.cleandoc(view_func.__doc__ or "")
-        self.has_kwargs = False
-        self.dependencies = []
-
-        self.params = []
-        for name, arg in self.signature.parameters.items():
-            if name == "request":
-                # TODO: maybe better assert that 1st param is request or check by type?
-                # maybe even have attribute like `has_request`
-                # so that users can ignore passing request if not needed
-                continue
-
-            if arg.kind == arg.VAR_KEYWORD:
-                # Skipping **kwargs
-                self.has_kwargs = True
-                continue
-
-            if arg.kind == arg.VAR_POSITIONAL:
-                # Skipping *args
-                continue
-
-            if arg.annotation is HttpResponse:
-                self.response_arg = name
-                continue
-
-            interface, should_inject = container.validate_injected_parameter(
-                arg, call=self.view_func
-            )
-            if should_inject:
-                self.dependencies.append((name, interface))
-                continue
-
-            func_param = self._get_param_type(name, arg)
-            self.params.append(func_param)
-
-        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)
-                )
-
-        self.models = self._create_models()
-
-        self._validate_view_path_params()