python-injection 0.18.7__py3-none-any.whl → 0.18.9__py3-none-any.whl

injection/__init__.pyi

@@ -35,12 +35,14 @@ def adefine_scope(
     name: str,
     /,
     kind: ScopeKind | ScopeKindStr = ...,
+    threadsafe: bool = ...,
 ) -> AsyncIterator[Scope]: ...
 @contextmanager
 def define_scope(
     name: str,
     /,
     kind: ScopeKind | ScopeKindStr = ...,
+    threadsafe: bool = ...,
 ) -> Iterator[Scope]: ...
 def mod(name: str = ..., /) -> Module:
     """
@@ -320,6 +322,7 @@ class Module:
         module: Module,
         *,
         priority: Priority | PriorityStr = ...,
+        unlock: bool = ...,
     ) -> Iterator[Self]:
         """
         Context manager or decorator for temporary use of a module.

injection/_core/module.py

@@ -788,12 +788,16 @@ class Module(Broker, EventListener):
         module: Module,
         *,
         priority: Priority | PriorityStr = Priority.get_default(),
+        unlock: bool = False,
     ) -> Iterator[Self]:
         self.use(module, priority=priority)
 
         try:
             yield self
         finally:
+            if unlock:
+                self.unlock()
+
             self.stop_using(module)
 
     def change_priority(self, module: Module, priority: Priority | PriorityStr) -> Self:
@@ -992,7 +996,7 @@ class InjectMetadata[**P, T](Caller[P, T], EventListener):
 
     def __init__(self, wrapped: Callable[P, T], /, threadsafe: bool) -> None:
         self.__dependencies = Dependencies.empty()
-        self.__lock = threading.Lock() if threadsafe else nullcontext()
+        self.__lock = threading.RLock() if threadsafe else nullcontext()
         self.__owner = None
         self.__tasks = deque()
         self.__wrapped = wrapped

injection/_core/scope.py

@@ -1,10 +1,17 @@
 from __future__ import annotations
 
 import itertools
+import threading
 from abc import ABC, abstractmethod
 from collections import defaultdict
 from collections.abc import AsyncIterator, Iterator, Mapping, MutableMapping
-from contextlib import AsyncExitStack, ExitStack, asynccontextmanager, contextmanager
+from contextlib import (
+    AsyncExitStack,
+    ExitStack,
+    asynccontextmanager,
+    contextmanager,
+    nullcontext,
+)
 from contextvars import ContextVar
 from dataclasses import dataclass, field
 from enum import StrEnum
@@ -129,9 +136,10 @@ async def adefine_scope(
     name: str,
     /,
     kind: ScopeKind | ScopeKindStr = ScopeKind.get_default(),
+    threadsafe: bool = False,
 ) -> AsyncIterator[ScopeFacade]:
     async with AsyncScope() as scope:
-        with _bind_scope(name, scope, kind) as facade:
+        with _bind_scope(name, scope, kind, threadsafe) as facade:
             yield facade
 
 
@@ -140,9 +148,10 @@ def define_scope(
     name: str,
     /,
     kind: ScopeKind | ScopeKindStr = ScopeKind.get_default(),
+    threadsafe: bool = False,
 ) -> Iterator[ScopeFacade]:
     with SyncScope() as scope:
-        with _bind_scope(name, scope, kind) as facade:
+        with _bind_scope(name, scope, kind, threadsafe) as facade:
             yield facade
 
 
@@ -191,27 +200,39 @@ def _bind_scope(
     name: str,
     scope: Scope,
     kind: ScopeKind | ScopeKindStr,
+    threadsafe: bool,
 ) -> Iterator[ScopeFacade]:
-    match ScopeKind(kind):
-        case ScopeKind.CONTEXTUAL:
-            is_already_defined = bool(get_scope(name, default=None))
-            states = __CONTEXTUAL_SCOPES
+    lock = threading.RLock() if threadsafe else nullcontext()
 
-        case ScopeKind.SHARED:
-            is_already_defined = bool(get_active_scopes(name))
-            states = __SHARED_SCOPES
+    with lock:
+        match ScopeKind(kind):
+            case ScopeKind.CONTEXTUAL:
+                is_already_defined = bool(get_scope(name, default=None))
+                states = __CONTEXTUAL_SCOPES
 
-        case _:
-            raise NotImplementedError
+            case ScopeKind.SHARED:
+                is_already_defined = bool(get_active_scopes(name))
+                states = __SHARED_SCOPES
 
-    if is_already_defined:
-        raise ScopeAlreadyDefinedError(
-            f"Scope `{name}` is already defined in the current context."
-        )
+            case _:
+                raise NotImplementedError
+
+        if is_already_defined:
+            raise ScopeAlreadyDefinedError(
+                f"Scope `{name}` is already defined in the current context."
+            )
 
-    with states[name].bind(scope):
+        stack = ExitStack()
+        binder = states[name].bind(scope)
+        stack.enter_context(binder)
+
+    try:
         yield _UserScope(scope)
 
+    finally:
+        with lock:
+            stack.close()
+
 
 @runtime_checkable
 class Scope(Protocol):

injection/entrypoint.py

@@ -153,9 +153,7 @@ class Entrypoint[**P, T]:
         setup_method = profile_loader.module.make_injected_function(setup_method)
 
         def decorator(function: Callable[P, T]) -> Callable[P, _T]:
-            if profile_loader.module_subsets:
-                profile_loader.init()
-
+            profile_loader.init()
             self = cls(function, profile_loader)
             return MethodType(setup_method, self)().function
 

