dycw-utilities 0.131.10__py3-none-any.whl → 0.131.12__py3-none-any.whl

{dycw_utilities-0.131.10.dist-info → dycw_utilities-0.131.12.dist-info}/METADATA

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

{dycw_utilities-0.131.10.dist-info → dycw_utilities-0.131.12.dist-info}/RECORD

@@ -1,30 +1,30 @@
-utilities/__init__.py,sha256=cONWlHZLOohX6BsePAlAXt2CKhMSrwzSki10hHq4rjw,61
+utilities/__init__.py,sha256=Mewpkpu3DcrrhZzBvzBQpI4GkBsPPKRq0bdDX_sR7t4,61
 utilities/aiolimiter.py,sha256=mD0wEiqMgwpty4XTbawFpnkkmJS6R4JRsVXFUaoitSU,628
 utilities/altair.py,sha256=HeZBVUocjkrTNwwKrClppsIqgNFF-ykv05HfZSoHYno,9104
 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
-utilities/click.py,sha256=CianelgUj_M2SBpuvhmRPKOGxuvLM04FHllUWtL7hok,14647
+utilities/click.py,sha256=8gRYeyu9KQ3uim0UpC8VnFnOOKD3DyGwMJ7k0Qns1lM,14659
 utilities/concurrent.py,sha256=s2scTEd2AhXVTW4hpASU2qxV_DiVLALfms55cCQzCvM,2886
 utilities/contextlib.py,sha256=lpaLJBy3X0UGLWjM98jkQZZq8so4fRmoK-Bheq0uOW4,1027
 utilities/contextvars.py,sha256=RsSGGrbQqqZ67rOydnM7WWIsM2lIE31UHJLejnHJPWY,505
 utilities/cryptography.py,sha256=_CiK_K6c_-uQuUhsUNjNjTL-nqxAh4_1zTfS11Xe120,972
 utilities/cvxpy.py,sha256=Rv1-fD-XYerosCavRF8Pohop2DBkU3AlFaGTfD8AEAA,13776
 utilities/dataclasses.py,sha256=iiC1wpGXWhaocIikzwBt8bbLWyImoUlOlcDZJGejaIg,33011
-utilities/datetime.py,sha256=aiPh2OZK2g9gn4yEeSO0lODOmvx8U_rGn6XeSzyk4VY,38738
+utilities/datetime.py,sha256=uPQdUgJJ9KuF-pogjYRbI9lOK-i5UBzPHexWe4pOVEo,38713
 utilities/enum.py,sha256=HoRwVCWzsnH0vpO9ZEcAAIZLMv0Sn2vJxxA4sYMQgDs,5793
 utilities/errors.py,sha256=nC7ZYtxxDBMfrTHtT_MByBfup_wfGQFRo3eDt-0ZPe8,1045
 utilities/eventkit.py,sha256=6M5Xu1SzN-juk9PqBHwy5dS-ta7T0qA6SMpDsakOJ0E,13039
-utilities/fastapi.py,sha256=8ABDSOH99j7H8cpKLZhUT2JzU18wiBqcTQuBUlTe-QE,2937
-utilities/fpdf2.py,sha256=lqizPXpzdwfJk3ChcbbWVa7WNXO2uvy7KDzWQtVTnXA,1831
+utilities/fastapi.py,sha256=zDNPgfYNTZWQfS87y8ekgoJvTvmq07gv5m5kOyMYoX8,2796
+utilities/fpdf2.py,sha256=PQysO4BcSMRpg-h-t2Pm7yatyk2yFl1inkvtKs1NG4M,1853
 utilities/functions.py,sha256=jgt592voaHNtX56qX0SRvFveVCRmSIxCZmqvpLZCnY8,27305
 utilities/functools.py,sha256=WrpHt7NLNWSUn9A1Q_ZIWlNaYZOEI4IFKyBG9HO3BC4,1643
 utilities/getpass.py,sha256=DfN5UgMAtFCqS3dSfFHUfqIMZX2shXvwphOz_6J6f6A,103
 utilities/git.py,sha256=oi7-_l5e9haSANSCvQw25ufYGoNahuUPHAZ6114s3JQ,1191
 utilities/hashlib.py,sha256=SVTgtguur0P4elppvzOBbLEjVM3Pea0eWB61yg2ilxo,309
 utilities/http.py,sha256=WcahTcKYRtZ04WXQoWt5EGCgFPcyHD3EJdlMfxvDt-0,946
