dycw-utilities 0.131.7__py3-none-any.whl → 0.131.9__py3-none-any.whl

{dycw_utilities-0.131.7.dist-info → dycw_utilities-0.131.9.dist-info}/METADATA

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

{dycw_utilities-0.131.7.dist-info → dycw_utilities-0.131.9.dist-info}/RECORD

@@ -1,7 +1,7 @@
-utilities/__init__.py,sha256=8vYsYB_QS775vHWdWRbA5PoQsxv9xMVXwDnzye5-mJc,60
+utilities/__init__.py,sha256=OQKoBd8NcREzug1yqBz40CfEPg5mv9S_IlwEwGMga6c,60
 utilities/aiolimiter.py,sha256=mD0wEiqMgwpty4XTbawFpnkkmJS6R4JRsVXFUaoitSU,628
 utilities/altair.py,sha256=HeZBVUocjkrTNwwKrClppsIqgNFF-ykv05HfZSoHYno,9104
-utilities/asyncio.py,sha256=lvdgBhuMtxq0dpiwF9g2WMMrit3kqXibN1V5NZ4xdbo,38046
+utilities/asyncio.py,sha256=yfKvAIDCRrWdyQMVZMo4DJQx4nVrXoAcqwhNuF95Ryo,38186
 utilities/atomicwrites.py,sha256=geFjn9Pwn-tTrtoGjDDxWli9NqbYfy3gGL6ZBctiqSo,5393
 utilities/atools.py,sha256=IYMuFSFGSKyuQmqD6v5IUtDlz8PPw0Sr87Cub_gRU3M,1168
 utilities/cachetools.py,sha256=C1zqOg7BYz0IfQFK8e3qaDDgEZxDpo47F15RTfJM37Q,2910
@@ -61,7 +61,7 @@ utilities/pytest.py,sha256=zP4CWKXpRVk4aRDRxolUAvqQwX7wgDO8lzmkQfuZaZo,7832
 utilities/pytest_regressions.py,sha256=YI55B7EtLjhz7zPJZ6NK9bWrxrKCKabWZJe1cwcbA5o,5082
 utilities/python_dotenv.py,sha256=edXsvHZhZnYeqfMfrsRRpj7_9eJI6uizh3xLx8Q9B3w,3228
 utilities/random.py,sha256=lYdjgxB7GCfU_fwFVl5U-BIM_HV3q6_urL9byjrwDM8,4157
-utilities/re.py,sha256=5J4d8VwIPFVrX2Eb8zfoxImDv7IwiN_U7mJ07wR2Wvs,3958
+utilities/re.py,sha256=J7pJOn-Zn5nJ6rvWwMeJWP86EtMk_klhBexnoSaQiZA,4610
 utilities/redis.py,sha256=IceT5EjgrebVkGL8X3M35xlqjI2c7zFbyV1P4dExN4M,36037
 utilities/reprlib.py,sha256=ssYTcBW-TeRh3fhCJv57sopTZHF5FrPyyUg9yp5XBlo,3953
 utilities/scipy.py,sha256=wZJM7fEgBAkLSYYvSmsg5ac-QuwAI0BGqHVetw1_Hb0,947
@@ -78,9 +78,9 @@ utilities/tempfile.py,sha256=VqmZJAhTJ1OaVywFzk5eqROV8iJbW9XQ_QYAV0bpdRo,1384
 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/timer.py,sha256=VeSl3ot8-f4D1d3HjjSsgKvjxHJGXd_sW4KcTExOR64,2475
 utilities/traceback.py,sha256=l9onlqDdW5GCSIFbU_-htBE7KlsvsJdNtGrK6-k0RCQ,8759
-utilities/types.py,sha256=gP04CcCOyFrG7BgblVCsrrChiuO2x842NDVW-GF7odo,18370
+utilities/types.py,sha256=Ubd3VBiqZ71eS71WSemHEM4oRF-5fnwd3PnMAm8IZaI,18461
 utilities/typing.py,sha256=kQWywPcRbFBKmvQBELmgbiqSHsnlo_D0ru53vl6KDeY,13846
 utilities/tzdata.py,sha256=yCf70NICwAeazN3_JcXhWvRqCy06XJNQ42j7r6gw3HY,1217
 utilities/tzlocal.py,sha256=P5BjqTiYskeCwjE7i9zycCFXO4MWdZgYCh4jut-LpzA,1042
@@ -88,10 +88,10 @@ utilities/uuid.py,sha256=jJTFxz-CWgltqNuzmythB7iEQ-Q1mCwPevUfKthZT3c,611
 utilities/version.py,sha256=ufhJMmI6KPs1-3wBI71aj5wCukd3sP_m11usLe88DNA,5117
 utilities/warnings.py,sha256=un1LvHv70PU-LLv8RxPVmugTzDJkkGXRMZTE2-fTQHw,1771
 utilities/whenever.py,sha256=jS31ZAY5OMxFxLja_Yo5Fidi87Pd-GoVZ7Vi_teqVDA,16743
