modern-di 0.15.2__tar.gz → 0.16.1__tar.gz

{modern_di-0.15.2 → modern_di-0.16.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modern-di
-Version: 0.15.2
+Version: 0.16.1
 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.15.2 → modern_di-0.16.1}/modern_di/container.py

@@ -4,6 +4,7 @@ import types
 import typing
 
 from modern_di.provider_state import ProviderState
+from modern_di.scope import Scope
 
 
 if typing.TYPE_CHECKING:
@@ -27,7 +28,7 @@ class Container(contextlib.AbstractAsyncContextManager["Container"], contextlib.
     def __init__(
         self,
         *,
-        scope: enum.IntEnum,
+        scope: enum.IntEnum = Scope.APP,
         parent_container: typing.Optional["Container"] = None,
         context: dict[str, typing.Any] | None = None,
         use_threading_lock: bool = True,

{modern_di-0.15.2 → modern_di-0.16.1}/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-0.15.2 → modern_di-0.16.1}/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-0.15.2 → modern_di-0.16.1}/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-0.15.2 → modern_di-0.16.1}/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