haiway 0.2.0__tar.gz → 0.3.1__tar.gz

{haiway-0.2.0/src/haiway.egg-info → haiway-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: haiway
-Version: 0.2.0
+Version: 0.3.1
 Summary: Framework for dependency injection and state management within structured concurrency model.
 Maintainer-email: Kacper Kaliński <kacper.kalinski@miquido.com>
 License: MIT License

{haiway-0.2.0 → haiway-0.3.1}/pyproject.toml

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

{haiway-0.2.0 → haiway-0.3.1}/src/haiway/__init__.py

@@ -1,10 +1,12 @@
 from haiway.context import (
+    Disposable,
+    Disposables,
     MissingContext,
     MissingState,
     ScopeMetrics,
     ctx,
 )
-from haiway.helpers import Disposable, Disposables, asynchronous, cache, retry, throttle, timeout
+from haiway.helpers import asynchronous, cache, retry, throttle, timeout
 from haiway.state import State
 from haiway.types import (
     MISSING,

{haiway-0.2.0 → haiway-0.3.1}/src/haiway/context/__init__.py

@@ -1,9 +1,12 @@
 from haiway.context.access import ctx
+from haiway.context.disposables import Disposable, Disposables
 from haiway.context.metrics import ScopeMetrics
 from haiway.context.types import MissingContext, MissingState
 
 __all__ = [
     "ctx",
+    "Disposable",
+    "Disposables",
     "MissingContext",
     "MissingState",
     "ScopeMetrics",

{haiway-0.2.0 → haiway-0.3.1}/src/haiway/context/access.py

@@ -5,11 +5,13 @@ from asyncio import (
 from collections.abc import (
     Callable,
     Coroutine,
+    Iterable,
 )
 from logging import Logger
 from types import TracebackType
 from typing import Any, final
 
+from haiway.context.disposables import Disposable, Disposables
 from haiway.context.metrics import MetricsContext, ScopeMetrics
 from haiway.context.state import StateContext
 from haiway.context.tasks import TaskGroupContext
@@ -23,25 +25,41 @@ __all__ = [
 
 @final
 class ScopeContext:
-    def __init__(
+    def __init__(  # noqa: PLR0913
         self,
+        trace_id: str | None,
+        name: str,
+        logger: Logger | None,
+        state: tuple[State, ...],
+        disposables: Disposables | None,
         task_group: TaskGroupContext,
-        state: StateContext,
-        metrics: MetricsContext,
         completion: Callable[[ScopeMetrics], Coroutine[None, None, None]] | None,
     ) -> None:
         self._task_group: TaskGroupContext = task_group
-        self._state: StateContext = state
-        self._metrics: MetricsContext = metrics
+        self._logger: Logger | None = logger
+        self._trace_id: str | None = trace_id
+        self._name: str = name
+        self._state_context: StateContext
+        self._state: tuple[State, ...] = state
+        self._disposables: Disposables | None = disposables
+        self._metrics_context: MetricsContext
         self._completion: Callable[[ScopeMetrics], Coroutine[None, None, None]] | None = completion
 
         freeze(self)
 
     def __enter__(self) -> None:
         assert self._completion is None, "Can't enter synchronous context with completion"  # nosec: B101
+        assert self._disposables is None, "Can't enter synchronous context with disposables"  # nosec: B101
+
+        self._state_context = StateContext.updated(self._state)
+        self._metrics_context = MetricsContext.scope(
+            self._name,
+            logger=self._logger,
+            trace_id=self._trace_id,
+        )
 
-        self._state.__enter__()
-        self._metrics.__enter__()
+        self._state_context.__enter__()
+        self._metrics_context.__enter__()
 
     def __exit__(
         self,
@@ -49,49 +67,71 @@ class ScopeContext:
         exc_val: BaseException | None,
         exc_tb: TracebackType | None,
     ) -> None:
-        self._metrics.__exit__(
+        self._metrics_context.__exit__(
             exc_type=exc_type,
             exc_val=exc_val,
             exc_tb=exc_tb,
         )
 
-        self._state.__exit__(
+        self._state_context.__exit__(
             exc_type=exc_type,
             exc_val=exc_val,
             exc_tb=exc_tb,
         )
 
     async def __aenter__(self) -> None:
-        self._state.__enter__()
-        self._metrics.__enter__()
         await self._task_group.__aenter__()
 
+        if self._disposables:
+            self._state_context = StateContext.updated(
+                (*self._state, *await self._disposables.__aenter__())
+            )
+
+        else:
+            self._state_context = StateContext.updated(self._state)
+
+        self._metrics_context = MetricsContext.scope(
+            self._name,
+            logger=self._logger,
+            trace_id=self._trace_id,
+        )
+
+        self._state_context.__enter__()
+        self._metrics_context.__enter__()
+
     async def __aexit__(
         self,
         exc_type: type[BaseException] | None,
         exc_val: BaseException | None,
         exc_tb: TracebackType | None,
     ) -> None:
+        if self._disposables:
+            await self._disposables.__aexit__(
+                exc_type=exc_type,
+                exc_val=exc_val,
+                exc_tb=exc_tb,
+            )
+
         await self._task_group.__aexit__(
             exc_type=exc_type,
             exc_val=exc_val,
             exc_tb=exc_tb,
         )
 
-        self._metrics.__exit__(
+        self._metrics_context.__exit__(
             exc_type=exc_type,
             exc_val=exc_val,
             exc_tb=exc_tb,
         )
 
-        self._state.__exit__(
+        self._state_context.__exit__(
             exc_type=exc_type,
             exc_val=exc_val,
             exc_tb=exc_tb,
         )
 
         if completion := self._completion:
-            await completion(self._metrics._metrics)  # pyright: ignore[reportPrivateUsage]
+            await completion(self._metrics_context._metrics)  # pyright: ignore[reportPrivateUsage]
 
 
 @final
@@ -101,6 +141,7 @@ class ctx:
         name: str,
         /,
         *state: State,
+        disposables: Disposables | Iterable[Disposable] | None = None,
         logger: Logger | None = None,
         trace_id: str | None = None,
         completion: Callable[[ScopeMetrics], Coroutine[None, None, None]] | None = None,
@@ -114,9 +155,14 @@ class ctx:
         name: Value
             name of the scope context
 
-        *state: State
-            state propagated within the scope context, will be merged with current if any\
-             by replacing current with provided on conflict
+        *state: State | Disposable
+            state propagated within the scope context, will be merged with current state by\
+             replacing current with provided on conflict.
+
+        disposables: Disposables | list[Disposable] | None
+            disposables consumed within the context when entered. Produced state will automatically\
+             be added to the scope state. Using asynchronous context is required if any disposables\
+             were provided.
 
         logger: Logger | None
             logger used within the scope context, when not provided current logger will be used\
@@ -138,14 +184,24 @@ class ctx:
             context object intended to enter context manager with it
         """
 
+        resolved_disposables: Disposables | None
+        match disposables:
+            case None:
+                resolved_disposables = None
+
+            case Disposables() as disposables:
+                resolved_disposables = disposables
+
+            case iterable:
+                resolved_disposables = Disposables(*iterable)
+
         return ScopeContext(
+            trace_id=trace_id,
+            name=name,
+            logger=logger,
+            state=state,
+            disposables=resolved_disposables,
             task_group=TaskGroupContext(),
-            metrics=MetricsContext.scope(
-                name,
-                logger=logger,
-                trace_id=trace_id,
-            ),
-            state=StateContext.updated(state),
             completion=completion,
         )
 

{haiway-0.2.0/src/haiway/helpers → haiway-0.3.1/src/haiway/context}/disposables.py

@@ -53,6 +53,9 @@ class Disposables:
         elif exceptions:
             raise exceptions[0]
 
+    def __bool__(self) -> bool:
+        return len(self._disposables) > 0
+
     async def __aenter__(self) -> Iterable[State]:
         return await self.initialize()
 

{haiway-0.2.0 → haiway-0.3.1}/src/haiway/helpers/__init__.py

@@ -1,6 +1,5 @@
-from haiway.helpers.asynchronous import asynchronous
-from haiway.helpers.cached import cache
-from haiway.helpers.disposables import Disposable, Disposables
+from haiway.helpers.asynchrony import asynchronous
+from haiway.helpers.caching import cache
 from haiway.helpers.retries import retry
 from haiway.helpers.throttling import throttle
 from haiway.helpers.timeouted import timeout
@@ -8,8 +7,6 @@ from haiway.helpers.timeouted import timeout
 __all__ = [
     "asynchronous",
     "cache",
-    "Disposable",
-    "Disposables",
     "retry",
     "throttle",
     "timeout",

haiway-0.2.0/src/haiway/helpers/asynchronous.py → haiway-0.3.1/src/haiway/helpers/asynchrony.py

@@ -3,9 +3,9 @@ from collections.abc import Callable, Coroutine
 from concurrent.futures import Executor
 from contextvars import Context, copy_context
 from functools import partial
-from typing import Any, Literal, cast, overload
+from typing import Any, cast, overload
 
-from haiway.types.missing import MISSING, Missing, not_missing
+from haiway.types.missing import MISSING, Missing
 
 __all__ = [
     "asynchronous",
@@ -25,7 +25,7 @@ def asynchronous[**Args, Result]() -> (
 def asynchronous[**Args, Result](
     *,
     loop: AbstractEventLoop | None = None,
-    executor: Executor | Literal["default"],
+    executor: Executor,
 ) -> Callable[
     [Callable[Args, Result]],
     Callable[Args, Coroutine[None, None, Result]],
@@ -43,7 +43,7 @@ def asynchronous[**Args, Result](
     function: Callable[Args, Result] | None = None,
     /,
     loop: AbstractEventLoop | None = None,
-    executor: Executor | Literal["default"] | Missing = MISSING,
+    executor: Executor | Missing = MISSING,
 ) -> (
     Callable[
         [Callable[Args, Result]],
@@ -63,10 +63,9 @@ def asynchronous[**Args, Result](
     loop: AbstractEventLoop | None
         loop used to call the function. When None was provided the loop currently running while \
         executing the function will be used. Default is None.
-    executor: Executor | Literal["default"] | Missing
-        executor used to run the function. Specifying "default" uses a default loop executor.
-        When not provided (Missing) no executor will be used \
-        (function will by just wrapped as an async function without any executor)
+    executor: Executor | Missing
+        executor used to run the function. When not provided (Missing) default loop executor\
+         will be used.
 
     Returns
     -------
@@ -79,26 +78,11 @@ def asynchronous[**Args, Result](
     ) -> Callable[Args, Coroutine[None, None, Result]]:
         assert not iscoroutinefunction(wrapped), "Cannot wrap async function in executor"  # nosec: B101
 
-        if not_missing(executor):
-            return _ExecutorWrapper(
-                wrapped,
-                loop=loop,
-                executor=cast(Executor | None, None if executor == "default" else executor),
-            )
-
-        else:
-
-            async def wrapper(
-                *args: Args.args,
-                **kwargs: Args.kwargs,
-            ) -> Result:
-                return wrapped(
-                    *args,
-                    **kwargs,
-                )
-
-            _mimic_async(wrapped, within=wrapper)
-            return wrapper
+        return _ExecutorWrapper(
+            wrapped,
+            loop=loop,
+            executor=cast(Executor | None, None if executor is MISSING else executor),
+        )
 
     if function := function:
         return wrap(wrapped=function)

{haiway-0.2.0 → haiway-0.3.1}/src/haiway/types/missing.py

@@ -46,20 +46,20 @@ class Missing(metaclass=MissingType):
         self,
         name: str,
     ) -> Any:
-        raise RuntimeError("Missing has no attributes")
+        raise AttributeError("Missing has no attributes")
 
     def __setattr__(
         self,
         __name: str,
         __value: Any,
     ) -> None:
-        raise RuntimeError("Missing can't be modified")
+        raise AttributeError("Missing can't be modified")
 
     def __delattr__(
         self,
         __name: str,
     ) -> None:
-        raise RuntimeError("Missing can't be modified")
+        raise AttributeError("Missing can't be modified")
 
 
 MISSING: Final[Missing] = Missing()

{haiway-0.2.0 → haiway-0.3.1/src/haiway.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: haiway
-Version: 0.2.0
+Version: 0.3.1
 Summary: Framework for dependency injection and state management within structured concurrency model.
 Maintainer-email: Kacper Kaliński <kacper.kalinski@miquido.com>
 License: MIT License

{haiway-0.2.0 → haiway-0.3.1}/src/haiway.egg-info/SOURCES.txt

@@ -10,14 +10,14 @@ src/haiway.egg-info/requires.txt
 src/haiway.egg-info/top_level.txt
 src/haiway/context/__init__.py
 src/haiway/context/access.py
+src/haiway/context/disposables.py
 src/haiway/context/metrics.py
 src/haiway/context/state.py
 src/haiway/context/tasks.py
 src/haiway/context/types.py
 src/haiway/helpers/__init__.py
-src/haiway/helpers/asynchronous.py
-src/haiway/helpers/cached.py
-src/haiway/helpers/disposables.py
+src/haiway/helpers/asynchrony.py
+src/haiway/helpers/caching.py
 src/haiway/helpers/retries.py
 src/haiway/helpers/throttling.py
 src/haiway/helpers/timeouted.py