ashka-lifecycle 0.2.0__tar.gz → 0.2.2__tar.gz

{ashka_lifecycle-0.2.0 → ashka_lifecycle-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ashka-lifecycle
-Version: 0.2.0
+Version: 0.2.2
 Summary: dishka lifecycle support
 Author: handsome-Druid
 Author-email: handsome-Druid <102826168@qq.com>

{ashka_lifecycle-0.2.0 → ashka_lifecycle-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ashka-lifecycle"
-version = "0.2.0"
+version = "0.2.2"
 description = "dishka lifecycle support"
 readme = "README.md"
 requires-python = ">=3.10,<3.15"

{ashka_lifecycle-0.2.0 → ashka_lifecycle-0.2.2}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "ashka-lifecycle"
-version = "0.2.0"
+version = "0.2.2"
 description = "dishka lifecycle support"
 readme = "README.md"
 authors = [

{ashka_lifecycle-0.2.0 → ashka_lifecycle-0.2.2}/src/ashka_lifecycle/__init__.py

@@ -1,3 +1,5 @@
+import ashka_lifecycle.async_container
+import ashka_lifecycle.container
 from ashka_lifecycle.entities.scope import AshkaScope
 from ashka_lifecycle.provider import (
     provide,  # pyright: ignore[reportUnknownVariableType]
@@ -16,3 +18,5 @@ def activate_lifecycle() -> None:
     Call this function manually before importing dishka to ensure that the
     dishka lifecycle is activated in advance.
     """
+    ashka_lifecycle.container.activate()
+    ashka_lifecycle.async_container.activate()

ashka_lifecycle-0.2.2/src/ashka_lifecycle/async_container.py

@@ -0,0 +1,51 @@
+from asyncio import gather
+from collections.abc import Callable, Coroutine
+from logging import getLogger
+
+from ashka_lifecycle.entities.bootstrap import (
+    bootstrap_types,
+)
+
+from dishka import AsyncContainer, Scope
+
+
+def activate(): ...
+
+
+_logger = getLogger(__name__)
+
+_aenter: Callable[..., Coroutine[None, object, AsyncContainer]] = (
+    AsyncContainer.__aenter__
+)
+
+
+async def __aenter__(self: AsyncContainer) -> AsyncContainer:
+    aenter: AsyncContainer = await _aenter(self)
+
+    if self.scope is Scope.APP:
+        _logger.debug("Initiating bootstrap factories.")
+        await gather(
+            *(
+                self.get(key.type_hint, key.component)
+                for key in self.registry.factories
+                if key.type_hint in bootstrap_types
+            )
+        )
+    else:
+        _logger.debug(
+            f"'<dishka_container>.scope': {self.scope!r} is not 'Scope.APP', skipping bootstrap"
+        )
+
+    return aenter
+
+
+async def init(self: AsyncContainer) -> None:
+    if not self.scope is Scope.APP:
+        _logger.warning(
+            f"'<dishka_container>.scope': {self.scope!r} is not 'Scope.APP', 'container.init()' won't do any bootstrap."
+        )
+    await self.__aenter__()
+
+
+AsyncContainer.__aenter__ = __aenter__
+AsyncContainer.init = init  # pyright: ignore[reportAttributeAccessIssue]

ashka_lifecycle-0.2.2/src/ashka_lifecycle/container.py

@@ -0,0 +1,44 @@
+from collections.abc import Callable
+from logging import getLogger
+
+from ashka_lifecycle.entities.bootstrap import (
+    bootstrap_types,
+)
+
+from dishka import Container, Scope
+
+
+def activate(): ...
+
+
+_logger = getLogger(__name__)
+
+_enter: Callable[..., Container] = Container.__enter__
+
+
+def __enter__(self: Container) -> Container:
+    enter: Container = _enter(self)
+
+    if self.scope is Scope.APP:
+        _logger.debug("Initiating bootstrap factories.")
+        for key in self.registry.factories:
+            if key.type_hint in bootstrap_types:
+                self.get(key.type_hint, key.component)
+    else:
+        _logger.debug(
+            f"'<dishka_container>.scope': {self.scope!r} is not 'Scope.APP', skipping bootstrap"
+        )
+
+    return enter
+
+
+def init(self: Container) -> None:
+    if not self.scope is Scope.APP:
+        _logger.warning(
+            f"'<dishka_container>.scope': {self.scope!r} is not 'Scope.APP', 'container.init()' won't do any bootstrap."
+        )
+    self.__enter__()
+
+
+Container.__enter__ = __enter__
+Container.init = init  # pyright: ignore[reportAttributeAccessIssue]

ashka_lifecycle-0.2.2/src/ashka_lifecycle/provider/make_factory.py

@@ -0,0 +1,110 @@
+from collections.abc import Callable
+from inspect import isbuiltin, isclass, isfunction
+from logging import getLogger
+from typing import Any, NewType, get_origin, get_type_hints, overload
+
+from ashka_lifecycle.entities.bootstrap import (
+    bootstrap_types,
+)
+from ashka_lifecycle.entities.scope import AshkaScope
+
+from dishka import BaseScope, Scope
+from dishka import provide as _provide  # pyright: ignore[reportUnknownVariableType]
+from dishka.dependency_source.composite import CompositeDependencySource
+from dishka.entities.provides_marker import ProvideMultiple
+from dishka.provider.exceptions import MissingReturnHintError
+from dishka.provider.make_factory import (
+    ProvideSource,
+    _clean_result_hint,  # pyright: ignore[reportPrivateUsage]
+    _guess_factory_type,  # pyright: ignore[reportPrivateUsage]
+)
+
+__all__: list[str] = ["provide"]
+
+_logger = getLogger(__name__)
+
+
+def activate(): ...
+
+
+@overload
+def provide(
+    *, scope: BaseScope | AshkaScope | None = None, **kwargs: Any
+) -> Callable[[Callable[..., Any]], CompositeDependencySource]: ...
+
+
+@overload
+def provide(
+    source: ProvideSource,  # pyright: ignore[reportUnknownParameterType]
+    *,
+    scope: BaseScope | AshkaScope | None = None,
+    **kwargs: Any,
+) -> CompositeDependencySource: ...
+
+
+def provide(
+    source: ProvideSource | None = None,  # pyright: ignore[reportUnknownParameterType]
+    *,
+    scope: BaseScope | AshkaScope | None = None,
+    **kwargs: Any,
+) -> (
+    CompositeDependencySource
+    | Callable[
+        [Callable[..., Any]],
+        CompositeDependencySource,
+    ]
+):
+    if scope is not AshkaScope.BOOTSTRAP:
+        return _provide(source, scope=scope, **kwargs)
+
+    def scoped(source: ProvideSource) -> CompositeDependencySource:  # pyright: ignore[reportUnknownParameterType]
+        _logger.debug(
+            f"Adding {getattr(source, '__name__', source)!r} to bootstrap list..."  # pyright: ignore[reportUnknownArgumentType]
+        )
+        bootstrap_types.add(
+            new_type := NewType(
+                "ashka_lifecycle.provider.make_factory.provide", AshkaScope
+            )
+        )
+        try:
+            return (
+                _provide(
+                    source,
+                    scope=Scope.APP,
+                    provides=ProvideMultiple[
+                        new_type, (_kwargs := kwargs.copy()).pop(provides)  # pyright: ignore[reportInvalidTypeArguments]
+                    ],
+                    **_kwargs,
+                )
+                if (provides := "provides") in kwargs
+                else _provide(
+                    source,
+                    scope=Scope.APP,
+                    provides=ProvideMultiple[
+                        new_type,
+                        source  # pyright: ignore[reportInvalidTypeArguments]
+                        if isclass(source) or isclass(get_origin(source))  # pyright: ignore[reportUnknownArgumentType]
+                        else _clean_result_hint(
+                            _guess_factory_type(
+                                func := getattr(source, "__func__", None)  # pyright: ignore[reportUnknownVariableType, reportUnknownArgumentType]
+                                or (
+                                    source
+                                    if isfunction(source) or isbuiltin(source)  # pyright: ignore[reportUnknownArgumentType]
+                                    else getattr(
+                                        source.__call__,  # pyright: ignore[reportAttributeAccessIssue, reportUnknownMemberType, reportUnknownArgumentType]
+                                        "__func__",
+                                        source.__call__,  # pyright: ignore[reportAttributeAccessIssue, reportUnknownMemberType, reportUnknownArgumentType]
+                                    )
+                                )
+                            ),
+                            get_type_hints(func)["return"],  # pyright: ignore[reportUnknownArgumentType]
+                        ),
+                    ],
+                    **kwargs,
+                )
+            )
+        except KeyError as e:
+            bootstrap_types.remove(new_type)
+            raise MissingReturnHintError(source) from e
+
+    return scoped if source is None else scoped(source)  # pyright: ignore[reportUnknownVariableType]

ashka_lifecycle-0.2.0/src/ashka_lifecycle/async_container.py

@@ -1,42 +0,0 @@
-from asyncio import gather
-from collections.abc import Callable, Coroutine
-
-from ashka_lifecycle.entities.bootstrap import (
-    bootstrap_types,
-)
-
-from dishka import AsyncContainer
-
-_aenter: Callable[..., Coroutine[None, object, AsyncContainer]] = (
-    AsyncContainer.__aenter__
-)
-
-
-async def __aenter__(self: AsyncContainer) -> AsyncContainer:
-    aenter: AsyncContainer = await _aenter(self)
-
-    await gather(
-        *(
-            self.get(key.type_hint, key.component)
-            for registry in iter(
-                lambda state=[self.registry]: (
-                    (state[0], state.__setitem__(0, state[0].child_registry))[0]  # pyright: ignore[reportCallIssue, reportArgumentType]
-                    if state[0] is not None  # pyright: ignore[reportUnnecessaryComparison]
-                    else None
-                ),
-                None,
-            )
-            for key in registry.factories
-            if key.type_hint in bootstrap_types
-        )
-    )
-
-    return aenter
-
-
-async def init(self: AsyncContainer) -> None:
-    await self.__aenter__()
-
-
-AsyncContainer.__aenter__ = __aenter__
-AsyncContainer.init = init  # pyright: ignore[reportAttributeAccessIssue]

ashka_lifecycle-0.2.0/src/ashka_lifecycle/container.py

@@ -1,37 +0,0 @@
-from collections.abc import Callable
-
-from ashka_lifecycle.entities.bootstrap import (
-    bootstrap_types,
-)
-
-from dishka import Container
-
-_enter: Callable[..., Container] = Container.__enter__
-
-
-def __enter__(self: Container) -> Container:
-    enter: Container = _enter(self)
-
-    [
-        self.get(key.type_hint, key.component)
-        for registry in iter(
-            lambda state=[self.registry]: (
-                (state[0], state.__setitem__(0, state[0].child_registry))[0]  # pyright: ignore[reportCallIssue, reportArgumentType]
-                if state[0] is not None  # pyright: ignore[reportUnnecessaryComparison]
-                else None
-            ),
-            None,
-        )
-        for key in registry.factories
-        if key.type_hint in bootstrap_types
-    ]
-
-    return enter
-
-
-def init(self: Container) -> None:
-    self.__enter__()
-
-
-Container.__enter__ = __enter__
-Container.init = init  # pyright: ignore[reportAttributeAccessIssue]

ashka_lifecycle-0.2.0/src/ashka_lifecycle/provider/make_factory.py

@@ -1,92 +0,0 @@
-from collections.abc import Callable
-from inspect import isbuiltin, isclass, isfunction
-from typing import Any, NewType, get_origin, get_type_hints, overload
-
-from ashka_lifecycle.entities.bootstrap import (
-    bootstrap_types,
-)
-from ashka_lifecycle.entities.scope import AshkaScope
-
-from dishka import BaseScope, Scope
-from dishka import provide as _provide  # pyright: ignore[reportUnknownVariableType]
-from dishka.dependency_source.composite import CompositeDependencySource
-from dishka.entities.provides_marker import ProvideMultiple
-from dishka.provider.make_factory import (
-    ProvideSource,
-    _clean_result_hint,  # pyright: ignore[reportPrivateUsage]
-    _guess_factory_type,  # pyright: ignore[reportPrivateUsage]
-)
-
-__all__: list[str] = ["provide"]
-
-
-@overload
-def provide(
-    *, scope: BaseScope | AshkaScope | None = None, **kwargs: Any
-) -> Callable[[Callable[..., Any]], CompositeDependencySource]: ...
-
-
-@overload
-def provide(
-    source: ProvideSource,  # pyright: ignore[reportUnknownParameterType]
-    *,
-    scope: BaseScope | AshkaScope | None = None,
-    **kwargs: Any,
-) -> CompositeDependencySource: ...
-
-
-def provide(
-    source: ProvideSource | None = None,  # pyright: ignore[reportUnknownParameterType]
-    *,
-    scope: BaseScope | AshkaScope | None = None,
-    **kwargs: Any,
-) -> (
-    CompositeDependencySource
-    | Callable[
-        [Callable[..., Any]],
-        CompositeDependencySource,
-    ]
-):
-    if scope is not AshkaScope.BOOTSTRAP:
-        return _provide(source, scope=scope, **kwargs)
-
-    def scoped(source: ProvideSource) -> CompositeDependencySource:  # pyright: ignore[reportUnknownParameterType]
-        return (
-            _provide(
-                source,
-                scope=Scope.APP,
-                provides=ProvideMultiple[
-                    new_type, (_kwargs := kwargs.copy()).pop(provides)  # pyright: ignore[reportInvalidTypeArguments]
-                ],
-                **_kwargs,
-            )
-            if bootstrap_types.add(new_type := NewType("_", object)) is None
-            and (provides := "provides") in kwargs
-            else _provide(
-                source,
-                scope=Scope.APP,
-                provides=ProvideMultiple[
-                    new_type,
-                    source  # pyright: ignore[reportInvalidTypeArguments]
-                    if isclass(source) or isclass(get_origin(source))  # pyright: ignore[reportUnknownArgumentType]
-                    else _clean_result_hint(
-                        _guess_factory_type(
-                            func := getattr(source, "__func__", None)  # pyright: ignore[reportUnknownVariableType, reportUnknownArgumentType]
-                            or (
-                                source
-                                if isfunction(source) or isbuiltin(source)  # pyright: ignore[reportUnknownArgumentType]
-                                else getattr(
-                                    source.__call__,  # pyright: ignore[reportAttributeAccessIssue, reportUnknownMemberType, reportUnknownArgumentType]
-                                    "__func__",
-                                    source.__call__,  # pyright: ignore[reportAttributeAccessIssue, reportUnknownMemberType, reportUnknownArgumentType]
-                                )
-                            )
-                        ),
-                        get_type_hints(func)["return"],  # pyright: ignore[reportUnknownArgumentType]
-                    ),
-                ],
-                **kwargs,
-            )
-        )
-
-    return scoped if source is None else scoped(source)  # pyright: ignore[reportUnknownVariableType]