anydi 0.48.2__tar.gz → 0.52.0__tar.gz

{anydi-0.48.2 → anydi-0.52.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anydi
-Version: 0.48.2
+Version: 0.52.0
 Summary: Dependency Injection library
 Keywords: dependency injection,dependencies,di,async,asyncio,application
 Author: Anton Ruhlov
@@ -20,16 +20,16 @@ Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Dist: typing-extensions>=4.15.0,<5
 Requires-Dist: anyio>=3.7.1
 Requires-Dist: wrapt>=1.17.0,<2
-Requires-Python: >=3.9.0, <3.14
+Requires-Python: >=3.10.0, <3.15
 Project-URL: Repository, https://github.com/antonrh/anydi
 Description-Content-Type: text/markdown
 
@@ -58,7 +58,7 @@ http://anydi.readthedocs.io/
 
 ---
 
-`AnyDI` is a modern, lightweight Dependency Injection library suitable for any synchronous or asynchronous applications with Python 3.9+, based on type annotations ([PEP 484](https://peps.python.org/pep-0484/)).
+`AnyDI` is a modern, lightweight Dependency Injection library suitable for any synchronous or asynchronous applications with Python 3.10+, based on type annotations ([PEP 484](https://peps.python.org/pep-0484/)).
 
 The key features are:
 
@@ -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.48.2 → anydi-0.52.0}/README.md

@@ -23,7 +23,7 @@ http://anydi.readthedocs.io/
 
 ---
 
-`AnyDI` is a modern, lightweight Dependency Injection library suitable for any synchronous or asynchronous applications with Python 3.9+, based on type annotations ([PEP 484](https://peps.python.org/pep-0484/)).
+`AnyDI` is a modern, lightweight Dependency Injection library suitable for any synchronous or asynchronous applications with Python 3.10+, based on type annotations ([PEP 484](https://peps.python.org/pep-0484/)).
 
 The key features are:
 
@@ -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.48.2 → anydi-0.52.0}/anydi/_async.py

@@ -1,6 +1,7 @@
 import functools
+from collections.abc import Callable
 from types import TracebackType
-from typing import Any, Callable, TypeVar
+from typing import Any, TypeVar
 
 import anyio.to_thread
 from typing_extensions import ParamSpec, Self

{anydi-0.48.2 → anydi-0.52.0}/anydi/_container.py

@@ -9,11 +9,11 @@ import logging
 import types
 import uuid
 from collections import defaultdict
-from collections.abc import AsyncIterator, Iterable, Iterator
+from collections.abc import AsyncIterator, Callable, Iterable, Iterator
 from contextvars import ContextVar
-from typing import Annotated, Any, Callable, TypeVar, cast, overload
+from typing import Annotated, Any, TypeVar, cast, get_args, get_origin, overload
 
-from typing_extensions import ParamSpec, Self, get_args, get_origin
+from typing_extensions import ParamSpec, Self, type_repr
 
 from ._async import run_sync
 from ._context import InstanceContext
@@ -33,7 +33,6 @@ from ._typing import (
     is_inject_marker,
     is_iterator_type,
     is_none_type,
-    type_repr,
 )
 
 T = TypeVar("T", bound=Any)
@@ -808,7 +807,10 @@ class Container:
         marker = metadata[-1]
         new_metadata = metadata[:-1]
         if new_metadata:
-            new_annotation = Annotated.__class_getitem__((origin, *new_metadata))  # type: ignore
+            if hasattr(Annotated, "__getitem__"):
+                new_annotation = Annotated.__getitem__((origin, *new_metadata))  # type: ignore
+            else:
+                new_annotation = Annotated.__class_getitem__((origin, *new_metadata))  # type: ignore
         else:
             new_annotation = origin
         return parameter.replace(annotation=new_annotation, default=marker)

{anydi-0.48.2 → anydi-0.52.0}/anydi/_decorators.py

@@ -1,8 +1,7 @@
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     Concatenate,
     ParamSpec,
     Protocol,

{anydi-0.48.2 → anydi-0.52.0}/anydi/_module.py

@@ -2,7 +2,8 @@ from __future__ import annotations
 
 import importlib
 import inspect
-from typing import TYPE_CHECKING, Any, Callable
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any
 
 from ._decorators import ProviderMetadata, is_provider
 

{anydi-0.48.2 → anydi-0.52.0}/anydi/_provider.py

@@ -2,9 +2,10 @@ from __future__ import annotations
 
 import enum
 import inspect
+from collections.abc import Callable
 from dataclasses import dataclass
 from functools import cached_property
-from typing import Any, Callable, NamedTuple
+from typing import Any, NamedTuple
 
 from ._scope import Scope
 from ._typing import NOT_SET

{anydi-0.48.2 → anydi-0.52.0}/anydi/_scan.py

@@ -3,10 +3,10 @@ from __future__ import annotations
 import importlib
 import inspect
 import pkgutil
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from dataclasses import dataclass
 from types import ModuleType
-from typing import TYPE_CHECKING, Any, Callable, Union
+from typing import TYPE_CHECKING, Any
 
 from ._decorators import is_injectable
 from ._typing import get_typed_parameters, is_inject_marker
@@ -14,8 +14,8 @@ from ._typing import get_typed_parameters, is_inject_marker
 if TYPE_CHECKING:
     from ._container import Container
 
-Package = Union[ModuleType, str]
-PackageOrIterable = Union[Package, Iterable[Package]]
+Package = ModuleType | str
+PackageOrIterable = Package | Iterable[Package]
 
 
 @dataclass(kw_only=True)

{anydi-0.48.2 → anydi-0.52.0}/anydi/_typing.py

@@ -3,44 +3,9 @@
 from __future__ import annotations
 
 import inspect
-import re
-import sys
-from collections.abc import AsyncIterator, Iterator
-from typing import Any, Callable, ForwardRef, TypeVar
-
-from typing_extensions import get_args, get_origin
-
-try:
-    from types import NoneType
-except ImportError:
-    NoneType = type(None)
-
-
-T = TypeVar("T")
-
-
-def type_repr(obj: Any) -> str:
-    """Get a string representation of a type or object."""
-    if isinstance(obj, str):
-        return obj
-
-    # Get module and qualname with defaults to handle non-types directly
-    module = getattr(obj, "__module__", type(obj).__module__)
-    qualname = getattr(obj, "__qualname__", type(obj).__qualname__)
-
-    origin = get_origin(obj)
-    # If origin exists, handle generics recursively
-    if origin:
-        args = ", ".join(type_repr(arg) for arg in get_args(obj))
-        return f"{type_repr(origin)}[{args}]"
-
-    # Substitute standard library prefixes for clarity
-    full_qualname = f"{module}.{qualname}"
-    return re.sub(
-        r"\b(builtins|typing|typing_extensions|collections\.abc|types)\.",
-        "",
-        full_qualname,
-    )
+from collections.abc import AsyncIterator, Callable, Iterator
+from types import NoneType
+from typing import Any, ForwardRef
 
 
 def is_context_manager(obj: Any) -> bool:
@@ -68,11 +33,8 @@ def get_typed_annotation(
 ) -> Any:
     """Get the typed annotation of a callable object."""
     if isinstance(annotation, str):
-        if sys.version_info >= (3, 10):
-            ref = ForwardRef(annotation, module=module)
-        else:
-            ref = ForwardRef(annotation)
-        annotation = ref._evaluate(globalns, globalns, recursive_guard=frozenset())  # noqa
+        ref = ForwardRef(annotation, module=module)
+        annotation = ref._evaluate(globalns, globalns, recursive_guard=frozenset())  # type: ignore[reportDeprecated]
     return annotation
 
 

anydi-0.52.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.48.2 → anydi-0.52.0}/anydi/ext/pydantic_settings.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-from collections.abc import Iterable
-from typing import Annotated, Any, Callable
+from collections.abc import Callable, Iterable
+from typing import Annotated, Any
 
 from pydantic.fields import ComputedFieldInfo, FieldInfo  # noqa
 from pydantic_settings import BaseSettings

{anydi-0.48.2 → anydi-0.52.0}/anydi/ext/pytest_plugin.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 import inspect
 import logging
-from collections.abc import Iterator
-from typing import Any, Callable, cast
+from collections.abc import Callable, Iterator
+from typing import Any, cast
 
 import pytest
 from anyio.pytest_plugin import extract_backend_and_options, get_runner

{anydi-0.48.2 → anydi-0.52.0}/anydi/testing.py

@@ -5,14 +5,13 @@ from collections.abc import Iterable, Iterator, Sequence
 from typing import Any, TypeVar
 
 import wrapt  # type: ignore
-from typing_extensions import Self
+from typing_extensions import Self, type_repr
 
 from ._container import Container
 from ._context import InstanceContext
 from ._module import ModuleDef
 from ._provider import Provider, ProviderDef
 from ._scope import Scope
-from ._typing import type_repr
 
 T = TypeVar("T")
 

{anydi-0.48.2 → anydi-0.52.0}/pyproject.toml

@@ -1,9 +1,9 @@
 [project]
 name = "anydi"
-version = "0.48.2"
+version = "0.52.0"
 description = "Dependency Injection library"
 authors = [{ name = "Anton Ruhlov", email = "antonruhlov@gmail.com" }]
-requires-python = ">=3.9.0, <3.14"
+requires-python = ">=3.10.0, <3.15"
 readme = "README.md"
 license = "MIT"
 keywords = [
@@ -29,11 +29,11 @@ classifiers = [
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: 3 :: Only",
 ]
 dependencies = [
@@ -50,22 +50,17 @@ anydi = "anydi.ext.pytest_plugin"
 
 [dependency-groups]
 dev = [
-    "ruff>=0.13.0",
+    "ruff>=0.14.0",
+    "pyright>=1.1.406",
     "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",
-    "bump-my-version>=1.1.4",
-    "pyright>=1.1.405",
-    "pytest-mock>=3.14.1",
 ]
 docs = [
     "mkdocs>=1.4.2,<2",
@@ -82,7 +77,7 @@ module-root = "."
 
 [tool.ruff]
 line-length = 88
-target-version = "py39"
+target-version = "py310"
 include = [
     "anydi/**/*.py",
     "tests/**/*.py",
@@ -117,7 +112,6 @@ addopts = [
 ]
 xfail_strict = true
 junit_family = "xunit2"
-DJANGO_SETTINGS_MODULE = "tests.ext.django.settings"
 
 [tool.coverage.report]
 exclude_also = [
@@ -133,39 +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",
-]
-
-[tool.bumpversion]
-current_version = "0.48.2"
-parse = """(?x)
-    (?P<major>0|[1-9]\\d*)\\.
-    (?P<minor>0|[1-9]\\d*)\\.
-    (?P<patch>0|[1-9]\\d*)
-    (?:
-        -                             # dash separator for pre-release section
-        (?P<pre_l>[a-zA-Z-]+)         # pre-release label
-        (?P<pre_n>0|[1-9]\\d*)        # pre-release version number
-    )?                                # pre-release section is optional
-"""
-serialize = [
-    "{major}.{minor}.{patch}-{pre_l}{pre_n}",
-    "{major}.{minor}.{patch}",
-]
-search = "{current_version}"
-replace = "{new_version}"
-message = "Bump version: {current_version} → {new_version}"
-
-[[tool.bumpversion.files]]
-filename = "pyproject.toml"
-search = "version = \"{current_version}\""
-replace = "version = \"{new_version}\""
-
-[tool.bumpversion.parts.pre_l]
-values = ["rc", "final"]
-optional_value = "final"
-

anydi-0.48.2/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.48.2/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.48.2/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.48.2/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.48.2/anydi/ext/django/apps.py

@@ -1,88 +0,0 @@
-from __future__ import annotations
-
-import types
-from typing import Callable, 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.48.2/anydi/ext/django/middleware.py

@@ -1,28 +0,0 @@
-from typing import Any, Callable
-
-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.48.2/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.48.2/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.48.2/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()