anydi 0.47.0rc0__py3-none-any.whl → 0.48.1__py3-none-any.whl

anydi/_container.py

@@ -28,7 +28,6 @@ from ._typing import (
     get_typed_annotation,
     get_typed_parameters,
     is_async_context_manager,
-    is_builtin_type,
     is_context_manager,
     is_event_type,
     is_inject_marker,
@@ -49,11 +48,9 @@ class Container:
         *,
         providers: Iterable[ProviderDef] | None = None,
         modules: Iterable[ModuleDef] | None = None,
-        default_scope: Scope = "transient",
         logger: logging.Logger | None = None,
     ) -> None:
         self._providers: dict[Any, Provider] = {}
-        self._default_scope: Scope = default_scope
         self._logger = logger or logging.getLogger(__name__)
         self._resources: dict[str, list[Any]] = defaultdict(list)
         self._singleton_context = InstanceContext()
@@ -85,11 +82,6 @@ class Container:
     # Properties
     ############################
 
-    @property
-    def default_scope(self) -> Scope:
-        """Get the default scope."""
-        return self._default_scope
-
     @property
     def providers(self) -> dict[type[Any], Provider]:
         """Get the registered providers."""
@@ -259,7 +251,7 @@ class Container:
     def _register_provider(  # noqa: C901
         self,
         call: Callable[..., Any],
-        scope: Scope | None,
+        scope: Scope,
         interface: Any = NOT_SET,
         override: bool = False,
         /,
@@ -268,11 +260,9 @@ class Container:
         """Register a provider with the specified scope."""
         name = type_repr(call)
         kind = ProviderKind.from_call(call)
-        detected_scope = scope
 
         # Validate scope if it provided
-        if scope:
-            self._validate_provider_scope(scope, name, kind)
+        self._validate_provider_scope(scope, name, kind)
 
         # Get the signature
         globalns = getattr(call, "__globals__", {})
@@ -315,6 +305,7 @@ class Container:
             )
 
         unresolved_parameter = None
+        unresolved_exc: LookupError | None = None
         parameters: list[inspect.Parameter] = []
         scopes: dict[Scope, Provider] = {}
 
@@ -335,13 +326,12 @@ class Container:
             )
 
             try:
-                sub_provider = self._get_or_register_provider(
-                    parameter.annotation, scope
-                )
-            except LookupError:
+                sub_provider = self._get_or_register_provider(parameter.annotation)
+            except LookupError as exc:
                 if self._parameter_has_default(parameter, **defaults):
                     continue
                 unresolved_parameter = parameter
+                unresolved_exc = exc
                 continue
 
             # Store first provider for each scope
@@ -350,24 +340,9 @@ class Container:
 
             parameters.append(parameter)
 
-        # Set detected scope
-        if detected_scope is None:
-            if "transient" in scopes:
-                detected_scope = "transient"
-            elif "request" in scopes:
-                detected_scope = "request"
-            elif "singleton" in scopes:
-                detected_scope = "singleton"
-            else:
-                detected_scope = self.default_scope
-
-        # Validate the provider scope after detection
-        if scope is None:
-            self._validate_provider_scope(detected_scope, name, kind)
-
         # Check for unresolved parameters
         if unresolved_parameter:
-            if detected_scope not in ("singleton", "transient"):
+            if scope not in ("singleton", "transient"):
                 self._unresolved_interfaces.add(interface)
             else:
                 raise LookupError(
@@ -376,20 +351,20 @@ class Container:
                     "which has not been registered or set. To resolve this, ensure "
                     f"that `{unresolved_parameter.name}` is registered before "
                     f"attempting to use it."
-                ) from None
+                ) from unresolved_exc
 
         # Check scope compatibility
         for sub_provider in scopes.values():
-            if sub_provider.scope not in ALLOWED_SCOPES.get(detected_scope, []):
+            if sub_provider.scope not in ALLOWED_SCOPES.get(scope, []):
                 raise ValueError(
-                    f"The provider `{name}` with a `{detected_scope}` scope cannot "
+                    f"The provider `{name}` with a `{scope}` scope cannot "
                     f"depend on `{sub_provider}` with a `{sub_provider.scope}` scope. "
                     "Please ensure all providers are registered with matching scopes."
                 )
 
         provider = Provider(
             call=call,
-            scope=detected_scope,
+            scope=scope,
             interface=interface,
             name=name,
             kind=kind,
@@ -425,20 +400,18 @@ class Container:
                 "properly registered before attempting to use it."
             ) from exc
 
