modern-di 0.2.0__py3-none-any.whl → 0.3.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of modern-di might be problematic. Click here for more details.
- modern_di/__init__.py +1 -1
- modern_di/container.py +32 -24
- modern_di/graph.py +12 -12
- modern_di/{resolver_state.py → provider_state.py} +3 -3
- modern_di/providers/__init__.py +15 -0
- modern_di/{resolvers → providers}/base.py +12 -12
- modern_di/providers/context_adapter.py +31 -0
- modern_di/{resolvers → providers}/factory.py +5 -5
- modern_di/{resolvers → providers}/resource.py +25 -25
- modern_di/providers/singleton.py +56 -0
- {modern_di-0.2.0.dist-info → modern_di-0.3.0.dist-info}/METADATA +2 -3
- modern_di-0.3.0.dist-info/RECORD +16 -0
- modern_di/resolvers/__init__.py +0 -13
- modern_di/resolvers/singleton.py +0 -56
- modern_di-0.2.0.dist-info/RECORD +0 -15
- {modern_di-0.2.0.dist-info → modern_di-0.3.0.dist-info}/WHEEL +0 -0
- {modern_di-0.2.0.dist-info → modern_di-0.3.0.dist-info}/licenses/LICENSE +0 -0
modern_di/__init__.py
CHANGED
modern_di/container.py
CHANGED
|
@@ -3,7 +3,7 @@ import enum
|
|
|
3
3
|
import types
|
|
4
4
|
import typing
|
|
5
5
|
|
|
6
|
-
from modern_di.
|
|
6
|
+
from modern_di.provider_state import ProviderState
|
|
7
7
|
|
|
8
8
|
|
|
9
9
|
if typing.TYPE_CHECKING:
|
|
@@ -14,29 +14,37 @@ T_co = typing.TypeVar("T_co", covariant=True)
|
|
|
14
14
|
|
|
15
15
|
|
|
16
16
|
class Container(contextlib.AbstractAsyncContextManager["Container"]):
|
|
17
|
-
__slots__ = "scope", "parent_container", "_is_async", "
|
|
17
|
+
__slots__ = "scope", "parent_container", "context", "_is_async", "_provider_states", "_overrides"
|
|
18
18
|
|
|
19
|
-
def __init__(
|
|
19
|
+
def __init__(
|
|
20
|
+
self,
|
|
21
|
+
*,
|
|
22
|
+
scope: enum.IntEnum,
|
|
23
|
+
parent_container: typing.Optional["Container"] = None,
|
|
24
|
+
context: dict[str, typing.Any] | None = None,
|
|
25
|
+
) -> None:
|
|
20
26
|
if scope.value != 1 and parent_container is None:
|
|
21
27
|
msg = "Only first scope can be used without parent_container"
|
|
22
28
|
raise RuntimeError(msg)
|
|
23
29
|
|
|
24
30
|
self.scope = scope
|
|
25
31
|
self.parent_container = parent_container
|
|
32
|
+
self.context: dict[str, typing.Any] = context or {}
|
|
26
33
|
self._is_async: bool | None = None
|
|
27
|
-
self.
|
|
34
|
+
self._provider_states: dict[str, ProviderState[typing.Any]] = {}
|
|
28
35
|
self._overrides: dict[str, typing.Any] = {}
|
|
29
36
|
|
|
30
37
|
def _exit(self) -> None:
|
|
31
38
|
self._is_async = None
|
|
32
|
-
self.
|
|
39
|
+
self._provider_states = {}
|
|
40
|
+
self._overrides = {}
|
|
33
41
|
|
|
34
42
|
def _check_entered(self) -> None:
|
|
35
43
|
if self._is_async is None:
|
|
36
44
|
msg = "Enter the context first"
|
|
37
45
|
raise RuntimeError(msg)
|
|
38
46
|
|
|
39
|
-
def build_child_container(self) -> "typing_extensions.Self":
|
|
47
|
+
def build_child_container(self, context: dict[str, typing.Any] | None = None) -> "typing_extensions.Self":
|
|
40
48
|
self._check_entered()
|
|
41
49
|
|
|
42
50
|
try:
|
|
@@ -45,7 +53,7 @@ class Container(contextlib.AbstractAsyncContextManager["Container"]):
|
|
|
45
53
|
msg = f"Max scope is reached, {self.scope.name}"
|
|
46
54
|
raise RuntimeError(msg) from exc
|
|
47
55
|
|
|
48
|
-
return self.__class__(scope=new_scope, parent_container=self)
|
|
56
|
+
return self.__class__(scope=new_scope, parent_container=self, context=context)
|
|
49
57
|
|
|
50
58
|
def find_container(self, scope: enum.IntEnum) -> "typing_extensions.Self":
|
|
51
59
|
container = self
|
|
@@ -53,30 +61,30 @@ class Container(contextlib.AbstractAsyncContextManager["Container"]):
|
|
|
53
61
|
container = typing.cast("typing_extensions.Self", container.parent_container)
|
|
54
62
|
return container
|
|
55
63
|
|
|
56
|
-
def
|
|
57
|
-
self,
|
|
58
|
-
) ->
|
|
64
|
+
def fetch_provider_state(
|
|
65
|
+
self, provider_id: str, is_async_resource: bool = False, is_lock_required: bool = False
|
|
66
|
+
) -> ProviderState[typing.Any]:
|
|
59
67
|
self._check_entered()
|
|
60
68
|
if is_async_resource and self._is_async is False:
|
|
61
69
|
msg = "Resolving async resource in sync container is not allowed"
|
|
62
70
|
raise RuntimeError(msg)
|
|
63
71
|
|
|
64
|
-
if
|
|
65
|
-
self.
|
|
72
|
+
if provider_id not in self._provider_states:
|
|
73
|
+
self._provider_states[provider_id] = ProviderState(is_lock_required=is_lock_required)
|
|
66
74
|
|
|
67
|
-
return self.
|
|
75
|
+
return self._provider_states[provider_id]
|
|
68
76
|
|
|
69
|
-
def override(self,
|
|
70
|
-
self._overrides[
|
|
77
|
+
def override(self, provider_id: str, override_object: object) -> None:
|
|
78
|
+
self._overrides[provider_id] = override_object
|
|
71
79
|
|
|
72
|
-
def fetch_override(self,
|
|
73
|
-
return self._overrides.get(
|
|
80
|
+
def fetch_override(self, provider_id: str) -> object | None:
|
|
81
|
+
return self._overrides.get(provider_id)
|
|
74
82
|
|
|
75
|
-
def reset_override(self,
|
|
76
|
-
if
|
|
83
|
+
def reset_override(self, provider_id: str | None = None) -> None:
|
|
84
|
+
if provider_id is None:
|
|
77
85
|
self._overrides = {}
|
|
78
86
|
else:
|
|
79
|
-
self._overrides.pop(
|
|
87
|
+
self._overrides.pop(provider_id, None)
|
|
80
88
|
|
|
81
89
|
async def __aenter__(self) -> "Container":
|
|
82
90
|
self._is_async = True
|
|
@@ -89,8 +97,8 @@ class Container(contextlib.AbstractAsyncContextManager["Container"]):
|
|
|
89
97
|
traceback: types.TracebackType | None,
|
|
90
98
|
) -> None:
|
|
91
99
|
self._check_entered()
|
|
92
|
-
for
|
|
93
|
-
await
|
|
100
|
+
for provider_state in reversed(self._provider_states.values()):
|
|
101
|
+
await provider_state.async_tear_down()
|
|
94
102
|
self._exit()
|
|
95
103
|
|
|
96
104
|
def __enter__(self) -> "Container":
|
|
@@ -104,6 +112,6 @@ class Container(contextlib.AbstractAsyncContextManager["Container"]):
|
|
|
104
112
|
traceback: types.TracebackType | None,
|
|
105
113
|
) -> None:
|
|
106
114
|
self._check_entered()
|
|
107
|
-
for
|
|
108
|
-
|
|
115
|
+
for provider_state in reversed(self._provider_states.values()):
|
|
116
|
+
provider_state.sync_tear_down()
|
|
109
117
|
self._exit()
|
modern_di/graph.py
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import typing
|
|
2
2
|
|
|
3
3
|
from modern_di import Container
|
|
4
|
-
from modern_di.
|
|
4
|
+
from modern_di.providers import AbstractProvider, BaseCreatorProvider
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
if typing.TYPE_CHECKING:
|
|
@@ -13,27 +13,27 @@ P = typing.ParamSpec("P")
|
|
|
13
13
|
|
|
14
14
|
|
|
15
15
|
class BaseGraph:
|
|
16
|
-
|
|
16
|
+
providers: dict[str, AbstractProvider[typing.Any]]
|
|
17
17
|
|
|
18
18
|
def __new__(cls, *_: typing.Any, **__: typing.Any) -> "typing_extensions.Self": # noqa: ANN401
|
|
19
19
|
msg = f"{cls.__name__} cannot not be instantiated"
|
|
20
20
|
raise RuntimeError(msg)
|
|
21
21
|
|
|
22
22
|
@classmethod
|
|
23
|
-
def
|
|
24
|
-
if not hasattr(cls, "
|
|
25
|
-
cls.
|
|
23
|
+
def get_providers(cls) -> dict[str, AbstractProvider[typing.Any]]:
|
|
24
|
+
if not hasattr(cls, "providers"):
|
|
25
|
+
cls.providers = {k: v for k, v in cls.__dict__.items() if isinstance(v, AbstractProvider)}
|
|
26
26
|
|
|
27
|
-
return cls.
|
|
27
|
+
return cls.providers
|
|
28
28
|
|
|
29
29
|
@classmethod
|
|
30
30
|
async def async_resolve_creators(cls, container: Container) -> None:
|
|
31
|
-
for
|
|
32
|
-
if isinstance(
|
|
33
|
-
await
|
|
31
|
+
for provider in cls.get_providers().values():
|
|
32
|
+
if isinstance(provider, BaseCreatorProvider) and provider.scope == container.scope:
|
|
33
|
+
await provider.async_resolve(container)
|
|
34
34
|
|
|
35
35
|
@classmethod
|
|
36
36
|
def sync_resolve_creators(cls, container: Container) -> None:
|
|
37
|
-
for
|
|
38
|
-
if isinstance(
|
|
39
|
-
|
|
37
|
+
for provider in cls.get_providers().values():
|
|
38
|
+
if isinstance(provider, BaseCreatorProvider) and provider.scope == container.scope:
|
|
39
|
+
provider.sync_resolve(container)
|
|
@@ -6,13 +6,13 @@ import typing
|
|
|
6
6
|
T_co = typing.TypeVar("T_co", covariant=True)
|
|
7
7
|
|
|
8
8
|
|
|
9
|
-
class
|
|
10
|
-
__slots__ = "context_stack", "instance", "
|
|
9
|
+
class ProviderState(typing.Generic[T_co]):
|
|
10
|
+
__slots__ = "context_stack", "instance", "provider_lock"
|
|
11
11
|
|
|
12
12
|
def __init__(self, is_lock_required: bool) -> None:
|
|
13
13
|
self.context_stack: contextlib.AsyncExitStack | contextlib.ExitStack | None = None
|
|
14
14
|
self.instance: T_co | None = None
|
|
15
|
-
self.
|
|
15
|
+
self.provider_lock: typing.Final = asyncio.Lock() if is_lock_required else None
|
|
16
16
|
|
|
17
17
|
async def async_tear_down(self) -> None:
|
|
18
18
|
if self.context_stack is None:
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
from modern_di.providers.base import AbstractProvider, BaseCreatorProvider
|
|
2
|
+
from modern_di.providers.context_adapter import ContextAdapter
|
|
3
|
+
from modern_di.providers.factory import Factory
|
|
4
|
+
from modern_di.providers.resource import Resource
|
|
5
|
+
from modern_di.providers.singleton import Singleton
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
__all__ = [
|
|
9
|
+
"AbstractProvider",
|
|
10
|
+
"BaseCreatorProvider",
|
|
11
|
+
"ContextAdapter",
|
|
12
|
+
"Factory",
|
|
13
|
+
"Singleton",
|
|
14
|
+
"Resource",
|
|
15
|
+
]
|
|
@@ -12,12 +12,12 @@ R = typing.TypeVar("R")
|
|
|
12
12
|
P = typing.ParamSpec("P")
|
|
13
13
|
|
|
14
14
|
|
|
15
|
-
class
|
|
16
|
-
BASE_SLOTS: typing.ClassVar = ["scope", "
|
|
15
|
+
class AbstractProvider(typing.Generic[T_co], abc.ABC):
|
|
16
|
+
BASE_SLOTS: typing.ClassVar = ["scope", "provider_id"]
|
|
17
17
|
|
|
18
18
|
def __init__(self, scope: enum.IntEnum) -> None:
|
|
19
19
|
self.scope = scope
|
|
20
|
-
self.
|
|
20
|
+
self.provider_id: typing.Final = str(uuid.uuid4())
|
|
21
21
|
|
|
22
22
|
@abc.abstractmethod
|
|
23
23
|
async def async_resolve(self, container: Container) -> T_co:
|
|
@@ -28,18 +28,18 @@ class AbstractResolver(typing.Generic[T_co], abc.ABC):
|
|
|
28
28
|
"""Resolve dependency synchronously."""
|
|
29
29
|
|
|
30
30
|
def override(self, override_object: object, container: Container) -> None:
|
|
31
|
-
container.override(self.
|
|
31
|
+
container.override(self.provider_id, override_object)
|
|
32
32
|
|
|
33
33
|
def reset_override(self, container: Container) -> None:
|
|
34
|
-
container.reset_override(self.
|
|
34
|
+
container.reset_override(self.provider_id)
|
|
35
35
|
|
|
36
36
|
@property
|
|
37
37
|
def cast(self) -> T_co:
|
|
38
38
|
return typing.cast(T_co, self)
|
|
39
39
|
|
|
40
40
|
|
|
41
|
-
class
|
|
42
|
-
BASE_SLOTS: typing.ClassVar = [*
|
|
41
|
+
class BaseCreatorProvider(AbstractProvider[T_co], abc.ABC):
|
|
42
|
+
BASE_SLOTS: typing.ClassVar = [*AbstractProvider.BASE_SLOTS, "_args", "_kwargs", "_creator"]
|
|
43
43
|
|
|
44
44
|
def __init__(
|
|
45
45
|
self,
|
|
@@ -50,7 +50,7 @@ class BaseCreatorResolver(AbstractResolver[T_co], abc.ABC):
|
|
|
50
50
|
) -> None:
|
|
51
51
|
super().__init__(scope)
|
|
52
52
|
|
|
53
|
-
if any(x.scope > self.scope for x in itertools.chain(args, kwargs.values()) if isinstance(x,
|
|
53
|
+
if any(x.scope > self.scope for x in itertools.chain(args, kwargs.values()) if isinstance(x, AbstractProvider)):
|
|
54
54
|
msg = "Scope of dependency cannot be more than scope of dependent"
|
|
55
55
|
raise RuntimeError(msg)
|
|
56
56
|
|
|
@@ -61,12 +61,12 @@ class BaseCreatorResolver(AbstractResolver[T_co], abc.ABC):
|
|
|
61
61
|
def _sync_build_creator(self, container: Container) -> typing.Any: # noqa: ANN401
|
|
62
62
|
return self._creator(
|
|
63
63
|
*typing.cast(
|
|
64
|
-
P.args, [x.sync_resolve(container) if isinstance(x,
|
|
64
|
+
P.args, [x.sync_resolve(container) if isinstance(x, AbstractProvider) else x for x in self._args]
|
|
65
65
|
),
|
|
66
66
|
**typing.cast(
|
|
67
67
|
P.kwargs,
|
|
68
68
|
{
|
|
69
|
-
k: v.sync_resolve(container) if isinstance(v,
|
|
69
|
+
k: v.sync_resolve(container) if isinstance(v, AbstractProvider) else v
|
|
70
70
|
for k, v in self._kwargs.items()
|
|
71
71
|
},
|
|
72
72
|
),
|
|
@@ -76,12 +76,12 @@ class BaseCreatorResolver(AbstractResolver[T_co], abc.ABC):
|
|
|
76
76
|
return self._creator(
|
|
77
77
|
*typing.cast(
|
|
78
78
|
P.args,
|
|
79
|
-
[await x.async_resolve(container) if isinstance(x,
|
|
79
|
+
[await x.async_resolve(container) if isinstance(x, AbstractProvider) else x for x in self._args],
|
|
80
80
|
),
|
|
81
81
|
**typing.cast(
|
|
82
82
|
P.kwargs,
|
|
83
83
|
{
|
|
84
|
-
k: await v.async_resolve(container) if isinstance(v,
|
|
84
|
+
k: await v.async_resolve(container) if isinstance(v, AbstractProvider) else v
|
|
85
85
|
for k, v in self._kwargs.items()
|
|
86
86
|
},
|
|
87
87
|
),
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import enum
|
|
2
|
+
import typing
|
|
3
|
+
|
|
4
|
+
from modern_di import Container
|
|
5
|
+
from modern_di.providers import AbstractProvider
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
T_co = typing.TypeVar("T_co", covariant=True)
|
|
9
|
+
P = typing.ParamSpec("P")
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
class ContextAdapter(AbstractProvider[T_co]):
|
|
13
|
+
__slots__ = [*AbstractProvider.BASE_SLOTS, "_function"]
|
|
14
|
+
|
|
15
|
+
def __init__(
|
|
16
|
+
self,
|
|
17
|
+
scope: enum.IntEnum,
|
|
18
|
+
function: typing.Callable[..., T_co],
|
|
19
|
+
) -> None:
|
|
20
|
+
super().__init__(scope)
|
|
21
|
+
self._function = function
|
|
22
|
+
|
|
23
|
+
async def async_resolve(self, container: Container) -> T_co:
|
|
24
|
+
return self.sync_resolve(container)
|
|
25
|
+
|
|
26
|
+
def sync_resolve(self, container: Container) -> T_co:
|
|
27
|
+
container = container.find_container(self.scope)
|
|
28
|
+
if (override := container.fetch_override(self.provider_id)) is not None:
|
|
29
|
+
return typing.cast(T_co, override)
|
|
30
|
+
|
|
31
|
+
return self._function(**container.context)
|
|
@@ -2,15 +2,15 @@ import enum
|
|
|
2
2
|
import typing
|
|
3
3
|
|
|
4
4
|
from modern_di import Container
|
|
5
|
-
from modern_di.
|
|
5
|
+
from modern_di.providers import BaseCreatorProvider
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
T_co = typing.TypeVar("T_co", covariant=True)
|
|
9
9
|
P = typing.ParamSpec("P")
|
|
10
10
|
|
|
11
11
|
|
|
12
|
-
class Factory(
|
|
13
|
-
__slots__ = [*
|
|
12
|
+
class Factory(BaseCreatorProvider[T_co]):
|
|
13
|
+
__slots__ = [*BaseCreatorProvider.BASE_SLOTS, "_creator"]
|
|
14
14
|
|
|
15
15
|
def __init__(
|
|
16
16
|
self,
|
|
@@ -23,14 +23,14 @@ class Factory(BaseCreatorResolver[T_co]):
|
|
|
23
23
|
|
|
24
24
|
async def async_resolve(self, container: Container) -> T_co:
|
|
25
25
|
container = container.find_container(self.scope)
|
|
26
|
-
if (override := container.fetch_override(self.
|
|
26
|
+
if (override := container.fetch_override(self.provider_id)) is not None:
|
|
27
27
|
return typing.cast(T_co, override)
|
|
28
28
|
|
|
29
29
|
return typing.cast(T_co, await self._async_build_creator(container))
|
|
30
30
|
|
|
31
31
|
def sync_resolve(self, container: Container) -> T_co:
|
|
32
32
|
container = container.find_container(self.scope)
|
|
33
|
-
if (override := container.fetch_override(self.
|
|
33
|
+
if (override := container.fetch_override(self.provider_id)) is not None:
|
|
34
34
|
return typing.cast(T_co, override)
|
|
35
35
|
|
|
36
36
|
return typing.cast(T_co, self._sync_build_creator(container))
|
|
@@ -4,15 +4,15 @@ import inspect
|
|
|
4
4
|
import typing
|
|
5
5
|
|
|
6
6
|
from modern_di import Container
|
|
7
|
-
from modern_di.
|
|
7
|
+
from modern_di.providers import BaseCreatorProvider
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
T_co = typing.TypeVar("T_co", covariant=True)
|
|
11
11
|
P = typing.ParamSpec("P")
|
|
12
12
|
|
|
13
13
|
|
|
14
|
-
class Resource(
|
|
15
|
-
__slots__ = [*
|
|
14
|
+
class Resource(BaseCreatorProvider[T_co]):
|
|
15
|
+
__slots__ = [*BaseCreatorProvider.BASE_SLOTS, "_creator", "_args", "_kwargs", "_is_async"]
|
|
16
16
|
|
|
17
17
|
def _is_creator_async(
|
|
18
18
|
self,
|
|
@@ -42,43 +42,43 @@ class Resource(BaseCreatorResolver[T_co]):
|
|
|
42
42
|
|
|
43
43
|
async def async_resolve(self, container: Container) -> T_co:
|
|
44
44
|
container = container.find_container(self.scope)
|
|
45
|
-
if (override := container.fetch_override(self.
|
|
45
|
+
if (override := container.fetch_override(self.provider_id)) is not None:
|
|
46
46
|
return typing.cast(T_co, override)
|
|
47
47
|
|
|
48
|
-
|
|
49
|
-
self.
|
|
48
|
+
provider_state = container.fetch_provider_state(
|
|
49
|
+
self.provider_id, is_async_resource=self._is_async, is_lock_required=True
|
|
50
50
|
)
|
|
51
|
-
if
|
|
52
|
-
return typing.cast(T_co,
|
|
51
|
+
if provider_state.instance is not None:
|
|
52
|
+
return typing.cast(T_co, provider_state.instance)
|
|
53
53
|
|
|
54
|
-
assert
|
|
55
|
-
await
|
|
54
|
+
assert provider_state.provider_lock
|
|
55
|
+
await provider_state.provider_lock.acquire()
|
|
56
56
|
|
|
57
57
|
try:
|
|
58
|
-
if
|
|
59
|
-
return typing.cast(T_co,
|
|
58
|
+
if provider_state.instance is not None:
|
|
59
|
+
return typing.cast(T_co, provider_state.instance)
|
|
60
60
|
|
|
61
61
|
_intermediate_ = await self._async_build_creator(container)
|
|
62
62
|
|
|
63
63
|
if self._is_creator_async(self._creator): # type: ignore[arg-type]
|
|
64
|
-
|
|
65
|
-
|
|
64
|
+
provider_state.context_stack = contextlib.AsyncExitStack()
|
|
65
|
+
provider_state.instance = await provider_state.context_stack.enter_async_context(_intermediate_)
|
|
66
66
|
else:
|
|
67
|
-
|
|
68
|
-
|
|
67
|
+
provider_state.context_stack = contextlib.ExitStack()
|
|
68
|
+
provider_state.instance = provider_state.context_stack.enter_context(_intermediate_)
|
|
69
69
|
finally:
|
|
70
|
-
|
|
70
|
+
provider_state.provider_lock.release()
|
|
71
71
|
|
|
72
|
-
return typing.cast(T_co,
|
|
72
|
+
return typing.cast(T_co, provider_state.instance)
|
|
73
73
|
|
|
74
74
|
def sync_resolve(self, container: Container) -> T_co:
|
|
75
75
|
container = container.find_container(self.scope)
|
|
76
|
-
if (override := container.fetch_override(self.
|
|
76
|
+
if (override := container.fetch_override(self.provider_id)) is not None:
|
|
77
77
|
return typing.cast(T_co, override)
|
|
78
78
|
|
|
79
|
-
|
|
80
|
-
if
|
|
81
|
-
return typing.cast(T_co,
|
|
79
|
+
provider_state = container.fetch_provider_state(self.provider_id)
|
|
80
|
+
if provider_state.instance is not None:
|
|
81
|
+
return typing.cast(T_co, provider_state.instance)
|
|
82
82
|
|
|
83
83
|
if self._is_async:
|
|
84
84
|
msg = "Async resource cannot be resolved synchronously"
|
|
@@ -86,9 +86,9 @@ class Resource(BaseCreatorResolver[T_co]):
|
|
|
86
86
|
|
|
87
87
|
_intermediate_ = self._sync_build_creator(container)
|
|
88
88
|
|
|
89
|
-
|
|
90
|
-
|
|
89
|
+
provider_state.context_stack = contextlib.ExitStack()
|
|
90
|
+
provider_state.instance = provider_state.context_stack.enter_context(
|
|
91
91
|
typing.cast(contextlib.AbstractContextManager[typing.Any], _intermediate_)
|
|
92
92
|
)
|
|
93
93
|
|
|
94
|
-
return typing.cast(T_co,
|
|
94
|
+
return typing.cast(T_co, provider_state.instance)
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import enum
|
|
2
|
+
import typing
|
|
3
|
+
|
|
4
|
+
from modern_di import Container
|
|
5
|
+
from modern_di.providers import BaseCreatorProvider
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
T_co = typing.TypeVar("T_co", covariant=True)
|
|
9
|
+
P = typing.ParamSpec("P")
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
class Singleton(BaseCreatorProvider[T_co]):
|
|
13
|
+
__slots__ = [*BaseCreatorProvider.BASE_SLOTS, "_creator"]
|
|
14
|
+
|
|
15
|
+
def __init__(
|
|
16
|
+
self,
|
|
17
|
+
scope: enum.IntEnum,
|
|
18
|
+
creator: typing.Callable[P, T_co],
|
|
19
|
+
*args: P.args,
|
|
20
|
+
**kwargs: P.kwargs,
|
|
21
|
+
) -> None:
|
|
22
|
+
super().__init__(scope, creator, *args, **kwargs)
|
|
23
|
+
|
|
24
|
+
async def async_resolve(self, container: Container) -> T_co:
|
|
25
|
+
container = container.find_container(self.scope)
|
|
26
|
+
if (override := container.fetch_override(self.provider_id)) is not None:
|
|
27
|
+
return typing.cast(T_co, override)
|
|
28
|
+
|
|
29
|
+
provider_state = container.fetch_provider_state(self.provider_id, is_lock_required=True)
|
|
30
|
+
if provider_state.instance is not None:
|
|
31
|
+
return typing.cast(T_co, provider_state.instance)
|
|
32
|
+
|
|
33
|
+
assert provider_state.provider_lock
|
|
34
|
+
await provider_state.provider_lock.acquire()
|
|
35
|
+
|
|
36
|
+
try:
|
|
37
|
+
if provider_state.instance is not None:
|
|
38
|
+
return typing.cast(T_co, provider_state.instance)
|
|
39
|
+
|
|
40
|
+
provider_state.instance = typing.cast(T_co, await self._async_build_creator(container))
|
|
41
|
+
finally:
|
|
42
|
+
provider_state.provider_lock.release()
|
|
43
|
+
|
|
44
|
+
return provider_state.instance
|
|
45
|
+
|
|
46
|
+
def sync_resolve(self, container: Container) -> T_co:
|
|
47
|
+
container = container.find_container(self.scope)
|
|
48
|
+
if (override := container.fetch_override(self.provider_id)) is not None:
|
|
49
|
+
return typing.cast(T_co, override)
|
|
50
|
+
|
|
51
|
+
provider_state = container.fetch_provider_state(self.provider_id)
|
|
52
|
+
if provider_state.instance is not None:
|
|
53
|
+
return typing.cast(T_co, provider_state.instance)
|
|
54
|
+
|
|
55
|
+
provider_state.instance = self._sync_build_creator(container)
|
|
56
|
+
return typing.cast(T_co, provider_state.instance)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.3
|
|
2
2
|
Name: modern-di
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.3.0
|
|
4
4
|
Summary: Dependency Injection framework with IOC-container and scopes
|
|
5
5
|
Project-URL: repository, https://github.com/modern-python/modern-di
|
|
6
6
|
Project-URL: docs, https://modern-di.readthedocs.io
|
|
@@ -19,7 +19,6 @@ Description-Content-Type: text/markdown
|
|
|
19
19
|
|
|
20
20
|
"Modern-DI"
|
|
21
21
|
==
|
|
22
|
-
[](https://codecov.io/gh/modern-python/modern-di)
|
|
23
22
|
[](https://mypy.readthedocs.io/en/stable/getting_started.html#strict-mode-and-configuration)
|
|
24
23
|
[](https://pypi.python.org/pypi/modern-di)
|
|
25
24
|
[](https://pypistats.org/packages/modern-di)
|
|
@@ -27,7 +26,7 @@ Description-Content-Type: text/markdown
|
|
|
27
26
|
|
|
28
27
|
Dependency injection framework for Python inspired by `dependency-injector` and `dishka`.
|
|
29
28
|
|
|
30
|
-
It is
|
|
29
|
+
It is in early development state and gives you the following:
|
|
31
30
|
- DI framework with IOC-container and scopes.
|
|
32
31
|
- Async and sync resolving.
|
|
33
32
|
- Python 3.10-3.13 support.
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
modern_di/__init__.py,sha256=L01VkzSJiV0d0FPrh1DZ-Wy5mUmoG6X-oLz7xYxtehI,194
|
|
2
|
+
modern_di/container.py,sha256=xAUiQ10nI_a0NcvedHJ-IFCBzr3HG7TtuJ6mwPiVhmA,3998
|
|
3
|
+
modern_di/graph.py,sha256=TaFlc7So3aGRjmv6XXVz4CawNCIadoWuTun4OPRC27M,1335
|
|
4
|
+
modern_di/provider_state.py,sha256=5Bl_iYEpXjMqoWZJ4op2-axo4Z8nR_vYbLVHL_u5R0c,1206
|
|
5
|
+
modern_di/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
6
|
+
modern_di/scope.py,sha256=nnrTLnFT_dMDLVIwvJHcGlJsB2k1WIHusrRSGQIMEsg,97
|
|
7
|
+
modern_di/providers/__init__.py,sha256=n389r5MlYTaVQ5nFYsy_keZqLasnW6uOKRYj0_F-aoY,425
|
|
8
|
+
modern_di/providers/base.py,sha256=-cXfJdb8_XpiZjxYw_c9vDD3YY6FSH1jAokynApYeX0,2897
|
|
9
|
+
modern_di/providers/context_adapter.py,sha256=61SmY7jAx0d0akdREmDhYjeFJUeiBB0zghxPyd2-Ads,885
|
|
10
|
+
modern_di/providers/factory.py,sha256=tx2Inik1IqQcDY8gsbQ1jWZf7hCuJbw_XC9h-RKxRVw,1164
|
|
11
|
+
modern_di/providers/resource.py,sha256=my4hDJ1i-PZTCDWTC1WT7Cd66ki-d2b61nVdfLG-vPQ,3628
|
|
12
|
+
modern_di/providers/singleton.py,sha256=30K2JOXSV3h_aPckXTIC9g5iGNmOfZpoBOeEX9RtYu4,1978
|
|
13
|
+
modern_di-0.3.0.dist-info/METADATA,sha256=Dc-vTMRaGuk3GFOBjbjD9XPkxM7bpK2HDKynKBBUEJo,1715
|
|
14
|
+
modern_di-0.3.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
|
|
15
|
+
modern_di-0.3.0.dist-info/licenses/LICENSE,sha256=aA5_eJwDKqnGvL7PbkPb9x5f-VGIqZ9cvWWkeGqeD90,1070
|
|
16
|
+
modern_di-0.3.0.dist-info/RECORD,,
|
modern_di/resolvers/__init__.py
DELETED
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
from modern_di.resolvers.base import AbstractResolver, BaseCreatorResolver
|
|
2
|
-
from modern_di.resolvers.factory import Factory
|
|
3
|
-
from modern_di.resolvers.resource import Resource
|
|
4
|
-
from modern_di.resolvers.singleton import Singleton
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
__all__ = [
|
|
8
|
-
"AbstractResolver",
|
|
9
|
-
"BaseCreatorResolver",
|
|
10
|
-
"Factory",
|
|
11
|
-
"Singleton",
|
|
12
|
-
"Resource",
|
|
13
|
-
]
|
modern_di/resolvers/singleton.py
DELETED
|
@@ -1,56 +0,0 @@
|
|
|
1
|
-
import enum
|
|
2
|
-
import typing
|
|
3
|
-
|
|
4
|
-
from modern_di import Container
|
|
5
|
-
from modern_di.resolvers import BaseCreatorResolver
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
T_co = typing.TypeVar("T_co", covariant=True)
|
|
9
|
-
P = typing.ParamSpec("P")
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
class Singleton(BaseCreatorResolver[T_co]):
|
|
13
|
-
__slots__ = [*BaseCreatorResolver.BASE_SLOTS, "_creator"]
|
|
14
|
-
|
|
15
|
-
def __init__(
|
|
16
|
-
self,
|
|
17
|
-
scope: enum.IntEnum,
|
|
18
|
-
creator: typing.Callable[P, T_co],
|
|
19
|
-
*args: P.args,
|
|
20
|
-
**kwargs: P.kwargs,
|
|
21
|
-
) -> None:
|
|
22
|
-
super().__init__(scope, creator, *args, **kwargs)
|
|
23
|
-
|
|
24
|
-
async def async_resolve(self, container: Container) -> T_co:
|
|
25
|
-
container = container.find_container(self.scope)
|
|
26
|
-
if (override := container.fetch_override(self.resolver_id)) is not None:
|
|
27
|
-
return typing.cast(T_co, override)
|
|
28
|
-
|
|
29
|
-
resolver_state = container.fetch_resolver_state(self.resolver_id, is_lock_required=True)
|
|
30
|
-
if resolver_state.instance is not None:
|
|
31
|
-
return typing.cast(T_co, resolver_state.instance)
|
|
32
|
-
|
|
33
|
-
assert resolver_state.resolver_lock
|
|
34
|
-
await resolver_state.resolver_lock.acquire()
|
|
35
|
-
|
|
36
|
-
try:
|
|
37
|
-
if resolver_state.instance is not None:
|
|
38
|
-
return typing.cast(T_co, resolver_state.instance)
|
|
39
|
-
|
|
40
|
-
resolver_state.instance = typing.cast(T_co, await self._async_build_creator(container))
|
|
41
|
-
finally:
|
|
42
|
-
resolver_state.resolver_lock.release()
|
|
43
|
-
|
|
44
|
-
return resolver_state.instance
|
|
45
|
-
|
|
46
|
-
def sync_resolve(self, container: Container) -> T_co:
|
|
47
|
-
container = container.find_container(self.scope)
|
|
48
|
-
if (override := container.fetch_override(self.resolver_id)) is not None:
|
|
49
|
-
return typing.cast(T_co, override)
|
|
50
|
-
|
|
51
|
-
resolver_state = container.fetch_resolver_state(self.resolver_id)
|
|
52
|
-
if resolver_state.instance is not None:
|
|
53
|
-
return typing.cast(T_co, resolver_state.instance)
|
|
54
|
-
|
|
55
|
-
resolver_state.instance = self._sync_build_creator(container)
|
|
56
|
-
return typing.cast(T_co, resolver_state.instance)
|
modern_di-0.2.0.dist-info/RECORD
DELETED
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
modern_di/__init__.py,sha256=2xhgfqi4gpzPrlfam5HSwTFRroWmYIybDgsSYD9pPNg,194
|
|
2
|
-
modern_di/container.py,sha256=o-6_eoSGpOrIZlAXDryISWmgnSLq7u0YAVRXHvkWU0s,3742
|
|
3
|
-
modern_di/graph.py,sha256=V6LUbtcZb64jBD-GJB2bJijEcPBHSYEEI9WZGflrFpQ,1335
|
|
4
|
-
modern_di/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
5
|
-
modern_di/resolver_state.py,sha256=rRIoyWPK7XtMeWPBFuEe8t81WdrHbj5-jtpOqZWf0jY,1206
|
|
6
|
-
modern_di/scope.py,sha256=nnrTLnFT_dMDLVIwvJHcGlJsB2k1WIHusrRSGQIMEsg,97
|
|
7
|
-
modern_di/resolvers/__init__.py,sha256=560FLaWh7hjqp5ghOHsEDWl8wmoPGXZ-UUO9GgYusgc,340
|
|
8
|
-
modern_di/resolvers/base.py,sha256=BMZbYfkIzAW8-8CQ9aRVIu5D8zw9owKv4nz-z0EMYmg,2897
|
|
9
|
-
modern_di/resolvers/factory.py,sha256=tMOxpXp-zaXiSsDGUp68L2mtcfF7K02ZdF-LglH4phs,1164
|
|
10
|
-
modern_di/resolvers/resource.py,sha256=8qtyIxspbtW7Q3Yo1Y6risNamG0H3XZNU0G9t-lfZjk,3628
|
|
11
|
-
modern_di/resolvers/singleton.py,sha256=k70nEaeBqsu-uHQFqsn8XZh-aw2tQR-J5ImLED6GQGg,1978
|
|
12
|
-
modern_di-0.2.0.dist-info/METADATA,sha256=uLMl5mJ78gixE_23iXUhMXKo2hZQao-Oc3zPkv2AtOY,1846
|
|
13
|
-
modern_di-0.2.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
|
|
14
|
-
modern_di-0.2.0.dist-info/licenses/LICENSE,sha256=aA5_eJwDKqnGvL7PbkPb9x5f-VGIqZ9cvWWkeGqeD90,1070
|
|
15
|
-
modern_di-0.2.0.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|