python-injection 0.26.3__py3-none-any.whl → 0.26.4__py3-none-any.whl

injection/_core/common/asynchronous.py

@@ -4,7 +4,7 @@ from contextlib import AbstractAsyncContextManager
 from dataclasses import dataclass
 from typing import Any, NoReturn, Protocol, runtime_checkable
 
-AsyncSemaphore: Callable[[int], AbstractAsyncContextManager[Any]]
+AsyncLock: Callable[[], AbstractAsyncContextManager[Any]]
 
 try:
     import anyio
@@ -12,10 +12,10 @@ try:
 except ImportError:  # pragma: no cover
     import asyncio
 
-    AsyncSemaphore = asyncio.Semaphore
+    AsyncLock = asyncio.Lock
 
 else:
-    AsyncSemaphore = anyio.Semaphore
+    AsyncLock = anyio.Lock
 
 
 @dataclass(repr=False, eq=False, frozen=True, slots=True)

injection/_core/common/threading.py

@@ -1,6 +1,8 @@
+from __future__ import annotations
+
 from contextlib import AbstractContextManager, nullcontext
 from os import getenv
-from threading import RLock
+from threading import Lock
 from typing import Any, Final
 
 _PYTHON_INJECTION_THREADSAFE: Final[bool] = bool(
@@ -8,6 +10,13 @@ _PYTHON_INJECTION_THREADSAFE: Final[bool] = bool(
 )
 
 
-def get_lock(threadsafe: bool | None = None) -> AbstractContextManager[Any]:
+def lock_if_threadsafe(
+    lock: AbstractContextManager[Any] | None = None,
+    threadsafe: bool | None = None,
+) -> AbstractContextManager[Any]:
     threadsafe = _PYTHON_INJECTION_THREADSAFE if threadsafe is None else threadsafe
-    return RLock() if threadsafe else nullcontext()
+
+    if not threadsafe:
+        return nullcontext()
+
+    return lock or Lock()

injection/_core/injectables.py

@@ -12,7 +12,7 @@ from typing import (
     runtime_checkable,
 )
 
-from injection._core.common.asynchronous import AsyncSemaphore, Caller
+from injection._core.common.asynchronous import AsyncLock, Caller
 from injection._core.common.type import InputType
 from injection._core.scope import Scope, get_first_scope, in_scope_cache
 from injection._core.slots import SlotKey
@@ -51,12 +51,12 @@ class TransientInjectable[T](Injectable[T]):
 
 
 class CacheLogic[T]:
-    __slots__ = ("__semaphore",)
+    __slots__ = ("__lock",)
 
-    __semaphore: AbstractAsyncContextManager[Any]
+    __lock: AbstractAsyncContextManager[Any]
 
     def __init__(self) -> None:
-        self.__semaphore = AsyncSemaphore(1)
+        self.__lock = AsyncLock()
 
     async def aget_or_create[K](
         self,
@@ -64,7 +64,7 @@ class CacheLogic[T]:
         key: K,
         factory: Callable[..., Awaitable[T]],
     ) -> T:
-        async with self.__semaphore:
+        async with self.__lock:
             with suppress(KeyError):
                 return cache[key]
 

injection/_core/module.py

@@ -35,6 +35,7 @@ from inspect import (
 )
 from inspect import signature as inspect_signature
 from logging import Logger, getLogger
+from threading import RLock
 from types import MethodType
 from typing import TYPE_CHECKING, Any, ClassVar, Literal, NamedTuple, Self, overload
 
@@ -44,7 +45,7 @@ from injection._core.common.asynchronous import Caller, SimpleAwaitable
 from injection._core.common.event import Event, EventChannel, EventListener
 from injection._core.common.invertible import Invertible, SimpleInvertible
 from injection._core.common.lazy import Lazy
-from injection._core.common.threading import get_lock
+from injection._core.common.threading import lock_if_threadsafe
 from injection._core.common.type import (
     InputType,
     TypeInfo,
@@ -180,6 +181,11 @@ class Module(EventListener, InjectionProvider):  # type: ignore[misc]
         init=False,
         repr=False,
     )
+    __lock: RLock = field(
+        default_factory=RLock,
+        init=False,
+        repr=False,
+    )
     __loggers: list[Logger] = field(
         default_factory=lambda: [getLogger("python-injection")],
         init=False,
@@ -350,7 +356,7 @@ class Module(EventListener, InjectionProvider):  # type: ignore[misc]
         /,
         threadsafe: bool | None = None,
     ) -> InjectMetadata[P, T]:
-        return InjectMetadata(wrapped, threadsafe).listen(self)
+        return InjectMetadata(wrapped, self.__lock, threadsafe).listen(self)
 
     if TYPE_CHECKING:  # pragma: no cover
 
@@ -397,7 +403,7 @@ class Module(EventListener, InjectionProvider):  # type: ignore[misc]
         *,
         threadsafe: bool | None = None,
     ) -> T:
