dycw-utilities 0.122.0__tar.gz → 0.123.0__tar.gz

{dycw_utilities-0.122.0 → dycw_utilities-0.123.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.122.0
+Version: 0.123.0
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12

{dycw_utilities-0.122.0 → dycw_utilities-0.123.0}/pyproject.toml

@@ -92,7 +92,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.122.0"
+version = "0.123.0"
 
 [project.optional-dependencies]
 test = [
@@ -334,7 +334,7 @@ zzz-test-zoneinfo = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.122.0"
+current_version = "0.123.0"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"
@@ -433,6 +433,7 @@ addopts = [
   "--durations=10",
   "--durations-min=10",
   "--strict-markers",
+  "--timeout=300",
 ]
 asyncio_default_fixture_loop_scope = "function"
 asyncio_mode = "auto"

{dycw_utilities-0.122.0 → dycw_utilities-0.123.0}/src/tests/test_asyncio.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from asyncio import CancelledError, Event, Queue, TaskGroup, run, sleep, timeout
+from contextlib import asynccontextmanager
 from dataclasses import dataclass, field
 from functools import partial
 from itertools import chain, count
@@ -53,7 +54,7 @@ from utilities.sentinel import Sentinel, sentinel
 from utilities.timer import Timer
 
 if TYPE_CHECKING:
-    from collections.abc import Callable, Iterator
+    from collections.abc import AsyncIterator, Callable, Iterator
 
     from utilities.types import (
         Coroutine1,
@@ -65,6 +66,47 @@ if TYPE_CHECKING:
 
 
 class TestEnhancedTaskGroup:
+    async def test_create_task_context_coroutine(self) -> None:
+        flag: bool = False
+
+        @asynccontextmanager
+        async def yield_true() -> AsyncIterator[None]:
+            nonlocal flag
+            try:
+                flag = True
+                yield
+            finally:
+                flag = False
+
+        assert not flag
+        async with EnhancedTaskGroup(timeout=0.1) as tg:
+            _ = tg.create_task_context(yield_true())
+            await sleep(0.05)
+            assert flag
+        assert not flag
+
+    async def test_create_task_context_looper(self) -> None:
+        @dataclass(kw_only=True)
+        class Example(InfiniteLooper[None]):
+            running: bool = False
+
+            @override
+            async def _initialize(self) -> None:
+                self.running = True
+
+            @override
+            async def _teardown(self) -> None:
+                self.running = False
+
+        looper = Example(duration=0.1)
+        assert not looper.running
+        async with EnhancedTaskGroup(timeout=0.1) as tg:
+            assert not looper.running
+            _ = tg.create_task_context(looper)
+            await sleep(0.05)
+            assert looper.running
+        assert not looper.running
+
     async def test_max_tasks_disabled(self) -> None:
         with Timer() as timer:
             async with EnhancedTaskGroup() as tg:
@@ -314,7 +356,7 @@ class TestInfiniteLooper:
 
         async def inc_external(obj: Example, /) -> None:
             nonlocal external
-            while True:
+            for _ in range(100):  # infinite doesn't work on CI
                 external += 1
                 obj.counter += 1
                 await sleep(0.05)
@@ -346,7 +388,7 @@ class TestInfiniteLooper:
             ...
         assert 4 <= looper.initializations <= 6
         assert 0 <= looper.counter <= 7
-        assert 16 <= external <= 21
+        assert 14 <= external <= 21
 
     async def test_with_coroutine_self_error(self) -> None:
         class CustomError(Exception): ...

{dycw_utilities-0.122.0 → dycw_utilities-0.123.0}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.122.0"
+__version__ = "0.123.0"

{dycw_utilities-0.122.0 → dycw_utilities-0.123.0}/src/utilities/asyncio.py

@@ -19,6 +19,7 @@ from asyncio import (
 )
 from collections.abc import Callable, Hashable, Iterable, Iterator, Mapping
 from contextlib import (
+    AbstractAsyncContextManager,
     AsyncExitStack,
     _AsyncGeneratorContextManager,
     asynccontextmanager,
@@ -85,6 +86,7 @@ class EnhancedTaskGroup(TaskGroup):
     _semaphore: Semaphore | None
     _timeout: Duration | None
     _error: type[Exception]
+    _stack: AsyncExitStack
     _timeout_cm: _AsyncGeneratorContextManager[None] | None
 
     @override
@@ -99,8 +101,24 @@ class EnhancedTaskGroup(TaskGroup):
         self._semaphore = None if max_tasks is None else Semaphore(max_tasks)
         self._timeout = timeout
         self._error = error
+        self._stack = AsyncExitStack()
         self._timeout_cm = None
 
+    @override
+    async def __aenter__(self) -> Self:
+        _ = await self._stack.__aenter__()
+        return await super().__aenter__()
+
+    @override
+    async def __aexit__(
+        self,
+        et: type[BaseException] | None,
+        exc: BaseException | None,
+        tb: TracebackType | None,
+    ) -> None:
+        _ = await self._stack.__aexit__(et, exc, tb)
+        _ = await super().__aexit__(et, exc, tb)
+
     @override
     def create_task(
         self,
@@ -116,6 +134,11 @@ class EnhancedTaskGroup(TaskGroup):
         coroutine = self._wrap_with_timeout(coroutine)
         return super().create_task(coroutine, name=name, context=context)
 
+    def create_task_context(self, cm: AbstractAsyncContextManager[_T], /) -> Task[_T]:
+        """Have the TaskGroup start an asynchronous context manager."""
+        _ = self._stack.push_async_callback(cm.__aexit__, None, None, None)
+        return self.create_task(cm.__aenter__())
+
     async def _wrap_with_semaphore(
         self, semaphore: Semaphore, coroutine: _CoroutineLike[_T], /
     ) -> _T:
@@ -155,18 +178,12 @@ class InfiniteLooper(ABC, Generic[THashable]):
 
     async def __aenter__(self) -> Self:
         """Context manager entry."""
-        if (self._task is None) and (self._depth == 0):
-            _ = await self._stack.__aenter__()
+        if self._depth == 0:
             self._task = create_task(self._run_looper())
             if self._await_upon_aenter:
                 with suppress(CancelledError):
                     await self._task
-        elif (self._task is not None) and (self._depth >= 1):
-            ...
-        else:
-            raise ImpossibleCaseError(  # pragma: no cover
-                case=[f"{self._task=}", f"{self._depth=}"]
-            )
+            _ = await self._stack.__aenter__()
         self._depth += 1
         return self
 
@@ -178,18 +195,16 @@ class InfiniteLooper(ABC, Generic[THashable]):
     ) -> None:
         """Context manager exit."""
         _ = (exc_type, exc_value, traceback)
-        if (self._task is None) or (self._depth == 0):
-            raise ImpossibleCaseError(  # pragma: no cover
-                case=[f"{self._task=}", f"{self._depth=}"]
-            )
-        self._depth -= 1
-        if self._depth == 0:
-            _ = await self._stack.__aexit__(exc_type, exc_value, traceback)
+        self._depth = max(self._depth - 1, 0)
+        if (self._depth == 0) and (self._task is not None):
             with suppress(CancelledError):
                 await self._task
             self._task = None
-            with suppress(Exception):
+            try:
                 await self._teardown()
+            except Exception as error:  # noqa: BLE001
+                self._error_upon_teardown(error)
+            _ = await self._stack.__aexit__(exc_type, exc_value, traceback)
 
     async def stop(self) -> None:
         """Stop the service."""