-utilities/hypothesis.py,sha256=-m9YWVgDkKdBfPkZHJ4-vCOGORVHqgtDhbXllfPrr7o,49873
+utilities/hypothesis.py,sha256=spJCB3bKcSMFKuSwi184xfTbom_HEBLB0_-AiPnSR-A,49822
 utilities/importlib.py,sha256=mV1xT_O_zt_GnZZ36tl3xOmMaN_3jErDWY54fX39F6Y,429
 utilities/inflect.py,sha256=DbqB5Q9FbRGJ1NbvEiZBirRMxCxgrz91zy5jCO9ZIs0,347
 utilities/ipython.py,sha256=V2oMYHvEKvlNBzxDXdLvKi48oUq2SclRg5xasjaXStw,763
@@ -32,16 +32,16 @@ utilities/iterables.py,sha256=mDqw2_0MUVp-P8FklgcaVTi2TXduH0MxbhTDzzhSBho,44915
 utilities/jupyter.py,sha256=ft5JA7fBxXKzP-L9W8f2-wbF0QeYc_2uLQNFDVk4Z-M,2917
 utilities/libcst.py,sha256=Jto5ppzRzsxn4AD32IS8n0lbgLYXwsVJB6EY8giNZyY,4974
 utilities/lightweight_charts.py,sha256=JrkrAZMo6JID2Eoc9QCc05Y_pK4l2zsApIhmii1z2Ig,2764
-utilities/logging.py,sha256=9XpYHrSVnW2_wYTWQb7LllVxcgq-U2vjUIlM4M60LCE,18407
+utilities/logging.py,sha256=zm5k0Cduxtx2H2o7odxUTJtPNkJS85mqHYN1cS5Kc1w,17863
 utilities/luigi.py,sha256=fpH9MbxJDuo6-k9iCXRayFRtiVbUtibCJKugf7ygpv0,5988
-utilities/math.py,sha256=-mQgbah-dPJwOEWf3SonrFoVZ2AVxMgpeQ3dfVa-oJA,26764
+utilities/math.py,sha256=_6vrDyjtaqE_OFE-F2DNWrDG_J_kMl3nFAJsok9v_bY,26862
 utilities/memory_profiler.py,sha256=tf2C51P2lCujPGvRt2Rfc7VEw5LDXmVPCG3z_AvBmbU,962
 utilities/modules.py,sha256=iuvLluJya-hvl1Q25-Jk3dLgx2Es3ck4SjJiEkAlVTs,3195
 utilities/more_itertools.py,sha256=tBbjjKx8_Uv_TCjxhPwrGfAx_jRHtvLIZqXVWAsjzqA,8842
 utilities/numpy.py,sha256=Xn23sA2ZbVNqwUYEgNJD3XBYH6IbCri_WkHSNhg3NkY,26122
 utilities/operator.py,sha256=0M2yZJ0PODH47ogFEnkGMBe_cfxwZR02T_92LZVZvHo,3715
 utilities/optuna.py,sha256=loyJGWTzljgdJaoLhP09PT8Jz6o_pwBOwehY33lHkhw,1923
-utilities/orjson.py,sha256=vmPsuOOxrQBAg6aEVVKHfOX9A04QlSa162El5HrIT9E,36889
+utilities/orjson.py,sha256=oD9sQYd3bQKZi2dwpQsaRVwCSlSQ2sREl83UZP4LD7w,36962
 utilities/os.py,sha256=D_FyyT-6TtqiN9KSS7c9g1fnUtgxmyMtzAjmYLkk46A,3587
 utilities/parse.py,sha256=vsZ2jf_ceSI_Kta9titixufysJaVXh0Whjz1T4awJZw,18938
 utilities/pathlib.py,sha256=PK41rf1c9Wqv7h8f5R7H3_Lhq_gQZTUJD5tu3gMHVaU,3247
@@ -55,13 +55,13 @@ utilities/pqdm.py,sha256=foRytQybmOQ05pjt5LF7ANyzrIa--4ScDE3T2wd31a4,3118
 utilities/psutil.py,sha256=RtbLKOoIJhqrJmEoHDBVeSD-KPzshtS0FtRXBP9_w2s,3751
 utilities/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utilities/pydantic.py,sha256=aP6OKowg2Md4rgQuQ5qTSF4bTbBuq7WtRb7zS3JSRGY,1841
-utilities/pyinstrument.py,sha256=KU7_wPX63TY_8kSps0WZ0ijpN7vXQUkp175vdg-CIdE,899
+utilities/pyinstrument.py,sha256=3MPNDbZW_1Aj1aA1_f-yqPStgmjIFxPwIafYq2dsaTs,853
 utilities/pyrsistent.py,sha256=wVOVIe_68AAaa-lUE9y-TEzDawVp1uEIc_zfoDgr5ww,2287
 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=J7pJOn-Zn5nJ6rvWwMeJWP86EtMk_klhBexnoSaQiZA,4610