-        with get_lock(threadsafe):
+        with lock_if_threadsafe(self.__lock, threadsafe):
             injectable = self[cls]
             return await injectable.aget_instance()
 
@@ -407,7 +413,7 @@ class Module(EventListener, InjectionProvider):  # type: ignore[misc]
         *,
         threadsafe: bool | None = None,
     ) -> T:
-        with get_lock(threadsafe):
+        with lock_if_threadsafe(self.__lock, threadsafe):
             injectable = self[cls]
             return injectable.get_instance()
 
@@ -598,11 +604,12 @@ class Module(EventListener, InjectionProvider):  # type: ignore[misc]
         return self
 
     def stop_using(self, module: Module) -> Self:
-        event = ModuleRemoved(self, module)
+        if module in self.__modules:
+            event = ModuleRemoved(self, module)
 
-        with suppress(KeyError), self.dispatch(event):
-            self.__modules.pop(module)
-            module.remove_listener(self)
+            with self.dispatch(event):
+                self.__modules.pop(module)
+                module.remove_listener(self)
 
         return self
 
@@ -833,11 +840,12 @@ class InjectMetadata[**P, T](Caller[P, T], EventListener):
     def __init__(
         self,
         wrapped: Callable[P, T],
+        lock: RLock,
         /,
         threadsafe: bool | None = None,
     ) -> None:
         self.__dependencies = Dependencies.empty()
-        self.__lock = get_lock(threadsafe)
+        self.__lock = lock_if_threadsafe(lock, threadsafe)
         self.__owner = None
         self.__tasks = deque()
         self.__wrapped = wrapped

injection/_core/scope.py

@@ -16,6 +16,7 @@ from contextvars import ContextVar
 from dataclasses import dataclass, field
 from enum import StrEnum
 from functools import partial