-    def _get_or_register_provider(
-        self, interface: Any, parent_scope: Scope | None, /, **defaults: Any
-    ) -> Provider:
+    def _get_or_register_provider(self, interface: Any, /, **defaults: Any) -> Provider:
         """Get or register a provider by interface."""
         try:
             return self._providers[interface]
         except KeyError:
-            if inspect.isclass(interface) and not is_builtin_type(interface):
-                # Try to get defined scope
-                if is_provided(interface):
-                    scope = interface.__provided__["scope"]
-                else:
-                    scope = parent_scope
-                return self._register_provider(interface, scope, interface, **defaults)
+            if inspect.isclass(interface) and is_provided(interface):
+                return self._register_provider(
+                    interface,
+                    interface.__provided__["scope"],
+                    NOT_SET,
+                    **defaults,
+                )
             raise LookupError(
                 f"The provider interface `{type_repr(interface)}` is either not "
                 "registered, not provided, or not set in the scoped context. "
@@ -533,7 +506,7 @@ class Container:
         self, interface: Any, create: bool, /, **defaults: Any
     ) -> Any:
         """Internal method to handle instance resolution and creation."""
-        provider = self._get_or_register_provider(interface, None, **defaults)
+        provider = self._get_or_register_provider(interface, **defaults)
         if provider.scope == "transient":
             return self._create_instance(provider, None, **defaults)
         context = self._get_instance_context(provider.scope)
@@ -548,7 +521,7 @@ class Container:
         self, interface: Any, create: bool, /, **defaults: Any
     ) -> Any:
         """Internal method to handle instance resolution and creation asynchronously."""
-        provider = self._get_or_register_provider(interface, None, **defaults)
+        provider = self._get_or_register_provider(interface, **defaults)
         if provider.scope == "transient":
             return await self._acreate_instance(provider, None, **defaults)
         context = self._get_instance_context(provider.scope)
@@ -884,3 +857,16 @@ class Container:
         self, /, packages: PackageOrIterable, *, tags: Iterable[str] | None = None
     ) -> None:
         self._scanner.scan(packages=packages, tags=tags)
+
+    ############################
+    # Testing
+    ############################
+
+    @contextlib.contextmanager
+    def override(self, interface: Any, instance: Any) -> Iterator[None]:
+        raise RuntimeError(
+            "Dependency overriding is not supported in this container.\n"
+            "Wrap your container with `anydi.testing.Container` instead.\n"
+            "Example:\n\n"
+            "    container = TestContainer.from_container(container)"
+        )

anydi/_typing.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import builtins
 import inspect
 import re
 import sys
@@ -44,11 +43,6 @@ def type_repr(obj: Any) -> str:
     )
 
 
-def is_builtin_type(tp: type[Any]) -> bool:
-    """Check if the given type is a built-in type."""
-    return tp.__module__ == builtins.__name__
-
-
 def is_context_manager(obj: Any) -> bool:
     """Check if the given object is a context manager."""
     return hasattr(obj, "__enter__") and hasattr(obj, "__exit__")

anydi/ext/django/apps.py

@@ -9,6 +9,7 @@ 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
@@ -32,9 +33,16 @@ class ContainerConfig(AppConfig):
                 raise ImproperlyConfigured(
                     f"Cannot import container factory '{container_factory_path}'."
                 ) from exc
-            self.container = container_factory()
+            container = container_factory()
         else:
-            self.container = anydi.Container()
+            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

anydi/testing.py

@@ -28,12 +28,7 @@ class TestContainer(Container):
         default_scope: Scope = "transient",
         logger: logging.Logger | None = None,
     ) -> None:
-        super().__init__(
-            providers=providers,
-            modules=modules,
-            default_scope=default_scope,
-            logger=logger,
-        )
+        super().__init__(providers=providers, modules=modules, logger=logger)
         self._override_instances: dict[Any, Any] = {}
 
     @classmethod
@@ -47,7 +42,6 @@ class TestContainer(Container):
                 )
                 for provider in container.providers.values()
             ],
-            default_scope=container.default_scope,
             logger=container.logger,
         )
 

{anydi-0.47.0rc0.dist-info → anydi-0.48.1.dist-info}/METADATA