-utilities/whenever2.py,sha256=XxiAEp4onJNhIi6G7L2HuzkMJZGA3j-I_fuXxmb5vtY,5432
+utilities/whenever2.py,sha256=JHixGl6KibK8GUF13GeBjvWMYsFHRDSXixSo0xMSJFM,5437
 utilities/zipfile.py,sha256=24lQc9ATcJxHXBPc_tBDiJk48pWyRrlxO2fIsFxU0A8,699
 utilities/zoneinfo.py,sha256=tvcgu3QzDxe2suTexi2QzRGpin7VK1TjHa0JYYxT69I,1862
-dycw_utilities-0.131.7.dist-info/METADATA,sha256=LY97kj9T58_Fg3RF7GpooTy1HfTHyI0XV3PMZnOEw9E,1584
-dycw_utilities-0.131.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.131.7.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.131.7.dist-info/RECORD,,
+dycw_utilities-0.131.9.dist-info/METADATA,sha256=Ot-6Wm0MCFNJh_vmaEvMVM89IHtiCDBrKiq267xA9bQ,1584
+dycw_utilities-0.131.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.131.9.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.131.9.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.131.7"
+__version__ = "0.131.9"

utilities/asyncio.py

@@ -43,6 +43,7 @@ from typing import (
 )
 
 from typing_extensions import deprecated