+from threading import Lock
 from types import EllipsisType, TracebackType
 from typing import (
     TYPE_CHECKING,
@@ -29,7 +30,7 @@ from typing import (
     runtime_checkable,
 )
 
-from injection._core.common.threading import get_lock
+from injection._core.common.threading import lock_if_threadsafe
 from injection._core.slots import SlotKey
 from injection.exceptions import (
     InjectionError,
@@ -38,6 +39,8 @@ from injection.exceptions import (
     ScopeUndefinedError,
 )
 
+__thread_lock: Final[Lock] = Lock()
+
 
 class ScopeKind(StrEnum):
     CONTEXTUAL = "contextual"
@@ -197,7 +200,7 @@ def _bind_scope(
     kind: ScopeKind | ScopeKindStr,
     threadsafe: bool | None,
 ) -> Iterator[ScopeFacade]:
-    lock = get_lock(threadsafe)
+    lock = lock_if_threadsafe(__thread_lock, threadsafe)
 
     with lock:
         if get_first_scope(name, default=None):
@@ -209,7 +212,7 @@ def _bind_scope(
         stack.enter_context(__scope_resolvers[kind][name].bind(scope))
 
     try:
-        yield _UserScope(scope, lock)
+        yield _UserScope(scope, lock_if_threadsafe(threadsafe=threadsafe))
 
     finally:
         with lock:

{python_injection-0.26.3.dist-info → python_injection-0.26.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: python-injection
-Version: 0.26.3
+Version: 0.26.4
 Summary: Dead-simple dependency injection framework for Python.
 Project-URL: Documentation, https://python-injection.remimd.dev
 Project-URL: Repository, https://github.com/100nm/python-injection
@@ -32,8 +32,8 @@ Description-Content-Type: text/markdown
 
 # python-injection
 
-[![PyPI - Version](https://img.shields.io/pypi/v/python-injection.svg?color=546d78&style=for-the-badge)](https://pypi.org/project/python-injection)
-[![PyPI - Downloads](https://img.shields.io/pypi/dm/python-injection.svg?color=546d78&style=for-the-badge)](https://pypistats.org/packages/python-injection)
+[![PyPI - Version](https://shieldcn.dev/pypi/v/python-injection.svg?variant=secondary)](https://pypi.org/project/python-injection)
+[![PyPI - Downloads](https://shieldcn.dev/pypi/dm/python-injection.svg?variant=secondary)](https://pypistats.org/packages/python-injection)
 
 ## Project motivations
 

{python_injection-0.26.3.dist-info → python_injection-0.26.4.dist-info}/RECORD

@@ -7,24 +7,24 @@ injection/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/_core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/_core/asfunction.py,sha256=GY228WHQWvA-9rg3unR8ttyIJlhwxy0bC3LUO5K8Erg,1864
 injection/_core/descriptors.py,sha256=OBuGGPPn9b2dLTfFA1tdUD2zv11F4_1h1Vsm_cNaF-M,3602
-injection/_core/injectables.py,sha256=6PY_-DCfCd7eTZoHwBxvuPMX78XIYq128sAKOAjoiOQ,6467
+injection/_core/injectables.py,sha256=MXl6sNKWAWvwcY7BnDf8fXhlIxc_DadzNB2RzhO7WA4,6436
 injection/_core/locator.py,sha256=zSzLN7WiEPlYyrWra8siVnqx78jEW7AZ0rn5hZSmF3o,8270
-injection/_core/module.py,sha256=W4HsK7OJ_wlKIkca4g6O4LT5v1nf2D6ow-303JasLQ0,28918
-injection/_core/scope.py,sha256=WIkv8PvmSZt4us3PKZA8KuM4Mtd7TzXVhi-V_zxt-kE,9060
+injection/_core/module.py,sha256=Ss562rKUfm9y7sHRknc-2Pa-YX0QD5zvEBDp3AtuAtA,29189
+injection/_core/scope.py,sha256=wFosijGOCyFJ5nbk8sclL47GbiI5gpYHegaJ0HloclU,9196
 injection/_core/slots.py,sha256=g9TG6CbqRzCsjg01iPyfRtTTUCJnnJOwcj9mJabH0dc,37
 injection/_core/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-injection/_core/common/asynchronous.py,sha256=QldcR-QyrDD8u1T-P5gEm2Vb-2DbU64bdE7NZXf_AhU,1785
+injection/_core/common/asynchronous.py,sha256=GFJHzUDoq0TnD3BWQ4669HhQ4kEsZH-B97dFoBzCft0,1757
 injection/_core/common/event.py,sha256=oZj1Uw4-XAcdBFzy7xmn9CC6HoIMxbdVXkHICLSORqk,1252
 injection/_core/common/invertible.py,sha256=gA_vw5nBjgp_w9MrDK5jMO8lhuOQWON8BbPpKzEuIY0,502
 injection/_core/common/lazy.py,sha256=jTv7mYChvRp6WLWILLbEejrHq24gFRKOkkUuZjnwYlE,796
-injection/_core/common/threading.py,sha256=-A1z7l363JZx8em88INpvV-DOQ7xO2y57u5I7Pta-Jw,459
+injection/_core/common/threading.py,sha256=m4AQsE_uTLpL8r0XzZ0q6-PZzcTH2izmXQF1Ojm-TVg,592
 injection/_core/common/type.py,sha256=d1CtWyu--7Ru7vi9uqAQucO1oXFmAsuUhP2j-dCYkfM,1533
 injection/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 injection/ext/fastapi.py,sha256=wpiNyHKEPwQ7sAJt30XpkgiCi4-gfmyqkQWw9BejXwg,1633
 injection/ext/fastapi.pyi,sha256=HLs7mfruIEFRrN_Xf8oCvSa4qwHWfwm6HHU_KMedXkE,185
 injection/testing/__init__.py,sha256=ZWMacZuGhK8Edq1L0Ng0PaRlgKXEunyFZkFvx7-IYIQ,935
 injection/testing/__init__.pyi,sha256=ZFQMUZmvBVkV6Ch7jiYE9zeJhnqHAQnt3vWQ1Th0zDk,646
-python_injection-0.26.3.dist-info/METADATA,sha256=QhVKKiAbtQNT1Y68W0JPBo4nTU_yPPCMY-sAiEqgjRw,3706
-python_injection-0.26.3.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-python_injection-0.26.3.dist-info/licenses/LICENSE,sha256=oC77BOa9kaaQni5rW-Z-ytz3E5h4EVg248BHg9UFgyg,1063
-python_injection-0.26.3.dist-info/RECORD,,
+python_injection-0.26.4.dist-info/METADATA,sha256=Ih2Ar0OxlZABkHCW6poo9PzQTBB7dBrnJS6QlCGmnck,3672
+python_injection-0.26.4.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+python_injection-0.26.4.dist-info/licenses/LICENSE,sha256=oC77BOa9kaaQni5rW-Z-ytz3E5h4EVg248BHg9UFgyg,1063
+python_injection-0.26.4.dist-info/RECORD,,

{python_injection-0.26.3.dist-info → python_injection-0.26.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.31.0
+Generator: hatchling 1.32.4
 Root-Is-Purelib: true
 Tag: py3-none-any