+utilities/re.py,sha256=6qxeV0rQZaBDKWcB7apSBmxtg_XzoGY-EdegTkMn-ZY,4578
 utilities/redis.py,sha256=IceT5EjgrebVkGL8X3M35xlqjI2c7zFbyV1P4dExN4M,36037
 utilities/reprlib.py,sha256=ssYTcBW-TeRh3fhCJv57sopTZHF5FrPyyUg9yp5XBlo,3953
 utilities/scipy.py,sha256=wZJM7fEgBAkLSYYvSmsg5ac-QuwAI0BGqHVetw1_Hb0,947
@@ -79,19 +79,19 @@ utilities/tenacity.py,sha256=1PUvODiBVgeqIh7G5TRt5WWMSqjLYkEqP53itT97WQc,4914
 utilities/text.py,sha256=ymBFlP_cA8OgNnZRVNs7FAh7OG8HxE6YkiLEMZv5g_A,11297
 utilities/threading.py,sha256=GvBOp4CyhHfN90wGXZuA2VKe9fGzMaEa7oCl4f3nnPU,1009
 utilities/timer.py,sha256=VeSl3ot8-f4D1d3HjjSsgKvjxHJGXd_sW4KcTExOR64,2475
-utilities/traceback.py,sha256=l9onlqDdW5GCSIFbU_-htBE7KlsvsJdNtGrK6-k0RCQ,8759
-utilities/types.py,sha256=Ubd3VBiqZ71eS71WSemHEM4oRF-5fnwd3PnMAm8IZaI,18461
-utilities/typing.py,sha256=kQWywPcRbFBKmvQBELmgbiqSHsnlo_D0ru53vl6KDeY,13846
+utilities/traceback.py,sha256=cMXrCD59CROnezAU8VW67CxZ8Igc5QmaxlV8qrBvNMs,8504
+utilities/types.py,sha256=CHQke10ETEpypxppYVhWp1G68S6mvifalrRLolYBcCg,19506
+utilities/typing.py,sha256=VuGuztLSkTicxgVwI5wrVOTcY70OlzwsTU7LcFVjGlY,14169
 utilities/tzdata.py,sha256=yCf70NICwAeazN3_JcXhWvRqCy06XJNQ42j7r6gw3HY,1217
-utilities/tzlocal.py,sha256=P5BjqTiYskeCwjE7i9zycCFXO4MWdZgYCh4jut-LpzA,1042
+utilities/tzlocal.py,sha256=xbBBzVIUKMk8AkhuIp1qxGRNBioIa5I09dpeoBnIOOU,662
 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=JHixGl6KibK8GUF13GeBjvWMYsFHRDSXixSo0xMSJFM,5437
+utilities/whenever.py,sha256=2NQ-0SnLNW2kFpefP9dVE8H0RbaeusXYLPmv282Jpto,16755
+utilities/whenever2.py,sha256=WiDVsgHA-4E-KiIJ25-R4qAWvtyBQk1EkhjMszFzQMM,7455
 utilities/zipfile.py,sha256=24lQc9ATcJxHXBPc_tBDiJk48pWyRrlxO2fIsFxU0A8,699
 utilities/zoneinfo.py,sha256=tvcgu3QzDxe2suTexi2QzRGpin7VK1TjHa0JYYxT69I,1862
-dycw_utilities-0.131.10.dist-info/METADATA,sha256=-HOUsSw5_v1-mDFC9l1PXOLDdbSUCRRbZYCgf-nmnbY,1585
-dycw_utilities-0.131.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.131.10.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.131.10.dist-info/RECORD,,
+dycw_utilities-0.131.12.dist-info/METADATA,sha256=8G8r4jcsCl-iXqwXZ2vq8Kx7M4S2A6xCNxQA3Blrv64,1585
+dycw_utilities-0.131.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.131.12.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.131.12.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.131.10"
+__version__ = "0.131.12"

utilities/click.py

@@ -23,13 +23,13 @@ from utilities.functions import EnsureStrError, ensure_str, get_class_name
 from utilities.iterables import is_iterable_not_str
 from utilities.text import split_str
 from utilities.types import (
-    DateLike,
     DateTimeLike,
     EnumLike,
     MaybeStr,
+    PyDateLike,
+    PyTimeDeltaLike,
+    PyTimeLike,
     TEnum,
-    TimeDeltaLike,
-    TimeLike,
 )
 
 if TYPE_CHECKING:
