modern-di 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

modern_di/resolvers/__init__.py

@@ -1,11 +1,13 @@
 from modern_di.resolvers.base import AbstractResolver, BaseCreatorResolver
 from modern_di.resolvers.factory import Factory
 from modern_di.resolvers.resource import Resource
+from modern_di.resolvers.singleton import Singleton
 
 
 __all__ = [
     "AbstractResolver",
     "BaseCreatorResolver",
     "Factory",
+    "Singleton",
     "Resource",
 ]

modern_di/resolvers/factory.py

@@ -26,21 +26,11 @@ class Factory(BaseCreatorResolver[T_co]):
         if (override := container.fetch_override(self.resolver_id)) is not None:
             return typing.cast(T_co, override)
 
-        resolver_state = container.fetch_resolver_state(self.resolver_id)
-        if resolver_state.instance is not None:
-            return typing.cast(T_co, resolver_state.instance)
-
-        resolver_state.instance = typing.cast(T_co, await self._async_build_creator(container))
-        return resolver_state.instance
+        return typing.cast(T_co, await self._async_build_creator(container))
 
     def sync_resolve(self, container: Container) -> T_co:
         container = container.find_container(self.scope)
         if (override := container.fetch_override(self.resolver_id)) is not None:
             return typing.cast(T_co, override)
 
-        resolver_state = container.fetch_resolver_state(self.resolver_id)
-        if resolver_state.instance is not None:
-            return typing.cast(T_co, resolver_state.instance)
-
-        resolver_state.instance = self._sync_build_creator(container)
-        return typing.cast(T_co, resolver_state.instance)
+        return typing.cast(T_co, self._sync_build_creator(container))

modern_di/resolvers/resource.py

@@ -46,13 +46,13 @@ class Resource(BaseCreatorResolver[T_co]):
             return typing.cast(T_co, override)
 
         resolver_state = container.fetch_resolver_state(
-            self.resolver_id, is_async_resource=self._is_async, is_lock_required=self._is_async
+            self.resolver_id, is_async_resource=self._is_async, is_lock_required=True
         )
         if resolver_state.instance is not None:
             return typing.cast(T_co, resolver_state.instance)
 
-        if resolver_state.resolver_lock:
-            await resolver_state.resolver_lock.acquire()
+        assert resolver_state.resolver_lock
+        await resolver_state.resolver_lock.acquire()
 
         try:
             if resolver_state.instance is not None:
@@ -67,8 +67,7 @@ class Resource(BaseCreatorResolver[T_co]):
                 resolver_state.context_stack = contextlib.ExitStack()
                 resolver_state.instance = resolver_state.context_stack.enter_context(_intermediate_)
         finally:
-            if resolver_state.resolver_lock:
-                resolver_state.resolver_lock.release()
+            resolver_state.resolver_lock.release()
 
         return typing.cast(T_co, resolver_state.instance)
 

modern_di/resolvers/singleton.py

@@ -0,0 +1,56 @@
+import enum
+import typing
+
+from modern_di import Container
+from modern_di.resolvers import BaseCreatorResolver
+
+
+T_co = typing.TypeVar("T_co", covariant=True)
+P = typing.ParamSpec("P")
+
+
+class Singleton(BaseCreatorResolver[T_co]):
+    __slots__ = [*BaseCreatorResolver.BASE_SLOTS, "_creator"]
+
+    def __init__(
+        self,
+        scope: enum.IntEnum,
+        creator: typing.Callable[P, T_co],
+        *args: P.args,
+        **kwargs: P.kwargs,
+    ) -> None:
+        super().__init__(scope, creator, *args, **kwargs)
+
+    async def async_resolve(self, container: Container) -> T_co:
+        container = container.find_container(self.scope)
+        if (override := container.fetch_override(self.resolver_id)) is not None:
+            return typing.cast(T_co, override)
+
+        resolver_state = container.fetch_resolver_state(self.resolver_id, is_lock_required=True)
+        if resolver_state.instance is not None:
+            return typing.cast(T_co, resolver_state.instance)
+
+        assert resolver_state.resolver_lock
+        await resolver_state.resolver_lock.acquire()
+
+        try:
+            if resolver_state.instance is not None:
+                return typing.cast(T_co, resolver_state.instance)
+
+            resolver_state.instance = typing.cast(T_co, await self._async_build_creator(container))
+        finally:
+            resolver_state.resolver_lock.release()
+
+        return resolver_state.instance
+
+    def sync_resolve(self, container: Container) -> T_co:
+        container = container.find_container(self.scope)
+        if (override := container.fetch_override(self.resolver_id)) is not None:
+            return typing.cast(T_co, override)
+
+        resolver_state = container.fetch_resolver_state(self.resolver_id)
+        if resolver_state.instance is not None:
+            return typing.cast(T_co, resolver_state.instance)
+
+        resolver_state.instance = self._sync_build_creator(container)
+        return typing.cast(T_co, resolver_state.instance)

