diff --git a/injection/common/event.py b/injection/common/event.py index 3942e21..134102a 100644 --- a/injection/common/event.py +++ b/injection/common/event.py @@ -4,6 +4,8 @@ from typing import ContextManager from weakref import WeakSet +from injection.common.tools.threading import frozen_collection + __all__ = ("Event", "EventChannel", "EventListener") @@ -26,7 +28,7 @@ class EventChannel: @contextmanager def dispatch(self, event: Event) -> ContextManager | ContextDecorator: with ExitStack() as stack: - for listener in tuple(self.__listeners): + for listener in frozen_collection(self.__listeners): context_manager = listener.on_event(event) if context_manager is None: diff --git a/injection/common/lazy.py b/injection/common/lazy.py index 6c92783..1dfc0ec 100644 --- a/injection/common/lazy.py +++ b/injection/common/lazy.py @@ -1,12 +1,12 @@ from collections.abc import Callable, Iterator, Mapping -from threading import RLock from types import MappingProxyType from typing import Any, Generic, TypeVar +from injection.common.tools.threading import thread_lock + __all__ = ("Lazy", "LazyMapping") _sentinel = object() -_thread_lock = RLock() _T = TypeVar("_T") _K = TypeVar("_K") @@ -22,7 +22,7 @@ def __init__(self, factory: Callable[[], _T]): def __invert__(self) -> _T: if not self.is_set: - with _thread_lock: + with thread_lock: self.__value = self.__factory() self.__factory = _sentinel diff --git a/injection/common/tools/__init__.py b/injection/common/tools/__init__.py index f677ba5..e69de29 100644 --- a/injection/common/tools/__init__.py +++ b/injection/common/tools/__init__.py @@ -1 +0,0 @@ -from ._type import * diff --git a/injection/common/tools/threading.py b/injection/common/tools/threading.py new file mode 100644 index 0000000..60b888a --- /dev/null +++ b/injection/common/tools/threading.py @@ -0,0 +1,28 @@ +from collections.abc import Callable, Collection, Iterator +from functools import wraps +from threading import RLock +from typing import Any, TypeVar + +__all__ = ("frozen_collection", "synchronized", "thread_lock") + +_T = TypeVar("_T") +thread_lock = RLock() + + +def synchronized(function: Callable[..., Any] = None, /): + def decorator(fn): + @wraps(fn) + def wrapper(*args, **kwargs): + with thread_lock: + return fn(*args, **kwargs) + + return wrapper + + return decorator(function) if function else decorator + + +def frozen_collection(collection: Collection[_T]) -> Iterator[_T]: + with thread_lock: + t = tuple(collection) + + yield from t diff --git a/injection/common/tools/_type.py b/injection/common/tools/type.py similarity index 100% rename from injection/common/tools/_type.py rename to injection/common/tools/type.py diff --git a/injection/core/module.py b/injection/core/module.py index bbefba8..51cf7e1 100644 --- a/injection/core/module.py +++ b/injection/core/module.py @@ -18,7 +18,6 @@ from enum import Enum, auto from functools import partialmethod, singledispatchmethod, wraps from inspect import Signature, isclass -from threading import RLock from types import MappingProxyType, UnionType from typing import ( Any, @@ -33,7 +32,12 @@ from injection.common.event import Event, EventChannel, EventListener from injection.common.lazy import Lazy, LazyMapping -from injection.common.tools import find_types, format_type, get_origins +from injection.common.tools.threading import ( + frozen_collection, + synchronized, + thread_lock, +) +from injection.common.tools.type import find_types, format_type, get_origins from injection.exceptions import ( InjectionError, ModuleError, @@ -45,7 +49,6 @@ __all__ = ("Injectable", "Module", "ModulePriority") _logger = logging.getLogger(__name__) -_thread_lock = RLock() _T = TypeVar("_T") Types = Iterable[type] | UnionType @@ -183,7 +186,7 @@ def get_instance(self) -> _T: with suppress(KeyError): return self.cache[self.__INSTANCE_KEY] - with _thread_lock: + with thread_lock: instance = self.factory() self.cache[self.__INSTANCE_KEY] = instance @@ -263,7 +266,7 @@ def __injectables(self) -> frozenset[Injectable]: def update(self, classes: Iterable[type], injectable: Injectable, override: bool): classes = frozenset(get_origins(*classes)) - with _thread_lock: + with thread_lock: if not injectable: classes -= self.__classes override = True @@ -279,6 +282,7 @@ def update(self, classes: Iterable[type], injectable: Injectable, override: bool return self + @synchronized def unlock(self): for injectable in self.__injectables: injectable.unlock() @@ -349,7 +353,7 @@ def is_locked(self) -> bool: @property def __brokers(self) -> Iterator[Broker]: - yield from tuple(self.__modules) + yield from frozen_collection(self.__modules) yield self.__container def injectable( @@ -492,6 +496,7 @@ def change_priority(self, module: Module, priority: ModulePriority): return self + @synchronized def unlock(self): for broker in self.__brokers: broker.unlock() @@ -544,13 +549,13 @@ def __new_binder(self, target: Callable[..., Any]) -> Binder: @dataclass(repr=False, frozen=True, slots=True) class Dependencies: - __mapping: MappingProxyType[str, Injectable] + mapping: MappingProxyType[str, Injectable] def __bool__(self) -> bool: - return bool(self.__mapping) + return bool(self.mapping) def __iter__(self) -> Iterator[tuple[str, Any]]: - for name, injectable in self.__mapping.items(): + for name, injectable in self.mapping.items(): yield name, injectable.get_instance() @property @@ -559,7 +564,7 @@ def arguments(self) -> OrderedDict[str, Any]: @classmethod def from_mapping(cls, mapping: Mapping[str, Injectable]): - return cls(MappingProxyType(mapping)) + return cls(mapping=MappingProxyType(mapping)) @classmethod def empty(cls): @@ -620,7 +625,7 @@ def bind( return Arguments(bound.args, bound.kwargs) def update(self, module: Module): - with _thread_lock: + with thread_lock: self.__dependencies = Dependencies.resolve(self.__signature, module) return self diff --git a/injection/exceptions.py b/injection/exceptions.py index c9b98a4..8a5d2b1 100644 --- a/injection/exceptions.py +++ b/injection/exceptions.py @@ -1,4 +1,4 @@ -from injection.common.tools import format_type +from injection.common.tools.type import format_type __all__ = ( "InjectionError", diff --git a/poetry.lock b/poetry.lock index 46a59e6..c173753 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. [[package]] name = "annotated-types" @@ -426,13 +426,13 @@ files = [ [[package]] name = "packaging" -version = "23.2" +version = "24.0" description = "Core utilities for Python packages" optional = false python-versions = ">=3.7" files = [ - {file = "packaging-23.2-py3-none-any.whl", hash = "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7"}, - {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"}, + {file = "packaging-24.0-py3-none-any.whl", hash = "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5"}, + {file = "packaging-24.0.tar.gz", hash = "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9"}, ] [[package]] @@ -452,13 +452,13 @@ testing = ["pytest", "pytest-benchmark"] [[package]] name = "pydantic" -version = "2.6.3" +version = "2.6.4" description = "Data validation using Python type hints" optional = false python-versions = ">=3.8" files = [ - {file = "pydantic-2.6.3-py3-none-any.whl", hash = "sha256:72c6034df47f46ccdf81869fddb81aade68056003900a8724a4f160700016a2a"}, - {file = "pydantic-2.6.3.tar.gz", hash = "sha256:e07805c4c7f5c6826e33a1d4c9d47950d7eaf34868e2690f8594d2e30241f11f"}, + {file = "pydantic-2.6.4-py3-none-any.whl", hash = "sha256:cc46fce86607580867bdc3361ad462bab9c222ef042d3da86f2fb333e1d916c5"}, + {file = "pydantic-2.6.4.tar.gz", hash = "sha256:b1704e0847db01817624a6b86766967f552dd9dbf3afba4004409f908dcc84e6"}, ] [package.dependencies] @@ -562,13 +562,13 @@ typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0" [[package]] name = "pytest" -version = "8.0.2" +version = "8.1.1" description = "pytest: simple powerful testing with Python" optional = false python-versions = ">=3.8" files = [ - {file = "pytest-8.0.2-py3-none-any.whl", hash = "sha256:edfaaef32ce5172d5466b5127b42e0d6d35ebbe4453f0e3505d96afd93f6b096"}, - {file = "pytest-8.0.2.tar.gz", hash = "sha256:d4051d623a2e0b7e51960ba963193b09ce6daeb9759a451844a21e4ddedfc1bd"}, + {file = "pytest-8.1.1-py3-none-any.whl", hash = "sha256:2a8386cfc11fa9d2c50ee7b2a57e7d898ef90470a7a34c4b949ff59662bb78b7"}, + {file = "pytest-8.1.1.tar.gz", hash = "sha256:ac978141a75948948817d360297b7aae0fcb9d6ff6bc9ec6d514b85d5a65c044"}, ] [package.dependencies] @@ -576,11 +576,11 @@ colorama = {version = "*", markers = "sys_platform == \"win32\""} exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} iniconfig = "*" packaging = "*" -pluggy = ">=1.3.0,<2.0" -tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""} +pluggy = ">=1.4,<2.0" +tomli = {version = ">=1", markers = "python_version < \"3.11\""} [package.extras] -testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] +testing = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] [[package]] name = "pytest-asyncio" @@ -657,7 +657,6 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, - {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, @@ -705,28 +704,28 @@ files = [ [[package]] name = "ruff" -version = "0.3.1" +version = "0.3.2" description = "An extremely fast Python linter and code formatter, written in Rust." optional = false python-versions = ">=3.7" files = [ - {file = "ruff-0.3.1-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:6b82e3937d0d76554cd5796bc3342a7d40de44494d29ff490022d7a52c501744"}, - {file = "ruff-0.3.1-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ae7954c8f692b70e6a206087ae3988acc9295d84c550f8d90b66c62424c16771"}, - {file = "ruff-0.3.1-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6b730f56ccf91225da0f06cfe421e83b8cc27b2a79393db9c3df02ed7e2bbc01"}, - {file = "ruff-0.3.1-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c78bfa85637668f47bd82aa2ae17de2b34221ac23fea30926f6409f9e37fc927"}, - {file = "ruff-0.3.1-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d6abaad602d6e6daaec444cbf4d9364df0a783e49604c21499f75bb92237d4af"}, - {file = "ruff-0.3.1-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:5f0c21b6914c3c9a25a59497cbb1e5b6c2d8d9beecc9b8e03ee986e24eee072e"}, - {file = "ruff-0.3.1-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:434c3fc72e6311c85cd143c4c448b0e60e025a9ac1781e63ba222579a8c29200"}, - {file = "ruff-0.3.1-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:78a7025e6312cbba496341da5062e7cdd47d95f45c1b903e635cdeb1ba5ec2b9"}, - {file = "ruff-0.3.1-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:52b02bb46f1a79b0c1fa93f6495bc7e77e4ef76e6c28995b4974a20ed09c0833"}, - {file = "ruff-0.3.1-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:11b5699c42f7d0b771c633d620f2cb22e727fb226273aba775a91784a9ed856c"}, - {file = "ruff-0.3.1-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:54e5dca3e411772b51194b3102b5f23b36961e8ede463776b289b78180df71a0"}, - {file = "ruff-0.3.1-py3-none-musllinux_1_2_i686.whl", hash = "sha256:951efb610c5844e668bbec4f71cf704f8645cf3106e13f283413969527ebfded"}, - {file = "ruff-0.3.1-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:09c7333b25e983aabcf6e38445252cff0b4745420fc3bda45b8fce791cc7e9ce"}, - {file = "ruff-0.3.1-py3-none-win32.whl", hash = "sha256:d937f9b99ebf346e0606c3faf43c1e297a62ad221d87ef682b5bdebe199e01f6"}, - {file = "ruff-0.3.1-py3-none-win_amd64.whl", hash = "sha256:c0318a512edc9f4e010bbaab588b5294e78c5cdc9b02c3d8ab2d77c7ae1903e3"}, - {file = "ruff-0.3.1-py3-none-win_arm64.whl", hash = "sha256:d3b60e44240f7e903e6dbae3139a65032ea4c6f2ad99b6265534ff1b83c20afa"}, - {file = "ruff-0.3.1.tar.gz", hash = "sha256:d30db97141fc2134299e6e983a6727922c9e03c031ae4883a6d69461de722ae7"}, + {file = "ruff-0.3.2-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:77f2612752e25f730da7421ca5e3147b213dca4f9a0f7e0b534e9562c5441f01"}, + {file = "ruff-0.3.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:9966b964b2dd1107797be9ca7195002b874424d1d5472097701ae8f43eadef5d"}, + {file = "ruff-0.3.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b83d17ff166aa0659d1e1deaf9f2f14cbe387293a906de09bc4860717eb2e2da"}, + {file = "ruff-0.3.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:bb875c6cc87b3703aeda85f01c9aebdce3d217aeaca3c2e52e38077383f7268a"}, + {file = "ruff-0.3.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:be75e468a6a86426430373d81c041b7605137a28f7014a72d2fc749e47f572aa"}, + {file = "ruff-0.3.2-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:967978ac2d4506255e2f52afe70dda023fc602b283e97685c8447d036863a302"}, + {file = "ruff-0.3.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1231eacd4510f73222940727ac927bc5d07667a86b0cbe822024dd00343e77e9"}, + {file = "ruff-0.3.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2c6d613b19e9a8021be2ee1d0e27710208d1603b56f47203d0abbde906929a9b"}, + {file = "ruff-0.3.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c8439338a6303585d27b66b4626cbde89bb3e50fa3cae86ce52c1db7449330a7"}, + {file = "ruff-0.3.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:de8b480d8379620cbb5ea466a9e53bb467d2fb07c7eca54a4aa8576483c35d36"}, + {file = "ruff-0.3.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:b74c3de9103bd35df2bb05d8b2899bf2dbe4efda6474ea9681280648ec4d237d"}, + {file = "ruff-0.3.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:f380be9fc15a99765c9cf316b40b9da1f6ad2ab9639e551703e581a5e6da6745"}, + {file = "ruff-0.3.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:0ac06a3759c3ab9ef86bbeca665d31ad3aa9a4b1c17684aadb7e61c10baa0df4"}, + {file = "ruff-0.3.2-py3-none-win32.whl", hash = "sha256:9bd640a8f7dd07a0b6901fcebccedadeb1a705a50350fb86b4003b805c81385a"}, + {file = "ruff-0.3.2-py3-none-win_amd64.whl", hash = "sha256:0c1bdd9920cab5707c26c8b3bf33a064a4ca7842d91a99ec0634fec68f9f4037"}, + {file = "ruff-0.3.2-py3-none-win_arm64.whl", hash = "sha256:5f65103b1d76e0d600cabd577b04179ff592064eaa451a70a81085930e907d0b"}, + {file = "ruff-0.3.2.tar.gz", hash = "sha256:fa78ec9418eb1ca3db392811df3376b46471ae93792a81af2d1cbb0e5dcb5142"}, ] [[package]]