injection/loaders.py

@@ -145,6 +145,10 @@ class ProfileLoader:
     module: Module = field(default_factory=mod, kw_only=True)
     __initialized_modules: set[str] = field(default_factory=set, init=False)
 
+    @property
+    def __is_empty(self) -> bool:
+        return not self.module_subsets
+
     def init(self) -> Self:
         self.__init_subsets_for(self.module)
         return self
@@ -159,12 +163,12 @@ class ProfileLoader:
         self.module.unlock().stop_using(mod(name))
 
     def __init_subsets_for(self, module: Module) -> Module:
-        if not self.__is_initialized(module):
+        if not self.__is_empty and not self.__is_initialized(module):
             target_modules = tuple(
                 self.__init_subsets_for(mod(name))
                 for name in self.module_subsets.get(module.name, ())
             )
-            module.unlock().init_modules(*target_modules)
+            module.init_modules(*target_modules)
             self.__mark_initialized(module)
 
         return module

{python_injection-0.18.7.dist-info → python_injection-0.18.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-injection
-Version: 0.18.7
+Version: 0.18.9
 Summary: Fast and easy dependency injection framework.
 Project-URL: Repository, https://github.com/100nm/python-injection
 Author: remimd

{python_injection-0.18.7.dist-info → python_injection-0.18.9.dist-info}/RECORD

@@ -1,14 +1,14 @@
 injection/__init__.py,sha256=7ZRUlO5EEPWO7IlbYHD-8DOX-cg4Np4nYq5fpw-U56o,1259
-injection/__init__.pyi,sha256=33A511o3QKQAiQOHL8OQtFPdF-ObM1BqWPmswXhxj7c,10634
-injection/entrypoint.py,sha256=baVzT8VoNJGQknSR9egCGa5wEjnnpd-BpjwXxHC-GI4,4802
+injection/__init__.pyi,sha256=aV1Ebgb7zdCs6b4K-aVzm0JX6W3x0fGp8vtFmWe2U_o,10718
+injection/entrypoint.py,sha256=12b0_zHAFxHCerAoJTIHkhqi3mLkgheECYAaCUZv_DU,4751
 injection/exceptions.py,sha256=v57yMujiq6H_zwwn30A8UYEZX9R9k-bY8FnsdaimPM4,1025
-injection/loaders.py,sha256=_IpsMhsDrto-OeMaBdD5b71wqzxhWnxgB-Fv2H3T4Zs,6465
+injection/loaders.py,sha256=6TjVz9yaQDCVIPIIhjeC6GSXm9rn3oUU2b5KjfOYlsM,6568
 injection/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/_core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/_core/descriptors.py,sha256=jH0pyIlPurMmU4yXr-HKS_7BJ-9d0XUvEx4pQre3QeI,704
 injection/_core/injectables.py,sha256=Rg1nxDkbcpeX4ELohrNVMguPhN36SNQuD0JKfyfL6bI,6192
-injection/_core/module.py,sha256=zpYLLhtXPLb6hE1U_A5AJ-ffffT_aPrq4DuVmJoxz3A,31931
-injection/_core/scope.py,sha256=OBzVY1mUApryqIZKQtwHz7wiuY13MfouyaHp50DpWeQ,8300
+injection/_core/module.py,sha256=4WqrDti98A5CrIWaHlld1GYYm4K-8XkKltchJoyXUTU,32016
+injection/_core/scope.py,sha256=6EKhwbXMwx8ZvqQ5TKzfVtg_JWHhZj_qkHACiDqs6h0,8731
 injection/_core/slots.py,sha256=g9TG6CbqRzCsjg01iPyfRtTTUCJnnJOwcj9mJabH0dc,37
 injection/_core/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/_core/common/asynchronous.py,sha256=QeS2Lc4gEBFvTA_snOWfme5mTL4BFZWqZ8EzJwOdVos,1816
@@ -22,7 +22,7 @@ injection/ext/fastapi.py,sha256=layUUer5IWiZX6Mmx1_RCYDLNCtEHtpya5ZL6TTBOkY,968
 injection/ext/fastapi.pyi,sha256=8OZEUjHFB9n7QXv_dtXdDuXW-r2huQEFsJ03gJOOvwQ,125
 injection/testing/__init__.py,sha256=bJ7WXBXrw4rHc91AFVFnOwFLWOlpvX9Oh2SnRQ_NESo,919
 injection/testing/__init__.pyi,sha256=raGsGlxwbz3jkzJwA_5oCIE1emWINjT2UuwzbnqRb-0,577
-python_injection-0.18.7.dist-info/METADATA,sha256=0QM_IhbxEFYlJ8pz77pfoZGlVD93CoGw29588Fc6h8g,3397
-python_injection-0.18.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_injection-0.18.7.dist-info/licenses/LICENSE,sha256=oC77BOa9kaaQni5rW-Z-ytz3E5h4EVg248BHg9UFgyg,1063
-python_injection-0.18.7.dist-info/RECORD,,
+python_injection-0.18.9.dist-info/METADATA,sha256=ReK9ZuwTqgR5Pv9RI-o2p-j33O2GgGz0Fq_WUpxBkZU,3397
+python_injection-0.18.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+python_injection-0.18.9.dist-info/licenses/LICENSE,sha256=oC77BOa9kaaQni5rW-Z-ytz3E5h4EVg248BHg9UFgyg,1063
+python_injection-0.18.9.dist-info/RECORD,,