anydi 0.28.0__tar.gz → 0.29.0__tar.gz

{anydi-0.28.0 → anydi-0.29.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anydi
-Version: 0.28.0
+Version: 0.29.0
 Summary: Dependency Injection library
 Home-page: https://github.com/antonrh/anydi
 License: MIT

{anydi-0.28.0 → anydi-0.29.0}/anydi/ext/django/_utils.py

@@ -11,16 +11,17 @@ from django.db.backends.base.base import BaseDatabaseWrapper
 from django.urls import URLPattern, URLResolver, get_resolver
 from typing_extensions import Annotated, get_origin
 
-import anydi
+from anydi import Container
 
 
 def register_settings(
-    container: anydi.Container, prefix: str = "django.conf.setting."
+    container: Container, prefix: str = "django.conf.setting."
 ) -> None:
     """Register Django settings into the container."""
 
-    def _get_setting_value(value: Any) -> Any:
-        return lambda: value
+    # Ensure prefix ends with a dot
+    if prefix[-1] != ".":
+        prefix += "."
 
     for setting_name in dir(settings):
         setting_value = getattr(settings, setting_name)
@@ -33,38 +34,11 @@ def register_settings(
             scope="singleton",
         )
 
-    def _resolve(resolve: Any) -> Any:
-        @wraps(resolve)
-        def wrapper(interface: Any) -> Any:
-            return resolve(_aware_settings(interface, prefix))
-
-        return wrapper
-
-    def _aresolve(resolve: Any) -> Any:
-        @wraps(resolve)
-        async def wrapper(interface: Any) -> Any:
-            return await resolve(_aware_settings(interface, prefix))
-
-        return wrapper
+    # Patch AnyDI to resolve Any types for annotated settings
+    _patch_any_typed_annotated(container, prefix=prefix)
 
-    # Patch resolvers
-    container.resolve = _resolve(container.resolve)  # type: ignore[method-assign]  # noqa
-    container.aresolve = _aresolve(container.aresolve)  # type: ignore[method-assign]  # noqa
 
-
-def _aware_settings(interface: Any, prefix: str) -> Any:
-    origin = get_origin(interface)
-    if origin is not Annotated:
-        return interface  # pragma: no cover
-    named = interface.__metadata__[-1]
-
-    if isinstance(named, str) and named.startswith(prefix):
-        _, setting_name = named.rsplit(prefix, maxsplit=1)
-        return Annotated[Any, f"{prefix}{setting_name}"]
-    return interface
-
-
-def register_components(container: anydi.Container) -> None:
+def register_components(container: Container) -> None:
     """Register Django components into the container."""
 
     # Register caches
@@ -90,7 +64,7 @@ def register_components(container: anydi.Container) -> None:
         )
 
 
-def inject_urlpatterns(container: anydi.Container, *, urlconf: str) -> None:
+def inject_urlpatterns(container: Container, *, urlconf: str) -> None:
     """Auto-inject the container into views."""
     resolver = get_resolver(urlconf)
     for pattern in iter_urlpatterns(resolver.url_patterns):
@@ -113,3 +87,42 @@ def iter_urlpatterns(
             yield from iter_urlpatterns(url_pattern.url_patterns)
         else:
             yield url_pattern
+
+
+def _get_setting_value(value: Any) -> Any:
+    return lambda: value
+
+
+def _any_typed_interface(interface: Any, prefix: str) -> Any:
+    origin = get_origin(interface)
+    if origin is not Annotated:
+        return interface  # pragma: no cover
+    named = interface.__metadata__[-1]
+
+    if isinstance(named, str) and named.startswith(prefix):
+        _, setting_name = named.rsplit(prefix, maxsplit=1)
+        return Annotated[Any, f"{prefix}{setting_name}"]
+    return interface
+
+
+def _patch_any_typed_annotated(container: Container, *, prefix: str) -> None:
+    def _patch_resolve(resolve: Any) -> Any:
+        @wraps(resolve)
+        def wrapper(interface: Any) -> Any:
+            return resolve(_any_typed_interface(interface, prefix))
+
+        return wrapper
+
+    def _patch_aresolve(resolve: Any) -> Any:
+        @wraps(resolve)
+        async def wrapper(interface: Any) -> Any:
+            return await resolve(_any_typed_interface(interface, prefix))
+
+        return wrapper
+
+    container.resolve = _patch_resolve(  # type: ignore[method-assign]
+        container.resolve
+    )
+    container.aresolve = _patch_aresolve(  # type: ignore[method-assign]
+        container.aresolve
+    )

anydi-0.29.0/anydi/ext/pydantic_settings.py

@@ -0,0 +1,48 @@
+from __future__ import annotations
+
+from typing import Any, Callable, Iterable
+
+from pydantic.fields import ComputedFieldInfo, FieldInfo  # noqa
+from pydantic_settings import BaseSettings
+from typing_extensions import Annotated
+
+from anydi import Container
+
+
+def install(
+    settings: BaseSettings | Iterable[BaseSettings],
+    container: Container,
+    *,
+    prefix: str = ".settings",
+) -> None:
+    """Install Pydantic settings into an AnyDI container."""
+
+    # Ensure prefix ends with a dot
+    if prefix[-1] != ".":
+        prefix += "."
+
+    def _register_settings(_settings: BaseSettings) -> None:
+        all_fields = {**_settings.model_fields, **_settings.model_computed_fields}
+        for setting_name, field_info in all_fields.items():
+            if isinstance(field_info, ComputedFieldInfo):
+                interface = field_info.return_type
+            elif isinstance(field_info, FieldInfo):
+                interface = field_info.annotation
+            else:
+                continue
+
+            container.register(
+                Annotated[interface, f"{prefix}{setting_name}"],
+                _get_setting_value(getattr(_settings, setting_name)),
+                scope="singleton",
+            )
+
+    if isinstance(settings, BaseSettings):
+        _register_settings(settings)
+    else:
+        for _settings in settings:
+            _register_settings(_settings)
+
+
+def _get_setting_value(setting_value: Any) -> Callable[[], Any]:
+    return lambda: setting_value

{anydi-0.28.0 → anydi-0.29.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "anydi"
-version = "0.28.0"
+version = "0.29.0"
 description = "Dependency Injection library"
 authors = ["Anton Ruhlov <antonruhlov@gmail.com>"]
 license = "MIT"
@@ -45,8 +45,8 @@ docs = ["mkdocs", "mkdocs-material"]
 async = ["anyio"]
 
 [tool.poetry.group.dev.dependencies]
-mypy = "^1.11.1"
-ruff = "^0.6.1"
+mypy = "^1.11.2"
+ruff = "^0.6.2"
 pytest = "^8.3.1"
 pytest-cov = "^5.0.0"
 fastapi = "^0.100.0"
@@ -56,6 +56,7 @@ django-ninja = "^1.1.0"
 pytest-django = "^4.8.0"
 faststream = "^0.5.10"
 redis = "^5.0.4"
+pydantic-settings = "^2.4.0"
 
 [tool.poetry.plugins.pytest11]
 anydi = "anydi.ext.pytest_plugin"