haiway 0.13.0__tar.gz → 0.14.0__tar.gz

{haiway-0.13.0 → haiway-0.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: haiway
-Version: 0.13.0
+Version: 0.14.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/junit/test-results.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><testsuites><testsuite name="pytest" errors="0" failures="0" skipped="0" tests="88" time="1.127" timestamp="2025-04-01T10:53:25.573207" hostname="fv-az1786-487"><testcase classname="tests.test_async_queue" name="test_fails_when_stream_fails" time="0.002" /><testcase classname="tests.test_async_queue" name="test_cancels_when_iteration_cancels" time="0.001" /><testcase classname="tests.test_async_queue" name="test_ends_when_stream_ends" time="0.001" /><testcase classname="tests.test_async_queue" name="test_buffers_values_when_not_reading" time="0.001" /><testcase classname="tests.test_async_queue" name="test_delivers_buffer_when_streaming_fails" time="0.001" /><testcase classname="tests.test_async_queue" name="test_delivers_updates_when_sending" time="0.001" /><testcase classname="tests.test_async_queue" name="test_fails_when_sending_to_finished" time="0.001" /><testcase classname="tests.test_async_queue" name="test_ignores_when_finishing_when_finished" time="0.001" /><testcase classname="tests.test_async_stream" name="test_fails_when_stream_fails" time="0.001" /><testcase classname="tests.test_async_stream" name="test_cancels_when_iteration_cancels" time="0.001" /><testcase classname="tests.test_async_stream" name="test_ends_when_stream_ends" time="0.001" /><testcase classname="tests.test_async_stream" name="test_finishes_without_buffer" time="0.001" /><testcase classname="tests.test_async_stream" name="test_fails_without_buffer" time="0.001" /><testcase classname="tests.test_async_stream" name="test_delivers_updates_when_sending" time="0.001" /><testcase classname="tests.test_async_stream" name="test_ignores_when_sending_to_finished" time="0.001" /><testcase classname="tests.test_async_stream" name="test_ignores_when_sending_to_failed" time="0.001" /><testcase classname="tests.test_async_stream" name="test_ignores_when_finishing_when_finished" time="0.001" /><testcase classname="tests.test_async_stream" name="test_delivers_all_when_sending_async" time="0.001" /><testcase classname="tests.test_attribute_path" name="test_id_path_points_to_self" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_attribute_path_points_to_attribute" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_nested_attribute_path_points_to_nested_attribute" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_recursive_attribute_path_points_to_attribute" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_list_item_path_points_to_item" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_tuple_item_path_points_to_item" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_mixed_tuple_item_path_points_to_item" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_dict_item_path_points_to_item" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_id_path_set_updates_self" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_attribute_path_set_updates_attribute" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_nested_attribute_path_set_updates_nested_attribute" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_recursive_attribute_set_updates_attribute" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_list_item_path_set_updates_item" time="0.001" /><testcase classname="tests.test_attribute_path" name="test_tuple_item_path_set_updates_item" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_mixed_tuple_item_set_updates_item" time="0.000" /><testcase classname="tests.test_attribute_path" name="test_dict_item_path_set_updates_item" time="0.000" /><testcase classname="tests.test_auto_retry" name="test_returns_value_without_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_retries_with_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_logs_issue_with_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_fails_with_exceeding_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_fails_with_cancellation" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_retries_with_selected_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_fails_with_not_selected_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_async_returns_value_without_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_async_retries_with_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_async_fails_with_exceeding_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_async_fails_with_cancellation" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_async_fails_when_cancelled" time="0.021" /><testcase classname="tests.test_auto_retry" name="test_async_uses_delay_with_errors" time="0.102" /><testcase classname="tests.test_auto_retry" name="test_async_uses_computed_delay_with_errors" time="0.107" /><testcase classname="tests.test_auto_retry" name="test_async_logs_issue_with_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_async_retries_with_selected_errors" time="0.001" /><testcase classname="tests.test_auto_retry" name="test_async_fails_with_not_selected_errors" time="0.001" /><testcase classname="tests.test_cache" name="test_returns_cache_value_with_same_argument" time="0.001" /><testcase classname="tests.test_cache" name="test_returns_fresh_value_with_different_argument" time="0.000" /><testcase classname="tests.test_cache" name="test_returns_fresh_value_with_limit_exceed" time="0.000" /><testcase classname="tests.test_cache" name="test_returns_same_value_with_repeating_argument" time="0.000" /><testcase classname="tests.test_cache" name="test_fails_with_error" time="0.000" /><testcase classname="tests.test_cache" name="test_returns_fresh_value_with_expiration_time_exceed" time="0.021" /><testcase classname="tests.test_cache" name="test_async_returns_cache_value_with_same_argument" time="0.001" /><testcase classname="tests.test_cache" name="test_async_returns_fresh_value_with_different_argument" time="0.001" /><testcase classname="tests.test_cache" name="test_async_returns_fresh_value_with_limit_exceed" time="0.001" /><testcase classname="tests.test_cache" name="test_async_returns_same_value_with_repeating_argument" time="0.001" /><testcase classname="tests.test_cache" name="test_async_returns_fresh_value_with_expiration_time_exceed" time="0.021" /><testcase classname="tests.test_cache" name="test_async_cancel_waiting_does_not_cancel_task" time="0.502" /><testcase classname="tests.test_cache" name="test_async_expiration_does_not_cancel_task" time="0.021" /><testcase classname="tests.test_cache" name="test_async_fails_with_error" time="0.001" /><testcase classname="tests.test_context" name="test_state_is_available_according_to_context" time="0.001" /><testcase classname="tests.test_context" name="test_state_update_updates_local_context" time="0.001" /><testcase classname="tests.test_context" name="test_exceptions_are_propagated" time="0.001" /><testcase classname="tests.test_state" name="test_basic_initializes_with_arguments" time="0.002" /><testcase classname="tests.test_state" name="test_basic_initializes_with_defaults" time="0.001" /><testcase classname="tests.test_state" name="test_basic_equals_checks_properties" time="0.000" /><testcase classname="tests.test_state" name="test_basic_initializes_with_arguments_and_defaults" time="0.000" /><testcase classname="tests.test_state" name="test_parametrized_initializes_with_proper_parameters" time="0.000" /><testcase classname="tests.test_state" name="test_nested_initializes_with_proper_arguments" time="0.001" /><testcase classname="tests.test_state" name="test_dict_skips_missing_properties" time="0.001" /><testcase classname="tests.test_state" name="test_initialization_allows_missing_properties" time="0.001" /><testcase classname="tests.test_state" name="test_generic_subtypes_validation" time="0.002" /><testcase classname="tests.test_state" name="test_copying_leaves_same_object" time="0.001" /><testcase classname="tests.test_streaming" name="test_fails_when_generator_fails" time="0.001" /><testcase classname="tests.test_streaming" name="test_cancels_when_iteration_cancels" time="0.001" /><testcase classname="tests.test_streaming" name="test_ends_when_generator_ends" time="0.001" /><testcase classname="tests.test_streaming" name="test_delivers_updates_when_generating" time="0.001" /><testcase classname="tests.test_streaming" name="test_streaming_context_variables_access_is_preserved" time="0.001" /><testcase classname="tests.test_streaming" name="test_nested_streaming_streams_correctly" time="0.001" /><testcase classname="tests.test_timeout" name="test_returns_result_when_returning_value" time="0.001" /><testcase classname="tests.test_timeout" name="test_raises_with_error" time="0.001" /><testcase classname="tests.test_timeout" name="test_raises_with_cancel" time="0.011" /><testcase classname="tests.test_timeout" name="test_raises_with_timeout" time="0.011" /></testsuite></testsuites>

{haiway-0.13.0 → haiway-0.14.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 [project]
 name = "haiway"
 description = "Framework for dependency injection and state management within structured concurrency model."
-version = "0.13.0"
+version = "0.14.0"
 readme = "README.md"
 maintainers = [
   { name = "Kacper Kaliński", email = "kacper.kalinski@miquido.com" },

{haiway-0.13.0 → haiway-0.14.0}/src/haiway/__init__.py

@@ -40,6 +40,7 @@ from haiway.types import (
 )
 from haiway.utils import (
     AsyncQueue,
+    AsyncStream,
     always,
     as_dict,
     as_list,
@@ -63,6 +64,7 @@ __all__ = [
     "MISSING",
     "ArgumentsTrace",
     "AsyncQueue",
+    "AsyncStream",
     "AttributePath",
     "AttributeRequirement",
     "Default",

{haiway-0.13.0 → haiway-0.14.0}/src/haiway/context/access.py

@@ -11,7 +11,6 @@ from collections.abc import (
     Coroutine,
     Iterable,
 )
-from contextvars import Context, copy_context
 from logging import Logger
 from types import TracebackType
 from typing import Any, final, overload
@@ -24,6 +23,7 @@ from haiway.context.state import StateContext
 from haiway.context.tasks import TaskGroupContext
 from haiway.state import State
 from haiway.utils import mimic_function
+from haiway.utils.stream import AsyncStream
 
 __all__ = [
     "ctx",
@@ -37,7 +37,6 @@ class ScopeContext:
         "_identifier",
         "_logger_context",
         "_metrics_context",
-        "_state",
         "_state_context",
         "_task_group_context",
     )
@@ -67,13 +66,12 @@ class ScopeContext:
         )
         # postponing task group creation to include only when needed
         self._task_group_context: TaskGroupContext
-        # postponing state creation to include disposables state when prepared
+        # prepare state context to capture current state
         self._state_context: StateContext
-        self._state: tuple[State, ...]
         object.__setattr__(
             self,
-            "_state",
-            state,
+            "_state_context",
+            StateContext.updated(state),
         )
         self._disposables: Disposables | None
         object.__setattr__(
@@ -115,12 +113,6 @@ class ScopeContext:
         assert self._disposables is None, "Can't enter synchronous context with disposables"  # nosec: B101
         self._identifier.__enter__()
         self._logger_context.__enter__()
-        # lazily initialize state
-        object.__setattr__(
-            self,
-            "_state_context",
-            StateContext.updated(self._state),
-        )
         self._state_context.__enter__()
         self._metrics_context.__enter__()
 
@@ -169,24 +161,17 @@ class ScopeContext:
 
         # lazily initialize state to include disposables results
         if self._disposables is not None:
+            assert self._state_context._token is None  # nosec: B101
             object.__setattr__(
                 self,
                 "_state_context",
-                StateContext.updated(
-                    (
-                        *self._state,
-                        *await self._disposables.__aenter__(),
-                    )
+                StateContext(
+                    state=self._state_context._state.updated(
+                        await self._disposables.__aenter__(),
+                    ),
                 ),
             )
 
-        else:
-            object.__setattr__(
-                self,
-                "_state_context",
-                StateContext.updated(self._state),
-            )
-
         self._state_context.__enter__()
         self._metrics_context.__enter__()
 
@@ -238,8 +223,8 @@ class ScopeContext:
     @overload
     def __call__[Result, **Arguments](
         self,
-        function: Callable[Arguments, Coroutine[None, None, Result]],
-    ) -> Callable[Arguments, Coroutine[None, None, Result]]: ...
+        function: Callable[Arguments, Coroutine[Any, Any, Result]],
+    ) -> Callable[Arguments, Coroutine[Any, Any, Result]]: ...
 
     @overload
     def __call__[Result, **Arguments](
@@ -249,8 +234,8 @@ class ScopeContext:
 
     def __call__[Result, **Arguments](
         self,
-        function: Callable[Arguments, Coroutine[None, None, Result]] | Callable[Arguments, Result],
-    ) -> Callable[Arguments, Coroutine[None, None, Result]] | Callable[Arguments, Result]:
+        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(
@@ -372,7 +357,7 @@ class ctx:
 
     @staticmethod
     def spawn[Result, **Arguments](
-        function: Callable[Arguments, Coroutine[None, None, Result]],
+        function: Callable[Arguments, Coroutine[Any, Any, Result]],
         /,
         *args: Arguments.args,
         **kwargs: Arguments.kwargs,
@@ -383,7 +368,7 @@ class ctx:
 
         Parameters
         ----------
-        function: Callable[Arguments, Coroutine[None, None, Result]]
+        function: Callable[Arguments, Coroutine[Any, Any, Result]]
             function to be called within the task group
 
         *args: Arguments.args
@@ -401,12 +386,12 @@ class ctx:
         return TaskGroupContext.run(function, *args, **kwargs)
 
     @staticmethod
-    def stream[Result, **Arguments](
-        source: Callable[Arguments, AsyncGenerator[Result, None]],
+    def stream[Element, **Arguments](
+        source: Callable[Arguments, AsyncGenerator[Element, None]],
         /,
         *args: Arguments.args,
         **kwargs: Arguments.kwargs,
-    ) -> AsyncIterator[Result]:
+    ) -> AsyncIterator[Element]:
         """
         Stream results produced by a generator within the proper context state.
 
@@ -427,25 +412,22 @@ class ctx:
             iterator for accessing generated results
         """
 
-        # prepare context snapshot
-        context_snapshot: Context = copy_context()
-
-        # prepare nested context
-        streaming_context: ScopeContext = ctx.scope(
-            getattr(
-                source,
-                "__name__",
-                "streaming",
-            )
-        )
+        output_stream = AsyncStream[Element]()
 
-        async def generator() -> AsyncGenerator[Result, None]:
-            async with streaming_context:
+        @ctx.scope("stream")
+        async def stream() -> None:
+            try:
                 async for result in source(*args, **kwargs):
-                    yield result
+                    await output_stream.send(result)
+
+            except BaseException as exc:
+                output_stream.finish(exception=exc)
+
+            else:
+                output_stream.finish()
 
-        # finally return it as an iterator
-        return context_snapshot.run(generator)
+        TaskGroupContext.run(stream)
+        return output_stream
 
     @staticmethod
     def check_cancellation() -> None:
@@ -488,7 +470,7 @@ class ctx:
         StateType
             resolved state instance
         """
-        return StateContext.current(
+        return StateContext.state(
             state,
             default=default,
         )

{haiway-0.13.0 → haiway-0.14.0}/src/haiway/context/state.py

@@ -92,7 +92,7 @@ class StateContext:
     _context = ContextVar[ScopeState]("StateContext")
 
     @classmethod
-    def current[StateType: State](
+    def state[StateType: State](
         cls,
         state: type[StateType],
         /,

{haiway-0.13.0 → haiway-0.14.0}/src/haiway/context/tasks.py

@@ -16,7 +16,7 @@ class TaskGroupContext:
     @classmethod
     def run[Result, **Arguments](
         cls,
-        function: Callable[Arguments, Coroutine[None, None, Result]],
+        function: Callable[Arguments, Coroutine[Any, Any, Result]],
         /,
         *args: Arguments.args,
         **kwargs: Arguments.kwargs,

{haiway-0.13.0 → haiway-0.14.0}/src/haiway/helpers/__init__.py

@@ -1,5 +1,5 @@
 from haiway.helpers.asynchrony import asynchronous, wrap_async
-from haiway.helpers.caching import cache
+from haiway.helpers.caching import CacheMakeKey, CacheRead, CacheWrite, cache
 from haiway.helpers.metrics import MetricsHolder, MetricsLogger
 from haiway.helpers.retries import retry
 from haiway.helpers.throttling import throttle
@@ -8,6 +8,9 @@ from haiway.helpers.tracing import ArgumentsTrace, ResultTrace, traced
 
 __all__ = [
     "ArgumentsTrace",
+    "CacheMakeKey",
+    "CacheRead",
+    "CacheWrite",
     "MetricsHolder",
     "MetricsLogger",
     "ResultTrace",

{haiway-0.13.0 → haiway-0.14.0}/src/haiway/helpers/asynchrony.py

@@ -14,9 +14,9 @@ __all__ = [
 
 
 def wrap_async[**Args, Result](
-    function: Callable[Args, Coroutine[None, None, Result]] | Callable[Args, Result],
+    function: Callable[Args, Coroutine[Any, Any, Result]] | Callable[Args, Result],
     /,
-) -> Callable[Args, Coroutine[None, None, Result]]:
+) -> Callable[Args, Coroutine[Any, Any, Result]]:
     if iscoroutinefunction(function):
         return function
 
@@ -30,10 +30,12 @@ def wrap_async[**Args, Result](
 
 
 @overload
-def asynchronous[**Args, Result]() -> Callable[
-    [Callable[Args, Result]],
-    Callable[Args, Coroutine[None, None, Result]],
-]: ...
+def asynchronous[**Args, Result]() -> (
+    Callable[
+        [Callable[Args, Result]],
+        Callable[Args, Coroutine[Any, Any, Result]],
+    ]
+): ...
 
 
 @overload
@@ -43,7 +45,7 @@ def asynchronous[**Args, Result](
     executor: Executor,
 ) -> Callable[
     [Callable[Args, Result]],
-    Callable[Args, Coroutine[None, None, Result]],
+    Callable[Args, Coroutine[Any, Any, Result]],
 ]: ...
 
 
@@ -51,7 +53,7 @@ def asynchronous[**Args, Result](
 def asynchronous[**Args, Result](
     function: Callable[Args, Result],
     /,
-) -> Callable[Args, Coroutine[None, None, Result]]: ...
+) -> Callable[Args, Coroutine[Any, Any, Result]]: ...
 
 
 def asynchronous[**Args, Result](
@@ -62,9 +64,9 @@ def asynchronous[**Args, Result](
 ) -> (
     Callable[
         [Callable[Args, Result]],
-        Callable[Args, Coroutine[None, None, Result]],
+        Callable[Args, Coroutine[Any, Any, Result]],
     ]
-    | Callable[Args, Coroutine[None, None, Result]]
+    | Callable[Args, Coroutine[Any, Any, Result]]
 ):
     """\
     Wrapper for a sync function to convert it to an async function. \
@@ -90,7 +92,7 @@ def asynchronous[**Args, Result](
 
     def wrap(
         wrapped: Callable[Args, Result],
-    ) -> Callable[Args, Coroutine[None, None, Result]]:
+    ) -> Callable[Args, Coroutine[Any, Any, Result]]:
         assert not iscoroutinefunction(wrapped), "Cannot wrap async function in executor"  # nosec: B101
 
         return _ExecutorWrapper(
@@ -152,7 +154,7 @@ class _ExecutorWrapper[**Args, Result]:
         instance: object,
         owner: type | None = None,
         /,
-    ) -> Callable[Args, Coroutine[None, None, Result]]:
+    ) -> Callable[Args, Coroutine[Any, Any, Result]]:
         if owner is None:
             return self
 
@@ -180,8 +182,8 @@ class _ExecutorWrapper[**Args, Result]:
 def _mimic_async[**Args, Result](
     function: Callable[Args, Result],
     /,
-    within: Callable[..., Coroutine[None, None, Result]],
-) -> Callable[Args, Coroutine[None, None, Result]]:
+    within: Callable[..., Coroutine[Any, Any, Result]],
+) -> Callable[Args, Coroutine[Any, Any, Result]]:
     try:
         annotations: Any = getattr(  # noqa: B009
             function,
@@ -192,7 +194,7 @@ def _mimic_async[**Args, Result](
             "__annotations__",
             {
                 **annotations,
-                "return": Coroutine[None, None, annotations.get("return", Any)],
+                "return": Coroutine[Any, Any, annotations.get("return", Any)],
             },
         )
 
@@ -234,6 +236,6 @@ def _mimic_async[**Args, Result](
     )
 
     return cast(
-        Callable[Args, Coroutine[None, None, Result]],
+        Callable[Args, Coroutine[Any, Any, Result]],
         within,
     )

{haiway-0.13.0 → haiway-0.14.0}/src/haiway/helpers/caching.py

@@ -3,12 +3,15 @@ from collections import OrderedDict
 from collections.abc import Callable, Coroutine, Hashable
 from functools import _make_key  # pyright: ignore[reportPrivateUsage]
 from time import monotonic
-from typing import NamedTuple, Protocol, cast, overload
+from typing import Any, NamedTuple, Protocol, cast, overload
 
 from haiway.context.access import ctx
 from haiway.utils.mimic import mimic_function
 
 __all__ = [
+    "CacheMakeKey",
+    "CacheRead",
+    "CacheWrite",
     "cache",
 ]
 
@@ -59,7 +62,7 @@ def cache[**Args, Result, Key](
     read: CacheRead[Key, Result],
     write: CacheWrite[Key, Result],
 ) -> Callable[
-    [Callable[Args, Coroutine[None, None, Result]]], Callable[Args, Coroutine[None, None, Result]]
+    [Callable[Args, Coroutine[Any, Any, Result]]], Callable[Args, Coroutine[Any, Any, Result]]
 ]: ...
 
 
@@ -73,8 +76,8 @@ def cache[**Args, Result, Key](  # noqa: PLR0913
     write: CacheWrite[Key, Result] | None = None,
 ) -> (
     Callable[
-        [Callable[Args, Coroutine[None, None, Result]]],
-        Callable[Args, Coroutine[None, None, Result]],
+        [Callable[Args, Coroutine[Any, Any, Result]]],
+        Callable[Args, Coroutine[Any, Any, Result]],
     ]
     | Callable[[Callable[Args, Result]], Callable[Args, Result]]
     | Callable[Args, Result]
@@ -317,13 +320,13 @@ class _AsyncCache[**Args, Result]:
 
     def __init__(
         self,
-        function: Callable[Args, Coroutine[None, None, Result]],
+        function: Callable[Args, Coroutine[Any, Any, Result]],
         /,
         limit: int,
         expiration: float | None,
         make_key: CacheMakeKey[Args, Hashable],
     ) -> None:
-        self._function: Callable[Args, Coroutine[None, None, Result]] = function
+        self._function: Callable[Args, Coroutine[Any, Any, Result]] = function
         self._cached: OrderedDict[Hashable, _CacheEntry[Result]] = OrderedDict()
         self._limit: int = limit
         self._make_key: CacheMakeKey[Args, Hashable] = make_key
@@ -348,7 +351,7 @@ class _AsyncCache[**Args, Result]:
         instance: object | None,
         owner: type | None = None,
         /,
-    ) -> Callable[Args, Coroutine[None, None, Result]]:
+    ) -> Callable[Args, Coroutine[Any, Any, Result]]:
         assert owner is None and instance is None, "cache does not work for classes"  # nosec: B101
         return self
 
@@ -405,13 +408,13 @@ class _CustomCache[**Args, Result, Key]:
 
     def __init__(
         self,
-        function: Callable[Args, Coroutine[None, None, Result]],
+        function: Callable[Args, Coroutine[Any, Any, Result]],
         /,
         make_key: CacheMakeKey[Args, Key],
         read: CacheRead[Key, Result],
         write: CacheWrite[Key, Result],
     ) -> None:
-        self._function: Callable[Args, Coroutine[None, None, Result]] = function
+        self._function: Callable[Args, Coroutine[Any, Any, Result]] = function
         self._make_key: CacheMakeKey[Args, Key] = make_key
         self._read: CacheRead[Key, Result] = read
         self._write: CacheWrite[Key, Result] = write

{haiway-0.13.0 → haiway-0.14.0}/src/haiway/helpers/metrics.py

@@ -15,6 +15,7 @@ __all_ = [
 
 class MetricsScopeStore:
     __slots__ = (
+        "allow_exit",
         "entered",
         "exited",
         "identifier",
@@ -31,6 +32,7 @@ class MetricsScopeStore:
         self.entered: float = monotonic()
         self.metrics: dict[type[State], State] = {}
         self.exited: float | None = None
+        self.allow_exit: bool = False
         self.nested: list[MetricsScopeStore] = []
 
     @property
@@ -115,7 +117,7 @@ class MetricsHolder:
 
     def __init__(self) -> None:
         self.root_scope: ScopeIdentifier | None = None
-        self.scopes: dict[ScopeIdentifier, MetricsScopeStore] = {}
+        self.scopes: dict[str, MetricsScopeStore] = {}
 
     def record(
         self,
@@ -124,10 +126,10 @@ class MetricsHolder:
         metric: State,
     ) -> None:
         assert self.root_scope is not None  # nosec: B101
-        assert scope in self.scopes  # nosec: B101
+        assert scope.scope_id in self.scopes  # nosec: B101
 
         metric_type: type[State] = type(metric)
-        metrics: dict[type[State], State] = self.scopes[scope].metrics
+        metrics: dict[type[State], State] = self.scopes[scope.scope_id].metrics
         if (current := metrics.get(metric_type)) and hasattr(current, "__add__"):
             metrics[type(metric)] = current.__add__(metric)  # pyright: ignore[reportUnknownMemberType, reportAttributeAccessIssue]
 
@@ -142,29 +144,29 @@ class MetricsHolder:
         merged: bool,
     ) -> Metric | None:
         assert self.root_scope is not None  # nosec: B101
-        assert scope in self.scopes  # nosec: B101
+        assert scope.scope_id in self.scopes  # nosec: B101
 
         if merged:
-            return self.scopes[scope].merged(metric)
+            return self.scopes[scope.scope_id].merged(metric)
 
         else:
-            return cast(Metric | None, self.scopes[scope].metrics.get(metric))
+            return cast(Metric | None, self.scopes[scope.scope_id].metrics.get(metric))
 
     def enter_scope[Metric: State](
         self,
         scope: ScopeIdentifier,
         /,
     ) -> None:
-        assert scope not in self.scopes  # nosec: B101
+        assert scope.scope_id not in self.scopes  # nosec: B101
         scope_metrics = MetricsScopeStore(scope)
-        self.scopes[scope] = scope_metrics
+        self.scopes[scope.scope_id] = scope_metrics
 
         if self.root_scope is None:
             self.root_scope = scope
 
         else:
             for key in self.scopes.keys():
-                if key.scope_id == scope.parent_id:
+                if key == scope.parent_id:
                     self.scopes[key].nested.append(scope_metrics)
                     return
 
@@ -177,8 +179,18 @@ class MetricsHolder:
         scope: ScopeIdentifier,
         /,
     ) -> None:
-        assert scope in self.scopes  # nosec: B101
-        self.scopes[scope].exited = monotonic()
+        assert self.root_scope is not None  # nosec: B101
+        assert scope.scope_id in self.scopes  # nosec: B101
+
+        self.scopes[scope.scope_id].allow_exit = True
+
+        if not all(nested.exited for nested in self.scopes[scope.scope_id].nested):
+            return  # not completed yet
+
+        self.scopes[scope.scope_id].exited = monotonic()
+
+        if scope != self.root_scope and self.scopes[scope.parent_id].allow_exit:
+            self.exit_scope(self.scopes[scope.parent_id].identifier)
 
 
 @final
@@ -213,7 +225,7 @@ class MetricsLogger:
         redact_content: bool,
     ) -> None:
         self.root_scope: ScopeIdentifier | None = None
-        self.scopes: dict[ScopeIdentifier, MetricsScopeStore] = {}
+        self.scopes: dict[str, MetricsScopeStore] = {}
         self.items_limit: int | None = items_limit
         self.redact_content: bool = redact_content
 
@@ -224,10 +236,10 @@ class MetricsLogger:
         metric: State,
     ) -> None:
         assert self.root_scope is not None  # nosec: B101
-        assert scope in self.scopes  # nosec: B101
+        assert scope.scope_id in self.scopes  # nosec: B101
 
         metric_type: type[State] = type(metric)
-        metrics: dict[type[State], State] = self.scopes[scope].metrics
+        metrics: dict[type[State], State] = self.scopes[scope.scope_id].metrics
         if (current := metrics.get(metric_type)) and hasattr(current, "__add__"):
             metrics[type(metric)] = current.__add__(metric)  # pyright: ignore[reportUnknownMemberType, reportAttributeAccessIssue]
 
@@ -248,29 +260,29 @@ class MetricsLogger:
         merged: bool,
     ) -> Metric | None:
         assert self.root_scope is not None  # nosec: B101
-        assert scope in self.scopes  # nosec: B101
+        assert scope.scope_id in self.scopes  # nosec: B101
 
         if merged:
-            return self.scopes[scope].merged(metric)
+            return self.scopes[scope.scope_id].merged(metric)
 
         else:
-            return cast(Metric | None, self.scopes[scope].metrics.get(metric))
+            return cast(Metric | None, self.scopes[scope.scope_id].metrics.get(metric))
 
     def enter_scope[Metric: State](
         self,
         scope: ScopeIdentifier,
         /,
     ) -> None:
-        assert scope not in self.scopes  # nosec: B101
+        assert scope.scope_id not in self.scopes  # nosec: B101
         scope_metrics = MetricsScopeStore(scope)
-        self.scopes[scope] = scope_metrics
+        self.scopes[scope.scope_id] = scope_metrics
 
         if self.root_scope is None:
             self.root_scope = scope
 
         else:
             for key in self.scopes.keys():
-                if key.scope_id == scope.parent_id:
+                if key == scope.parent_id:
                     self.scopes[key].nested.append(scope_metrics)
                     return
 
@@ -283,12 +295,22 @@ class MetricsLogger:
         scope: ScopeIdentifier,
         /,
     ) -> None:
-        assert scope in self.scopes  # nosec: B101
-        self.scopes[scope].exited = monotonic()
+        assert self.root_scope is not None  # nosec: B101
+        assert scope.scope_id in self.scopes  # nosec: B101
+
+        self.scopes[scope.scope_id].allow_exit = True
+
+        if not all(nested.exited for nested in self.scopes[scope.scope_id].nested):
+            return  # not completed yet
+
+        self.scopes[scope.scope_id].exited = monotonic()
+
+        if scope != self.root_scope and self.scopes[scope.parent_id].allow_exit:
+            self.exit_scope(self.scopes[scope.parent_id].identifier)
 
-        if scope == self.root_scope and self.scopes[scope].finished:
+        elif scope == self.root_scope and self.scopes[self.root_scope.scope_id].finished:
             if log := _tree_log(
-                self.scopes[scope],
+                self.scopes[scope.scope_id],
                 list_items_limit=self.items_limit,
                 redact_content=self.redact_content,
             ):

{haiway-0.13.0 → haiway-0.14.0}/src/haiway/helpers/retries.py

@@ -1,7 +1,7 @@
 from asyncio import CancelledError, iscoroutinefunction, sleep
 from collections.abc import Callable, Coroutine
 from time import sleep as sleep_sync
-from typing import cast, overload
+from typing import Any, cast, overload
 
 from haiway.context import ctx
 from haiway.utils import mimic_function
@@ -178,12 +178,12 @@ def _wrap_sync[**Args, Result](
 
 
 def _wrap_async[**Args, Result](
-    function: Callable[Args, Coroutine[None, None, Result]],
+    function: Callable[Args, Coroutine[Any, Any, Result]],
     *,
     limit: int,
     delay: Callable[[int, Exception], float] | float | None,
     catching: set[type[Exception]] | tuple[type[Exception], ...],
-) -> Callable[Args, Coroutine[None, None, Result]]:
+) -> Callable[Args, Coroutine[Any, Any, Result]]:
     assert limit > 0, "Limit has to be greater than zero"  # nosec: B101
 
     @mimic_function(function)