+from whenever import TimeDelta
 
 from utilities.dataclasses import replace_non_sentinel
 from utilities.datetime import (
@@ -961,11 +962,14 @@ def put_items_nowait(items: Iterable[_T], queue: Queue[_T], /) -> None:
 ##
 
 
-async def sleep_dur(*, duration: Duration | None = None) -> None:
+async def sleep_dur(*, duration: Duration | TimeDelta | None = None) -> None:
     """Sleep which accepts durations."""
     if duration is None:
         return
-    await sleep(datetime_duration_to_float(duration))
+    if isinstance(duration, TimeDelta):
+        await sleep(duration.in_seconds())
+    else:
+        await sleep(datetime_duration_to_float(duration))
 
 
 ##

utilities/re.py

@@ -2,37 +2,59 @@ from __future__ import annotations
 
 import re
 from dataclasses import dataclass
-from typing import override
+from re import Pattern
+from typing import TYPE_CHECKING, assert_never, override
 
 from utilities.iterables import OneEmptyError, OneNonUniqueError, one
 
+if TYPE_CHECKING:
+    from utilities.types import PatternLike
 
-def extract_group(pattern: str, text: str, /, *, flags: int = 0) -> str:
+
+def ensure_pattern(pattern: PatternLike, /, *, flags: int = 0) -> Pattern[str]:
+    """Ensure a pattern is returned."""
+    match pattern:
+        case Pattern():
+            return pattern
+        case str():
+            return re.compile(pattern, flags=flags)
+        case _ as never:
+            assert_never(never)
+
+
+##
+
+
+def extract_group(pattern: PatternLike, text: str, /, *, flags: int = 0) -> str:
     """Extract a group.
 
     The regex must have 1 capture group, and this must match exactly once.
     """
-    compiled = re.compile(pattern, flags=flags)
-    match compiled.groups:
+    pattern_use = ensure_pattern(pattern, flags=flags)
+    match pattern_use.groups:
         case 0:
-            raise _ExtractGroupNoCaptureGroupsError(pattern=pattern, text=text)
+            raise _ExtractGroupNoCaptureGroupsError(pattern=pattern_use, text=text)
         case 1:
-            matches: list[str] = compiled.findall(text)
+            matches: list[str] = pattern_use.findall(text)
             try:
                 return one(matches)
             except OneEmptyError:
-                raise _ExtractGroupNoMatchesError(pattern=pattern, text=text) from None
+                raise _ExtractGroupNoMatchesError(
+                    pattern=pattern_use, text=text
+                ) from None
             except OneNonUniqueError:
                 raise _ExtractGroupMultipleMatchesError(
-                    pattern=pattern, text=text, matches=matches
+                    pattern=pattern_use, text=text, matches=matches
                 ) from None
         case _:
-            raise _ExtractGroupMultipleCaptureGroupsError(pattern=pattern, text=text)
+            raise _ExtractGroupMultipleCaptureGroupsError(
+                pattern=pattern_use, text=text
+            )
 
 
 @dataclass(kw_only=True, slots=True)
 class ExtractGroupError(Exception):
-    pattern: str
+    pattern: Pattern[str]
     text: str
 
 
@@ -68,32 +90,35 @@ class _ExtractGroupNoMatchesError(ExtractGroupError):
         return f"Pattern {self.pattern} must match against {self.text}"
 
 
-def extract_groups(pattern: str, text: str, /, *, flags: int = 0) -> list[str]:
+##
+
+
+def extract_groups(pattern: PatternLike, text: str, /, *, flags: int = 0) -> list[str]:
     """Extract multiple groups.
 
     The regex may have any number of capture groups, and they must collectively
     match exactly once.
     """
-    compiled = re.compile(pattern, flags=flags)
-    if (n_groups := compiled.groups) == 0:
-        raise _ExtractGroupsNoCaptureGroupsError(pattern=pattern, text=text)
-    matches: list[str] = compiled.findall(text)
+    pattern_use = ensure_pattern(pattern, flags=flags)
+    if (n_groups := pattern_use.groups) == 0:
+        raise _ExtractGroupsNoCaptureGroupsError(pattern=pattern_use, text=text)
+    matches: list[str] = pattern_use.findall(text)
     match len(matches), n_groups:
         case 0, _:
-            raise _ExtractGroupsNoMatchesError(pattern=pattern, text=text)
+            raise _ExtractGroupsNoMatchesError(pattern=pattern_use, text=text)
         case 1, 1:
             return matches
         case 1, _:
             return list(one(matches))
         case _:
             raise _ExtractGroupsMultipleMatchesError(
-                pattern=pattern, text=text, matches=matches
+                pattern=pattern_use, text=text, matches=matches
             )
 
 
 @dataclass(kw_only=True, slots=True)
 class ExtractGroupsError(Exception):
-    pattern: str
+    pattern: Pattern[str]
     text: str
 
 
@@ -108,7 +133,7 @@ class _ExtractGroupsMultipleMatchesError(ExtractGroupsError):
 
 @dataclass(kw_only=True, slots=True)
 class _ExtractGroupsNoCaptureGroupsError(ExtractGroupsError):
-    pattern: str
+    pattern: Pattern[str]
     text: str
 
     @override
@@ -123,4 +148,10 @@ class _ExtractGroupsNoMatchesError(ExtractGroupsError):
         return f"Pattern {self.pattern} must match against {self.text}"
 
 
-__all__ = ["ExtractGroupError", "ExtractGroupsError", "extract_group", "extract_groups"]
+__all__ = [
+    "ExtractGroupError",
+    "ExtractGroupsError",
+    "ensure_pattern",
+    "extract_group",
+    "extract_groups",
+]

utilities/timer.py

@@ -1,14 +1,14 @@
 from __future__ import annotations
 
-import datetime as dt
 from operator import add, eq, ge, gt, le, lt, mul, ne, sub, truediv
-from timeit import default_timer
-from typing import TYPE_CHECKING, Any, Self, overload, override
+from typing import TYPE_CHECKING, Any, Self, override
+
+from utilities.whenever2 import get_now_local
 
 if TYPE_CHECKING:
     from collections.abc import Callable
 
-    from utilities.types import Number
+    from whenever import TimeDelta, ZonedDateTime
 
 
 class Timer:
@@ -16,116 +16,82 @@ class Timer:
 
     def __init__(self) -> None:
         super().__init__()
-        self._start = default_timer()
-        self._end: float | None = None
+        self._start: ZonedDateTime = get_now_local()
+        self._end: ZonedDateTime | None = None
 
     # arithmetic
 
-    def __add__(self, other: Any) -> dt.timedelta:
-        if isinstance(other, int | float):
-            return dt.timedelta(seconds=self._apply_op(add, other))
-        if isinstance(other, dt.timedelta | Timer):
-            return self._apply_op(add, other)
-        return NotImplemented
+    def __add__(self, other: Any) -> TimeDelta:
+        return self._apply_op(add, other)
 
     def __float__(self) -> float:
-        end_use = default_timer() if (end := self._end) is None else end
-        return end_use - self._start
+        return self.timedelta.in_seconds()
+
+    def __sub__(self, other: Any) -> TimeDelta:
+        return self._apply_op(sub, other)
 
-    def __sub__(self, other: Any) -> dt.timedelta:
-        if isinstance(other, int | float):
-            return dt.timedelta(seconds=self._apply_op(sub, other))
-        if isinstance(other, dt.timedelta | Timer):
-            return self._apply_op(sub, other)
-        return NotImplemented
-
-    def __mul__(self, other: Any) -> dt.timedelta:
-        if isinstance(other, int | float):
-            return dt.timedelta(seconds=self._apply_op(mul, other))
-        return NotImplemented
-
-    @overload
-    def __truediv__(self, other: Number) -> dt.timedelta: ...
-    @overload
-    def __truediv__(self, other: dt.timedelta | Timer) -> float: ...
-    def __truediv__(self, other: Any) -> dt.timedelta | float:
-        if isinstance(other, int | float):
-            return dt.timedelta(seconds=self._apply_op(truediv, other))
-        if isinstance(other, dt.timedelta | Timer):
-            return self._apply_op(truediv, other)
-        return NotImplemented
+    def __mul__(self, other: Any) -> TimeDelta:
+        return self._apply_op(mul, other)
+
+    def __truediv__(self, other: Any) -> TimeDelta:
+        return self._apply_op(truediv, other)
 
     # context manager
 
     def __enter__(self) -> Self:
-        self._start = default_timer()
+        self._start = get_now_local()
         return self
 
     def __exit__(self, *_: object) -> bool:
-        self._end = default_timer()
+        self._end = get_now_local()
         return False
 
     # repr
 
     @override
     def __repr__(self) -> str:
-        return str(self.timedelta)
+        return self.timedelta.format_common_iso()
 
     @override
     def __str__(self) -> str:
-        return str(self.timedelta)
+        return self.timedelta.format_common_iso()
 
     # comparison
 
     @override
     def __eq__(self, other: object) -> bool:
-        if isinstance(other, int | float | dt.timedelta | Timer):
-            return self._apply_op(eq, other)
-        return False
+        return self._apply_op(eq, other)
 
     def __ge__(self, other: Any) -> bool:
-        if isinstance(other, int | float | dt.timedelta | Timer):
-            return self._apply_op(ge, other)
-        return NotImplemented
+        return self._apply_op(ge, other)
 
     def __gt__(self, other: Any) -> bool:
-        if isinstance(other, int | float | dt.timedelta | Timer):
-            return self._apply_op(gt, other)
-        return NotImplemented
+        return self._apply_op(gt, other)
 
     def __le__(self, other: Any) -> bool:
-        if isinstance(other, int | float | dt.timedelta | Timer):
-            return self._apply_op(le, other)
-        return NotImplemented
+        return self._apply_op(le, other)
 
     def __lt__(self, other: Any) -> bool:
-        if isinstance(other, int | float | dt.timedelta | Timer):
-            return self._apply_op(lt, other)
-        return NotImplemented
+        return self._apply_op(lt, other)
 
     @override
     def __ne__(self, other: object) -> bool:
-        if isinstance(other, int | float | dt.timedelta | Timer):
-            return self._apply_op(ne, other)
-        return True
+        return self._apply_op(ne, other)
 
     # properties
 
     @property
-    def timedelta(self) -> dt.timedelta:
+    def timedelta(self) -> TimeDelta:
         """The elapsed time, as a `timedelta` object."""
-        return dt.timedelta(seconds=float(self))
+        end_use = get_now_local() if (end := self._end) is None else end
+        return end_use - self._start
 
     # private
 
     def _apply_op(self, op: Callable[[Any, Any], Any], other: Any, /) -> Any:
-        if isinstance(other, int | float):
-            return op(float(self), other)
         if isinstance(other, Timer):
             return op(self.timedelta, other.timedelta)
-        if isinstance(other, dt.timedelta):
-            return op(self.timedelta, other)
-        return NotImplemented  # pragma: no cover
+        return op(self.timedelta, other)
 
 
 __all__ = ["Timer"]

utilities/types.py

@@ -7,6 +7,7 @@ from enum import Enum
 from logging import Logger
 from pathlib import Path
 from random import Random
+from re import Pattern
 from types import TracebackType
 from typing import (
     Any,
@@ -249,6 +250,10 @@ type PathLike = MaybeStr[Path]
 type Seed = int | float | str | bytes | bytearray | Random
 
 
+# re
+type PatternLike = MaybeStr[Pattern[str]]
+
+
 # traceback
 type ExcInfo = tuple[type[BaseException], BaseException, TracebackType]
 type OptExcInfo = ExcInfo | tuple[None, None, None]
@@ -294,6 +299,7 @@ __all__ = [
     "Parallelism",
     "ParseObjectExtra",
     "PathLike",
+    "PatternLike",
     "RoundMode",
     "Seed",
     "SerializeObjectExtra",

utilities/whenever2.py

@@ -53,7 +53,7 @@ DATE_DELTA_PARSABLE_MAX = DateDelta(days=999999)
 ## common constants
 
 
-ZERO_TIME = Time()
+ZERO_TIME = TimeDelta()
 MICROSECOND = TimeDelta(microseconds=1)
 MILLISECOND = TimeDelta(milliseconds=1)
 SECOND = TimeDelta(seconds=1)