modern-di 0.9.0__py3-none-any.whl → 0.10.0__py3-none-any.whl

modern_di/container.py

@@ -13,7 +13,7 @@ if typing.TYPE_CHECKING:
 T_co = typing.TypeVar("T_co", covariant=True)
 
 
-class Container(contextlib.AbstractAsyncContextManager["Container"]):
+class Container(contextlib.AbstractAsyncContextManager["Container"], contextlib.AbstractContextManager["Container"]):
     __slots__ = (
         "_is_async",
         "_overrides",

modern_di/providers/abstract.py

@@ -61,31 +61,29 @@ class AbstractCreatorProvider(AbstractOverrideProvider[T_co], abc.ABC):
         self._args: typing.Final = args
         self._kwargs: typing.Final = kwargs
 
+    def _sync_resolve_args(self, container: Container) -> list[typing.Any]:
+        return [x.sync_resolve(container) if isinstance(x, AbstractProvider) else x for x in self._args]
+
+    def _sync_resolve_kwargs(self, container: Container) -> dict[str, typing.Any]:
+        return {k: v.sync_resolve(container) if isinstance(v, AbstractProvider) else v for k, v in self._kwargs.items()}
+
     def _sync_build_creator(self, container: Container) -> typing.Any:  # noqa: ANN401
         return self._creator(
-            *typing.cast(
-                P.args, [x.sync_resolve(container) if isinstance(x, AbstractProvider) else x for x in self._args]
-            ),
-            **typing.cast(
-                P.kwargs,
-                {
-                    k: v.sync_resolve(container) if isinstance(v, AbstractProvider) else v
-                    for k, v in self._kwargs.items()
-                },
-            ),
+            *typing.cast(P.args, self._sync_resolve_args(container)),
+            **typing.cast(P.kwargs, self._sync_resolve_kwargs(container)),
         )
 
+    async def _async_resolve_args(self, container: Container) -> list[typing.Any]:
+        return [await x.async_resolve(container) if isinstance(x, AbstractProvider) else x for x in self._args]
+
+    async def _async_resolve_kwargs(self, container: Container) -> dict[str, typing.Any]:
+        return {
+            k: await v.async_resolve(container) if isinstance(v, AbstractProvider) else v
+            for k, v in self._kwargs.items()
+        }
+
     async def _async_build_creator(self, container: Container) -> typing.Any:  # noqa: ANN401
         return self._creator(
-            *typing.cast(
-                P.args,
-                [await x.async_resolve(container) if isinstance(x, AbstractProvider) else x for x in self._args],
-            ),
-            **typing.cast(
-                P.kwargs,
-                {
-                    k: await v.async_resolve(container) if isinstance(v, AbstractProvider) else v
-                    for k, v in self._kwargs.items()
-                },
-            ),
+            *typing.cast(P.args, await self._async_resolve_args(container)),
+            **typing.cast(P.kwargs, await self._async_resolve_kwargs(container)),
         )

modern_di/providers/factory.py

@@ -3,7 +3,7 @@ import typing
 
 from modern_di import Container
 from modern_di.providers.abstract import AbstractCreatorProvider
-from modern_di.providers.injected_factory import InjectedFactory
+from modern_di.providers.injected_factory import AsyncInjectedFactory, SyncInjectedFactory
 
 
 T_co = typing.TypeVar("T_co", covariant=True)
@@ -23,8 +23,12 @@ class Factory(AbstractCreatorProvider[T_co]):
         super().__init__(scope, creator, *args, **kwargs)
 
     @property
-    def factory_provider(self) -> InjectedFactory[T_co]:
-        return InjectedFactory(self)
+    def sync_provider(self) -> SyncInjectedFactory[T_co]:
+        return SyncInjectedFactory(self)
+
+    @property
+    def async_provider(self) -> AsyncInjectedFactory[T_co]:
+        return AsyncInjectedFactory(self)
 
     async def async_resolve(self, container: Container) -> T_co:
         container = container.find_container(self.scope)

modern_di/providers/injected_factory.py

@@ -9,7 +9,7 @@ T_co = typing.TypeVar("T_co", covariant=True)
 P = typing.ParamSpec("P")
 
 
-class InjectedFactory(AbstractProvider[T_co]):
+class SyncInjectedFactory(AbstractProvider[T_co]):
     __slots__ = [*AbstractProvider.BASE_SLOTS, "_factory_provider"]
 
     def __init__(self, factory_provider: AbstractProvider[T_co]) -> None:
@@ -17,13 +17,29 @@ class InjectedFactory(AbstractProvider[T_co]):
         self._factory_provider = factory_provider
 
     async def async_resolve(self, container: Container) -> typing.Callable[[], T_co]:  # type: ignore[override]
-        await self._factory_provider.async_resolve(container)
-        return functools.partial(self._factory_provider.sync_resolve, container)
+        return self.sync_resolve(container)
 
     def sync_resolve(self, container: Container) -> typing.Callable[[], T_co]:  # type: ignore[override]
-        self._factory_provider.sync_resolve(container)
         return functools.partial(self._factory_provider.sync_resolve, container)
 
     @property
     def cast(self) -> typing.Callable[[], T_co]:  # type: ignore[override]
         return typing.cast(typing.Callable[[], T_co], self)
+
+
+class AsyncInjectedFactory(AbstractProvider[T_co]):
+    __slots__ = [*AbstractProvider.BASE_SLOTS, "_factory_provider"]
+
+    def __init__(self, factory_provider: AbstractProvider[T_co]) -> None:
+        super().__init__(factory_provider.scope)
+        self._factory_provider = factory_provider
+
+    async def async_resolve(self, container: Container) -> typing.Callable[[], typing.Awaitable[T_co]]:  # type: ignore[override]
+        return self.sync_resolve(container)
+
+    def sync_resolve(self, container: Container) -> typing.Callable[[], typing.Awaitable[T_co]]:  # type: ignore[override]
+        return functools.partial(self._factory_provider.async_resolve, container)
+
+    @property
+    def cast(self) -> typing.Callable[[], typing.Awaitable[T_co]]:  # type: ignore[override]
+        return typing.cast(typing.Callable[[], typing.Awaitable[T_co]], self)

{modern_di-0.9.0.dist-info → modern_di-0.10.0.dist-info}/METADATA

@@ -1,11 +1,11 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: modern-di
-Version: 0.9.0
+Version: 0.10.0
 Summary: Dependency Injection framework with IOC-container and scopes
 Project-URL: repository, https://github.com/modern-python/modern-di
 Project-URL: docs, https://modern-di.readthedocs.io
 Author-email: Artur Shiriev <me@shiriev.ru>
-License: MIT
+License-Expression: MIT
 Keywords: DI,dependency injector,ioc-container,mocks,python
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11

{modern_di-0.9.0.dist-info → modern_di-0.10.0.dist-info}/RECORD

@@ -1,20 +1,20 @@
 modern_di/__init__.py,sha256=L01VkzSJiV0d0FPrh1DZ-Wy5mUmoG6X-oLz7xYxtehI,194
-modern_di/container.py,sha256=a9NB7P4OQ92seGGztu9SGBChmv79nJ9kHxeF8V2zwpg,4900
+modern_di/container.py,sha256=BmviR8lr01EcdHpzvm63_otMUtw0Ytp9rUk7eG3i2IE,4948
 modern_di/graph.py,sha256=X60wtG3Mqus_5YZNiZlQuXoHODBp7rYl_IHJs7GzSQM,1356
 modern_di/provider_state.py,sha256=oU08QnMr0yhIZKkz0Pee8_RnWtETDE9ux4JB83qhwTI,1358
 modern_di/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modern_di/scope.py,sha256=e6Olc-CF89clbYDNGciy-F8EqJt1Mw2703zfuJaEY94,113
 modern_di/providers/__init__.py,sha256=tnF38UC-INW1GPPsGlj5tLqGi6fMfHodpi91wHDW-jY,649
-modern_di/providers/abstract.py,sha256=UMj4CRn-JfGZfiveWFTkH7V92h4UXS4eYf8noZqPWGQ,3107
+modern_di/providers/abstract.py,sha256=dgtAwzwtK-zyIHroxAT3QB5CV06sx3PUugYweZexkMc,3408
 modern_di/providers/container_provider.py,sha256=r5IEQXgKtPwvHvbqkbPnmGyDGGCCjokTtdard9Rvt40,548
 modern_di/providers/context_adapter.py,sha256=_b1x3ToQPWT-9KkDioFhw1W8Q1VXZYUnczfYzMTobVA,760
 modern_di/providers/dict.py,sha256=nCU9iaqteYHDbILAfhrdnbMgS9_emE4MS7Xn2VoUlPo,858
-modern_di/providers/factory.py,sha256=NozbrprJlRJPWSNdvKR0kOwPt1Q9i_ZLJTPOfzdDDJo,1359
-modern_di/providers/injected_factory.py,sha256=wK9GG5_d33BdrpimnR6W-zeviZcCS8qe8ZGTmjYtFf4,1135
+modern_di/providers/factory.py,sha256=Nn9WZuOHF4r5Go4vOuW_jAjmXs0A2WJCGiGQ1eUFB58,1507
+modern_di/providers/injected_factory.py,sha256=KkDww-zUgm41LFt5j8crRzzFuBSkmKvOfptzHWMgVok,1848
 modern_di/providers/list.py,sha256=3hx34RfBRmqzh-cT5D6wSTDJPkBGMK_ul4n9gQz-o9M,769
 modern_di/providers/resource.py,sha256=CsMekkVISklTqN539XqH4iE80vfc6sQMav5OT8fZvyA,4591
 modern_di/providers/selector.py,sha256=RQbHD2-Liw-TGqu6UELbfCzXYuqxiO_Mg1tLyF3mKQo,1419
 modern_di/providers/singleton.py,sha256=_hUpCmbHgLAigdhBiu0zypwWwrIGdB6_oZkGfuLxzNE,2372
-modern_di-0.9.0.dist-info/METADATA,sha256=jmn_QkeNOtjU_z1raF5FECSDkaLMhBkTXjb8SEqT7Hc,5493
-modern_di-0.9.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-modern_di-0.9.0.dist-info/RECORD,,
+modern_di-0.10.0.dist-info/METADATA,sha256=CwHhtofaNICrWExZ-9i_E9clyCsMxfWsU60qqpYzyJU,5505
+modern_di-0.10.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+modern_di-0.10.0.dist-info/RECORD,,

{modern_di-0.9.0.dist-info → modern_di-0.10.0.dist-info}/WHEEL

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