@@ -1,36 +1,36 @@
 Metadata-Version: 2.4
 Name: anydi
-Version: 0.47.0rc0
+Version: 0.48.1
 Summary: Dependency Injection library
-Project-URL: Repository, https://github.com/antonrh/anydi
+Keywords: dependency injection,dependencies,di,async,asyncio,application
+Author: Anton Ruhlov
 Author-email: Anton Ruhlov <antonruhlov@gmail.com>
 License-Expression: MIT
-License-File: LICENSE
-Keywords: application,async,asyncio,dependencies,dependency injection,di
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 5 - Production/Stable
+Classifier: Topic :: Internet
+Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: Software Development
+Classifier: Typing :: Typed
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Information Technology
-Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
 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: Topic :: Internet
-Classifier: Topic :: Software Development
-Classifier: Topic :: Software Development :: Libraries
-Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Typing :: Typed
-Requires-Python: ~=3.9
+Classifier: Programming Language :: Python :: 3 :: Only
+Requires-Dist: typing-extensions>=4.15.0,<5
 Requires-Dist: anyio>=3.7.1
-Requires-Dist: typing-extensions<5,>=4.14.0
-Requires-Dist: wrapt<2,>=1.17.0
+Requires-Dist: wrapt>=1.17.0,<2
+Requires-Python: ~=3.9
+Project-URL: Repository, https://github.com/antonrh/anydi
 Description-Content-Type: text/markdown
 
 # AnyDI

{anydi-0.47.0rc0.dist-info → anydi-0.48.1.dist-info}/RECORD

@@ -1,33 +1,32 @@
 anydi/__init__.py,sha256=KjjYm-1yAFxiPYaMs1WRJMtxE0q_vdX7ZRLQR1fFGs8,567
 anydi/_async.py,sha256=KhRd3RmZFcwNDzrMm8ctA1gwrg-6m_7laECTYsZdF5k,1445
-anydi/_container.py,sha256=Ug0TVOuNQ1cpwUQiHSNtAiZB-qJHv8ECd89WcK6ZwWg,32350
+anydi/_container.py,sha256=fELFvxMrsrO2MQhAtnMmLKFxkvsaySx5ZwFGHy5KcOw,31860
 anydi/_context.py,sha256=_Xy8cTpRskb4cxTd-Fe-5NnIZyBe1DnovkofhdeUfmw,3020
 anydi/_decorators.py,sha256=F3yBeGQSz1EsulZaEvYn3cd6FEjJRMoyA6u1QCbEwcs,2813
 anydi/_module.py,sha256=QPvP27JndZkwl-FYUZWscJm6yfkNzjwoFGURyDhb6Pc,2582
 anydi/_provider.py,sha256=ig2ecn-STmFGcpkLE5A5OM35XHtU2NsxFVrGp2CvuvM,2123
 anydi/_scan.py,sha256=nOpspmceVucdwf8nUv1QVFsz2sRVWCVUb0QTH9EbWr4,3653
 anydi/_scope.py,sha256=PFHjPb2-n0vhRo9mvD_craTFfoJBzR3y-N3_0apL5Q0,258
-anydi/_typing.py,sha256=7Nhg4ezPgvFmdGOd2SI_9y5iQv8j-QkNOohXRGNAaIE,4057
-anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi/testing.py,sha256=ex9grqKpQmmJWwhIVnzq6aHaUAGLu2-7fwLyYTUuKHE,5678
+anydi/_typing.py,sha256=cYsEnv_QpI8B1DIZ8zPZwywEmZjtx0otJjj6vTLLk_E,3895
 anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi/ext/fastapi.py,sha256=L9VGPHGy23se1sflmJqTE7LNfQuElVdYEogoT1f5-4A,2324
-anydi/ext/faststream.py,sha256=Dy81Vf34CP6pEIbZ-41vh_-Dn6Qc-rcf14U5poebjxI,1905
-anydi/ext/pydantic_settings.py,sha256=8IXXLuG_OvKbvKlBkBRQUHcXgbTpgQUxeWyoMcRIUQM,1488
-anydi/ext/pytest_plugin.py,sha256=IoP6XKuGLGLd2Xlpfttc3mI4pxCm2WQLE7x_a7asbv4,4732
 anydi/ext/django/__init__.py,sha256=QI1IABCVgSDTUoh7M9WMECKXwB3xvh04HfQ9TOWw1Mk,223
 anydi/ext/django/_container.py,sha256=cxVoYQG16WP0S_Yv4TnLwuaaT7NVEOhLWO-YdALJUb4,418
 anydi/ext/django/_settings.py,sha256=NsYbFBeslqw_tcXCn2b2gKnSp7eb64DM4dRc4tn_eiw,808
 anydi/ext/django/_utils.py,sha256=sYfUgBV9azddWYB4vNaZadDXcv_MiU-wSfVKV-TZDrE,2695
