python-injection 0.18.7__tar.gz → 0.18.9__tar.gz

{python_injection-0.18.7 → python_injection-0.18.9}/PKG-INFO

@@ -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 → python_injection-0.18.9}/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.

{python_injection-0.18.7 → python_injection-0.18.9}/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

{python_injection-0.18.7 → python_injection-0.18.9}/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):

{python_injection-0.18.7 → python_injection-0.18.9}/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
 

{python_injection-0.18.7 → python_injection-0.18.9}/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 → python_injection-0.18.9}/pyproject.toml

@@ -29,7 +29,7 @@ test = [
 
 [project]
 name = "python-injection"
-version = "0.18.7"
+version = "0.18.9"
 description = "Fast and easy dependency injection framework."
 license = "MIT"
 license-files = ["LICENSE"]