modern-di 0.16.0__py3-none-any.whl → 0.16.2__py3-none-any.whl

modern_di/providers/abstract.py

@@ -1,6 +1,5 @@
 import abc
 import enum
-import itertools
 import typing
 import uuid
 
@@ -34,10 +33,20 @@ class AbstractProvider(typing.Generic[T_co], abc.ABC):
     def cast(self) -> T_co:
         return typing.cast(T_co, self)
 
-    def _check_providers_scope(self, providers: typing.Iterable[typing.Any]) -> None:
-        if any(x.scope > self.scope for x in providers if isinstance(x, AbstractProvider)):
-            msg = "Scope of dependency cannot be more than scope of dependent"
-            raise RuntimeError(msg)
+    def _check_providers_scope(
+        self, *, args: typing.Iterable[typing.Any] | None = None, kwargs: typing.Mapping[str, typing.Any] | None = None
+    ) -> None:
+        if args:
+            for provider in args:
+                if isinstance(provider, AbstractProvider) and provider.scope > self.scope:
+                    msg = f"Scope of dependency is {provider.scope.name} and current scope is {self.scope.name}"
+                    raise RuntimeError(msg)
+
+        if kwargs:
+            for name, provider in kwargs.items():
+                if isinstance(provider, AbstractProvider) and provider.scope > self.scope:
+                    msg = f"Scope of {name} is {provider.scope.name} and current scope is {self.scope.name}"
+                    raise RuntimeError(msg)
 
     def __getattr__(self, attr_name: str) -> typing.Any:  # noqa: ANN401
         """Get an attribute from the resolve object.
@@ -75,7 +84,7 @@ class AbstractCreatorProvider(AbstractOverrideProvider[T_co], abc.ABC):
         **kwargs: P.kwargs,
     ) -> None:
         super().__init__(scope)
-        self._check_providers_scope(itertools.chain(args, kwargs.values()))
+        self._check_providers_scope(args=args, kwargs=kwargs)
         self._creator: typing.Final = creator
         self._args: typing.Final = args
         self._kwargs: typing.Final = kwargs

modern_di/providers/dict.py

@@ -13,7 +13,7 @@ class Dict(AbstractProvider[dict[str, T_co]]):
 
     def __init__(self, scope: enum.IntEnum, **providers: AbstractProvider[T_co]) -> None:
         super().__init__(scope)
-        self._check_providers_scope(providers.values())
+        self._check_providers_scope(kwargs=providers)
         self._providers: typing.Final = providers
 
     async def async_resolve(self, container: Container) -> dict[str, T_co]:

modern_di/providers/list.py

@@ -13,7 +13,7 @@ class List(AbstractProvider[list[T_co]]):
 
     def __init__(self, scope: enum.IntEnum, *providers: AbstractProvider[T_co]) -> None:
         super().__init__(scope)
-        self._check_providers_scope(providers)
+        self._check_providers_scope(args=providers)
         self._providers: typing.Final = providers
 
     async def async_resolve(self, container: Container) -> list[T_co]:

modern_di/providers/selector.py

@@ -16,7 +16,7 @@ class Selector(AbstractProvider[T_co]):
         self, scope: enum.IntEnum, function: typing.Callable[..., str], **providers: AbstractProvider[T_co]
     ) -> None:
         super().__init__(scope)
-        self._check_providers_scope(providers.values())
+        self._check_providers_scope(kwargs=providers)
         self._function: typing.Final = function
         self._providers: typing.Final = providers
 

{modern_di-0.16.0.dist-info → modern_di-0.16.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modern-di
-Version: 0.16.0
+Version: 0.16.2
 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

{modern_di-0.16.0.dist-info → modern_di-0.16.2.dist-info}/RECORD

@@ -7,19 +7,19 @@ modern_di/scope.py,sha256=e6Olc-CF89clbYDNGciy-F8EqJt1Mw2703zfuJaEY94,113
 modern_di/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modern_di/helpers/attr_getter_helpers.py,sha256=HUjExWLRAz2h0YX2_h5xKPX9-_K3i-BZTeZb3u-Wq5k,221
 modern_di/providers/__init__.py,sha256=u19TXXMG0Ex8YsAnLzsf2mz3K78zEFVLBT_SiD51Dyw,873
-modern_di/providers/abstract.py,sha256=TZryLsWRXsOu0aApmY13iHTNHTl1yU7jHs6sPCJrz5k,5417
+modern_di/providers/abstract.py,sha256=cRMTL09RRFzgtfzDu7Ba1qkcJ8uQ00WJ1xtDBZbWYhU,5873
 modern_di/providers/async_factory.py,sha256=eW7Y517NwUg_lov6YccCaBNUNuOEVEfQbAXjDQ-DUOI,1075
 modern_di/providers/async_singleton.py,sha256=DIrix--RxrfDJfjP1OaTqk7-NNrG2MCQIt_wCaF2O3I,1649
 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/dict.py,sha256=k_6BH51xyyE1dJmk-cJG3Qzssyf8M90zgD7dEtLF3LI,856
 modern_di/providers/factory.py,sha256=uQOZ7-_thFUsWE13JeBpJYkQa-e9tt__1tJF4u92WvY,1492
 modern_di/providers/injected_factory.py,sha256=KkDww-zUgm41LFt5j8crRzzFuBSkmKvOfptzHWMgVok,1848
-modern_di/providers/list.py,sha256=3hx34RfBRmqzh-cT5D6wSTDJPkBGMK_ul4n9gQz-o9M,769
+modern_di/providers/list.py,sha256=Y9rcAWR50EvV8ns8HYAw2ZMJbSASjmMBkr_SZXb8uhc,774
 modern_di/providers/object.py,sha256=Sm0mb3Ua7cZ5Ay65fLvl7fnJDSQrQZwvzio3lkkXP2A,825
 modern_di/providers/resource.py,sha256=jEP6Ppr0gmdgWaQGF4sU2PIdt5xSzxcSDubC_IqxE1k,4559
-modern_di/providers/selector.py,sha256=RQbHD2-Liw-TGqu6UELbfCzXYuqxiO_Mg1tLyF3mKQo,1419
+modern_di/providers/selector.py,sha256=8WCqdaIxb2SNp-hKs1F9pfW0v3PdFr2IfH9VGMxWejs,1417
 modern_di/providers/singleton.py,sha256=gfJvAQ7L0JBYlhrzKvaYYDiWo8MPbp0CCU8hGtuzs7U,2357
-modern_di-0.16.0.dist-info/METADATA,sha256=QyyOUsYG55pqOIq3IUZ0u58sorcZxoe41MaZDEMKOKE,3382
-modern_di-0.16.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-modern_di-0.16.0.dist-info/RECORD,,
+modern_di-0.16.2.dist-info/METADATA,sha256=pjeBhf9ylEBUnbv6FNt161UCxlMuOAKMogo-n7s34pU,3382
+modern_di-0.16.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+modern_di-0.16.2.dist-info/RECORD,,