-anydi/ext/django/apps.py,sha256=YLL1uU6dSQ3uf3GB0VHzPW_eLuB1j9h6pv8EdAutMqo,2725
+anydi/ext/django/apps.py,sha256=kGqTUZK55OPtaG5lktavSr88_quDm9GNFUE94eQh6zQ,2965
 anydi/ext/django/middleware.py,sha256=5OUdp0OWRozyW338Sq04BDhacaFlyUTTOduS_7EwCTA,854
 anydi/ext/django/ninja/__init__.py,sha256=4J0zoHPK9itbTVrjjvLX6Ftrsb2ND8bITqNDIJzEhks,520
 anydi/ext/django/ninja/_operation.py,sha256=wk5EOjLY3KVIHk9jMCGsFsja9-dQmMOpLpHXciqxQdk,2680
 anydi/ext/django/ninja/_signature.py,sha256=p7JtyMdFhX4fWQOvAhvZNss6iURNERcdsTsQADTHkMY,2358
+anydi/ext/fastapi.py,sha256=L9VGPHGy23se1sflmJqTE7LNfQuElVdYEogoT1f5-4A,2324
+anydi/ext/faststream.py,sha256=Dy81Vf34CP6pEIbZ-41vh_-Dn6Qc-rcf14U5poebjxI,1905
+anydi/ext/pydantic_settings.py,sha256=8IXXLuG_OvKbvKlBkBRQUHcXgbTpgQUxeWyoMcRIUQM,1488
+anydi/ext/pytest_plugin.py,sha256=IoP6XKuGLGLd2Xlpfttc3mI4pxCm2WQLE7x_a7asbv4,4732
 anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 anydi/ext/starlette/middleware.py,sha256=MxnzshAs-CMvjJp0r457k52MzBL8O4KAuClnF6exBdU,803
-anydi-0.47.0rc0.dist-info/METADATA,sha256=MB9wf9GrUWqVQ-SlB4Y3jdz8Fx4WYS6XNA9L298u0lc,4960
-anydi-0.47.0rc0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-anydi-0.47.0rc0.dist-info/entry_points.txt,sha256=Nklo9f3Oe4AkNsEgC4g43nCJ-23QDngZSVDNRMdaILI,43
-anydi-0.47.0rc0.dist-info/licenses/LICENSE,sha256=V6rU8a8fv6o2jQ-7ODHs0XfDFimot8Q6Km6CylRIDTo,1069
-anydi-0.47.0rc0.dist-info/RECORD,,
+anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+anydi/testing.py,sha256=waz0nO-MnfPGQLnPuDT0bdEdfqfmgkbsuFuxWfct6kw,5539
+anydi-0.48.1.dist-info/WHEEL,sha256=Pi5uDq5Fdo_Rr-HD5h9BiPn9Et29Y9Sh8NhcJNnFU1c,79
+anydi-0.48.1.dist-info/entry_points.txt,sha256=AgOcQYM5KyS4D37QcYb00tiid0QA-pD1VrjHHq4QAps,44
+anydi-0.48.1.dist-info/METADATA,sha256=X9swcb7pHvqntskN44YfhEJlCnR6wCGJWGwARHAPWfM,4956
+anydi-0.48.1.dist-info/RECORD,,

anydi-0.48.1.dist-info/WHEEL

@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: uv 0.8.17
+Root-Is-Purelib: true
+Tag: py3-none-any

{anydi-0.47.0rc0.dist-info → anydi-0.48.1.dist-info}/entry_points.txt

@@ -1,2 +1,3 @@
 [pytest11]
 anydi = anydi.ext.pytest_plugin
+

anydi-0.47.0rc0.dist-info/WHEEL

@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: hatchling 1.27.0
-Root-Is-Purelib: true
-Tag: py3-none-any

anydi-0.47.0rc0.dist-info/licenses/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 Anton Ruhlov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.