modern-di 0.4.3__py3-none-any.whl → 0.5.1__py3-none-any.whl

modern_di/container.py

@@ -23,10 +23,6 @@ class Container(contextlib.AbstractAsyncContextManager["Container"]):
         parent_container: typing.Optional["Container"] = None,
         context: dict[str, typing.Any] | None = None,
     ) -> None:
-        if scope.value != 1 and parent_container is None:
-            msg = "Only first scope can be used without parent_container"
-            raise RuntimeError(msg)
-
         self.scope = scope
         self.parent_container = parent_container
         self.context: dict[str, typing.Any] = context or {}
@@ -45,16 +41,22 @@ class Container(contextlib.AbstractAsyncContextManager["Container"]):
             msg = "Enter the context first"
             raise RuntimeError(msg)
 
-    def build_child_container(self, context: dict[str, typing.Any] | None = None) -> "typing_extensions.Self":
+    def build_child_container(
+        self, context: dict[str, typing.Any] | None = None, scope: enum.IntEnum | None = None
+    ) -> "typing_extensions.Self":
         self._check_entered()
+        if scope and scope <= self.scope:
+            msg = "Scope of child container must be more than current scope"
+            raise RuntimeError(msg)
 
-        try:
-            new_scope = self.scope.__class__(self.scope.value + 1)
-        except ValueError as exc:
-            msg = f"Max scope is reached, {self.scope.name}"
-            raise RuntimeError(msg) from exc
+        if not scope:
+            try:
+                scope = self.scope.__class__(self.scope.value + 1)
+            except ValueError as exc:
+                msg = f"Max scope is reached, {self.scope.name}"
+                raise RuntimeError(msg) from exc
 
-        return self.__class__(scope=new_scope, parent_container=self, context=context)
+        return self.__class__(scope=scope, parent_container=self, context=context)
 
     def find_container(self, scope: enum.IntEnum) -> "typing_extensions.Self":
         container = self
@@ -64,6 +66,11 @@ class Container(contextlib.AbstractAsyncContextManager["Container"]):
 
         while container.scope > scope and container.parent_container:
             container = typing.cast("typing_extensions.Self", container.parent_container)
+
+        if container.scope != scope:
+            msg = f"Scope {scope.name} is skipped"
+            raise RuntimeError(msg)
+
         return container
 
     def fetch_provider_state(

modern_di/scope.py

@@ -3,6 +3,7 @@ import enum
 
 class Scope(enum.IntEnum):
     APP = 1
-    REQUEST = 2
-    ACTION = 3
-    STEP = 4
+    SESSION = 2
+    REQUEST = 3
+    ACTION = 4
+    STEP = 5

{modern_di-0.4.3.dist-info → modern_di-0.5.1.dist-info}/METADATA

@@ -1,13 +1,12 @@
 Metadata-Version: 2.3
 Name: modern-di
-Version: 0.4.3
+Version: 0.5.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
 Author-email: Artur Shiriev <me@shiriev.ru>
 License-Expression: MIT
-License-File: LICENSE
-Keywords: dependency injector,di,ioc-container,mocks,python
+Keywords: DI,dependency injector,ioc-container,mocks,python
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{modern_di-0.4.3.dist-info → modern_di-0.5.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
 modern_di/__init__.py,sha256=L01VkzSJiV0d0FPrh1DZ-Wy5mUmoG6X-oLz7xYxtehI,194
-modern_di/container.py,sha256=v96v5qPTGfYaONuMZhO-C4K7rMlCfzLzZdCLuJtviCw,4156
+modern_di/container.py,sha256=wJ18aOVb-RMFEBafTesZdvMUOSlJ-44qcNFtR0Cak1Q,4351
 modern_di/graph.py,sha256=X60wtG3Mqus_5YZNiZlQuXoHODBp7rYl_IHJs7GzSQM,1356
 modern_di/provider_state.py,sha256=5Bl_iYEpXjMqoWZJ4op2-axo4Z8nR_vYbLVHL_u5R0c,1206
 modern_di/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-modern_di/scope.py,sha256=nnrTLnFT_dMDLVIwvJHcGlJsB2k1WIHusrRSGQIMEsg,97
+modern_di/scope.py,sha256=e6Olc-CF89clbYDNGciy-F8EqJt1Mw2703zfuJaEY94,113
 modern_di/providers/__init__.py,sha256=oeP3sKZJQF9COfT_YYJiLwiU3CbDfQMk4rzYHO52Xvg,555
 modern_di/providers/abstract.py,sha256=UMj4CRn-JfGZfiveWFTkH7V92h4UXS4eYf8noZqPWGQ,3107
 modern_di/providers/context_adapter.py,sha256=_b1x3ToQPWT-9KkDioFhw1W8Q1VXZYUnczfYzMTobVA,760
@@ -13,7 +13,6 @@ modern_di/providers/list.py,sha256=3hx34RfBRmqzh-cT5D6wSTDJPkBGMK_ul4n9gQz-o9M,7
 modern_di/providers/resource.py,sha256=nKy8_Wfn2cAIvlu_qGjGanmlgrkHQUsZxBNNR6p7OuE,3649
 modern_di/providers/selector.py,sha256=RQbHD2-Liw-TGqu6UELbfCzXYuqxiO_Mg1tLyF3mKQo,1419
 modern_di/providers/singleton.py,sha256=7XBNhVzhV5Rh_F7iWZx8is7i7_PuctQ9thKeqIkjnTs,1999
-modern_di-0.4.3.dist-info/METADATA,sha256=s6Q1DeZMxAAuAs8ce9wGcYd4DRbLZCWPGJBpAtQaslk,2767
-modern_di-0.4.3.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-modern_di-0.4.3.dist-info/licenses/LICENSE,sha256=aA5_eJwDKqnGvL7PbkPb9x5f-VGIqZ9cvWWkeGqeD90,1070
-modern_di-0.4.3.dist-info/RECORD,,
+modern_di-0.5.1.dist-info/METADATA,sha256=RrhmXaaNkHk5qyOfqclWkC39M2zMtOC4ADmAhr1EhCs,2745
+modern_di-0.5.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+modern_di-0.5.1.dist-info/RECORD,,

modern_di-0.4.3.dist-info/licenses/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 modern-python
-
-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.