dycw-utilities 0.117.0__tar.gz → 0.117.1__tar.gz

{dycw_utilities-0.117.0 → dycw_utilities-0.117.1}/PKG-INFO

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

{dycw_utilities-0.117.0 → dycw_utilities-0.117.1}/pyproject.toml

@@ -92,7 +92,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.117.0"
+version = "0.117.1"
 
 [project.optional-dependencies]
 test = [
@@ -334,7 +334,7 @@ zzz-test-zoneinfo = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.117.0"
+current_version = "0.117.1"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.117.0 → dycw_utilities-0.117.1}/src/tests/test_asyncio.py

@@ -17,7 +17,7 @@ from itertools import chain, count
 from re import search
 from typing import TYPE_CHECKING, Self, override
 
-from hypothesis import Phase, given, settings
+from hypothesis import HealthCheck, Phase, given, settings
 from hypothesis.strategies import (
     DataObject,
     data,
@@ -28,7 +28,7 @@ from hypothesis.strategies import (
     permutations,
     sampled_from,
 )
-from pytest import approx, mark, param, raises
+from pytest import LogCaptureFixture, approx, mark, param, raises
 
 from utilities.asyncio import (
     AsyncLoopingService,
@@ -42,6 +42,7 @@ from utilities.asyncio import (
     QueueProcessor,
     UniquePriorityQueue,
     UniqueQueue,
+    _DurationOrEvery,
     get_event,
     get_items,
     get_items_nowait,
@@ -54,7 +55,12 @@ from utilities.asyncio import (
     timeout_dur,
 )
 from utilities.dataclasses import replace_non_sentinel
-from utilities.datetime import MILLISECOND, datetime_duration_to_timedelta, get_now
+from utilities.datetime import (
+    MILLISECOND,
+    MINUTE,
+    datetime_duration_to_timedelta,
+    get_now,
+)
 from utilities.hypothesis import sentinels, text_ascii
 from utilities.iterables import one, unique_everseen
 from utilities.pytest import skipif_windows
@@ -343,8 +349,8 @@ class TestGetEvent:
 
 
 class TestInfiniteLooper:
-    @given(n=integers(10, 11))
-    async def test_main(self, *, n: int) -> None:
+    @given(n=integers(10, 11), sleep_core=sampled_from([0.1, ("every", 0.1)]))
+    async def test_main(self, *, n: int, sleep_core: _DurationOrEvery) -> None:
         class TrueError(BaseException): ...
 
         class FalseError(BaseException): ...
@@ -370,7 +376,7 @@ class TestInfiniteLooper:
                 yield (True, TrueError)
                 yield (False, FalseError)
 
-        looper = Example(sleep_core=0.1)
+        looper = Example(sleep_core=sleep_core)
         match n % 2 == 0:
             case True:
                 with raises(TrueError):
@@ -522,7 +528,24 @@ class TestInfiniteLooper:
         assert 1 <= looper.counter <= 6
 
     @given(logger=just("logger") | none())
-    async def test_error_upon_initialize(self, *, logger: str | None) -> None:
+    @mark.parametrize(
+        ("sleep_restart", "desc"),
+        [
+            (60.0, "for 0:01:00"),
+            (MINUTE, "for 0:01:00"),
+            (("every", 60), "until next 0:01:00"),
+            (("every", MINUTE), "until next 0:01:00"),
+        ],
+    )
+    @settings(suppress_health_check={HealthCheck.function_scoped_fixture})
+    async def test_error_upon_initialize(
+        self,
+        *,
+        sleep_restart: _DurationOrEvery,
+        desc: str,
+        logger: str | None,
+        caplog: LogCaptureFixture,
+    ) -> None:
         class CustomError(Exception): ...
 
         @dataclass(kw_only=True)
@@ -535,13 +558,34 @@ class TestInfiniteLooper:
             async def _core(self) -> None:
                 raise NotImplementedError
 
-        looper = Example(sleep_core=0.1, logger=logger)
+        looper = Example(sleep_core=0.1, sleep_restart=sleep_restart, logger=logger)
         with raises(TimeoutError):
             async with timeout_dur(duration=0.5):
                 _ = await looper()
+        if logger is not None:
+            message = caplog.messages[0]
+            expected = f"'Example' encountered 'CustomError()' whilst initializing; sleeping {desc}..."
+            assert message == expected
 
     @given(logger=just("logger") | none())
-    async def test_error_group_upon_coroutines(self, *, logger: str | None) -> None:
+    @mark.parametrize(
+        ("sleep_restart", "desc"),
+        [
+            (60.0, "for 0:01:00"),
+            (MINUTE, "for 0:01:00"),
+            (("every", 60), "until next 0:01:00"),
+            (("every", MINUTE), "until next 0:01:00"),
+        ],
+    )
+    @settings(suppress_health_check={HealthCheck.function_scoped_fixture})
+    async def test_error_group_upon_coroutines(
+        self,
+        *,
+        sleep_restart: _DurationOrEvery,
+        desc: str,
+        logger: str | None,
+        caplog: LogCaptureFixture,
+    ) -> None:
         class CustomError(Exception): ...
 
         @dataclass(kw_only=True)
@@ -556,10 +600,14 @@ class TestInfiniteLooper:
             ) -> Iterator[tuple[None, MaybeType[BaseException]]]:
                 yield (None, CustomError)
 
-        looper = Example(sleep_core=0.1, logger=logger)
+        looper = Example(sleep_core=0.1, sleep_restart=sleep_restart, logger=logger)
         with raises(TimeoutError):
             async with timeout_dur(duration=0.5):
                 _ = await looper()
+        if logger is not None:
+            message = caplog.messages[0]
+            expected = f"'Example' encountered 'CustomError()'; sleeping {desc}..."
+            assert message == expected
 
     async def test_error_no_event_found(self) -> None:
         @dataclass(kw_only=True)

{dycw_utilities-0.117.0 → dycw_utilities-0.117.1}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.117.0"
+__version__ = "0.117.1"

{dycw_utilities-0.117.0 → dycw_utilities-0.117.1}/src/utilities/asyncio.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import datetime as dt
 from abc import ABC, abstractmethod
 from asyncio import (
     CancelledError,
@@ -32,6 +33,7 @@ from typing import (
     TYPE_CHECKING,
     Any,
     Generic,
+    Literal,
     NoReturn,
     Self,
     TextIO,
@@ -46,6 +48,7 @@ from utilities.datetime import (
     MINUTE,
     SECOND,
     datetime_duration_to_float,
+    datetime_duration_to_timedelta,
     get_now,
     round_datetime,
 )
@@ -62,7 +65,6 @@ from utilities.types import (
 )
 
 if TYPE_CHECKING:
-    import datetime as dt
     from asyncio import _CoroutineLike
     from asyncio.subprocess import Process
     from collections.abc import AsyncIterator, Sequence
@@ -337,12 +339,15 @@ class ExceptionProcessor(QueueProcessor[Exception | type[Exception]]):
 ##
 
 
+type _DurationOrEvery = Duration | tuple[Literal["every"], Duration]
+
+
 @dataclass(kw_only=True, unsafe_hash=True)
 class InfiniteLooper(ABC, Generic[THashable]):
     """An infinite loop which can throw exceptions by setting events."""
 
-    sleep_core: Duration = SECOND
-    sleep_restart: Duration = MINUTE
+    sleep_core: _DurationOrEvery = SECOND
+    sleep_restart: _DurationOrEvery = MINUTE
     logger: str | None = None
     _events: Mapping[THashable, Event] = field(
         default_factory=dict, init=False, repr=False, hash=False
@@ -369,7 +374,7 @@ class InfiniteLooper(ABC, Generic[THashable]):
                     await self._initialize()
                 except Exception as error:  # noqa: BLE001
                     self._error_upon_initialize(error)
-                    await sleep_dur(duration=self.sleep_restart)
+                    await self._run_sleep(self.sleep_restart)
                 else:
                     while True:
                         try:
@@ -380,14 +385,14 @@ class InfiniteLooper(ABC, Generic[THashable]):
                             )
                         except StopIteration:
                             await self._core()
-                            await sleep_dur(duration=self.sleep_core)
+                            await self._run_sleep(self.sleep_core)
                         else:
                             self._raise_error(event)
             except InfiniteLooperError:
                 raise
             except Exception as error:  # noqa: BLE001
                 self._error_upon_core(error)
-                await sleep_dur(duration=self.sleep_restart)
+                await self._run_sleep(self.sleep_restart)
 
     async def _run_looper_with_coroutines(
         self, *coroutines: Callable[[], Coroutine1[None]]
@@ -401,7 +406,7 @@ class InfiniteLooper(ABC, Generic[THashable]):
                     _ = [tg.create_task(c()) for c in coroutines]
             except ExceptionGroup as error:
                 self._error_group_upon_coroutines(error)
-                await sleep_dur(duration=self.sleep_restart)
+                await self._run_sleep(self.sleep_restart)
 
     async def _initialize(self) -> None:
         """Initialize the loop."""
@@ -413,20 +418,20 @@ class InfiniteLooper(ABC, Generic[THashable]):
         """Handle any errors upon initializing the looper."""
         if self.logger is not None:
             getLogger(name=self.logger).error(
-                "%r encountered %r whilst initializing; sleeping for %s...",
+                "%r encountered %r whilst initializing; sleeping %s...",
                 get_class_name(self),
                 repr_error(error),
-                self.sleep_restart,
+                self._sleep_restart_desc,
             )
 
     def _error_upon_core(self, error: Exception, /) -> None:
         """Handle any errors upon running the core function."""
         if self.logger is not None:
             getLogger(name=self.logger).error(
-                "%r encountered %r; sleeping for %s...",
+                "%r encountered %r; sleeping %s...",
                 get_class_name(self),
                 repr_error(error),
-                self.sleep_restart,
+                self._sleep_restart_desc,
             )
 
     def _error_group_upon_coroutines(self, group: ExceptionGroup, /) -> None:
@@ -439,7 +444,7 @@ class InfiniteLooper(ABC, Generic[THashable]):
                 f"- Error #{i}/{n}: {repr_error(e)}"
                 for i, e in enumerate(errors, start=1)
             )
-            msgs.append(f"Sleeping for {self.sleep_restart}...")
+            msgs.append(f"Sleeping {self._sleep_restart_desc}...")
             getLogger(name=self.logger).error("\n".join(msgs))
 
     def _raise_error(self, event: THashable, /) -> NoReturn:
@@ -454,6 +459,29 @@ class InfiniteLooper(ABC, Generic[THashable]):
             event: Event() for event, _ in self._yield_events_and_exceptions()
         }
 
+    async def _run_sleep(self, sleep: _DurationOrEvery, /) -> None:
+        """Sleep until the next part of the loop."""
+        match sleep:
+            case int() | float() | dt.timedelta() as duration:
+                await sleep_dur(duration=duration)
+            case "every", (int() | float() | dt.timedelta()) as duration:
+                await sleep_until_rounded(duration)
+            case _ as never:
+                assert_never(never)
+
+    @property
+    def _sleep_restart_desc(self) -> str:
+        """Get a description of the sleep until restart."""
+        match self.sleep_restart:
+            case int() | float() | dt.timedelta() as duration:
+                timedelta = datetime_duration_to_timedelta(duration)
+                return f"for {timedelta}"
+            case "every", (int() | float() | dt.timedelta()) as duration:
+                timedelta = datetime_duration_to_timedelta(duration)
+                return f"until next {timedelta}"
+            case _ as never:
+                assert_never(never)
+
     def _set_event(self, event: THashable, /) -> None:
         """Set the given event."""
         try: