anydi 0.27.1__py3-none-any.whl → 0.29.0__py3-none-any.whl

anydi/_context.py

@@ -195,6 +195,14 @@ class ResourceScopedContext(ScopedContext):
         """
         return interface in self._instances
 
+    def _create_instance(self, provider: Provider) -> Any:
+        """Create an instance using the provider."""
+        instance = super()._create_instance(provider)
+        # Enter the context manager if the instance is closable.
+        if hasattr(instance, "__enter__") and hasattr(instance, "__exit__"):
+            self._stack.enter_context(instance)
+        return instance
+
     def _create_resource(self, provider: Provider) -> Any:
         """Create a resource using the provider.
 
@@ -208,6 +216,14 @@ class ResourceScopedContext(ScopedContext):
         cm = contextlib.contextmanager(provider.obj)(*args, **kwargs)
         return self._stack.enter_context(cm)
 
+    async def _acreate_instance(self, provider: Provider) -> Any:
+        """Create an instance asynchronously using the provider."""
+        instance = await super()._acreate_instance(provider)
+        # Enter the context manager if the instance is closable.
+        if hasattr(instance, "__aenter__") and hasattr(instance, "__aexit__"):
+            await self._async_stack.enter_async_context(instance)
+        return instance
+
     async def _acreate_resource(self, provider: Provider) -> Any:
         """Create a resource asynchronously using the provider.
 

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/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.27.1.dist-info → anydi-0.29.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anydi
-Version: 0.27.1
+Version: 0.29.0
 Summary: Dependency Injection library
 Home-page: https://github.com/antonrh/anydi
 License: MIT
@@ -32,7 +32,7 @@ Provides-Extra: async
 Provides-Extra: docs
 Requires-Dist: anyio (>=3.6.2,<4.0.0) ; extra == "async"
 Requires-Dist: mkdocs (>=1.4.2,<2.0.0) ; extra == "docs"
-Requires-Dist: mkdocs-material (>=9.5.21,<10.0.0) ; extra == "docs"
+Requires-Dist: mkdocs-material (>=9.5.29,<10.0.0) ; extra == "docs"
 Requires-Dist: typing-extensions (>=4.12.1,<5.0.0)
 Project-URL: Repository, https://github.com/antonrh/anydi
 Description-Content-Type: text/markdown

{anydi-0.27.1.dist-info → anydi-0.29.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 anydi/__init__.py,sha256=aeaBp5vq09sG-e9sqqs9qpUtUIDNfOdFPrlAfE5Ku9E,584
 anydi/_container.py,sha256=-vpiYl2Tx2QK9wl74DiF5qLFRudJ3e78TqEyuyOrthE,29055
-anydi/_context.py,sha256=_hJ1Cf2amgAr4uLvgk2KtGWMo0p7JFM_db1_YbWweHI,11895
+anydi/_context.py,sha256=Wm4DT8Ie_TPchWmIBe8Q9f90dQrGd5lY8H5K85rStgY,12706
 anydi/_logger.py,sha256=UpubJUnW83kffFxkhUlObm2DmZX1Pjqoz9YFKS-JOPg,52
 anydi/_module.py,sha256=E1TfLud_Af-MPB83PxIzHVA1jlDW2FGaRP_il1a6y3Y,3675
 anydi/_scanner.py,sha256=cyEk-K2Q8ssZStq8GrxMeEcCuAZMw-RXrjlgWEevKCs,6667
@@ -11,7 +11,7 @@ anydi/ext/_utils.py,sha256=2kxLPTMM9Ro3s6-knbqYzONlqRB3hMcwZFFRQGHcFUg,2691
 anydi/ext/django/__init__.py,sha256=QI1IABCVgSDTUoh7M9WMECKXwB3xvh04HfQ9TOWw1Mk,223
 anydi/ext/django/_container.py,sha256=cxVoYQG16WP0S_Yv4TnLwuaaT7NVEOhLWO-YdALJUb4,418
 anydi/ext/django/_settings.py,sha256=cKzFBGtPCsexZ2ZcInubBukIebhxzNfa3F0KuwoZYaA,844
-anydi/ext/django/_utils.py,sha256=76_T-gxP67qddlRyevAF2oe-FTv9NBJSBgOWxxs0qZQ,3673
+anydi/ext/django/_utils.py,sha256=E0GGxsEJiSJsA4-8AcEwfdUi_iK7qGpKfGNRDKmDqEg,3976
 anydi/ext/django/apps.py,sha256=-gj_tqb6goeYMNItr6nwWHYXZwDOdiH8anby0YwnUmw,2866
 anydi/ext/django/middleware.py,sha256=iVHWtE829khMY-BXbNNt0g2FrIApKprna7dCG9ObEis,823
 anydi/ext/django/ninja/__init__.py,sha256=kW3grUgWp_nkWSG_-39ADHMrZLGNcj9TsJ9OW8iWWrk,546
@@ -19,12 +19,13 @@ anydi/ext/django/ninja/_operation.py,sha256=wSWa7D73XTVlOibmOciv2l6JHPe1ERZcXrqI
 anydi/ext/django/ninja/_signature.py,sha256=2cSzKxBIxXLqtwNuH6GSlmjVJFftoGmleWfyk_NVEWw,2207
 anydi/ext/fastapi.py,sha256=vhfSyovXuCjvSkx6AiLOTNU975i8wDg72C5fqXQiFLw,2896
 anydi/ext/faststream.py,sha256=L4rkWYIO4ZZuWH-8M8NT6_J0bT0Dz_EWO3B6Oj1iFBI,2024
+anydi/ext/pydantic_settings.py,sha256=UwJWByusXLKvlIp5gBHslgUom2bK93QZwwFhJgzY1gg,1490
 anydi/ext/pytest_plugin.py,sha256=3OWphc4nEzla46_8KR7LXtwGns5eol_YlUWfTf4Cr2Q,3952
 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.27.1.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.27.1.dist-info/METADATA,sha256=YJpEkYC-TShdr7ntwZOW1JTbk1NJxJvz5xgXCWtROWw,5111
-anydi-0.27.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-anydi-0.27.1.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
-anydi-0.27.1.dist-info/RECORD,,
+anydi-0.29.0.dist-info/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
+anydi-0.29.0.dist-info/METADATA,sha256=HgsJLUAb-SP361yfEM5mI4Y7Q6MWNiA2sL1m1RIccl4,5111
+anydi-0.29.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+anydi-0.29.0.dist-info/entry_points.txt,sha256=GmQblwzxFg42zva1HyBYJJ7TvrTIcSAGBHmyi3bvsi4,42
+anydi-0.29.0.dist-info/RECORD,,