dycw-utilities 0.126.11__py3-none-any.whl → 0.127.0__py3-none-any.whl

{dycw_utilities-0.126.11.dist-info → dycw_utilities-0.127.0.dist-info}/METADATA

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

{dycw_utilities-0.126.11.dist-info → dycw_utilities-0.127.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-utilities/__init__.py,sha256=zZdDjXYw0iXgNb3iikpaOv2GNjXKtYX9dLFyhvGm1Bs,61
+utilities/__init__.py,sha256=9_7tk0nJkuN-6qR4z_kQd3QZb3ioRi15dhZGN0m-284,60
 utilities/altair.py,sha256=Gpja-flOo-Db0PIPJLJsgzAlXWoKUjPU1qY-DQ829ek,9156
-utilities/asyncio.py,sha256=phbGti22VSe9cu-SwM1vP8kyUg8AUDHvvciMvE6JnCg,51842
+utilities/asyncio.py,sha256=wKxwNnxdWxsiy5U0b1F3UgpWRHlPKM0y_OcmURzqxR8,51396
 utilities/atomicwrites.py,sha256=geFjn9Pwn-tTrtoGjDDxWli9NqbYfy3gGL6ZBctiqSo,5393
 utilities/atools.py,sha256=IYMuFSFGSKyuQmqD6v5IUtDlz8PPw0Sr87Cub_gRU3M,1168
 utilities/cachetools.py,sha256=C1zqOg7BYz0IfQFK8e3qaDDgEZxDpo47F15RTfJM37Q,2910
@@ -61,15 +61,14 @@ utilities/pytest_regressions.py,sha256=-SVT9647Dg6-JcdsiaDKXe3NdOmmrvGevLKWwGjxq
 utilities/python_dotenv.py,sha256=iWcnpXbH7S6RoXHiLlGgyuH6udCupAcPd_gQ0eAenQ0,3190
 utilities/random.py,sha256=lYdjgxB7GCfU_fwFVl5U-BIM_HV3q6_urL9byjrwDM8,4157
 utilities/re.py,sha256=5J4d8VwIPFVrX2Eb8zfoxImDv7IwiN_U7mJ07wR2Wvs,3958
-utilities/redis.py,sha256=pMKJjNI5e0lG-FZh2_idMBBmfgNr53KIGjBquZQOLZc,37556
-utilities/reprlib.py,sha256=Re9bk3n-kC__9DxQmRlevqFA86pE6TtVfWjUgpbVOv0,1849
-utilities/rich.py,sha256=t50MwwVBsoOLxzmeVFSVpjno4OW6Ufum32skXbV8-Bs,1911
+utilities/redis.py,sha256=EZgqWeoGpvN-BfCQL93F3rYlfB4U_zhzHCBuZpDmKpo,37157
+utilities/reprlib.py,sha256=ssYTcBW-TeRh3fhCJv57sopTZHF5FrPyyUg9yp5XBlo,3953
 utilities/scipy.py,sha256=X6ROnHwiUhAmPhM0jkfEh0-Fd9iRvwiqtCQMOLmOQF8,945
 utilities/sentinel.py,sha256=3jIwgpMekWgDAxPDA_hXMP2St43cPhciKN3LWiZ7kv0,1248
 utilities/shelve.py,sha256=HZsMwK4tcIfg3sh0gApx4-yjQnrY4o3V3ZRimvRhoW0,738
-utilities/slack_sdk.py,sha256=h2DiVkcFyYcT5zzZOAo6CSith5BBlHUbXeOJSL1neK8,5948
+utilities/slack_sdk.py,sha256=jqQyiYSKseZNdg2lCkvPzrAows9p7kVDDjvEnatioKo,5702
 utilities/socket.py,sha256=K77vfREvzoVTrpYKo6MZakol0EYu2q1sWJnnZqL0So0,118
-utilities/sqlalchemy.py,sha256=rHixzaYl_QHTR1dAhLj15ntiE5kwZWY4MKIr97crDts,39602
+utilities/sqlalchemy.py,sha256=XTZmNKXD9SUbZ7V1xNNxok-0Ej0Cf4ya5pjuIeH-kdg,39388
 utilities/sqlalchemy_polars.py,sha256=s7hQNep2O5DTgIRXyN_JRQma7a4DAtNd25tshaZW8iw,15490
 utilities/statsmodels.py,sha256=koyiBHvpMcSiBfh99wFUfSggLNx7cuAw3rwyfAhoKpQ,3410
 utilities/streamlit.py,sha256=U9PJBaKP1IdSykKhPZhIzSPTZsmLsnwbEPZWzNhJPKk,2955
@@ -80,7 +79,7 @@ utilities/tenacity.py,sha256=1PUvODiBVgeqIh7G5TRt5WWMSqjLYkEqP53itT97WQc,4914
 utilities/text.py,sha256=ymBFlP_cA8OgNnZRVNs7FAh7OG8HxE6YkiLEMZv5g_A,11297
 utilities/threading.py,sha256=GvBOp4CyhHfN90wGXZuA2VKe9fGzMaEa7oCl4f3nnPU,1009
 utilities/timer.py,sha256=Rkc49KSpHuC8s7vUxGO9DU55U9I6yDKnchsQqrUCVBs,4075
-utilities/traceback.py,sha256=p9WATV-e4_5AW6SvyRBiU-MY8XnEFcKgrFNUoFzalXI,27521
+utilities/traceback.py,sha256=Jg7HS3AwQ-W-msdwHp22_PSHZcR54PbmsSf115B6TSM,27435
 utilities/types.py,sha256=2f1DqTZTMRlpCPWPd9-rh_uwmRPv9UdBoi_Bfv7Ccmo,18374
 utilities/typing.py,sha256=H6ysJkI830aRwLsMKz0SZIw4cpcsm7d6KhQOwr-SDh0,13817
 utilities/tzdata.py,sha256=yCf70NICwAeazN3_JcXhWvRqCy06XJNQ42j7r6gw3HY,1217
@@ -91,7 +90,7 @@ utilities/warnings.py,sha256=un1LvHv70PU-LLv8RxPVmugTzDJkkGXRMZTE2-fTQHw,1771
 utilities/whenever.py,sha256=jS31ZAY5OMxFxLja_Yo5Fidi87Pd-GoVZ7Vi_teqVDA,16743
 utilities/zipfile.py,sha256=24lQc9ATcJxHXBPc_tBDiJk48pWyRrlxO2fIsFxU0A8,699
 utilities/zoneinfo.py,sha256=-5j7IQ9nb7gR43rdgA7ms05im-XuqhAk9EJnQBXxCoQ,1874
-dycw_utilities-0.126.11.dist-info/METADATA,sha256=BpSldlx63eNjZ98CKmHpEi6Ee2Zm5HqWnYZrKbBOICI,12804
-dycw_utilities-0.126.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.126.11.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.126.11.dist-info/RECORD,,
+dycw_utilities-0.127.0.dist-info/METADATA,sha256=bbY-L7Ck2mkOycI3XCTxhqptadPeM716AJz69ryeIXw,12803
+dycw_utilities-0.127.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.127.0.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.127.0.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.126.11"
+__version__ = "0.127.0"

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",

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,

utilities/reprlib.py

@@ -1,7 +1,13 @@
 from __future__ import annotations
 
 import reprlib
-from typing import Any
+from functools import partial
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
+    from utilities.types import StrMapping
 
 RICH_MAX_WIDTH: int = 80
 RICH_INDENT_SIZE: int = 4
@@ -11,6 +17,19 @@ RICH_MAX_DEPTH: int | None = None
 RICH_EXPAND_ALL: bool = False
 
 
+##
+
+
+def get_call_args_mapping(*args: Any, **kwargs: Any) -> StrMapping:
+    """Get the representation of a set of call arguments."""
+    return {f"args[{i}]": v for i, v in enumerate(args)} | {
+        f"kwargs[{k}]": v for k, v in kwargs.items()
+    }
+
+
+##
+
+
 def get_repr(
     obj: Any,
     /,
@@ -38,6 +57,9 @@ def get_repr(
     )
 
 
+##
+
+
 def get_repr_and_class(
     obj: Any,
     /,
@@ -62,6 +84,65 @@ def get_repr_and_class(
     return f"Object {repr_use!r} of type {type(obj).__name__!r}"
 
 
+##
+
+
+def yield_call_args_repr(
+    *args: Any,
+    _max_width: int = RICH_MAX_WIDTH,
+    _indent_size: int = RICH_INDENT_SIZE,
+    _max_length: int | None = RICH_MAX_LENGTH,
+    _max_string: int | None = RICH_MAX_STRING,
+    _max_depth: int | None = RICH_MAX_DEPTH,
+    _expand_all: bool = RICH_EXPAND_ALL,
+    **kwargs: Any,
+) -> Iterator[str]:
+    """Pretty print of a set of positional/keyword arguments."""
+    mapping = get_call_args_mapping(*args, **kwargs)
+    return yield_mapping_repr(
+        mapping,
+        _max_width=_max_width,
+        _indent_size=_indent_size,
+        _max_length=_max_length,
+        _max_string=_max_string,
+        _max_depth=_max_depth,
+        _expand_all=_expand_all,
+    )
+
+
+##
+
+
+def yield_mapping_repr(
+    mapping: StrMapping,
+    /,
+    *,
+    _max_width: int = RICH_MAX_WIDTH,
+    _indent_size: int = RICH_INDENT_SIZE,
+    _max_length: int | None = RICH_MAX_LENGTH,
+    _max_string: int | None = RICH_MAX_STRING,
+    _max_depth: int | None = RICH_MAX_DEPTH,
+    _expand_all: bool = RICH_EXPAND_ALL,
+) -> Iterator[str]:
+    """Pretty print of a set of keyword arguments."""
+    try:
+        from rich.pretty import pretty_repr
+    except ModuleNotFoundError:  # pragma: no cover
+        repr_use = repr
+    else:
+        repr_use = partial(
+            pretty_repr,
+            max_width=_max_width,
+            indent_size=_indent_size,
+            max_length=_max_length,
+            max_string=_max_string,
+            max_depth=_max_depth,
+            expand_all=_expand_all,
+        )
+    for k, v in mapping.items():
+        yield f"{k} = {repr_use(v)}"
+
+
 __all__ = [
     "RICH_EXPAND_ALL",
     "RICH_INDENT_SIZE",
@@ -69,6 +150,9 @@ __all__ = [
     "RICH_MAX_LENGTH",
     "RICH_MAX_STRING",
     "RICH_MAX_WIDTH",
+    "get_call_args_mapping",
     "get_repr",
     "get_repr_and_class",
+    "yield_call_args_repr",
+    "yield_mapping_repr",
 ]

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,
         )

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,

utilities/traceback.py

@@ -42,6 +42,8 @@ from utilities.reprlib import (
     RICH_MAX_LENGTH,
     RICH_MAX_STRING,
     RICH_MAX_WIDTH,
+    yield_call_args_repr,
+    yield_mapping_repr,
 )
 from utilities.types import TBaseException, TCallable
 from utilities.version import get_version
@@ -199,8 +201,6 @@ class _CallArgs:
     @classmethod
     def create(cls, func: Callable[..., Any], *args: Any, **kwargs: Any) -> Self:
         """Make the initial trace data."""
-        from utilities.rich import yield_call_args_repr
-
         sig = signature(func)
         try:
             bound_args = sig.bind(*args, **kwargs)
@@ -437,8 +437,6 @@ class _Frame:
         depth: int = 0,
     ) -> str:
         """Format the traceback."""
-        from utilities.rich import yield_call_args_repr, yield_mapping_repr
-
         lines: list[str] = [f"Frame {index + 1}/{total}: {self.name} ({self.module})"]
         if detail:
             lines.append(indent("Inputs:", _INDENT))
@@ -459,13 +457,13 @@ class _Frame:
             lines.extend(
                 indent(line, 2 * _INDENT)
                 for line in yield_mapping_repr(
+                    self.locals,
                     _max_width=self.max_width,
                     _indent_size=self.indent_size,
                     _max_length=self.max_length,
                     _max_string=self.max_string,
                     _max_depth=self.max_depth,
                     _expand_all=self.expand_all,
-                    **self.locals,
                 )
             )
             lines.extend([

utilities/rich.py

@@ -1,74 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, Any
-
-from rich.pretty import pretty_repr
-
-from utilities.reprlib import (
-    RICH_EXPAND_ALL,
-    RICH_INDENT_SIZE,
-    RICH_MAX_DEPTH,
-    RICH_MAX_LENGTH,
-    RICH_MAX_STRING,
-    RICH_MAX_WIDTH,
-)
-
-if TYPE_CHECKING:
-    from collections.abc import Iterator
-
-
-##
-
-
-def yield_call_args_repr(
-    *args: Any,
-    _max_width: int = RICH_MAX_WIDTH,
-    _indent_size: int = RICH_INDENT_SIZE,
-    _max_length: int | None = RICH_MAX_LENGTH,
-    _max_string: int | None = RICH_MAX_STRING,
-    _max_depth: int | None = RICH_MAX_DEPTH,
-    _expand_all: bool = RICH_EXPAND_ALL,
-    **kwargs: Any,
-) -> Iterator[str]:
-    """Pretty print of a set of positional/keyword arguments."""
-    mapping = {f"args[{i}]": v for i, v in enumerate(args)} | {
-        f"kwargs[{k}]": v for k, v in kwargs.items()
-    }
-    return yield_mapping_repr(
-        _max_width=_max_width,
-        _indent_size=_indent_size,
-        _max_length=_max_length,
-        _max_string=_max_string,
-        _max_depth=_max_depth,
-        _expand_all=_expand_all,
-        **mapping,
-    )
-
-
-##
-
-
-def yield_mapping_repr(
-    _max_width: int = RICH_MAX_WIDTH,
-    _indent_size: int = RICH_INDENT_SIZE,
-    _max_length: int | None = RICH_MAX_LENGTH,
-    _max_string: int | None = RICH_MAX_STRING,
-    _max_depth: int | None = RICH_MAX_DEPTH,
-    _expand_all: bool = RICH_EXPAND_ALL,  # noqa: FBT001
-    **kwargs: Any,
-) -> Iterator[str]:
-    """Pretty print of a set of keyword arguments."""
-    for k, v in kwargs.items():
-        v_repr = pretty_repr(
-            v,
-            max_width=_max_width,
-            indent_size=_indent_size,
-            max_length=_max_length,
-            max_string=_max_string,
-            max_depth=_max_depth,
-            expand_all=_expand_all,
-        )
-        yield f"{k} = {v_repr}"
-
-
-__all__ = ["yield_call_args_repr", "yield_mapping_repr"]