haiway 0.4.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

haiway/context/disposables.py

@@ -1,20 +1,19 @@
-from asyncio import gather, shield
+from asyncio import gather
 from collections.abc import Iterable
+from contextlib import AbstractAsyncContextManager
+from itertools import chain
 from types import TracebackType
-from typing import Protocol, final, runtime_checkable
+from typing import final
 
 from haiway.state import State
+from haiway.utils import freeze
 
 __all__ = [
     "Disposable",
     "Disposables",
 ]
 
-
-@runtime_checkable
-class Disposable(Protocol):
-    async def initialize(self) -> State | None: ...
-    async def dispose(self) -> None: ...
+type Disposable = AbstractAsyncContextManager[Iterable[State] | State | None]
 
 
 @final
@@ -25,39 +24,35 @@ class Disposables:
     ) -> None:
         self._disposables: tuple[Disposable, ...] = disposables
 
-    async def initialize(self) -> Iterable[State]:
-        return [
-            state
-            for state in await gather(
-                *[disposable.initialize() for disposable in self._disposables],
-            )
-            if state is not None
-        ]
-
-    async def dispose(self) -> None:
-        results: list[BaseException | None] = await shield(
-            gather(
-                *[disposable.dispose() for disposable in self._disposables],
-                return_exceptions=True,
-            ),
-        )
+        freeze(self)
 
-        self._disposables = ()
-        exceptions: list[BaseException] = [
-            exception for exception in results if exception is not None
-        ]
+    def __bool__(self) -> bool:
+        return len(self._disposables) > 0
 
-        if len(exceptions) > 1:
-            raise BaseExceptionGroup("Disposing errors", exceptions)
+    async def _initialize(
+        self,
+        disposable: Disposable,
+        /,
+    ) -> Iterable[State]:
+        match await disposable.__aenter__():
+            case None:
+                return ()
 
-        elif exceptions:
-            raise exceptions[0]
+            case State() as single:
+                return (single,)
 
-    def __bool__(self) -> bool:
-        return len(self._disposables) > 0
+            case multiple:
+                return multiple
 
     async def __aenter__(self) -> Iterable[State]:
-        return await self.initialize()
+        return [
+            *chain.from_iterable(
+                state
+                for state in await gather(
+                    *[self._initialize(disposable) for disposable in self._disposables],
+                )
+            )
+        ]
 
     async def __aexit__(
         self,
@@ -65,4 +60,19 @@ class Disposables:
         exc_val: BaseException | None,
         exc_tb: TracebackType | None,
     ) -> None:
-        await self.dispose()
+        results: list[bool | BaseException | None] = await gather(
+            *[
+                disposable.__aexit__(
+                    exc_type,
+                    exc_val,
+                    exc_tb,
+                )
+                for disposable in self._disposables
+            ],
+            return_exceptions=True,
+        )
+
+        exceptions: list[BaseException] = [exc for exc in results if isinstance(exc, BaseException)]
+
+        if len(exceptions) > 1:
+            raise BaseExceptionGroup("Disposing errors", exceptions)

haiway/utils/queue.py

@@ -1,7 +1,6 @@
 from asyncio import AbstractEventLoop, CancelledError, Future, get_running_loop
 from collections import deque
 from collections.abc import AsyncIterator
-from typing import Self
 
 __all__ = [
     "AsyncQueue",
@@ -63,9 +62,6 @@ class AsyncQueue[Element](AsyncIterator[Element]):
     def cancel(self) -> None:
         self.finish(exception=CancelledError())
 
-    def __aiter__(self) -> Self:
-        return self
-
     async def __anext__(self) -> Element:
         assert self._waiting is None, "Only a single queue consumer is supported!"  # nosec: B101
 

{haiway-0.4.0.dist-info → haiway-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: haiway
-Version: 0.4.0
+Version: 0.5.0
 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.4.0.dist-info → haiway-0.5.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ haiway/__init__.py,sha256=hLc3-FDmNQEV4r-RLOiGjWtYSk7krU8vRMBaZyRU08g,1267
 haiway/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 haiway/context/__init__.py,sha256=21Y3zvRo1bHASZD6B_FNkU28k1-g88RdmUyqxvYXJxg,336
 haiway/context/access.py,sha256=zPQcQBp5XMlNuszbxhtzi-5mNpDLpZ6PT-gVFDBH0dA,14115
-haiway/context/disposables.py,sha256=VQX9jVo1pjqkmOYzWpsbYyF45y0XtpjorIIaeMBCwTU,1771
+haiway/context/disposables.py,sha256=DZjnMp-wMfF-em2Wjhbm1MvXubNpuzFBT70BQNIxC7M,2019
 haiway/context/metrics.py,sha256=R6BIH3Pwtm_fQqPZmTei3nUGNDAZEnvUKaVxwjWxgS0,10755
 haiway/context/state.py,sha256=GxGwPQTK8FdSprBd83lQbA9veubp0o93_1Yk3gb7HMc,3000
 haiway/context/tasks.py,sha256=xXtXIUwXOra0EePTdkcEbMOmpWwFcO3hCRfR_IfvAHk,1978
@@ -28,9 +28,9 @@ haiway/utils/immutable.py,sha256=K34ZIMzbkpgkHKH-KF73plEbXExsajNRkRTYp9nJEf4,620
 haiway/utils/logs.py,sha256=oDsc1ZdqKDjlTlctLbDcp9iX98Acr-1tdw-Pyg3DElo,1577
 haiway/utils/mimic.py,sha256=BkVjTVP2TxxC8GChPGyDV6UXVwJmiRiSWeOYZNZFHxs,1828
 haiway/utils/noop.py,sha256=qgbZlOKWY6_23Zs43OLukK2HagIQKRyR04zrFVm5rWI,344
-haiway/utils/queue.py,sha256=7gLpL07E4K_FnP1AygmpNnBpwfS5kgnw_6wakuRkmw4,2423
-haiway-0.4.0.dist-info/LICENSE,sha256=GehQEW_I1pkmxkkj3NEa7rCTQKYBn7vTPabpDYJlRuo,1063
-haiway-0.4.0.dist-info/METADATA,sha256=7inuv-8w44WoEhdlvmdPJkrbb-uz_pQ85KCpypIGf7w,3872
-haiway-0.4.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-haiway-0.4.0.dist-info/top_level.txt,sha256=_LdXVLzUzgkvAGQnQJj5kQfoFhpPW6EF4Kj9NapniLg,7
-haiway-0.4.0.dist-info/RECORD,,
+haiway/utils/queue.py,sha256=oQ3GXCJ-PGNtMEr6EPdgqAvYZoj8lAa7Z2drBKBEoBM,2345
+haiway-0.5.0.dist-info/LICENSE,sha256=GehQEW_I1pkmxkkj3NEa7rCTQKYBn7vTPabpDYJlRuo,1063
+haiway-0.5.0.dist-info/METADATA,sha256=vKid6rHV96N2FZJZ7WUmSBgpqzG5xeMkGsxY43OVNHY,3872
+haiway-0.5.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+haiway-0.5.0.dist-info/top_level.txt,sha256=_LdXVLzUzgkvAGQnQJj5kQfoFhpPW6EF4Kj9NapniLg,7
+haiway-0.5.0.dist-info/RECORD,,