haiway 0.14.0__py3-none-any.whl → 0.15.0__py3-none-any.whl

haiway/context/access.py

@@ -1,6 +1,7 @@
 from asyncio import (
     CancelledError,
     Task,
+    TaskGroup,
     current_task,
     iscoroutinefunction,
 )
@@ -45,6 +46,7 @@ class ScopeContext:
         self,
         label: str,
         logger: Logger | None,
+        task_group: TaskGroup | None,
         state: tuple[State, ...],
         disposables: Disposables | None,
         metrics: MetricsHandler | None,
@@ -64,8 +66,16 @@ class ScopeContext:
                 logger=logger,
             ),
         )
-        # postponing task group creation to include only when needed
-        self._task_group_context: TaskGroupContext
+        self._task_group_context: TaskGroupContext | None
+        object.__setattr__(
+            self,
+            "_task_group_context",
+            TaskGroupContext(
+                task_group=task_group,
+            )
+            if task_group is not None or self._identifier.is_root
+            else None,
+        )
         # prepare state context to capture current state
         self._state_context: StateContext
         object.__setattr__(
@@ -110,6 +120,9 @@ class ScopeContext:
         )
 
     def __enter__(self) -> str:
+        assert (  # nosec: B101
+            self._task_group_context is None or self._identifier.is_root
+        ), "Can't enter synchronous context with task group"
         assert self._disposables is None, "Can't enter synchronous context with disposables"  # nosec: B101
         self._identifier.__enter__()
         self._logger_context.__enter__()
@@ -151,23 +164,19 @@ class ScopeContext:
     async def __aenter__(self) -> str:
         self._identifier.__enter__()
         self._logger_context.__enter__()
-        # lazily initialize group when needed
-        object.__setattr__(
-            self,
-            "_task_group_context",
-            TaskGroupContext(),
-        )
-        await self._task_group_context.__aenter__()
+
+        if task_group := self._task_group_context:
+            await task_group.__aenter__()
 
         # lazily initialize state to include disposables results
-        if self._disposables is not None:
+        if disposables := self._disposables:
             assert self._state_context._token is None  # nosec: B101
             object.__setattr__(
                 self,
                 "_state_context",
                 StateContext(
                     state=self._state_context._state.updated(
-                        await self._disposables.__aenter__(),
+                        await disposables.__aenter__(),
                     ),
                 ),
             )
@@ -183,18 +192,19 @@ class ScopeContext:
         exc_val: BaseException | None,
         exc_tb: TracebackType | None,
     ) -> None:
-        if self._disposables is not None:
-            await self._disposables.__aexit__(
+        if disposables := self._disposables:
+            await disposables.__aexit__(
                 exc_type=exc_type,
                 exc_val=exc_val,
                 exc_tb=exc_tb,
             )
 
-        await self._task_group_context.__aexit__(
-            exc_type=exc_type,
-            exc_val=exc_val,
-            exc_tb=exc_tb,
-        )
+        if task_group := self._task_group_context:
+            await task_group.__aexit__(
+                exc_type=exc_type,
+                exc_val=exc_val,
+                exc_tb=exc_tb,
+            )
 
         self._metrics_context.__exit__(
             exc_type=exc_type,
@@ -278,6 +288,7 @@ class ctx:
         *state: State,
         disposables: Disposables | Iterable[Disposable] | None = None,
         logger: Logger | None = None,
+        task_group: TaskGroup | None = None,
         metrics: MetricsHandler | None = None,
     ) -> ScopeContext:
         """
@@ -302,6 +313,10 @@ class ctx:
             logger used within the scope context, when not provided current logger will be used\
              if any, otherwise the logger with the scope name will be requested.
 
+        task_group: TaskGroup | None
+            task group used for spawning and joining tasks within the context. Root scope will
+             always have task group created even when not set.
+
         metrics_store: MetricsStore | None = None
             metrics storage solution responsible for recording and storing metrics.\
              Metrics recroding will be ignored if storage is not provided.
@@ -328,6 +343,7 @@ class ctx:
         return ScopeContext(
             label=label,
             logger=logger,
+            task_group=task_group,
             state=state,
             disposables=resolved_disposables,
             metrics=metrics,

haiway/context/state.py

@@ -1,10 +1,12 @@
-from collections.abc import Iterable, MutableMapping
+from asyncio import iscoroutinefunction
+from collections.abc import Callable, Coroutine, Iterable, MutableMapping
 from contextvars import ContextVar, Token
 from types import TracebackType
-from typing import Any, Self, cast, final
+from typing import Any, Self, cast, final, overload
 
 from haiway.context.types import MissingContext, MissingState
 from haiway.state import State
+from haiway.utils.mimic import mimic_function
 
 __all__ = [
     "ScopeState",
@@ -179,3 +181,41 @@ class StateContext:
             "_token",
             None,
         )
+
+    @overload
+    def __call__[Result, **Arguments](
+        self,
+        function: Callable[Arguments, Coroutine[Any, Any, Result]],
+    ) -> Callable[Arguments, Coroutine[Any, Any, Result]]: ...
+
+    @overload
+    def __call__[Result, **Arguments](
+        self,
+        function: Callable[Arguments, Result],
+    ) -> Callable[Arguments, Result]: ...
+
+    def __call__[Result, **Arguments](
+        self,
+        function: Callable[Arguments, Coroutine[Any, Any, Result]] | Callable[Arguments, Result],
+    ) -> Callable[Arguments, Coroutine[Any, Any, Result]] | Callable[Arguments, Result]:
+        if iscoroutinefunction(function):
+
+            async def async_context(
+                *args: Arguments.args,
+                **kwargs: Arguments.kwargs,
+            ) -> Result:
+                with self:
+                    return await function(*args, **kwargs)
+
+            return mimic_function(function, within=async_context)
+
+        else:
+
+            def sync_context(
+                *args: Arguments.args,
+                **kwargs: Arguments.kwargs,
+            ) -> Result:
+                with self:
+                    return function(*args, **kwargs)  # pyright: ignore[reportReturnType]
+
+            return mimic_function(function, within=sync_context)  # pyright: ignore[reportReturnType]

haiway/context/tasks.py

@@ -40,12 +40,13 @@ class TaskGroupContext:
 
     def __init__(
         self,
+        task_group: TaskGroup | None = None,
     ) -> None:
         self._group: TaskGroup
         object.__setattr__(
             self,
             "_group",
-            TaskGroup(),
+            task_group if task_group is not None else TaskGroup(),
         )
         self._token: Token[TaskGroup] | None
         object.__setattr__(

haiway/helpers/asynchrony.py

@@ -30,12 +30,10 @@ def wrap_async[**Args, Result](
 
 
 @overload
-def asynchronous[**Args, Result]() -> (
-    Callable[
-        [Callable[Args, Result]],
-        Callable[Args, Coroutine[Any, Any, Result]],
-    ]
-): ...
+def asynchronous[**Args, Result]() -> Callable[
+    [Callable[Args, Result]],
+    Callable[Args, Coroutine[Any, Any, Result]],
+]: ...
 
 
 @overload

haiway/helpers/caching.py

@@ -66,7 +66,7 @@ def cache[**Args, Result, Key](
 ]: ...
 
 
-def cache[**Args, Result, Key](  # noqa: PLR0913
+def cache[**Args, Result, Key](
     function: Callable[Args, Result] | None = None,
     *,
     limit: int | None = None,

{haiway-0.14.0.dist-info → haiway-0.15.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: haiway
-Version: 0.14.0
+Version: 0.15.0
 Summary: Framework for dependency injection and state management within structured concurrency model.
 Project-URL: Homepage, https://miquido.com
 Project-URL: Repository, https://github.com/miquido/haiway.git

{haiway-0.14.0.dist-info → haiway-0.15.0.dist-info}/RECORD

@@ -1,17 +1,17 @@
 haiway/__init__.py,sha256=RhW9HOIAVQ3srQ-v23tPghJ20dWcn_uAyt8U8Hhn868,2081
 haiway/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 haiway/context/__init__.py,sha256=feqd0eJnGQwh4B8BZXpS0fQRE-DqoFCFOHipF1jOY8A,762
-haiway/context/access.py,sha256=1Oq70pcp54bC9NNp-zMocDewVJpcZgepi99_xeqz98o,18502
+haiway/context/access.py,sha256=yW6GNZtSWaxtBRTViP3BiJJYEsLbKkS6Zyzrp1uKgvo,19122
 haiway/context/disposables.py,sha256=vcsh8jRaJ8Q1ob7oh5LsrSPw9f5AMTcaD_p_Gb7tXAI,2588
 haiway/context/identifier.py,sha256=lz-FuspOtsaEsfb7QPrEVWYfbcMJgd3A6BGG3kLbaV0,3914
 haiway/context/logging.py,sha256=F3dr6MLjodg3MX5WTInxn3r3JuihG-giBzumI0GGUQw,5590
 haiway/context/metrics.py,sha256=N20XQtC8au_e_3iWrsZdej78YBEIWF44fdtWcZBWono,5223
-haiway/context/state.py,sha256=7pXb5gvyPOWiRbxX-sSfO-hjaHcTUIp_uTKhjaSLeRo,4552
-haiway/context/tasks.py,sha256=MKfsa-921cIpQ_BKskwokjR27suCHkHZa3O9kOE8UOg,2826
+haiway/context/state.py,sha256=61SndKeMF3uS_HNeF-6gZUyVI6f4hi5pUXNG95VZLA8,5981
+haiway/context/tasks.py,sha256=VjYrsf9OxQb_m0etmEO0BAs0syLGC728E5TjkdMUMEE,2913
 haiway/context/types.py,sha256=VvJA7wAPZ3ISpgyThVguioYUXqhHf0XkPfRd0M1ERiQ,142
 haiway/helpers/__init__.py,sha256=ZKDlL3twDqXyI1a9FDgRy3m1-Dfycvke6BJ4C3CndEk,671
-haiway/helpers/asynchrony.py,sha256=YHLK5Hjc-5UWlQRypC11yHeEQyeAtHqrMoBTBfqQBvQ,6286
-haiway/helpers/caching.py,sha256=EU5usTHGDzf0SO3bMW4hHB9oZlLlE7BxO_2ckbjYBw8,13274
+haiway/helpers/asynchrony.py,sha256=pmPvlH4UiIaHXfQNsHvlDmzu5gCa8Pzc0_gNBAPgirU,6266
+haiway/helpers/caching.py,sha256=3M5JVI6dq-Xx6qI2DbLw2wek8U7xVjqbCZowldApXnc,13257
 haiway/helpers/metrics.py,sha256=VNxgPgV8pgt-51f2CANy1IVx8VMYIAxT3F849t3IeQs,14604
 haiway/helpers/retries.py,sha256=3m1SsJW_YY_HPufX9LEzcd_MEyRRFNXvSExLeEti8W8,7539
 haiway/helpers/throttling.py,sha256=r9HnUuo4nX36Pf-oMFHUJk-ZCDeXQ__JTDHlkSltRhA,4121
@@ -37,7 +37,7 @@ haiway/utils/mimic.py,sha256=BkVjTVP2TxxC8GChPGyDV6UXVwJmiRiSWeOYZNZFHxs,1828
 haiway/utils/noop.py,sha256=qgbZlOKWY6_23Zs43OLukK2HagIQKRyR04zrFVm5rWI,344
 haiway/utils/queue.py,sha256=Tk1bXvuNbEgapeC3-h_PYBASqVjhEoL8mUvtJnM29xI,4000
 haiway/utils/stream.py,sha256=Vqyi0EwcupkVyKQ7eple6z9DkcbSHkE-6yMw85mak9Q,2832
-haiway-0.14.0.dist-info/METADATA,sha256=e01xN8K8-d8RiPRaV2ibtsxEHfITllUZmxZA_VzEpBs,4299
-haiway-0.14.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-haiway-0.14.0.dist-info/licenses/LICENSE,sha256=3phcpHVNBP8jsi77gOO0E7rgKeDeu99Pi7DSnK9YHoQ,1069
-haiway-0.14.0.dist-info/RECORD,,
+haiway-0.15.0.dist-info/METADATA,sha256=Ftb3j0GmzxcM0mfqPSaXXdR2sCMy0Dw4txMFLIh2iyA,4299
+haiway-0.15.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+haiway-0.15.0.dist-info/licenses/LICENSE,sha256=3phcpHVNBP8jsi77gOO0E7rgKeDeu99Pi7DSnK9YHoQ,1069
+haiway-0.15.0.dist-info/RECORD,,