dycw-utilities 0.126.12__tar.gz → 0.127.1__tar.gz

{dycw_utilities-0.126.12 → dycw_utilities-0.127.1}/PKG-INFO

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

{dycw_utilities-0.126.12 → dycw_utilities-0.127.1}/pyproject.toml

@@ -94,7 +94,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.126.12"
+version = "0.127.1"
 
 [project.optional-dependencies]
 test = [
@@ -334,7 +334,7 @@ zzz-test-zoneinfo = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.126.12"
+current_version = "0.127.1"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"
@@ -375,6 +375,7 @@ data_file = ".coverage/data"
 omit = ["src/utilities/streamlit.py"]
 parallel = true
 plugins = ["coverage_conditional_plugin"]
+source = ["src/utilities"]
 
 # hatch
 [tool.hatch]

{dycw_utilities-0.126.12 → dycw_utilities-0.127.1}/src/tests/test_asyncio.py

@@ -15,13 +15,12 @@ from hypothesis.strategies import (
     booleans,
     data,
     integers,
-    just,
     lists,
     none,
     permutations,
     sampled_from,
 )
-from pytest import LogCaptureFixture, mark, param, raises
+from pytest import LogCaptureFixture, approx, mark, param, raises
 
 from tests.test_asyncio_classes.loopers import (
     _REL,
@@ -42,7 +41,6 @@ from utilities.asyncio import (
     InfiniteLooper,
     InfiniteQueueLooper,
     Looper,
-    LooperTimeoutError,
     UniquePriorityQueue,
     UniqueQueue,
     _InfiniteLooperDefaultEventError,
@@ -72,6 +70,7 @@ from utilities.hypothesis import sentinels, text_ascii
 from utilities.iterables import one, unique_everseen
 from utilities.pytest import skipif_windows
 from utilities.sentinel import Sentinel, sentinel
+from utilities.text import unique_str
 from utilities.timer import Timer
 
 if TYPE_CHECKING:
@@ -199,7 +198,6 @@ class TestEnhancedTaskGroup:
             assert looper.running
         assert not looper.running
 
-    @mark.flaky
     async def test_max_tasks_disabled(self) -> None:
         with Timer() as timer:
             async with EnhancedTaskGroup() as tg:
@@ -626,7 +624,7 @@ class TestInfiniteLooper:
         ):
             raise _InfiniteLooperDefaultEventError(looper=looper)
 
-    @given(logger=just("logger") | none())
+    @given(log=booleans())
     @mark.parametrize(("sleep_restart", "desc"), sleep_restart_cases)
     @settings(suppress_health_check={HealthCheck.function_scoped_fixture})
     async def test_error_upon_initialize(
@@ -634,7 +632,7 @@ class TestInfiniteLooper:
         *,
         sleep_restart: DurationOrEveryDuration,
         desc: str,
-        logger: str | None,
+        log: bool,
         caplog: LogCaptureFixture,
     ) -> None:
         class CustomError(Exception): ...
@@ -651,15 +649,19 @@ class TestInfiniteLooper:
 
         async with (
             timeout(1.0),
-            Example(sleep_core=0.1, sleep_restart=sleep_restart, logger=logger),
+            Example(
+                sleep_core=0.1,
+                sleep_restart=sleep_restart,
+                logger=unique_str() if log else None,
+            ),
         ):
             ...
-        if logger is not None:
+        if log:
             message = caplog.messages[0]
             expected = f"'Example' encountered 'CustomError()' whilst initializing; sleeping {desc}..."
             assert message == expected
 
-    @given(logger=just("logger") | none())
+    @given(log=booleans())
     @mark.parametrize(("sleep_restart", "desc"), sleep_restart_cases)
     @settings(suppress_health_check={HealthCheck.function_scoped_fixture})
     async def test_error_upon_core(
@@ -667,7 +669,7 @@ class TestInfiniteLooper:
         *,
         sleep_restart: DurationOrEveryDuration,
         desc: str,
-        logger: str | None,
+        log: bool,
         caplog: LogCaptureFixture,
     ) -> None:
         class CustomError(Exception): ...
@@ -680,15 +682,19 @@ class TestInfiniteLooper:
 
         async with (
             timeout(1.0),
-            Example(sleep_core=0.1, sleep_restart=sleep_restart, logger=logger),
+            Example(
+                sleep_core=0.1,
+                sleep_restart=sleep_restart,
+                logger=unique_str() if log else None,
+            ),
         ):
             ...
-        if logger is not None:
+        if log:
             message = caplog.messages[0]
             expected = f"'Example' encountered 'CustomError()'; sleeping {desc}..."
             assert message == expected
 
-    @given(logger=just("logger") | none())
+    @given(log=booleans())
     @mark.parametrize(("sleep_restart", "desc"), sleep_restart_cases)
     @settings(suppress_health_check={HealthCheck.function_scoped_fixture})
     async def test_error_upon_teardown(
@@ -696,7 +702,7 @@ class TestInfiniteLooper:
         *,
         sleep_restart: DurationOrEveryDuration,
         desc: str,
-        logger: str | None,
+        log: bool,
         caplog: LogCaptureFixture,
     ) -> None:
         class Custom1Error(Exception): ...
@@ -725,14 +731,18 @@ class TestInfiniteLooper:
 
         async with (
             timeout(1.0),
-            Example(sleep_core=0.1, sleep_restart=sleep_restart, logger=logger),
+            Example(
+                sleep_core=0.1,
+                sleep_restart=sleep_restart,
+                logger=unique_str() if log else None,
+            ),
         ):
             ...
-        if logger is not None:
+        if log:
             expected = f"'Example' encountered 'Custom2Error()' whilst tearing down; sleeping {desc}..."
             assert expected in caplog.messages
 
-    @given(logger=just("logger") | none())
+    @given(log=booleans())
     @mark.parametrize(("sleep_restart", "desc"), sleep_restart_cases)
     @settings(suppress_health_check={HealthCheck.function_scoped_fixture})
     async def test_error_group_upon_others(
@@ -740,7 +750,7 @@ class TestInfiniteLooper:
         *,
         sleep_restart: DurationOrEveryDuration,
         desc: str,
-        logger: str | None,
+        log: bool,
         caplog: LogCaptureFixture,
     ) -> None:
         class CustomError(Exception): ...
@@ -771,10 +781,14 @@ class TestInfiniteLooper:
 
         async with (
             timeout(1.0),
-            Example(sleep_core=0.05, sleep_restart=sleep_restart, logger=logger),
+            Example(
+                sleep_core=0.05,
+                sleep_restart=sleep_restart,
+                logger=unique_str() if log else None,
+            ),
         ):
             ...
-        if logger is not None:
+        if log:
             message = caplog.messages[0]
             expected = f"""\
 'Example' encountered 1 error(s):
@@ -868,11 +882,10 @@ class TestInfiniteQueueLooper:
             await looper.run_until_empty(stop=True)
         assert looper.empty()
 
-    @given(logger=just("logger") | none())
-    @mark.flaky
+    @given(log=booleans())
     @settings(suppress_health_check={HealthCheck.function_scoped_fixture})
     async def test_error_process_items(
-        self, *, logger: str | None, caplog: LogCaptureFixture
+        self, *, log: bool, caplog: LogCaptureFixture
     ) -> None:
         class CustomError(Exception): ...
 
@@ -884,9 +897,12 @@ class TestInfiniteQueueLooper:
             async def _process_queue(self) -> None:
                 raise CustomError
 
-        async with timeout(1.0), Example(sleep_core=0.05, logger=logger) as looper:
+        async with (
+            timeout(1.0),
+            Example(sleep_core=0.05, logger=unique_str() if log else None) as looper,
+        ):
             looper.put_left_nowait(1)
-        if logger is not None:
+        if log:
             message = caplog.messages[0]
             expected = "'Example' encountered 'CustomError()'; sleeping for 0:01:00..."
             assert message == expected
@@ -1361,9 +1377,10 @@ class TestLooper:
 
     async def test_timeout(self) -> None:
         looper = CountingLooper(timeout=1.0)
-        async with looper:
-            with raises(LooperTimeoutError, match="Timeout"):
+        with Timer() as timer:
+            async with looper:
                 await looper
+        assert float(timer) == approx(1.0, rel=_REL)
         self._assert_stats_full(looper, stops=1)
 
     def test_with_auto_start(self) -> None:

{dycw_utilities-0.126.12 → dycw_utilities-0.127.1}/src/tests/test_sqlalchemy.py

@@ -170,7 +170,7 @@ class TestCheckEngine:
 
 class TestColumnwiseMinMax:
     @given(data=data(), values=sets(pairs(integers(0, 10) | none()), min_size=1))
-    @settings_with_reduced_examples(phases={Phase.generate})
+    @settings(max_examples=1, phases={Phase.generate})
     async def test_main(
         self, *, data: DataObject, values: set[tuple[int | None, int | None]]
     ) -> None:

{dycw_utilities-0.126.12 → dycw_utilities-0.127.1}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.126.12"
+__version__ = "0.127.1"

{dycw_utilities-0.126.12 → dycw_utilities-0.127.1}/src/utilities/asyncio.py

@@ -663,15 +663,6 @@ class InfiniteQueueLooper(InfiniteLooper[THashable], Generic[THashable, _T]):
 class LooperError(Exception): ...
 
 
-@dataclass(kw_only=True, slots=True)
-class LooperTimeoutError(LooperError):
-    duration: Duration | None = None
-
-    @override
-    def __str__(self) -> str:
-        return "Timeout" if self.duration is None else f"Timeout after {self.duration}"
-
-
 @dataclass(kw_only=True, slots=True)
 class _LooperNoTaskError(LooperError):
     looper: Looper
@@ -691,7 +682,6 @@ class Looper(Generic[_T]):
     empty_upon_exit: bool = field(default=False, repr=False)
     logger: str | None = field(default=None, repr=False)
     timeout: Duration | None = field(default=None, repr=False)
-    timeout_error: type[Exception] = field(default=LooperTimeoutError, repr=False)
     # settings
     _backoff: float = field(init=False, repr=False)
     _debug: bool = field(default=False, repr=False)
@@ -757,7 +747,7 @@ class Looper(Generic[_T]):
                     _ = await self._stack.enter_async_context(looper)
                 if self.auto_start:
                     _ = self._debug and self._logger.debug("%s: auto-starting...", self)
-                    with suppress(self.timeout_error):
+                    with suppress(TimeoutError):
                         await self._task
             case _ as never:
                 assert_never(never)
@@ -893,7 +883,6 @@ class Looper(Generic[_T]):
         backoff: Duration | Sentinel = sentinel,
         logger: str | None | Sentinel = sentinel,
         timeout: Duration | None | Sentinel = sentinel,
-        timeout_error: type[Exception] | Sentinel = sentinel,
         _debug: bool | Sentinel = sentinel,
         **kwargs: Any,
     ) -> Self:
@@ -906,7 +895,6 @@ class Looper(Generic[_T]):
             backoff=backoff,
             logger=logger,
             timeout=timeout,
-            timeout_error=timeout_error,
             _debug=_debug,
             **kwargs,
         )
@@ -1029,7 +1017,7 @@ class Looper(Generic[_T]):
     async def run_looper(self) -> None:
         """Run the looper."""
         try:
-            async with timeout_dur(duration=self.timeout, error=self.timeout_error):
+            async with timeout_dur(duration=self.timeout):
                 while True:
                     if self._is_stopped.is_set():
                         _ = self._debug and self._logger.debug("%s: stopped", self)
@@ -1068,6 +1056,8 @@ class Looper(Generic[_T]):
             if error.args[0] == "generator didn't stop after athrow()":
                 return
             raise
+        except TimeoutError:
+            pass
 
     async def run_until_empty(self) -> None:
         """Run until the queue is empty."""
@@ -1430,7 +1420,6 @@ __all__ = [
     "InfiniteQueueLooper",
     "Looper",
     "LooperError",
-    "LooperTimeoutError",
     "StreamCommandOutput",
     "UniquePriorityQueue",
     "UniqueQueue",

{dycw_utilities-0.126.12 → dycw_utilities-0.127.1}/src/utilities/redis.py

@@ -25,13 +25,7 @@ from typing import (
 from redis.asyncio import Redis
 from redis.typing import EncodableT
 
-from utilities.asyncio import (
-    EnhancedQueue,
-    InfiniteQueueLooper,
-    Looper,
-    LooperTimeoutError,
-    timeout_dur,
-)
+from utilities.asyncio import EnhancedQueue, InfiniteQueueLooper, Looper, timeout_dur
 from utilities.contextlib import suppress_super_object_attribute_error
 from utilities.datetime import (
     MILLISECOND,
@@ -702,9 +696,6 @@ class PublishServiceMixin(Generic[_T]):
     publish_service_empty_upon_exit: bool = field(default=False, repr=False)
     publish_service_logger: str | None = field(default=None, repr=False)
     publish_service_timeout: Duration | None = field(default=None, repr=False)
-    publish_service_timeout_error: type[Exception] = field(
-        default=LooperTimeoutError, repr=False
-    )
     publish_service_debug: bool = field(default=False, repr=False)
     _is_pending_restart: Event = field(default_factory=Event, init=False, repr=False)
     # base - publish service
@@ -724,7 +715,6 @@ class PublishServiceMixin(Generic[_T]):
             empty_upon_exit=self.publish_service_empty_upon_exit,
             logger=self.publish_service_logger,
             timeout=self.publish_service_timeout,
-            timeout_error=self.publish_service_timeout_error,
             _debug=self.publish_service_debug,
             # publish service
             redis=self.publish_service_redis,
@@ -986,9 +976,6 @@ class SubscribeServiceMixin(Generic[_T]):
     subscribe_service_empty_upon_exit: bool = field(default=False, repr=False)
     subscribe_service_logger: str | None = field(default=None, repr=False)
     subscribe_service_timeout: Duration | None = field(default=None, repr=False)
-    subscribe_service_timeout_error: type[Exception] = field(
-        default=LooperTimeoutError, repr=False
-    )
     subscribe_service_debug: bool = field(default=False, repr=False)
     # base - looper
     subscribe_service_redis: Redis
@@ -1009,7 +996,6 @@ class SubscribeServiceMixin(Generic[_T]):
             empty_upon_exit=self.subscribe_service_empty_upon_exit,
             logger=self.subscribe_service_logger,
             timeout=self.subscribe_service_timeout,
-            timeout_error=self.subscribe_service_timeout_error,
             _debug=self.subscribe_service_debug,
             # subscribe service
             redis=self.subscribe_service_redis,

{dycw_utilities-0.126.12 → dycw_utilities-0.127.1}/src/utilities/slack_sdk.py

@@ -7,12 +7,7 @@ from typing import TYPE_CHECKING, Any, Self, override
 
 from slack_sdk.webhook.async_client import AsyncWebhookClient
 
-from utilities.asyncio import (
-    InfiniteQueueLooper,
-    Looper,
-    LooperTimeoutError,
-    timeout_dur,
-)
+from utilities.asyncio import InfiniteQueueLooper, Looper, timeout_dur
 from utilities.datetime import MINUTE, SECOND, datetime_duration_to_float
 from utilities.functools import cache
 from utilities.math import safe_round
@@ -94,7 +89,6 @@ class SlackHandlerService(Handler, Looper[str]):
         backoff: Duration = SECOND,
         logger: str | None = None,
         timeout: Duration | None = None,
-        timeout_error: type[Exception] = LooperTimeoutError,
         _debug: bool = False,
         level: int = NOTSET,
         sender: Callable[[str, str], Coroutine1[None]] = _send_adapter,
@@ -108,7 +102,6 @@ class SlackHandlerService(Handler, Looper[str]):
             backoff=backoff,
             logger=logger,
             timeout=timeout,
-            timeout_error=timeout_error,
             _debug=_debug,
         )
         Looper.__post_init__(self)
@@ -144,7 +137,6 @@ class SlackHandlerService(Handler, Looper[str]):
         backoff: Duration | Sentinel = sentinel,
         logger: str | None | Sentinel = sentinel,
         timeout: Duration | None | Sentinel = sentinel,
-        timeout_error: type[Exception] | Sentinel = sentinel,
         _debug: bool | Sentinel = sentinel,
         **kwargs: Any,
     ) -> Self:
@@ -157,7 +149,6 @@ class SlackHandlerService(Handler, Looper[str]):
             backoff=backoff,
             logger=logger,
             timeout=timeout,
-            timeout_error=timeout_error,
             _debug=_debug,
             **kwargs,
         )

{dycw_utilities-0.126.12 → dycw_utilities-0.127.1}/src/utilities/sqlalchemy.py

@@ -57,12 +57,7 @@ from sqlalchemy.orm import (
 from sqlalchemy.orm.exc import UnmappedClassError
 from sqlalchemy.pool import NullPool, Pool
 
-from utilities.asyncio import (
-    InfiniteQueueLooper,
-    Looper,
-    LooperTimeoutError,
-    timeout_dur,
-)
+from utilities.asyncio import InfiniteQueueLooper, Looper, timeout_dur
 from utilities.contextlib import suppress_super_object_attribute_error
 from utilities.datetime import SECOND
 from utilities.functions import (
@@ -707,9 +702,6 @@ class UpsertServiceMixin:
     upsert_service_empty_upon_exit: bool = field(default=False, repr=False)
     upsert_service_logger: str | None = field(default=None, repr=False)
     upsert_service_timeout: Duration | None = field(default=None, repr=False)
-    upsert_service_timeout_error: type[Exception] = field(
-        default=LooperTimeoutError, repr=False
-    )
     upsert_service_debug: bool = field(default=False, repr=False)
     # base - upsert service
     upsert_service_database: AsyncEngine
@@ -734,7 +726,6 @@ class UpsertServiceMixin:
             empty_upon_exit=self.upsert_service_empty_upon_exit,
             logger=self.upsert_service_logger,
             timeout=self.upsert_service_timeout,
-            timeout_error=self.upsert_service_timeout_error,
             _debug=self.upsert_service_debug,
             # upsert service
             engine=self.upsert_service_database,