anydi 0.25.0__tar.gz → 0.25.0a0__tar.gz

{anydi-0.25.0 → anydi-0.25.0a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anydi
-Version: 0.25.0
+Version: 0.25.0a0
 Summary: Dependency Injection library
 Home-page: https://github.com/antonrh/anydi
 License: MIT
@@ -89,7 +89,7 @@ pip install anydi
 *app.py*
 
 ```python
-from anydi import auto, Container
+from anydi import Container, dep
 
 container = Container()
 
@@ -100,7 +100,7 @@ def message() -> str:
 
 
 @container.inject
-def say_hello(message: str = auto) -> None:
+def say_hello(message: str = dep()) -> None:
     print(message)
 
 
@@ -139,59 +139,3 @@ def say_hello(message: str = Inject()) -> dict[str, str]:
 anydi.ext.fastapi.install(app, container)
 ```
 
-
-
-## Django Ninja Example
-
-*container.py*
-
-```python
-from anydi import Container
-
-
-def get_container() -> Container:
-    container = Container()
-
-    @container.provider(scope="singleton")
-    def message() -> str:
-        return "Hello, World!"
-
-    return container
-```
-
-*settings.py*
-
-```python
-INSTALLED_APPS = [
-    ...
-    "anydi.ext.django",
-]
-
-ANYDI = {
-    "CONTAINER_FACTORY": "myapp.container.get_container",
-    "PATCH_NINJA": True,
-}
-```
-
-*urls.py*
-
-```python
-from django.http import HttpRequest
-from django.urls import path
-from ninja import NinjaAPI
-
-from anydi import auto
-
-api = NinjaAPI()
-
-
-@api.get("/hello")
-def say_hello(request: HttpRequest, message: str = auto) -> dict[str, str]:
-    return {"message": message}
-
-
-urlpatterns = [
-    path("api/", api.urls),
-]
-```
-

{anydi-0.25.0 → anydi-0.25.0a0}/README.md

@@ -49,7 +49,7 @@ pip install anydi
 *app.py*
 
 ```python
-from anydi import auto, Container
+from anydi import Container, dep
 
 container = Container()
 
@@ -60,7 +60,7 @@ def message() -> str:
 
 
 @container.inject
-def say_hello(message: str = auto) -> None:
+def say_hello(message: str = dep()) -> None:
     print(message)
 
 
@@ -98,59 +98,3 @@ def say_hello(message: str = Inject()) -> dict[str, str]:
 # Install the container into the FastAPI app
 anydi.ext.fastapi.install(app, container)
 ```
-
-
-
-## Django Ninja Example
-
-*container.py*
-
-```python
-from anydi import Container
-
-
-def get_container() -> Container:
-    container = Container()
-
-    @container.provider(scope="singleton")
-    def message() -> str:
-        return "Hello, World!"
-
-    return container
-```
-
-*settings.py*
-
-```python
-INSTALLED_APPS = [
-    ...
-    "anydi.ext.django",
-]
-
-ANYDI = {
-    "CONTAINER_FACTORY": "myapp.container.get_container",
-    "PATCH_NINJA": True,
-}
-```
-
-*urls.py*
-
-```python
-from django.http import HttpRequest
-from django.urls import path
-from ninja import NinjaAPI
-
-from anydi import auto
-
-api = NinjaAPI()
-
-
-@api.get("/hello")
-def say_hello(request: HttpRequest, message: str = auto) -> dict[str, str]:
-    return {"message": message}
-
-
-urlpatterns = [
-    path("api/", api.urls),
-]
-```

{anydi-0.25.0 → anydi-0.25.0a0}/anydi/__init__.py

@@ -1,6 +1,6 @@
 """AnyDI public objects and functions."""
 
-from typing import Any, cast
+from typing import Any
 
 from ._container import Container, request, singleton, transient
 from ._module import Module, provider
@@ -14,7 +14,7 @@ def dep() -> Any:
 
 
 # Alias for dependency auto marker
-auto = cast(Any, Marker())
+auto = dep
 
 
 __all__ = [

{anydi-0.25.0 → anydi-0.25.0a0}/anydi/_container.py

@@ -15,16 +15,21 @@ from typing import (
     Awaitable,
     Callable,
     ContextManager,
+    Dict,
     Iterable,
     Iterator,
+    List,
     Mapping,
+    Optional,
     Sequence,
+    Type,
     TypeVar,
+    Union,
     cast,
     overload,
 )
 
-from typing_extensions import ParamSpec, final, get_args, get_origin
+from typing_extensions import Annotated, ParamSpec, final, get_args, get_origin
 
 try:
     from types import NoneType
@@ -42,19 +47,13 @@ from ._context import (
 from ._logger import logger
 from ._module import Module, ModuleRegistry
 from ._scanner import Scanner
-from ._types import AnyInterface, Interface, Provider, Scope, is_marker
-from ._utils import (
-    get_full_qualname,
-    get_typed_parameters,
-    get_typed_return_annotation,
-    has_resource_origin,
-    is_builtin_type,
-)
+from ._types import AnyInterface, Interface, Marker, Provider, Scope
+from ._utils import get_full_qualname, get_signature, is_builtin_type
 
 T = TypeVar("T", bound=Any)
 P = ParamSpec("P")
 
-ALLOWED_SCOPES: dict[Scope, list[Scope]] = {
+ALLOWED_SCOPES: Dict[Scope, List[Scope]] = {
     "singleton": ["singleton"],
     "request": ["request", "singleton"],
     "transient": ["transient", "singleton", "request"],
@@ -72,9 +71,10 @@ class Container:
     def __init__(
         self,
         *,
-        providers: Mapping[type[Any], Provider] | None = None,
-        modules: Sequence[Module | type[Module] | Callable[[Container], None]]
-        | None = None,
+        providers: Optional[Mapping[Type[Any], Provider]] = None,
+        modules: Optional[
+            Sequence[Union[Module, Type[Module], Callable[[Container], None]]]
+        ] = None,
         strict: bool = False,
     ) -> None:
         """Initialize the AnyDI instance.
@@ -84,13 +84,13 @@ class Container:
             modules: Optional sequence of modules to register during initialization.
             strict: Whether to enable strict mode. Defaults to False.
         """
-        self._providers: dict[type[Any], Provider] = {}
+        self._providers: Dict[Type[Any], Provider] = {}
         self._singleton_context = SingletonContext(self)
         self._transient_context = TransientContext(self)
-        self._request_context_var: ContextVar[RequestContext | None] = ContextVar(
+        self._request_context_var: ContextVar[Optional[RequestContext]] = ContextVar(
             "request_context", default=None
         )
-        self._override_instances: dict[type[Any], Any] = {}
+        self._override_instances: Dict[Type[Any], Any] = {}
         self._strict = strict
 
         # Components
@@ -117,7 +117,7 @@ class Container:
         return self._strict
 
     @property
-    def providers(self) -> dict[type[Any], Provider]:
+    def providers(self) -> Dict[Type[Any], Provider]:
         """Get the registered providers.
 
         Returns:
@@ -333,7 +333,7 @@ class Container:
         """
         related_providers = []
 
-        for parameter in provider.parameters:
+        for parameter in provider.parameters.values():
             if parameter.annotation is inspect._empty:  # noqa
                 raise TypeError(
                     f"Missing provider `{provider}` "
@@ -363,7 +363,7 @@ class Container:
                     "registered with matching scopes."
                 )
 
-    def _detect_scope(self, obj: Callable[..., Any]) -> Scope | None:
+    def _detect_scope(self, obj: Callable[..., Any]) -> Optional[Scope]:
         """Detect the scope for a provider.
 
         Args:
@@ -372,7 +372,7 @@ class Container:
             The auto scope, or None if the auto scope cannot be detected.
         """
         has_transient, has_request, has_singleton = False, False, False
-        for parameter in get_typed_parameters(obj):
+        for parameter in get_signature(obj).parameters.values():
             sub_provider = self._get_or_register_provider(parameter.annotation)
             if not has_transient and sub_provider.scope == "transient":
                 has_transient = True
@@ -389,7 +389,7 @@ class Container:
         return None
 
     def register_module(
-        self, module: Module | type[Module] | Callable[[Container], None]
+        self, module: Union[Module, Type[Module], Callable[[Container], None]]
     ) -> None:
         """Register a module as a callable, module type, or module instance.
 
@@ -633,11 +633,14 @@ class Container:
     def inject(self) -> Callable[[Callable[P, T]], Callable[P, T]]: ...
 
     def inject(
-        self, obj: Callable[P, T | Awaitable[T]] | None = None
-    ) -> (
-        Callable[[Callable[P, T | Awaitable[T]]], Callable[P, T | Awaitable[T]]]
-        | Callable[P, T | Awaitable[T]]
-    ):
+        self, obj: Union[Callable[P, Union[T, Awaitable[T]]], None] = None
+    ) -> Union[
+        Callable[
+            [Callable[P, Union[T, Awaitable[T]]]],
+            Callable[P, Union[T, Awaitable[T]]],
+        ],
+        Callable[P, Union[T, Awaitable[T]]],
+    ]:
         """Decorator to inject dependencies into a callable.
 
         Args:
@@ -649,8 +652,8 @@ class Container:
         """
 
         def decorator(
-            obj: Callable[P, T | Awaitable[T]],
-        ) -> Callable[P, T | Awaitable[T]]:
+            obj: Callable[P, Union[T, Awaitable[T]]],
+        ) -> Callable[P, Union[T, Awaitable[T]]]:
             injected_params = self._get_injected_params(obj)
 
             if inspect.iscoroutinefunction(obj):
@@ -691,9 +694,12 @@ class Container:
     def scan(
         self,
         /,
-        packages: types.ModuleType | str | Iterable[types.ModuleType | str],
+        packages: Union[
+            Union[types.ModuleType, str],
+            Iterable[Union[types.ModuleType, str]],
+        ],
         *,
-        tags: Iterable[str] | None = None,
+        tags: Optional[Iterable[str]] = None,
     ) -> None:
         """Scan packages or modules for decorated members and inject dependencies.
 
@@ -717,28 +723,32 @@ class Container:
         Raises:
             TypeError: If the provider return annotation is missing or invalid.
         """
-        annotation = get_typed_return_annotation(obj)
+        annotation = get_signature(obj).return_annotation
 
-        if annotation is None:
+        if annotation is inspect._empty:  # noqa
             raise TypeError(
                 f"Missing `{get_full_qualname(obj)}` provider return annotation."
             )
 
-        origin = get_origin(annotation)
+        origin = get_origin(annotation) or annotation
+        args = get_args(annotation)
 
-        if has_resource_origin(origin):
-            args = get_args(annotation)
+        # Supported generic types
+        if origin in (list, dict, tuple, Annotated):
             if args:
-                return args[0]
+                return annotation
             else:
                 raise TypeError(
-                    f"Cannot use `{get_full_qualname(obj)}` resource type annotation "
+                    f"Cannot use `{get_full_qualname(obj)}` generic type annotation "
                     "without actual type."
                 )
 
-        return annotation
+        try:
+            return args[0]
+        except IndexError:
+            return annotation
 
-    def _get_injected_params(self, obj: Callable[..., Any]) -> dict[str, Any]:
+    def _get_injected_params(self, obj: Callable[..., Any]) -> Dict[str, Any]:
         """Get the injected parameters of a callable object.
 
         Args:
@@ -749,8 +759,8 @@ class Container:
                 of the injected parameters.
         """
         injected_params = {}
-        for parameter in get_typed_parameters(obj):
-            if not is_marker(parameter.default):
+        for parameter in get_signature(obj).parameters.values():
+            if not isinstance(parameter.default, Marker):
                 continue
             try:
                 self._validate_injected_parameter(obj, parameter)

{anydi-0.25.0 → anydi-0.25.0a0}/anydi/_context.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import abc
 import contextlib
 from types import TracebackType
-from typing import TYPE_CHECKING, Any, TypeVar, cast
+from typing import TYPE_CHECKING, Any, Dict, List, Tuple, Type, TypeVar, cast
 
 from typing_extensions import Self, final
 
@@ -87,7 +87,7 @@ class ScopedContext(abc.ABC):
 
     def _get_provider_arguments(
         self, provider: Provider
-    ) -> tuple[list[Any], dict[str, Any]]:
+    ) -> Tuple[List[Any], Dict[str, Any]]:
         """Retrieve the arguments for a provider.
 
         Args:
@@ -97,7 +97,7 @@ class ScopedContext(abc.ABC):
             The arguments for the provider.
         """
         args, kwargs = [], {}
-        for parameter in provider.parameters:
+        for parameter in provider.parameters.values():
             instance = self.container.resolve(parameter.annotation)
             if parameter.kind == parameter.POSITIONAL_ONLY:
                 args.append(instance)
@@ -107,7 +107,7 @@ class ScopedContext(abc.ABC):
 
     async def _aget_provider_arguments(
         self, provider: Provider
-    ) -> tuple[list[Any], dict[str, Any]]:
+    ) -> Tuple[List[Any], Dict[str, Any]]:
         """Asynchronously retrieve the arguments for a provider.
 
         Args:
@@ -117,7 +117,7 @@ class ScopedContext(abc.ABC):
             The arguments for the provider.
         """
         args, kwargs = [], {}
-        for parameter in provider.parameters:
+        for parameter in provider.parameters.values():
             instance = await self.container.aresolve(parameter.annotation)
             if parameter.kind == parameter.POSITIONAL_ONLY:
                 args.append(instance)
@@ -132,7 +132,7 @@ class ResourceScopedContext(ScopedContext):
     def __init__(self, container: Container) -> None:
         """Initialize the ScopedContext."""
         super().__init__(container)
-        self._instances: dict[type[Any], Any] = {}
+        self._instances: Dict[Type[Any], Any] = {}
         self._stack = contextlib.ExitStack()
         self._async_stack = contextlib.AsyncExitStack()
 
@@ -237,7 +237,7 @@ class ResourceScopedContext(ScopedContext):
 
     def __exit__(
         self,
-        exc_type: type[BaseException] | None,
+        exc_type: Type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: TracebackType | None,
     ) -> None:
@@ -265,7 +265,7 @@ class ResourceScopedContext(ScopedContext):
 
     async def __aexit__(
         self,
-        exc_type: type[BaseException] | None,
+        exc_type: Type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: TracebackType | None,
     ) -> None:

{anydi-0.25.0 → anydi-0.25.0a0}/anydi/_module.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import inspect
-from typing import TYPE_CHECKING, Any, Callable, TypeVar
+from typing import TYPE_CHECKING, Any, Callable, Dict, List, Tuple, Type, TypeVar, Union
 
 from typing_extensions import Concatenate, NamedTuple, ParamSpec
 
@@ -24,7 +24,7 @@ class ModuleMeta(type):
     and stores it in the `providers` attribute.
     """
 
-    def __new__(cls, name: str, bases: tuple[type, ...], attrs: dict[str, Any]) -> Any:
+    def __new__(cls, name: str, bases: Tuple[type, ...], attrs: Dict[str, Any]) -> Any:
         """Create a new instance of the ModuleMeta class.
 
         This method extracts provider information from the class attributes and
@@ -49,7 +49,7 @@ class ModuleMeta(type):
 class Module(metaclass=ModuleMeta):
     """A base class for defining AnyDI modules."""
 
-    providers: list[tuple[str, ProviderDecoratorArgs]]
+    providers: List[Tuple[str, ProviderDecoratorArgs]]
 
     def configure(self, container: Container) -> None:
         """Configure the AnyDI container with providers and their dependencies.
@@ -67,7 +67,7 @@ class ModuleRegistry:
         self.container = container
 
     def register(
-        self, module: Module | type[Module] | Callable[[Container], None]
+        self, module: Union[Module, Type[Module], Callable[[Container], None]]
     ) -> None:
         """Register a module as a callable, module type, or module instance.
 

{anydi-0.25.0 → anydi-0.25.0a0}/anydi/_scanner.py

@@ -10,6 +10,8 @@ from typing import (
     Any,
     Callable,
     Iterable,
+    List,
+    Optional,
     TypeVar,
     Union,
     cast,
@@ -19,8 +21,8 @@ from typing import (
 
 from typing_extensions import NamedTuple, ParamSpec
 
-from ._types import is_marker
-from ._utils import get_typed_parameters
+from ._types import Marker
+from ._utils import get_signature
 
 if TYPE_CHECKING:
     from ._container import Container
@@ -54,9 +56,9 @@ class Scanner:
     def scan(
         self,
         /,
-        packages: ModuleType | str | Iterable[ModuleType | str],
+        packages: Union[Union[ModuleType, str], Iterable[Union[ModuleType, str]]],
         *,
-        tags: Iterable[str] | None = None,
+        tags: Optional[Iterable[str]] = None,
     ) -> None:
         """Scan packages or modules for decorated members and inject dependencies.
 
@@ -66,10 +68,10 @@ class Scanner:
             tags: Optional list of tags to filter the scanned members. Only members
                 with at least one matching tag will be scanned. Defaults to None.
         """
-        dependencies: list[Dependency] = []
+        dependencies: List[Dependency] = []
 
         if isinstance(packages, Iterable) and not isinstance(packages, str):
-            scan_packages: Iterable[ModuleType | str] = packages
+            scan_packages: Iterable[Union[ModuleType, str]] = packages
         else:
             scan_packages = cast(Iterable[Union[ModuleType, str]], [packages])
 
@@ -82,10 +84,10 @@ class Scanner:
 
     def _scan_package(
         self,
-        package: ModuleType | str,
+        package: Union[ModuleType, str],
         *,
-        tags: Iterable[str] | None = None,
-    ) -> list[Dependency]:
+        tags: Optional[Iterable[str]] = None,
+    ) -> List[Dependency]:
         """Scan a package or module for decorated members.
 
         Args:
@@ -105,7 +107,7 @@ class Scanner:
         if not package_path:
             return self._scan_module(package, tags=tags)
 
-        dependencies: list[Dependency] = []
+        dependencies: List[Dependency] = []
 
         for module_info in pkgutil.walk_packages(
             path=package_path, prefix=package.__name__ + "."
@@ -117,7 +119,7 @@ class Scanner:
 
     def _scan_module(
         self, module: ModuleType, *, tags: Iterable[str]
-    ) -> list[Dependency]:
+    ) -> List[Dependency]:
         """Scan a module for decorated members.
 
         Args:
@@ -128,7 +130,7 @@ class Scanner:
         Returns:
             A list of scanned dependencies.
         """
-        dependencies: list[Dependency] = []
+        dependencies: List[Dependency] = []
 
         for _, member in inspect.getmembers(module):
             if getattr(member, "__module__", None) != module.__name__ or not callable(
@@ -157,11 +159,11 @@ class Scanner:
 
             # Get by Marker
             if inspect.isclass(member):
-                parameters = get_typed_parameters(member.__init__)
+                signature = get_signature(member.__init__)
             else:
-                parameters = get_typed_parameters(member)
-            for parameter in parameters:
-                if is_marker(parameter.default):
+                signature = get_signature(member)
+            for parameter in signature.parameters.values():
+                if isinstance(parameter.default, Marker):
                     dependencies.append(
                         self._create_dependency(member=member, module=module)
                     )
@@ -186,7 +188,7 @@ class Scanner:
 
 class InjectDecoratorArgs(NamedTuple):
     wrapped: bool
-    tags: Iterable[str] | None
+    tags: Optional[Iterable[str]]
 
 
 @overload
@@ -195,14 +197,20 @@ def injectable(obj: Callable[P, T]) -> Callable[P, T]: ...
 
 @overload
 def injectable(
-    *, tags: Iterable[str] | None = None
+    *, tags: Optional[Iterable[str]] = None
 ) -> Callable[[Callable[P, T]], Callable[P, T]]: ...
 
 
 def injectable(
-    obj: Callable[P, T] | None = None,
-    tags: Iterable[str] | None = None,
-) -> Callable[[Callable[P, T]], Callable[P, T]] | Callable[P, T]:
+    obj: Optional[Callable[P, T]] = None,
+    tags: Optional[Iterable[str]] = None,
+) -> Union[
+    Callable[
+        [Callable[P, T]],
+        Callable[P, T],
+    ],
+    Callable[P, T],
+]:
     """Decorator for marking a function or method as requiring dependency injection.
 
     Args:

{anydi-0.25.0 → anydi-0.25.0a0}/anydi/_types.py

@@ -1,13 +1,11 @@
-from __future__ import annotations
-
 import inspect
 from dataclasses import dataclass
 from functools import cached_property
 from typing import Any, Callable, Type, TypeVar, Union
 
-from typing_extensions import Annotated, Literal, Self, TypeAlias
+from typing_extensions import Annotated, Literal, Mapping, TypeAlias
 
-from ._utils import get_full_qualname, get_typed_parameters
+from ._utils import get_full_qualname, get_signature
 
 Scope = Literal["transient", "singleton", "request"]
 
@@ -21,14 +19,6 @@ class Marker:
 
     __slots__ = ()
 
-    def __call__(self) -> Self:
-        return self
-
-
-def is_marker(obj: Any) -> bool:
-    """Checks if an object is a marker."""
-    return isinstance(obj, Marker)
-
 
 @dataclass(frozen=True)
 class Provider:
@@ -60,13 +50,13 @@ class Provider:
         return get_full_qualname(self.obj)
 
     @cached_property
-    def parameters(self) -> list[inspect.Parameter]:
+    def parameters(self) -> Mapping[str, inspect.Parameter]:
         """Returns the parameters of the provider as a mapping.
 
         Returns:
             The parameters of the provider.
         """
-        return get_typed_parameters(self.obj)
+        return get_signature(self.obj).parameters
 
     @cached_property
     def is_class(self) -> bool: