anydi 0.54.1__py3-none-any.whl → 0.55.1__py3-none-any.whl

anydi/testing.py

@@ -1,18 +1,15 @@
 import contextlib
 import logging
 from collections.abc import Iterable, Iterator, Sequence
-from typing import Any, TypeVar
+from typing import Any
 
 import wrapt  # type: ignore
 from typing_extensions import Self, type_repr
 
 from ._container import Container
-from ._context import InstanceContext
 from ._module import ModuleDef
-from ._provider import Provider, ProviderDef, ProviderParameter
-from ._scope import Scope
-
-T = TypeVar("T")
+from ._provider import ProviderDef
+from ._types import NOT_SET
 
 
 class TestContainer(Container):
@@ -23,11 +20,11 @@ class TestContainer(Container):
         *,
         providers: Sequence[ProviderDef] | None = None,
         modules: Iterable[ModuleDef] | None = None,
-        default_scope: Scope = "transient",
         logger: logging.Logger | None = None,
     ) -> None:
         super().__init__(providers=providers, modules=modules, logger=logger)
         self._override_instances: dict[Any, Any] = {}
+        self._revisions: dict[Any, int] = {}
 
     @classmethod
     def from_container(cls, container: Container) -> Self:
@@ -53,54 +50,23 @@ class TestContainer(Container):
                 f"The provider interface `{type_repr(interface)}` not registered."
             )
         self._override_instances[interface] = instance
+        self._touch_revision(interface)
         try:
             yield
         finally:
             self._override_instances.pop(interface, None)
+            self._touch_revision(interface)
 
-    def _resolve_or_create(
-        self, interface: Any, create: bool, /, **defaults: Any
-    ) -> Any:
-        """Internal method to handle instance resolution and creation."""
-        instance = super()._resolve_or_create(interface, create, **defaults)
-        return self._patch_resolver(interface, instance)
-
-    async def _aresolve_or_create(
-        self, interface: Any, create: bool, /, **defaults: Any
-    ) -> Any:
-        """Internal method to handle instance resolution and creation asynchronously."""
-        instance = await super()._aresolve_or_create(interface, create, **defaults)
-        return self._patch_resolver(interface, instance)
-
-    def _get_provider_instance(
-        self,
-        provider: Provider,
-        parameter: ProviderParameter,
-        context: InstanceContext | None,
-        /,
-        **defaults: Any,
-    ) -> Any:
-        """Retrieve an instance of a dependency from the scoped context."""
-        instance = super()._get_provider_instance(
-            provider, parameter, context, **defaults
-        )
-        return InstanceProxy(instance, interface=parameter.annotation)
+    def _touch_revision(self, interface: Any) -> None:
+        self._revisions[interface] = self._revisions.get(interface, 0) + 1
 
-    async def _aget_provider_instance(
-        self,
-        provider: Provider,
-        parameter: ProviderParameter,
-        context: InstanceContext | None,
-        /,
-        **defaults: Any,
-    ) -> Any:
-        """Asynchronously retrieve an instance of a dependency from the context."""
-        instance = await super()._aget_provider_instance(
-            provider, parameter, context, **defaults
-        )
-        return InstanceProxy(instance, interface=parameter.annotation)
+    def _hook_override_for(self, interface: Any) -> Any:
+        return self._override_instances.get(interface, NOT_SET)
+
+    def _hook_wrap_dependency(self, annotation: Any, value: Any) -> Any:
+        return InstanceProxy(value, interface=annotation)
 
-    def _patch_resolver(self, interface: Any, instance: Any) -> Any:
+    def _hook_post_resolve(self, interface: Any, instance: Any) -> Any:  # noqa: C901
         """Patch the test resolver for the instance."""
         if interface in self._override_instances:
             return self._override_instances[interface]

{anydi-0.54.1.dist-info → anydi-0.55.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anydi
-Version: 0.54.1
+Version: 0.55.1
 Summary: Dependency Injection library
 Keywords: dependency injection,dependencies,di,async,asyncio,application
 Author: Anton Ruhlov
@@ -35,21 +35,15 @@ Description-Content-Type: text/markdown
 
 # AnyDI
 
-<p align="center">
-    <i>Modern, lightweight Dependency Injection library using type annotations.</i>
-</p>
-
-<p align="center">
-    <a href="https://github.com/antonrh/anydi/actions/workflows/ci.yml" target="_blank">
-        <img src="https://github.com/antonrh/anydi/actions/workflows/ci.yml/badge.svg" alt="CI">
-    </a>
-    <a href="https://codecov.io/gh/antonrh/anydi" target="_blank">
-        <img src="https://codecov.io/gh/antonrh/anydi/branch/main/graph/badge.svg?token=67CLD19I0C" alt="Coverage">
-    </a>
-    <a href="https://anydi.readthedocs.io/en/latest/?badge=latest" target="_blank">
-        <img src="https://readthedocs.org/projects/anydi/badge/?version=latest" alt="Documentation">
-    </a>
-</p>
+<div style="text-align: center;">
+
+Modern, lightweight Dependency Injection library using type annotations.
+
+[![CI](https://github.com/antonrh/anydi/actions/workflows/ci.yml/badge.svg)](https://github.com/antonrh/anydi/actions/workflows/ci.yml)
+[![Coverage](https://codecov.io/gh/antonrh/anydi/branch/main/graph/badge.svg)](https://codecov.io/gh/antonrh/anydi)
+[![Documentation](https://readthedocs.org/projects/anydi/badge/?version=latest)](https://anydi.readthedocs.io/en/latest/)
+
+</div>
 
 ---
 Documentation

anydi-0.55.1.dist-info/RECORD

@@ -0,0 +1,24 @@
+anydi/__init__.py,sha256=Cz-beqReX0d05SFDmYcrzIs3FqQkWAwpy1Aqzd5db34,547
+anydi/_async_lock.py,sha256=3dwZr0KthXFYha0XKMyXf8jMmGb1lYoNC0O5w29V9ic,1104
+anydi/_container.py,sha256=6C8LM9PxMahKnu7YLMGJ50dPzYLRknZ9G9RKwyB18wE,24853
+anydi/_context.py,sha256=-9QqeMWo9OpZVXZxZCQgIsswggl3Ch7lgx1KiFX_ezc,3752
+anydi/_decorators.py,sha256=J3W261ZAG7q4XKm4tbAv1wsWr9ysx9_5MUbUvSJB_MQ,2809
+anydi/_module.py,sha256=2kN5uEXLd2Dsc58gz5IWK43wJewr_QgIVGSO3iWp798,2609
+anydi/_provider.py,sha256=OV1WFHTYv7W2U0XDk_Kql1r551Vhq8o-pUV5ep1HQcU,1574
+anydi/_resolver.py,sha256=olWUYp0PfsWUt7hp2MW69734T29ck6fu3s7Nk4-U7rU,25183
+anydi/_scanner.py,sha256=oycIC9kw9fsIG9qgtRHeBkj3HjmcLK0FTqWLXTLLSWE,3636
+anydi/_types.py,sha256=l3xQ0Zn15gRAwvBoQ9PRfCBigi2rrtSqGV-C50xXrLw,1780
+anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+anydi/ext/django/__init__.py,sha256=Ve8lncLU9dPY_Vjt4zihPgsSxwAtFHACn0XvBM5JG8k,367
+anydi/ext/fastapi.py,sha256=FflFBdK-moyv9Vsfem4NyNt8jgPwFLweeCl5cfU0Iks,2348
+anydi/ext/faststream.py,sha256=dJPInvi0JUx-SS8H4aBRl3u-PAW6S_TqqfxVOl3D1L0,1929
+anydi/ext/pydantic_settings.py,sha256=0GQjw7QpQlT5p6GxFClXYdtc6J42PClmAnRWPEzMjvY,1488
+anydi/ext/pytest_plugin.py,sha256=Es1K1S6_2gIdTUYkbw2d1aZcHnjJutGFafVsLPGcVJc,4684
+anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+anydi/ext/starlette/middleware.py,sha256=MxnzshAs-CMvjJp0r457k52MzBL8O4KAuClnF6exBdU,803
+anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+anydi/testing.py,sha256=JNXA-XGjkU7PMturkzDzumDcLlnYOLzCtBUQ9HyQMLM,4309
+anydi-0.55.1.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+anydi-0.55.1.dist-info/entry_points.txt,sha256=AgOcQYM5KyS4D37QcYb00tiid0QA-pD1VrjHHq4QAps,44
+anydi-0.55.1.dist-info/METADATA,sha256=TEL8yqko7Et9BJW8uiUq8r-Hjjj5PcYYXBS91eHTuPE,4799
+anydi-0.55.1.dist-info/RECORD,,

anydi/_scope.py

@@ -1,9 +0,0 @@
-from typing import Literal
-
-Scope = Literal["transient", "singleton", "request"]
-
-ALLOWED_SCOPES: dict[Scope, list[Scope]] = {
-    "singleton": ["singleton"],
-    "request": ["request", "singleton"],
-    "transient": ["transient", "request", "singleton"],
-}

anydi-0.54.1.dist-info/RECORD

@@ -1,24 +0,0 @@
-anydi/__init__.py,sha256=KjjYm-1yAFxiPYaMs1WRJMtxE0q_vdX7ZRLQR1fFGs8,567
-anydi/_async.py,sha256=lrKTrqMC81POFbea3kaC9KkY3sp0DaenuVPvwOg88xA,1472
-anydi/_container.py,sha256=zNDS22G52JlCPvrRM0fD4FvzP3rvvipqYyRhDXcMjKU,35233
-anydi/_context.py,sha256=_9hKjimFZhnVs_lllon0111az8-KtwzBRpxnNoOy3Z0,3075
-anydi/_decorators.py,sha256=yxY876_2fzC30UIb4-4mR-J5ToQN3BH61E2cFH-iX8Y,2809
-anydi/_module.py,sha256=2kN5uEXLd2Dsc58gz5IWK43wJewr_QgIVGSO3iWp798,2609
-anydi/_provider.py,sha256=HwbAIJzj6jV0qlA2lzOmueVdScJAAB9Yzu5leboKCUs,2386
-anydi/_scan.py,sha256=BLayc0NY_NYicr-ApX7Ztco9sd0izSZKGB-pUktui_s,3637
-anydi/_scope.py,sha256=PFHjPb2-n0vhRo9mvD_craTFfoJBzR3y-N3_0apL5Q0,258
-anydi/_typing.py,sha256=I0Qt3Ec6ki6ZXf0Krm-LUIPRvzvyUUHfKdvmQijBErQ,1718
-anydi/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi/ext/django/__init__.py,sha256=Ve8lncLU9dPY_Vjt4zihPgsSxwAtFHACn0XvBM5JG8k,367
-anydi/ext/fastapi.py,sha256=pdYumpXMAw2VjlDlb8u3R_RQi6htRieiZKsSA-9BSdA,2349
-anydi/ext/faststream.py,sha256=CEuGjVZRbgSjkeV1rSp6xWggGYoKnBDeo3PiPgKtxuc,1930
-anydi/ext/pydantic_settings.py,sha256=0GQjw7QpQlT5p6GxFClXYdtc6J42PClmAnRWPEzMjvY,1488
-anydi/ext/pytest_plugin.py,sha256=Es1K1S6_2gIdTUYkbw2d1aZcHnjJutGFafVsLPGcVJc,4684
-anydi/ext/starlette/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi/ext/starlette/middleware.py,sha256=MxnzshAs-CMvjJp0r457k52MzBL8O4KAuClnF6exBdU,803
-anydi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anydi/testing.py,sha256=X_zQqwqhqTbzp4YL9b9b2CQ0ag7gHO1cH-ASRVmVFoU,5523
-anydi-0.54.1.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-anydi-0.54.1.dist-info/entry_points.txt,sha256=AgOcQYM5KyS4D37QcYb00tiid0QA-pD1VrjHHq4QAps,44
-anydi-0.54.1.dist-info/METADATA,sha256=0l58D93hIjXzIhJuWMXJ0ofEYzMbixoMI4gfphGhfjs,5022
-anydi-0.54.1.dist-info/RECORD,,