anydi 0.25.0a0__py3-none-any.whl → 0.25.0a1__py3-none-any.whl

anydi/__init__.py

@@ -1,6 +1,6 @@
 """AnyDI public objects and functions."""
 
-from typing import Any
+from typing import Any, cast
 
 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 = dep
+auto = cast(Any, Marker())
 
 
 __all__ = [

anydi/_container.py

@@ -47,7 +47,7 @@ from ._context import (
 from ._logger import logger
 from ._module import Module, ModuleRegistry
 from ._scanner import Scanner
-from ._types import AnyInterface, Interface, Marker, Provider, Scope
+from ._types import AnyInterface, Interface, Provider, Scope, is_marker
 from ._utils import get_full_qualname, get_signature, is_builtin_type
 
 T = TypeVar("T", bound=Any)
@@ -760,7 +760,7 @@ class Container:
         """
         injected_params = {}
         for parameter in get_signature(obj).parameters.values():
-            if not isinstance(parameter.default, Marker):
+            if not is_marker(parameter.default):
                 continue
             try:
                 self._validate_injected_parameter(obj, parameter)

anydi/_scanner.py

@@ -21,7 +21,7 @@ from typing import (
 
 from typing_extensions import NamedTuple, ParamSpec
 
-from ._types import Marker
+from ._types import is_marker
 from ._utils import get_signature
 
 if TYPE_CHECKING:
@@ -163,7 +163,7 @@ class Scanner:
             else:
                 signature = get_signature(member)
             for parameter in signature.parameters.values():
-                if isinstance(parameter.default, Marker):
+                if is_marker(parameter.default):
                     dependencies.append(
                         self._create_dependency(member=member, module=module)
                     )

anydi/_types.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 from functools import cached_property
 from typing import Any, Callable, Type, TypeVar, Union
 
-from typing_extensions import Annotated, Literal, Mapping, TypeAlias
+from typing_extensions import Annotated, Literal, Mapping, Self, TypeAlias
 
 from ._utils import get_full_qualname, get_signature
 
@@ -19,6 +19,14 @@ 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:

anydi/ext/django/apps.py

@@ -1,35 +1,53 @@
+import logging
 import types
+from asyncio import get_running_loop
 from functools import wraps
-from typing import Annotated, Any, get_origin
+from typing import Any, Callable, cast
 
 from django.apps import AppConfig
 from django.conf import settings
 from django.core.cache import BaseCache, caches
+from django.core.exceptions import ImproperlyConfigured
 from django.db import connections
 from django.db.backends.base.base import BaseDatabaseWrapper
 from django.urls import get_resolver
 from django.utils.module_loading import import_string
+from typing_extensions import Annotated, get_origin
 
 import anydi
 
 from ._utils import iter_urlpatterns
 
+logger = logging.getLogger(__name__)
+
 
 class ContainerConfig(AppConfig):  # type: ignore[misc]
     name = "anydi.ext.django"
     label = "anydi_django"
 
     # Prefix for Django settings
-    settings_prefix = "django.conf.settings"
+    settings_prefix = "django.conf.settings."
 
     def __init__(self, app_name: str, app_module: types.ModuleType | None) -> None:
         super().__init__(app_name, app_module)
         # Create a container
-        self.container = anydi.Container(
-            strict=getattr(settings, "ANYDI_STRICT_MODE", False),
-        )
+        container_getter_path = getattr(settings, "ANYDI_CONTAINER_GETTER", None)
+        if container_getter_path:
+            try:
+                container_getter = cast(
+                    Callable[[], anydi.Container], import_string(container_getter_path)
+                )
+            except ImportError as exc:
+                raise ImproperlyConfigured(
+                    f"Cannot import container getter '{container_getter_path}'."
+                ) from exc
+            self.container = container_getter()
+        else:
+            self.container = anydi.Container(
+                strict=getattr(settings, "ANYDI_STRICT_MODE", False),
+            )
 
-    def ready(self) -> None:
+    def ready(self) -> None:  # noqa: C901
         # Register Django settings
         if getattr(settings, "ANYDI_REGISTER_SETTINGS", False):
             self.register_settings()
@@ -40,7 +58,12 @@ class ContainerConfig(AppConfig):  # type: ignore[misc]
 
         # Register modules
         for module_path in getattr(settings, "ANYDI_MODULES", []):
-            module_cls = import_string(module_path)
+            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
@@ -51,30 +74,47 @@ class ContainerConfig(AppConfig):  # type: ignore[misc]
         if urlconf := getattr(settings, "ANYDI_AUTO_INJECT_URLCONF", None):
             self.auto_inject_urlconf(urlconf)
 
+        # Scan packages
+        for scan_package in getattr(settings, "ANYDI_SCAN_PACKAGES", []):
+            self.container.scan(scan_package)
+
+        # Start the container
+        if getattr(settings, "ANYDI_START_CONTAINER", False):
+            try:
+                get_running_loop()
+            except RuntimeError:
+                logger.warning(
+                    "Starting the container is only supported in an async context."
+                )
+            else:
+                self.container.start()
+
     def register_settings(self) -> None:  # noqa: C901
         """Register Django settings into the container."""
 
         def _get_setting_value(value: Any) -> Any:
             return lambda: value
 
-        for setting_name, value in settings.__dict__.items():
+        for setting_name in dir(settings):
+            setting_value = getattr(settings, setting_name)
             if not setting_name.isupper():
                 continue
+
             self.container.register(
-                Annotated[Any, f"{self.settings_prefix}.{setting_name}"],
-                _get_setting_value(value),
+                Annotated[Any, f"{self.settings_prefix}{setting_name}"],
+                _get_setting_value(setting_value),
                 scope="singleton",
             )
 
         def _aware_settings(interface: Any) -> Any:
             origin = get_origin(interface)
             if origin is not Annotated:
-                return interface
+                return interface  # pragma: no cover
             named = interface.__metadata__[-1]
 
-            if isinstance(named, str):
+            if isinstance(named, str) and named.startswith(self.settings_prefix):
                 _, setting_name = named.rsplit(self.settings_prefix, maxsplit=1)
-                return Annotated[Any, f"{self.settings_prefix}.{setting_name}"]
+                return Annotated[Any, f"{self.settings_prefix}{setting_name}"]
             return interface
 
         def _resolve(resolve: Any) -> Any:
@@ -110,7 +150,6 @@ class ContainerConfig(AppConfig):  # type: ignore[misc]
             )
 
         # Register database connections
-
         def _get_connection(alias: str) -> Any:
             return lambda: connections[alias]
 
@@ -127,7 +166,7 @@ class ContainerConfig(AppConfig):  # type: ignore[misc]
         for pattern in iter_urlpatterns(resolver.url_patterns):
             # Skip django-ninja views
             if pattern.lookup_str.startswith("ninja."):
-                continue
+                continue  # pragma: no cover
             pattern.callback = self.container.inject(pattern.callback)
 
     @staticmethod

anydi/ext/django/ninja/__init__.py

@@ -1,6 +1,6 @@
 try:
     from ninja import operation
-except ImportError as exc:
+except ImportError as exc:  # pragma: no cover
     raise ImportError(
         "'django-ninja' is not installed. "
         "Please install it using 'pip install django-ninja'."

anydi/ext/django/ninja/_signature.py

@@ -3,8 +3,8 @@ from collections.abc import Callable
 from typing import Any
 
 from django.http import HttpResponse
-from ninja.signature.details import (  # noqa
-    FuncParam,
+from ninja.signature.details import (
+    FuncParam,  # noqa
     ViewSignature as BaseViewSignature,
 )
 from ninja.signature.utils import get_path_param_names, get_typed_signature

{anydi-0.25.0a0.dist-info → anydi-0.25.0a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anydi
-Version: 0.25.0a0
+Version: 0.25.0a1
 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 Container, dep
+from anydi import auto, Container
 
 container = Container()
 
@@ -100,7 +100,7 @@ def message() -> str:
 
 
 @container.inject
-def say_hello(message: str = dep()) -> None:
+def say_hello(message: str = auto) -> None:
     print(message)
 
 

{anydi-0.25.0a0.dist-info → anydi-0.25.0a1.dist-info}/RECORD

@@ -1,26 +1,26 @@
-anydi/__init__.py,sha256=p2GQq45mulZRlC8oJ7bvOpjVFCeycsgI2IcNJjs_LhU,562
-anydi/_container.py,sha256=bd1qe6DY6dyyIjBXbRhSglUD0MJX6OeVKVSGqUqFTuU,28347
+anydi/__init__.py,sha256=aeaBp5vq09sG-e9sqqs9qpUtUIDNfOdFPrlAfE5Ku9E,584
+anydi/_container.py,sha256=LeGrujx8zMzBuR8PD7qNqVJmmLB-frAG74gihX0lxNc,28341
 anydi/_context.py,sha256=btGJzvTMkj5v95rAw6kjOclISKcSugC4wzrHlWlCk_I,10258
 anydi/_logger.py,sha256=UpubJUnW83kffFxkhUlObm2DmZX1Pjqoz9YFKS-JOPg,52
 anydi/_module.py,sha256=1fBo9-RWxo7TeyP0Y2uJokT-NXP2pjik6CXNoeo3l-8,3712
-anydi/_scanner.py,sha256=YYPqzAQRgxxMpOSOpE7EqA_hccC6VjKi9Y8y_5HbtlA,6781
-anydi/_types.py,sha256=AuHR2hvqaMazL55xj8I9YI6nyBAD16uQznNcmZoQsPE,3240
+anydi/_scanner.py,sha256=9S3XbNVFAnHClT3FBo2CWeDBzCLG58i93a1ZJgaMNIo,6775
+anydi/_types.py,sha256=TfqJ7TfudOzGMG4_OliAMMJplu42mXZcZmgmtK2oz14,3412
 anydi/_utils.py,sha256=haRwC6YTTFf6CNTfwsRQ4NZsNByoUkEmE4-rh1-VYLs,3152
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/django/__init__.py,sha256=wsFBQP2j76Ui_0SJlN_8LKhZvEEdxA-w_yoyRAcaM58,59
 anydi/ext/django/_container.py,sha256=cxVoYQG16WP0S_Yv4TnLwuaaT7NVEOhLWO-YdALJUb4,418
 anydi/ext/django/_utils.py,sha256=C-1UabpwgCHUryAT-Pv8vU5QFfBahQlqhjecvihjtgY,430
-anydi/ext/django/apps.py,sha256=d1679lLRtlzaEQCwSj92JBTJcEk0s0F5cD_Hi3jbM2Y,4739
-anydi/ext/django/ninja/__init__.py,sha256=TBufIoxOWDbKHqd4-t6MBLwILqMUhwoEiJkpp1RrZZc,520
+anydi/ext/django/apps.py,sha256=qjzKqYIB00qjsSv2RQNVnFMi0lCljmaGtMIy3JMAE0U,6326
+anydi/ext/django/ninja/__init__.py,sha256=FckjVqzXTzlBllFg2PZ62wi432-ydZFyWq6ZkF2LJ9I,540
 anydi/ext/django/ninja/_operation.py,sha256=A_RbMbJyVaafoeBhZpmPQ96l1RQFLA1FchkJC_uRKnM,2660
-anydi/ext/django/ninja/_signature.py,sha256=Nbt2Zh-XlOtqrkhYydOUvCnNbuDytTunJPeQDtyTIyo,2177
+anydi/ext/django/ninja/_signature.py,sha256=kdPU0QL3_oloWi43ehi2QJVn_WaRm1klZ6D7sA-SQYo,2177
 anydi/ext/fastapi.py,sha256=zKuo7nNpcMXppUsime5LLKTkAiNrlEtcLRFK4FRur0c,5311
 anydi/ext/pytest_plugin.py,sha256=tmncz2IbIR7FGlgmAtcf00yDKg9SQP9lCFnJBmtHx3A,3976
 anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/starlette/middleware.py,sha256=Ni0BQaPjs_Ha6zcLZYYJ3-XkslTCnL9aCSa06rnRDMI,1139
 anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi-0.25.0a0.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.25.0a0.dist-info/METADATA,sha256=t4xUiUIM8ogKK0vHY9rr2xVaZ8iZmW85kZNkImahCXU,4373
-anydi-0.25.0a0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-anydi-0.25.0a0.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
-anydi-0.25.0a0.dist-info/RECORD,,
+anydi-0.25.0a1.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.25.0a1.dist-info/METADATA,sha256=WvjurCb1o4pBgxTvNh-7KY3-6qocjK0euML7cVagy2E,4373
+anydi-0.25.0a1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+anydi-0.25.0a1.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
+anydi-0.25.0a1.dist-info/RECORD,,