{modern_di-0.1.0.dist-info → modern_di-0.2.0.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.3
 Name: modern-di
-Version: 0.1.0
-Summary: Simple Dependency Injection framework
-Project-URL: repository, https://github.com/modern-python/that-depends
-Project-URL: docs, https://that-depends.readthedocs.io
+Version: 0.2.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-Expression: MIT
 License-File: LICENSE
@@ -28,7 +28,7 @@ Description-Content-Type: text/markdown
 Dependency injection framework for Python inspired by `dependency-injector` and `dishka`.
 
 It is production-ready and gives you the following:
-- Simple DI framework with IOC-container.
+- DI framework with IOC-container and scopes.
 - Async and sync resolving.
 - Python 3.10-3.13 support.
 - Full coverage by types annotations (mypy in strict mode).

modern_di-0.2.0.dist-info/RECORD

@@ -0,0 +1,15 @@
+modern_di/__init__.py,sha256=2xhgfqi4gpzPrlfam5HSwTFRroWmYIybDgsSYD9pPNg,194
+modern_di/container.py,sha256=o-6_eoSGpOrIZlAXDryISWmgnSLq7u0YAVRXHvkWU0s,3742
+modern_di/graph.py,sha256=V6LUbtcZb64jBD-GJB2bJijEcPBHSYEEI9WZGflrFpQ,1335
+modern_di/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+modern_di/resolver_state.py,sha256=rRIoyWPK7XtMeWPBFuEe8t81WdrHbj5-jtpOqZWf0jY,1206
+modern_di/scope.py,sha256=nnrTLnFT_dMDLVIwvJHcGlJsB2k1WIHusrRSGQIMEsg,97
+modern_di/resolvers/__init__.py,sha256=560FLaWh7hjqp5ghOHsEDWl8wmoPGXZ-UUO9GgYusgc,340
+modern_di/resolvers/base.py,sha256=BMZbYfkIzAW8-8CQ9aRVIu5D8zw9owKv4nz-z0EMYmg,2897
+modern_di/resolvers/factory.py,sha256=tMOxpXp-zaXiSsDGUp68L2mtcfF7K02ZdF-LglH4phs,1164
+modern_di/resolvers/resource.py,sha256=8qtyIxspbtW7Q3Yo1Y6risNamG0H3XZNU0G9t-lfZjk,3628
+modern_di/resolvers/singleton.py,sha256=k70nEaeBqsu-uHQFqsn8XZh-aw2tQR-J5ImLED6GQGg,1978
+modern_di-0.2.0.dist-info/METADATA,sha256=uLMl5mJ78gixE_23iXUhMXKo2hZQao-Oc3zPkv2AtOY,1846
+modern_di-0.2.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+modern_di-0.2.0.dist-info/licenses/LICENSE,sha256=aA5_eJwDKqnGvL7PbkPb9x5f-VGIqZ9cvWWkeGqeD90,1070
+modern_di-0.2.0.dist-info/RECORD,,

modern_di-0.1.0.dist-info/RECORD

@@ -1,14 +0,0 @@
-modern_di/__init__.py,sha256=2xhgfqi4gpzPrlfam5HSwTFRroWmYIybDgsSYD9pPNg,194
-modern_di/container.py,sha256=o-6_eoSGpOrIZlAXDryISWmgnSLq7u0YAVRXHvkWU0s,3742
-modern_di/graph.py,sha256=V6LUbtcZb64jBD-GJB2bJijEcPBHSYEEI9WZGflrFpQ,1335
-modern_di/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-modern_di/resolver_state.py,sha256=rRIoyWPK7XtMeWPBFuEe8t81WdrHbj5-jtpOqZWf0jY,1206
-modern_di/scope.py,sha256=nnrTLnFT_dMDLVIwvJHcGlJsB2k1WIHusrRSGQIMEsg,97
-modern_di/resolvers/__init__.py,sha256=ubCeXD-44otfS1-AG5vRbTaqn8d6szY7cKQTprFT3Pk,271
-modern_di/resolvers/base.py,sha256=BMZbYfkIzAW8-8CQ9aRVIu5D8zw9owKv4nz-z0EMYmg,2897
-modern_di/resolvers/factory.py,sha256=CyMvl--t3bCapxARFnCKNJNgy1svCR5c9HcwHm85G8Q,1650
-modern_di/resolvers/resource.py,sha256=s0c2PQQSjffdKKXxZ6fJVKJaiqqBgQLZ8mTpzKjDb4Q,3688
-modern_di-0.1.0.dist-info/METADATA,sha256=t_wifprG9bqMg-H6l8kTRoWYFPZcbJm6bMtBjsaJLeM,1825
-modern_di-0.1.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-modern_di-0.1.0.dist-info/licenses/LICENSE,sha256=aA5_eJwDKqnGvL7PbkPb9x5f-VGIqZ9cvWWkeGqeD90,1070
-modern_di-0.1.0.dist-info/RECORD,,