@@ -76,7 +76,7 @@ class Date(ParamType):
 
     @override
     def convert(
-        self, value: DateLike, param: Parameter | None, ctx: Context | None
+        self, value: PyDateLike, param: Parameter | None, ctx: Context | None
     ) -> dt.date:
         """Convert a value into the `Date` type."""
         from utilities.whenever import EnsureDateError, ensure_date
@@ -197,7 +197,7 @@ class Time(ParamType):
 
     @override
     def convert(
-        self, value: TimeLike, param: Parameter | None, ctx: Context | None
+        self, value: PyTimeLike, param: Parameter | None, ctx: Context | None
     ) -> dt.time:
         """Convert a value into the `Time` type."""
         from utilities.whenever import EnsureTimeError, ensure_time
@@ -219,7 +219,7 @@ class Timedelta(ParamType):
 
     @override
     def convert(
-        self, value: TimeDeltaLike, param: Parameter | None, ctx: Context | None
+        self, value: PyTimeDeltaLike, param: Parameter | None, ctx: Context | None
     ) -> dt.timedelta:
         """Convert a value into the `Timedelta` type."""
         from utilities.whenever import EnsureTimedeltaError, ensure_timedelta

utilities/datetime.py

@@ -21,21 +21,14 @@ from utilities.iterables import OneEmptyError, one
 from utilities.math import SafeRoundError, round_, safe_round
 from utilities.platform import SYSTEM
 from utilities.sentinel import Sentinel, sentinel
-from utilities.types import MaybeStr
+from utilities.types import MaybeCallablePyDate, MaybeCallablePyDateTime, MaybeStr
 from utilities.typing import is_instance_gen
 from utilities.zoneinfo import UTC, ensure_time_zone, get_time_zone_name
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
 
-    from utilities.types import (
-        DateOrDateTime,
-        Duration,
-        MaybeCallableDate,
-        MaybeCallableDateTime,
-        RoundMode,
-        TimeZoneLike,
-    )
+    from utilities.types import DateOrDateTime, Duration, MathRoundMode, TimeZoneLike
 
 
 _DAYS_PER_YEAR = 365.25
@@ -476,19 +469,19 @@ def format_datetime_local_and_utc(datetime: dt.datetime, /) -> str:
 
 
 @overload
-def get_date(*, date: MaybeCallableDate) -> dt.date: ...
+def get_date(*, date: MaybeCallablePyDate) -> dt.date: ...
 @overload
 def get_date(*, date: None) -> None: ...
 @overload
 def get_date(*, date: Sentinel) -> Sentinel: ...
 @overload
-def get_date(*, date: MaybeCallableDate | Sentinel) -> dt.date | Sentinel: ...
+def get_date(*, date: MaybeCallablePyDate | Sentinel) -> dt.date | Sentinel: ...
 @overload
 def get_date(
-    *, date: MaybeCallableDate | None | Sentinel = sentinel
+    *, date: MaybeCallablePyDate | None | Sentinel = sentinel
 ) -> dt.date | None | Sentinel: ...
 def get_date(
-    *, date: MaybeCallableDate | None | Sentinel = sentinel
+    *, date: MaybeCallablePyDate | None | Sentinel = sentinel
 ) -> dt.date | None | Sentinel:
     """Get the date."""
     match date:
@@ -504,13 +497,13 @@ def get_date(
 
 
 @overload
-def get_datetime(*, datetime: MaybeCallableDateTime) -> dt.datetime: ...
+def get_datetime(*, datetime: MaybeCallablePyDateTime) -> dt.datetime: ...
 @overload
 def get_datetime(*, datetime: None) -> None: ...
 @overload
 def get_datetime(*, datetime: Sentinel) -> Sentinel: ...
 def get_datetime(
-    *, datetime: MaybeCallableDateTime | None | Sentinel = sentinel
+    *, datetime: MaybeCallablePyDateTime | None | Sentinel = sentinel
 ) -> dt.datetime | None | Sentinel:
     """Get the datetime."""
     match datetime:
@@ -755,7 +748,7 @@ def mean_datetime(
     /,
     *,
     weights: Iterable[SupportsFloat] | None = None,
-    mode: RoundMode = "standard",
+    mode: MathRoundMode = "standard",
     rel_tol: float | None = None,
     abs_tol: float | None = None,
 ) -> dt.datetime:
@@ -790,7 +783,7 @@ def mean_timedelta(
     /,
     *,
     weights: Iterable[SupportsFloat] | None = None,
-    mode: RoundMode = "standard",
+    mode: MathRoundMode = "standard",
     rel_tol: float | None = None,
     abs_tol: float | None = None,
 ) -> dt.timedelta:
@@ -1022,7 +1015,7 @@ def round_datetime(
     duration: Duration,
     /,
     *,
-    mode: RoundMode = "standard",
+    mode: MathRoundMode = "standard",
     rel_tol: float | None = None,
     abs_tol: float | None = None,
 ) -> dt.datetime:

utilities/fastapi.py

@@ -9,8 +9,7 @@ from uvicorn import Config, Server
 
 from utilities.asyncio import Looper
 from utilities.datetime import SECOND, datetime_duration_to_float
-from utilities.tzlocal import get_now_local  # skipif-ci
-from utilities.whenever import serialize_zoned_datetime  # skipif-ci
+from utilities.whenever2 import get_now_local
 
 if TYPE_CHECKING:
     from types import TracebackType
@@ -31,8 +30,7 @@ class _PingerReceiverApp(FastAPI):
 
         @self.get("/ping")  # skipif-ci
         def ping() -> str:
-            now = serialize_zoned_datetime(get_now_local())  # skipif-ci
-            return f"pong @ {now}"  # skipif-ci
+            return f"pong @ {get_now_local()}"  # skipif-ci
 
         _ = ping  # skipif-ci
 

utilities/fpdf2.py

@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING, override
 from fpdf import FPDF
 from fpdf.enums import XPos, YPos
 
-from utilities.tzlocal import get_now_local
+from utilities.whenever2 import format_compact, get_now
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
@@ -47,7 +47,7 @@ def yield_pdf(*, header: str | None = None) -> Iterator[_BasePDF]:
         def footer(self) -> None:
             self.set_y(-15)
             self.set_font(family="Helvetica", style="I", size=8)
-            page_no, now = self.page_no(), get_now_local()
+            page_no, now = self.page_no(), format_compact(get_now())
             text = f"page {page_no}/{{}}; {now}"
             _ = self.cell(
                 w=0,

utilities/hypothesis.py

@@ -48,7 +48,7 @@ from hypothesis.strategies import (
     uuids,
 )
 from hypothesis.utils.conventions import not_set
-from whenever import Date, DateDelta, PlainDateTime, Time, TimeDelta
+from whenever import Date, DateDelta, PlainDateTime, Time, TimeDelta, ZonedDateTime
 
 from utilities.datetime import (
     DATETIME_MAX_NAIVE,
@@ -112,10 +112,9 @@ if TYPE_CHECKING:
 
     from hypothesis.database import ExampleDatabase
     from numpy.random import RandomState
-    from whenever import ZonedDateTime
 
     from utilities.numpy import NDArrayB, NDArrayF, NDArrayI, NDArrayO
-    from utilities.types import Duration, Number, RoundMode, TimeZoneLike
+    from utilities.types import Duration, MathRoundMode, Number, TimeZoneLike
 
 
 _T = TypeVar("_T")
@@ -725,7 +724,7 @@ def min_and_max_datetimes(
     min_value: MaybeSearchStrategy[dt.datetime | None] = None,
     max_value: MaybeSearchStrategy[dt.datetime | None] = None,
     time_zone: MaybeSearchStrategy[ZoneInfo | timezone] = UTC,
-    round_: RoundMode | None = None,
+    round_: MathRoundMode | None = None,
     timedelta: dt.timedelta | None = None,
     rel_tol: float | None = None,
     abs_tol: float | None = None,
@@ -804,7 +803,7 @@ def min_and_maybe_max_datetimes(
     min_value: MaybeSearchStrategy[dt.datetime | None] = None,
     max_value: MaybeSearchStrategy[dt.datetime | None | Sentinel] = sentinel,
     time_zone: MaybeSearchStrategy[ZoneInfo | timezone] = UTC,
-    round_: RoundMode | None = None,
+    round_: MathRoundMode | None = None,
     timedelta: dt.timedelta | None = None,
     rel_tol: float | None = None,
     abs_tol: float | None = None,
@@ -1036,7 +1035,7 @@ def plain_datetimes(
     *,
     min_value: MaybeSearchStrategy[dt.datetime] = DATETIME_MIN_NAIVE,
     max_value: MaybeSearchStrategy[dt.datetime] = DATETIME_MAX_NAIVE,
-    round_: RoundMode | None = None,
+    round_: MathRoundMode | None = None,
     timedelta: dt.timedelta | None = None,
     rel_tol: float | None = None,
     abs_tol: float | None = None,
@@ -1056,7 +1055,7 @@ def plain_datetimes(
 
 @dataclass(kw_only=True, slots=True)
 class PlainDateTimesError(Exception):
-    round_: RoundMode
+    round_: MathRoundMode
 
     @override
     def __str__(self) -> str:
@@ -1577,7 +1576,7 @@ def zoned_datetimes(
     min_value: MaybeSearchStrategy[dt.datetime] = DATETIME_MIN_UTC + DAY,
     max_value: MaybeSearchStrategy[dt.datetime] = DATETIME_MAX_UTC - DAY,
     time_zone: MaybeSearchStrategy[ZoneInfo | timezone] = UTC,
-    round_: RoundMode | None = None,
+    round_: MathRoundMode | None = None,
     timedelta: dt.timedelta | None = None,
     rel_tol: float | None = None,
     abs_tol: float | None = None,
@@ -1626,7 +1625,7 @@ def zoned_datetimes(
 
 @dataclass(kw_only=True, slots=True)
 class ZonedDateTimesError(Exception):
-    round_: RoundMode
+    round_: MathRoundMode
 
     @override
     def __str__(self) -> str:
@@ -1646,8 +1645,6 @@ def zoned_datetimes_whenever(
     time_zone: MaybeSearchStrategy[TimeZoneLike] = UTC,
 ) -> ZonedDateTime:
     """Strategy for generating zoned datetimes."""
-    from whenever import PlainDateTime, ZonedDateTime
-
     min_value_, max_value_ = [draw2(draw, v) for v in [min_value, max_value]]
     time_zone_ = ensure_time_zone(draw2(draw, time_zone))
     match min_value_:

utilities/logging.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import datetime as dt
 import re
 from dataclasses import dataclass, field
 from functools import cached_property
@@ -19,7 +18,6 @@ from logging import (
 from logging.handlers import BaseRotatingHandler, TimedRotatingFileHandler
 from pathlib import Path
 from re import Pattern
-from time import time
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -32,22 +30,31 @@ from typing import (
     override,
 )
 
+from whenever import PlainDateTime, ZonedDateTime
+
 from utilities.atomicwrites import move_many
 from utilities.dataclasses import replace_non_sentinel
-from utilities.datetime import (
-    SECOND,
-    parse_datetime_compact,
-    round_datetime,
-    serialize_compact,
-)
 from utilities.errors import ImpossibleCaseError
 from utilities.iterables import OneEmptyError, always_iterable, one
 from utilities.pathlib import ensure_suffix, get_path
+from utilities.re import (
+    ExtractGroupError,
+    ExtractGroupsError,
+    extract_group,
+    extract_groups,
+)
 from utilities.sentinel import Sentinel, sentinel
-from utilities.tzlocal import get_now_local
+from utilities.tzlocal import LOCAL_TIME_ZONE_NAME
+from utilities.whenever2 import (
+    WheneverLogRecord,
+    format_compact,
+    get_now,
+    get_now_local,
+)
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterable, Mapping
+    from datetime import time
     from logging import _FilterType
 
     from utilities.types import (
@@ -59,7 +66,9 @@ if TYPE_CHECKING:
     )
 
 
-_DEFAULT_FORMAT = "{asctime} | {name}:{funcName}:{lineno} | {levelname:8} | {message}"
+_DEFAULT_FORMAT = (
+    "{zoned_datetime} | {name}:{funcName}:{lineno} | {levelname:8} | {message}"
+)
 _DEFAULT_DATEFMT = "%Y-%m-%d %H:%M:%S"
 _DEFAULT_BACKUP_COUNT: int = 100
 _DEFAULT_MAX_BYTES: int = 10 * 1024**2
@@ -81,7 +90,6 @@ def add_filters(handler: Handler, /, *filters: _FilterType) -> None:
 def basic_config(
     *,
     obj: LoggerOrName | Handler | None = None,
-    whenever: bool = False,
     format_: str = _DEFAULT_FORMAT,
     datefmt: str = _DEFAULT_DATEFMT,
     level: LogLevel = "INFO",
@@ -98,7 +106,6 @@ def basic_config(
             logger.addHandler(handler := StreamHandler())
             basic_config(
                 obj=handler,
-                whenever=whenever,
                 format_=format_,
                 datefmt=datefmt,
                 level=level,
@@ -109,7 +116,6 @@ def basic_config(
         case str() as name:
             basic_config(
                 obj=get_logger(logger=name),
-                whenever=whenever,
                 format_=format_,
                 datefmt=datefmt,
                 level=level,
@@ -122,7 +128,6 @@ def basic_config(
             if filters is not None:
                 add_filters(handler, *always_iterable(filters))
             formatter = get_formatter(
-                whenever=whenever,
                 format_=format_,
                 datefmt=datefmt,
                 plain=plain,
@@ -184,18 +189,13 @@ class _FieldStyleDict(TypedDict):
 
 def get_formatter(
     *,
-    whenever: bool = False,
     format_: str = _DEFAULT_FORMAT,
     datefmt: str = _DEFAULT_DATEFMT,
     plain: bool = False,
     color_field_styles: Mapping[str, _FieldStyleKeys] | None = None,
 ) -> Formatter:
     """Get the formatter; colored if available."""
-    if whenever:
-        from utilities.whenever2 import WheneverLogRecord
-
-        setLogRecordFactory(WheneverLogRecord)
-        format_ = format_.replace("{asctime}", "{zoned_datetime}")
+    setLogRecordFactory(WheneverLogRecord)
     if plain:
         return _get_plain_formatter(format_=format_, datefmt=datefmt)
     try:
@@ -204,8 +204,7 @@ def get_formatter(
         return _get_plain_formatter(format_=format_, datefmt=datefmt)
     default = cast("dict[_FieldStyleKeys, _FieldStyleDict]", DEFAULT_FIELD_STYLES)
     field_styles = {cast("str", k): v for k, v in default.items()}
-    if whenever:
-        field_styles["zoned_datetime"] = default["asctime"]
+    field_styles["zoned_datetime"] = default["asctime"]
     if color_field_styles is not None:
         field_styles.update({k: default[v] for k, v in color_field_styles.items()})
     return ColoredFormatter(
@@ -261,7 +260,6 @@ class GetLoggingLevelNumberError(Exception):
 def setup_logging(
     *,
     logger: LoggerOrName | None = None,
-    whenever: bool = False,
     format_: str = _DEFAULT_FORMAT,
     datefmt: str = _DEFAULT_DATEFMT,
     console_level: LogLevel = "INFO",
@@ -277,7 +275,6 @@ def setup_logging(
     """Set up logger."""
     basic_config(
         obj=logger,
-        whenever=whenever,
         format_=f"{console_prefix} {format_}",
         datefmt=datefmt,
         level=console_level,
@@ -300,7 +297,6 @@ def setup_logging(
             logger_use.addHandler(handler)
             basic_config(
                 obj=handler,
-                whenever=whenever,
                 format_=format_,
                 datefmt=datefmt,
                 level=level,
@@ -335,7 +331,7 @@ class SizeAndTimeRotatingFileHandler(BaseRotatingHandler):
         interval: int = 1,
         backupCount: int = _DEFAULT_BACKUP_COUNT,
         utc: bool = False,
-        atTime: dt.time | None = None,
+        atTime: time | None = None,
     ) -> None:
         path = Path(filename)
         path.parent.mkdir(parents=True, exist_ok=True)
@@ -387,7 +383,7 @@ class SizeAndTimeRotatingFileHandler(BaseRotatingHandler):
         if not self.delay:  # pragma: no cover
             self.stream = self._open()
         self._time_handler.rolloverAt = (  # skipif-ci-and-windows
-            self._time_handler.computeRollover(int(time()))
+            self._time_handler.computeRollover(get_now().timestamp())
         )
 
     def _should_rollover(self, record: LogRecord, /) -> bool:
@@ -405,10 +401,8 @@ class SizeAndTimeRotatingFileHandler(BaseRotatingHandler):
 def _compute_rollover_patterns(stem: str, suffix: str, /) -> _RolloverPatterns:
     return _RolloverPatterns(
         pattern1=re.compile(rf"^{stem}\.(\d+){suffix}$"),
-        pattern2=re.compile(rf"^{stem}\.(\d+)__(\d{{8}}T\d{{6}}){suffix}$"),
-        pattern3=re.compile(
-            rf"^{stem}\.(\d+)__(\d{{8}}T\d{{6}})__(\d{{8}}T\d{{6}}){suffix}$"
-        ),
+        pattern2=re.compile(rf"^{stem}\.(\d+)__([\dT]+?){suffix}$"),
+        pattern3=re.compile(rf"^{stem}\.(\d+)__([\dT]+?)__([\dT]+?){suffix}$"),
     )
 
 
@@ -457,7 +451,7 @@ def _compute_rollover_actions(
                 rotations.add(
                     _Rotation(file=file, index=curr + 1, start=start, end=end)
                 )
-            case int() as index, dt.datetime(), dt.datetime():
+            case int() as index, ZonedDateTime(), ZonedDateTime():
                 rotations.add(_Rotation(file=file, index=index + 1))
             case _:  # pragma: no cover
                 raise NotImplementedError
@@ -481,14 +475,8 @@ class _RotatingLogFile:
     stem: str
     suffix: str
     index: int | None = None
-    start: dt.datetime | None = None
-    end: dt.datetime | None = None
-
-    def __post_init__(self) -> None:
-        if self.start is not None:
-            self.start = round_datetime(self.start, SECOND)
-        if self.end is not None:
-            self.end = round_datetime(self.end, SECOND)
+    start: ZonedDateTime | None = None
+    end: ZonedDateTime | None = None
 
     @classmethod
     def from_path(
@@ -505,16 +493,23 @@ class _RotatingLogFile:
         if patterns is None:
             patterns = _compute_rollover_patterns(stem, suffix)
         try:
-            (index,) = patterns.pattern1.findall(path.name)
-        except ValueError:
+            index, start, end = extract_groups(patterns.pattern3, path.name)
+        except ExtractGroupsError:
             pass
         else:
             return cls(
-                directory=path.parent, stem=stem, suffix=suffix, index=int(index)
+                directory=path.parent,
+                stem=stem,
+                suffix=suffix,
+                index=int(index),
+                start=PlainDateTime.parse_common_iso(start).assume_tz(
+                    LOCAL_TIME_ZONE_NAME
+                ),
+                end=PlainDateTime.parse_common_iso(end).assume_tz(LOCAL_TIME_ZONE_NAME),
             )
         try:
-            ((index, end),) = patterns.pattern2.findall(path.name)
-        except ValueError:
+            index, end = extract_groups(patterns.pattern2, path.name)
+        except ExtractGroupsError:
             pass
         else:
             return cls(
@@ -522,21 +517,17 @@ class _RotatingLogFile:
                 stem=stem,
                 suffix=suffix,
                 index=int(index),
-                end=parse_datetime_compact(end),
+                end=PlainDateTime.parse_common_iso(end).assume_tz(LOCAL_TIME_ZONE_NAME),
             )
         try:
-            ((index, start, end),) = patterns.pattern3.findall(path.name)
-        except ValueError:
-            return cls(directory=path.parent, stem=stem, suffix=suffix)
+            index = extract_group(patterns.pattern1, path.name)
+        except ExtractGroupError:
+            pass
         else:
             return cls(
-                directory=path.parent,
-                stem=stem,
-                suffix=suffix,
-                index=int(index),
-                start=parse_datetime_compact(start),
-                end=parse_datetime_compact(end),
+                directory=path.parent, stem=stem, suffix=suffix, index=int(index)
             )
+        return cls(directory=path.parent, stem=stem, suffix=suffix)
 
     @cached_property
     def path(self) -> Path:
@@ -546,10 +537,10 @@ class _RotatingLogFile:
                 tail = None
             case int() as index, None, None:
                 tail = str(index)
-            case int() as index, None, dt.datetime() as end:
-                tail = f"{index}__{serialize_compact(end)}"
-            case int() as index, dt.datetime() as start, dt.datetime() as end:
-                tail = f"{index}__{serialize_compact(start)}__{serialize_compact(end)}"
+            case int() as index, None, ZonedDateTime() as end:
+                tail = f"{index}__{format_compact(end)}"
+            case int() as index, ZonedDateTime() as start, ZonedDateTime() as end:
+                tail = f"{index}__{format_compact(start)}__{format_compact(end)}"
             case _:  # pragma: no cover
                 raise ImpossibleCaseError(
                     case=[f"{self.index=}", f"{self.start=}", f"{self.end=}"]
@@ -561,8 +552,8 @@ class _RotatingLogFile:
         self,
         *,
         index: int | None | Sentinel = sentinel,
-        start: dt.datetime | None | Sentinel = sentinel,
-        end: dt.datetime | None | Sentinel = sentinel,
+        start: ZonedDateTime | None | Sentinel = sentinel,
+        end: ZonedDateTime | None | Sentinel = sentinel,
     ) -> Self:
         return replace_non_sentinel(self, index=index, start=start, end=end)
 
@@ -579,14 +570,8 @@ class _Deletion:
 class _Rotation:
     file: _RotatingLogFile
     index: int = 0
-    start: dt.datetime | None | Sentinel = sentinel
-    end: dt.datetime | Sentinel = sentinel
-
-    def __post_init__(self) -> None:
-        if isinstance(self.start, dt.datetime):
-            self.start = round_datetime(self.start, SECOND)
-        if isinstance(self.end, dt.datetime):
-            self.end = round_datetime(self.end, SECOND)
+    start: ZonedDateTime | None | Sentinel = sentinel
+    end: ZonedDateTime | Sentinel = sentinel
 
     @cached_property
     def destination(self) -> Path: