dycw-utilities 0.131.19__py3-none-any.whl → 0.132.0__py3-none-any.whl

{dycw_utilities-0.131.19.dist-info → dycw_utilities-0.132.0.dist-info}/METADATA

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

{dycw_utilities-0.131.19.dist-info → dycw_utilities-0.132.0.dist-info}/RECORD

@@ -1,30 +1,29 @@
-utilities/__init__.py,sha256=R2vwqRIsE4_EtyBG_rcNMmBFLNOvTZ8ZPET3SOpv2QI,61
+utilities/__init__.py,sha256=rp9t0gUqAH2TAe2FasaswzrPMlJ2l6RH0WIc6dPt-DM,60
 utilities/aiolimiter.py,sha256=mD0wEiqMgwpty4XTbawFpnkkmJS6R4JRsVXFUaoitSU,628
 utilities/altair.py,sha256=HeZBVUocjkrTNwwKrClppsIqgNFF-ykv05HfZSoHYno,9104
-utilities/asyncio.py,sha256=mHnlSA4KPeDaBRts8Rn4sNA_4urodj7gQzs-_8Z-F7A,37587
+utilities/asyncio.py,sha256=USWMMrHqPVRr20vlIn_n5JLimyqa-5xLhuqDYWJed8A,37586
 utilities/atomicwrites.py,sha256=geFjn9Pwn-tTrtoGjDDxWli9NqbYfy3gGL6ZBctiqSo,5393
 utilities/atools.py,sha256=-bFGIrwYMFR7xl39j02DZMsO_u5x5_Ph7bRlBUFVYyw,1048
 utilities/cachetools.py,sha256=uBtEv4hD-TuCPX_cQy1lOpLF-QqfwnYGSf0o4Soqydc,2826
-utilities/click.py,sha256=sdGAMoarAWJ4_A3o-UzM7hpe7R37yvC_X_Uh8vasa-A,13295
+utilities/click.py,sha256=jLyep_czA3k-3XWHWrKFEEN79ZbMhVT2H7TGnTa8i44,13314
 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=NwqxkOufzZyGrnX8YwksrEF9DAkVPf3HioLOwe9jMWA,5754
 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=4PpToyT-xE8kjVJpFE1nMBzx2I1HcXaGTRzNV3JfZLQ,2672
-utilities/fpdf2.py,sha256=PQysO4BcSMRpg-h-t2Pm7yatyk2yFl1inkvtKs1NG4M,1853
+utilities/fastapi.py,sha256=E8T2J1-N_RbpkN4czthU6NPIxAZDzxy-k_WGJaxeJ48,2671
+utilities/fpdf2.py,sha256=PmPj8ugr_SlxFEpw-9OsI8--mteLQ4MaXv_Cbmf7XXs,1852
 utilities/functions.py,sha256=1GMHO3PJUPil9cpDNI656RN9aGWoJS2grzPFk3HWgJg,28267
 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=OMuN6S_L_OjEOdXdDlyJ53li1vKZPJVUmUFYGtNM9-0,35277
+utilities/hypothesis.py,sha256=MS0UgZjevC9QuJAUlGa8ozcbAhlq1qZnSRiSk_1KsXg,35204
 utilities/importlib.py,sha256=mV1xT_O_zt_GnZZ36tl3xOmMaN_3jErDWY54fX39F6Y,429
 utilities/inflect.py,sha256=DbqB5Q9FbRGJ1NbvEiZBirRMxCxgrz91zy5jCO9ZIs0,347
 utilities/ipython.py,sha256=V2oMYHvEKvlNBzxDXdLvKi48oUq2SclRg5xasjaXStw,763
@@ -32,7 +31,7 @@ utilities/iterables.py,sha256=cuebB4ivKlZuKm8S3PQIfjavn9h-5mBGmvYq4FpSxFg,43812
 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=zm5k0Cduxtx2H2o7odxUTJtPNkJS85mqHYN1cS5Kc1w,17863
+utilities/logging.py,sha256=j0xS7bNdZcMAobWSRahpg_d7GWewd_99oXvexrjWm6k,17841
 utilities/luigi.py,sha256=UAt4TDMtinLAN7sipX0jSvH-aZzHUTQbHB3Rwtbq994,4840
 utilities/math.py,sha256=_6vrDyjtaqE_OFE-F2DNWrDG_J_kMl3nFAJsok9v_bY,26862
 utilities/memory_profiler.py,sha256=tf2C51P2lCujPGvRt2Rfc7VEw5LDXmVPCG3z_AvBmbU,962
@@ -41,35 +40,35 @@ utilities/more_itertools.py,sha256=tBbjjKx8_Uv_TCjxhPwrGfAx_jRHtvLIZqXVWAsjzqA,8
 utilities/numpy.py,sha256=Xn23sA2ZbVNqwUYEgNJD3XBYH6IbCri_WkHSNhg3NkY,26122
 utilities/operator.py,sha256=DuiWdkmK0D-ddvFqOayDkazTQE1Ysvtl6-UiBN5gns8,3857
 utilities/optuna.py,sha256=loyJGWTzljgdJaoLhP09PT8Jz6o_pwBOwehY33lHkhw,1923
-utilities/orjson.py,sha256=7CraMEtaJtKTDTTVS4fQU6PeuFcG0V8SGwD3sqZ8kSI,36475
+utilities/orjson.py,sha256=y5ynSGhQjX7vikfvsHh_AklLnH7gjvsSkIC3h5tnx98,36474
 utilities/os.py,sha256=D_FyyT-6TtqiN9KSS7c9g1fnUtgxmyMtzAjmYLkk46A,3587
 utilities/parse.py,sha256=YE2VWYKDm9WYf5wcOWrOxVfM6UWvhkSxSkwdxRQNsA0,17633
 utilities/pathlib.py,sha256=PK41rf1c9Wqv7h8f5R7H3_Lhq_gQZTUJD5tu3gMHVaU,3247
 utilities/period.py,sha256=opqpBevBGSGXbA7NYfRJjtthi1JPxdMaZ7QV3xosnTc,4774
 utilities/pickle.py,sha256=MBT2xZCsv0pH868IXLGKnlcqNx2IRVKYNpRcqiQQqxw,653
-utilities/platform.py,sha256=48IOKx1IC6ZJXWG-b56ZQptITcNFhWRjELW72o2dGTA,2398
+utilities/platform.py,sha256=5uCKRf_ij7ukJDcbnNfhY2ay9fbrpiNLRO1t2QvcwqQ,2825
 utilities/polars.py,sha256=BYTYniVSW9SrBWdmoTy8RqUgqBW4y07mlRPEWXPUyYg,63357
 utilities/polars_ols.py,sha256=Uc9V5kvlWZ5cU93lKZ-cfAKdVFFw81tqwLW9PxtUvMs,5618
-utilities/pottery.py,sha256=2w3YuoH1KmLaCVqkwSghHTOT8S4xiUskwRHSRqrUEQY,3430
+utilities/pottery.py,sha256=RN3XwOEsVAPXvEfsRPmn3ZSKgTzK_c182PNrtksq-bg,3429
 utilities/pqdm.py,sha256=foRytQybmOQ05pjt5LF7ANyzrIa--4ScDE3T2wd31a4,3118
-utilities/psutil.py,sha256=ZkwBGfTqAv8hxCyJVVJFctIVQvxhYuB28re3mIPBodc,3761
+utilities/psutil.py,sha256=0j4YxtVb8VjaaKKiHg6UEK95SUPkEcENgPtLgPJsNv0,3760
 utilities/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utilities/pydantic.py,sha256=aP6OKowg2Md4rgQuQ5qTSF4bTbBuq7WtRb7zS3JSRGY,1841
-utilities/pyinstrument.py,sha256=3MPNDbZW_1Aj1aA1_f-yqPStgmjIFxPwIafYq2dsaTs,853
+utilities/pyinstrument.py,sha256=_Rfq6Gg4NKV2NF0dRYOpK2IRyyePxI7-3UmHIQLYrlQ,852
 utilities/pyrsistent.py,sha256=wVOVIe_68AAaa-lUE9y-TEzDawVp1uEIc_zfoDgr5ww,2287
-utilities/pytest.py,sha256=BQ3D3HjkmccTx9R9MahsNqtHEqB9L4rdjV0Xd-GCf5Y,8274
+utilities/pytest.py,sha256=xSDybvkvdj7Ix-Tpc1INctKZV07qwrQvJlQonSimB7o,8273
 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=6qxeV0rQZaBDKWcB7apSBmxtg_XzoGY-EdegTkMn-ZY,4578
-utilities/redis.py,sha256=oA70YoFnSaSqTBzMHrbHkkGIBWU69-97MQEwH_0iX3g,35762
+utilities/redis.py,sha256=u1nYu3ccGni8u3AFg5aXDdpW4ZmT6lGAHIk-wKeZPq4,35761
 utilities/reprlib.py,sha256=ssYTcBW-TeRh3fhCJv57sopTZHF5FrPyyUg9yp5XBlo,3953
 utilities/scipy.py,sha256=wZJM7fEgBAkLSYYvSmsg5ac-QuwAI0BGqHVetw1_Hb0,947
 utilities/sentinel.py,sha256=3jIwgpMekWgDAxPDA_hXMP2St43cPhciKN3LWiZ7kv0,1248
 utilities/shelve.py,sha256=HZsMwK4tcIfg3sh0gApx4-yjQnrY4o3V3ZRimvRhoW0,738
-utilities/slack_sdk.py,sha256=ZpPzV_oHpSJbontGo2_YVVjKH08PjLjsx5Me-nLy918,4246
+utilities/slack_sdk.py,sha256=SsRMJD2HuPUjAFg-2JxOQ9IhKViu4f66cN5kt-C2a7M,4245
 utilities/socket.py,sha256=K77vfREvzoVTrpYKo6MZakol0EYu2q1sWJnnZqL0So0,118
-utilities/sqlalchemy.py,sha256=sTlxK-Is-XCj7srTRh3Nz68axzIdDYZWLQdTeXnOdkQ,38015
+utilities/sqlalchemy.py,sha256=2rApf8NNGdpT827ep19LFt2zCe_oHgF__0WYVk_svtw,38014
 utilities/sqlalchemy_polars.py,sha256=bDiKqHxOWu0Dj4ZDuGcVgR7ulm7sB90iVNINAKaeaKc,14290
 utilities/statsmodels.py,sha256=koyiBHvpMcSiBfh99wFUfSggLNx7cuAw3rwyfAhoKpQ,3410
 utilities/streamlit.py,sha256=U9PJBaKP1IdSykKhPZhIzSPTZsmLsnwbEPZWzNhJPKk,2955
@@ -77,8 +76,8 @@ utilities/string.py,sha256=XmU-s04qIV_tODnKl2pQiwmHaxzgOqRKU-RyzdrfvSE,620
 utilities/tempfile.py,sha256=VqmZJAhTJ1OaVywFzk5eqROV8iJbW9XQ_QYAV0bpdRo,1384
 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=cMXrCD59CROnezAU8VW67CxZ8Igc5QmaxlV8qrBvNMs,8504
+utilities/timer.py,sha256=oYqRQ-G-DMOOHB6a4yP5-PJDVimLnbNkMnkOj_jUmFg,2474
+utilities/traceback.py,sha256=i-790AQbTrDA8MiYyOcYPFpm48I558VR_kL_7x4ypfY,8503
 utilities/typed_settings.py,sha256=zUA0_CmVJT5rwrm3e-dZO83OdPXEel4NfVK24NAD5Vk,1779
 utilities/types.py,sha256=fuJQiVjKYKL9g3F5H7oW_98Xm1-R5Xq4t4kU-aHxW0M,18826
 utilities/typing.py,sha256=kVWK6ciV8T0MKxnFQcMSEr_XlRisspH5aBTTosMUh30,13872
@@ -87,10 +86,10 @@ 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/whenever2.py,sha256=dzIIyKjHLvS6_GkMnU1SCZCDRZ03YvbDaECc7_Zn4k4,15706
+utilities/whenever.py,sha256=tArX9unVEKhRYdvbUFa83e4hrzdtMKKCEN4QWTaYd8c,19524
 utilities/zipfile.py,sha256=24lQc9ATcJxHXBPc_tBDiJk48pWyRrlxO2fIsFxU0A8,699
 utilities/zoneinfo.py,sha256=oEH-nL3t4h9uawyZqWDtNtDAl6M-CLpLYGI_nI6DulM,1971
-dycw_utilities-0.131.19.dist-info/METADATA,sha256=4wWvsi5Rc-2kqwdJGksTRAULcU83WQf3u2sBx6UIL20,1585
-dycw_utilities-0.131.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.131.19.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.131.19.dist-info/RECORD,,
+dycw_utilities-0.132.0.dist-info/METADATA,sha256=uup-06B--FHZD8qwwZxSe2XuXJvBLf6F5QPidKDvHCg,1584
+dycw_utilities-0.132.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.132.0.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.132.0.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.131.19"
+__version__ = "0.132.0"

utilities/asyncio.py

@@ -56,7 +56,7 @@ from utilities.types import (
     THashable,
     TSupportsRichComparison,
 )
-from utilities.whenever2 import SECOND, get_now
+from utilities.whenever import SECOND, get_now
 
 if TYPE_CHECKING:
     from asyncio import _CoroutineLike

utilities/click.py

@@ -8,7 +8,7 @@ import whenever
 from click import Choice, Context, Parameter, ParamType
 from click.types import StringParamType
 
-from utilities.datetime import EnsureMonthError, ensure_month
+import utilities.whenever
 from utilities.enum import EnsureEnumError, ensure_enum
 from utilities.functions import EnsureStrError, ensure_str, get_class_name
 from utilities.iterables import is_iterable_not_str
@@ -25,12 +25,12 @@ from utilities.types import (
     TimeLike,
     ZonedDateTimeLike,
 )
+from utilities.whenever import _MonthParseCommonISOError
 
 if TYPE_CHECKING:
     from collections.abc import Iterable, Sequence
 
-    import utilities.datetime
-    from utilities.datetime import MonthLike
+    from utilities.whenever import MonthLike
 
 
 _T = TypeVar("_T")
@@ -185,11 +185,11 @@ class Month(ParamType):
     @override
     def convert(
         self, value: MonthLike, param: Parameter | None, ctx: Context | None
-    ) -> utilities.datetime.Month:
+    ) -> utilities.whenever.Month:
         """Convert a value into the `Month` type."""
         try:
-            return ensure_month(value)
-        except EnsureMonthError as error:
+            return utilities.whenever.Month.ensure(value)
+        except _MonthParseCommonISOError as error:
             self.fail(str(error), param, ctx)
 
 

utilities/fastapi.py

@@ -8,7 +8,7 @@ from fastapi import FastAPI
 from uvicorn import Config, Server
 
 from utilities.asyncio import Looper
-from utilities.whenever2 import SECOND, get_now_local
+from utilities.whenever import SECOND, get_now_local
 
 if TYPE_CHECKING:
     from types import TracebackType

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.whenever2 import format_compact, get_now
+from utilities.whenever import format_compact, get_now
 
 if TYPE_CHECKING:
     from collections.abc import Iterator

utilities/hypothesis.py

@@ -31,7 +31,6 @@ from hypothesis.strategies import (
     booleans,
     characters,
     composite,
-    dates,
     datetimes,
     floats,
     integers,
@@ -57,14 +56,6 @@ from whenever import (
     ZonedDateTime,
 )
 
-from utilities.datetime import (
-    MAX_DATE_TWO_DIGIT_YEAR,
-    MAX_MONTH,
-    MIN_DATE_TWO_DIGIT_YEAR,
-    MIN_MONTH,
-    Month,
-    date_to_month,
-)
 from utilities.functions import ensure_int, ensure_str
 from utilities.math import (
     MAX_FLOAT32,
@@ -87,7 +78,7 @@ from utilities.platform import IS_WINDOWS
 from utilities.sentinel import Sentinel, sentinel
 from utilities.tempfile import TEMP_DIR, TemporaryDirectory
 from utilities.version import Version
-from utilities.whenever2 import (
+from utilities.whenever import (
     DATE_DELTA_MAX,
     DATE_DELTA_MIN,
     DATE_DELTA_PARSABLE_MAX,
@@ -98,13 +89,18 @@ from utilities.whenever2 import (
     DATE_TIME_DELTA_MIN,
     DATE_TIME_DELTA_PARSABLE_MAX,
     DATE_TIME_DELTA_PARSABLE_MIN,
+    DATE_TWO_DIGIT_YEAR_MAX,
+    DATE_TWO_DIGIT_YEAR_MIN,
     DAY,
+    MONTH_MAX,
+    MONTH_MIN,
     PLAIN_DATE_TIME_MAX,
     PLAIN_DATE_TIME_MIN,
     TIME_DELTA_MAX,
     TIME_DELTA_MIN,
     TIME_MAX,
     TIME_MIN,
+    Month,
     to_date_time_delta,
     to_days,
     to_nanos,
@@ -180,7 +176,7 @@ def bool_arrays(
 
 
 @composite
-def date_deltas_whenever(
+def date_deltas(
     draw: DrawFn,
     /,
     *,
@@ -217,7 +213,7 @@ def date_deltas_whenever(
 
 
 @composite
-def date_time_deltas_whenever(
+def date_time_deltas(
     draw: DrawFn,
     /,
     *,
@@ -253,30 +249,13 @@ def date_time_deltas_whenever(
 
 
 @composite
-def dates_two_digit_year(
-    draw: DrawFn,
-    /,
-    *,
-    min_value: MaybeSearchStrategy[dt.date] = MIN_DATE_TWO_DIGIT_YEAR,
-    max_value: MaybeSearchStrategy[dt.date] = MAX_DATE_TWO_DIGIT_YEAR,
-) -> dt.date:
-    """Strategy for generating dates with valid 2 digit years."""
-    min_value_, max_value_ = [draw2(draw, v) for v in [min_value, max_value]]
-    min_value_ = max(min_value_, MIN_DATE_TWO_DIGIT_YEAR)
-    max_value_ = min(max_value_, MAX_DATE_TWO_DIGIT_YEAR)
-    return draw(dates(min_value=min_value_, max_value=max_value_))
-
-
-##
-
-
-@composite
-def dates_whenever(
+def dates(
     draw: DrawFn,
     /,
     *,
     min_value: MaybeSearchStrategy[Date | None] = None,
     max_value: MaybeSearchStrategy[Date | None] = None,
+    two_digit: MaybeSearchStrategy[bool] = False,
 ) -> Date:
     """Strategy for generating dates."""
     min_value_, max_value_ = [draw2(draw, v) for v in [min_value, max_value]]
@@ -294,9 +273,11 @@ def dates_whenever(
             ...
         case _ as never:
             assert_never(never)
-    py_date = draw(
-        dates(min_value=min_value_.py_date(), max_value=max_value_.py_date())
-    )
+    if draw2(draw, two_digit):
+        min_value_ = max(min_value_, DATE_TWO_DIGIT_YEAR_MIN)
+        max_value_ = min(max_value_, DATE_TWO_DIGIT_YEAR_MAX)
+    min_date, max_date = [d.py_date() for d in [min_value_, max_value_]]
+    py_date = draw(hypothesis.strategies.dates(min_value=min_date, max_value=max_date))
     return Date.from_py_date(py_date)
 
 
@@ -639,13 +620,29 @@ def months(
     draw: DrawFn,
     /,
     *,
-    min_value: MaybeSearchStrategy[Month] = MIN_MONTH,
-    max_value: MaybeSearchStrategy[Month] = MAX_MONTH,
+    min_value: MaybeSearchStrategy[Month | None] = None,
+    max_value: MaybeSearchStrategy[Month | None] = None,
+    two_digit: MaybeSearchStrategy[bool] = False,
 ) -> Month:
-    """Strategy for generating datetimes with the UTC timezone."""
-    min_value_, max_value_ = [draw2(draw, v).to_date() for v in [min_value, max_value]]
-    date = draw(dates(min_value=min_value_, max_value=max_value_))
-    return date_to_month(date)
+    """Strategy for generating months."""
+    min_value_, max_value_ = [draw2(draw, v) for v in [min_value, max_value]]
+    match min_value_:
+        case None:
+            min_value_ = MONTH_MIN
+        case Month():
+            ...
+        case _ as never:
+            assert_never(never)
+    match max_value_:
+        case None:
+            max_value_ = MONTH_MAX
+        case Month():
+            ...
+        case _ as never:
+            assert_never(never)
+    min_date, max_date = [m.to_date() for m in [min_value_, max_value_]]
+    date = draw(dates(min_value=min_date, max_value=max_date, two_digit=two_digit))
+    return Month.from_date(date)
 
 
 ##
@@ -735,7 +732,7 @@ def paths() -> SearchStrategy[Path]:
 
 
 @composite
-def plain_datetimes_whenever(
+def plain_datetimes(
     draw: DrawFn,
     /,
     *,
@@ -1076,7 +1073,7 @@ def text_printable(
 
 
 @composite
-def time_deltas_whenever(
+def time_deltas(
     draw: DrawFn,
     /,
     *,
@@ -1111,7 +1108,7 @@ def time_deltas_whenever(
 
 
 @composite
-def times_whenever(
+def times(
     draw: DrawFn,
     /,
     *,
@@ -1212,7 +1209,7 @@ def versions(draw: DrawFn, /, *, suffix: MaybeSearchStrategy[bool] = False) -> V
 
 
 @composite
-def zoned_datetimes_whenever(
+def zoned_datetimes(
     draw: DrawFn,
     /,
     *,
@@ -1239,7 +1236,7 @@ def zoned_datetimes_whenever(
                 max_value_ = max_value_.to_tz(time_zone_.key).to_plain()
         case _ as never:
             assert_never(never)
-    plain = draw(plain_datetimes_whenever(min_value=min_value_, max_value=max_value_))
+    plain = draw(plain_datetimes(min_value=min_value_, max_value=max_value_))
     with (
         assume_does_not_raise(RepeatedTime),
         assume_does_not_raise(SkippedTime),
@@ -1259,10 +1256,9 @@ __all__ = [
     "Shape",
     "assume_does_not_raise",
     "bool_arrays",
-    "date_deltas_whenever",
-    "date_time_deltas_whenever",
-    "dates_two_digit_year",
-    "dates_whenever",
+    "date_deltas",
+    "date_time_deltas",
+    "dates",
     "draw2",
     "float32s",
     "float64s",
@@ -1279,7 +1275,7 @@ __all__ = [
     "numbers",
     "pairs",
     "paths",
-    "plain_datetimes_whenever",
+    "plain_datetimes",
     "random_states",
     "sentinels",
     "sets_fixed_length",
@@ -1294,11 +1290,11 @@ __all__ = [
     "text_clean",
     "text_digits",
     "text_printable",
-    "time_deltas_whenever",
-    "times_whenever",
+    "time_deltas",
+    "times",
     "triples",
     "uint32s",
     "uint64s",
     "versions",
-    "zoned_datetimes_whenever",
+    "zoned_datetimes",
 ]

utilities/logging.py

@@ -45,12 +45,7 @@ from utilities.re import (
 )
 from utilities.sentinel import Sentinel, sentinel
 from utilities.tzlocal import LOCAL_TIME_ZONE_NAME
-from utilities.whenever2 import (
-    WheneverLogRecord,
-    format_compact,
-    get_now,
-    get_now_local,
-)
+from utilities.whenever import WheneverLogRecord, format_compact, get_now, get_now_local
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterable, Mapping

utilities/orjson.py

@@ -47,7 +47,7 @@ from utilities.math import MAX_INT64, MIN_INT64
 from utilities.types import Dataclass, LogLevel, MaybeIterable, PathLike, StrMapping
 from utilities.tzlocal import LOCAL_TIME_ZONE
 from utilities.version import Version, parse_version
-from utilities.whenever2 import from_timestamp
+from utilities.whenever import from_timestamp
 
 if TYPE_CHECKING:
     from collections.abc import Set as AbstractSet

utilities/platform.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 from pathlib import Path
 from platform import system
+from re import sub
 from typing import TYPE_CHECKING, Literal, assert_never, override
 
 if TYPE_CHECKING:
@@ -69,6 +70,22 @@ MAX_PID = get_max_pid()
 ##
 
 
+def get_strftime(text: str, /) -> str:
+    """Get a platform-specific format string."""
+    match SYSTEM:
+        case "windows":  # skipif-not-windows
+            return text
+        case "mac":  # skipif-not-macos
+            return text
+        case "linux":  # skipif-not-linux
+            return sub("%Y", "%4Y", text)
+        case _ as never:
+            assert_never(never)
+
+
+##
+
+
 def maybe_yield_lower_case(text: Iterable[str], /) -> Iterator[str]:
     """Yield lower-cased text if the platform is case-insentive."""
     match SYSTEM:
@@ -94,6 +111,7 @@ __all__ = [
     "GetSystemError",
     "System",
     "get_max_pid",
+    "get_strftime",
     "get_system",
     "maybe_yield_lower_case",
 ]

utilities/pottery.py

@@ -10,7 +10,7 @@ from redis.asyncio import Redis
 
 from utilities.asyncio import sleep_td, timeout_td
 from utilities.iterables import always_iterable
-from utilities.whenever2 import MILLISECOND, SECOND
+from utilities.whenever import MILLISECOND, SECOND
 
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator, Iterable

utilities/psutil.py

@@ -11,7 +11,7 @@ from psutil import swap_memory, virtual_memory
 
 from utilities.asyncio import Looper
 from utilities.contextlib import suppress_super_object_attribute_error
-from utilities.whenever2 import SECOND, get_now
+from utilities.whenever import SECOND, get_now
 
 if TYPE_CHECKING:
     from logging import Logger

utilities/pyinstrument.py

@@ -8,7 +8,7 @@ from pyinstrument.profiler import Profiler
 
 from utilities.atomicwrites import writer
 from utilities.pathlib import get_path
-from utilities.whenever2 import format_compact, get_now
+from utilities.whenever import format_compact, get_now
 
 if TYPE_CHECKING:
     from collections.abc import Iterator

utilities/pytest.py

@@ -24,7 +24,7 @@ from utilities.platform import (
     IS_WINDOWS,
 )
 from utilities.random import get_state
-from utilities.whenever2 import SECOND, get_now_local
+from utilities.whenever import SECOND, get_now_local
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterable, Sequence

utilities/redis.py

@@ -29,7 +29,7 @@ from utilities.errors import ImpossibleCaseError
 from utilities.functions import ensure_int, identity
 from utilities.iterables import always_iterable, one
 from utilities.orjson import deserialize, serialize
-from utilities.whenever2 import MILLISECOND, SECOND
+from utilities.whenever import MILLISECOND, SECOND
 
 if TYPE_CHECKING:
     from collections.abc import (

utilities/slack_sdk.py

@@ -10,7 +10,7 @@ from slack_sdk.webhook.async_client import AsyncWebhookClient
 from utilities.asyncio import Looper, timeout_td
 from utilities.functools import cache
 from utilities.sentinel import Sentinel, sentinel
-from utilities.whenever2 import MINUTE, SECOND
+from utilities.whenever import MINUTE, SECOND
 
 if TYPE_CHECKING:
     from collections.abc import Callable

utilities/sqlalchemy.py

@@ -91,7 +91,7 @@ from utilities.iterables import (
 from utilities.reprlib import get_repr
 from utilities.text import snake_case
 from utilities.types import MaybeIterable, MaybeType, StrMapping, TupleOrStrMapping
-from utilities.whenever2 import SECOND
+from utilities.whenever import SECOND
 
 if TYPE_CHECKING:
     from whenever import TimeDelta

utilities/timer.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from operator import add, eq, ge, gt, le, lt, mul, ne, sub, truediv
 from typing import TYPE_CHECKING, Any, Self, override
 
-from utilities.whenever2 import get_now_local
+from utilities.whenever import get_now_local
 
 if TYPE_CHECKING:
     from collections.abc import Callable

utilities/traceback.py

@@ -27,7 +27,7 @@ from utilities.reprlib import (
     yield_mapping_repr,
 )
 from utilities.version import get_version
-from utilities.whenever2 import format_compact, get_now, to_zoned_date_time
+from utilities.whenever import format_compact, get_now, to_zoned_date_time
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterator, Sequence

utilities/{whenever2.py → whenever.py}

@@ -1,26 +1,34 @@
 from __future__ import annotations
 
-import datetime as dt
 from collections.abc import Callable, Iterable
-from dataclasses import dataclass
+from dataclasses import dataclass, replace
 from functools import cache
 from logging import LogRecord
 from statistics import fmean
-from typing import TYPE_CHECKING, Any, SupportsFloat, assert_never, overload, override
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Self,
+    SupportsFloat,
+    assert_never,
+    overload,
+    override,
+)
 
 from whenever import (
     Date,
     DateDelta,
     DateTimeDelta,
     PlainDateTime,
-    Time,
     TimeDelta,
     ZonedDateTime,
 )
 
-from utilities.datetime import maybe_sub_pct_y
 from utilities.math import sign
+from utilities.platform import get_strftime
+from utilities.re import ExtractGroupsError, extract_groups
 from utilities.sentinel import Sentinel, sentinel
+from utilities.types import MaybeStr
 from utilities.tzlocal import LOCAL_TIME_ZONE, LOCAL_TIME_ZONE_NAME
 from utilities.zoneinfo import UTC, get_time_zone_name
 
@@ -37,14 +45,14 @@ if TYPE_CHECKING:
 ## bounds
 
 
-DATE_MIN = Date.from_py_date(dt.date.min)
-DATE_MAX = Date.from_py_date(dt.date.max)
-TIME_MIN = Time.from_py_time(dt.time.min)
-TIME_MAX = Time.from_py_time(dt.time.max)
-
-
-PLAIN_DATE_TIME_MIN = PlainDateTime.from_py_datetime(dt.datetime.min)  # noqa: DTZ901
-PLAIN_DATE_TIME_MAX = PlainDateTime.from_py_datetime(dt.datetime.max)  # noqa: DTZ901
+PLAIN_DATE_TIME_MIN = PlainDateTime(1, 1, 1)
+PLAIN_DATE_TIME_MAX = PlainDateTime(
+    9999, 12, 31, hour=23, minute=59, second=59, nanosecond=999999999
+)
+DATE_MIN = PLAIN_DATE_TIME_MIN.date()
+DATE_MAX = PLAIN_DATE_TIME_MAX.date()
+TIME_MIN = PLAIN_DATE_TIME_MIN.time()
+TIME_MAX = PLAIN_DATE_TIME_MIN.time()
 ZONED_DATE_TIME_MIN = PLAIN_DATE_TIME_MIN.assume_tz(UTC.key)
 ZONED_DATE_TIME_MAX = PLAIN_DATE_TIME_MAX.assume_tz(UTC.key)
 
@@ -97,6 +105,10 @@ DATE_DELTA_PARSABLE_MIN = DateDelta(days=-999999)
 DATE_DELTA_PARSABLE_MAX = DateDelta(days=999999)
 
 
+DATE_TWO_DIGIT_YEAR_MIN = Date(1969, 1, 1)
+DATE_TWO_DIGIT_YEAR_MAX = Date(DATE_TWO_DIGIT_YEAR_MIN.year + 99, 12, 31)
+
+
 ## common constants
 
 
@@ -148,7 +160,7 @@ def datetime_utc(
 def format_compact(datetime: ZonedDateTime, /) -> str:
     """Convert a zoned datetime to the local time zone, then format."""
     py_datetime = datetime.round().to_tz(LOCAL_TIME_ZONE_NAME).to_plain().py_datetime()
-    return py_datetime.strftime(maybe_sub_pct_y("%Y%m%dT%H%M%S"))
+    return py_datetime.strftime(get_strftime("%Y%m%dT%H%M%S"))
 
 
 ##
@@ -313,6 +325,124 @@ class _MinMaxDatePeriodError(MinMaxDateError):
 ##
 
 
+@dataclass(order=True, unsafe_hash=True, slots=True)
+class Month:
+    """Represents a month in time."""
+
+    year: int
+    month: int
+
+    def __post_init__(self) -> None:
+        try:
+            _ = Date(self.year, self.month, 1)
+        except ValueError:
+            raise _MonthInvalidError(year=self.year, month=self.month) from None
+
+    @override
+    def __repr__(self) -> str:
+        return self.format_common_iso()
+
+    @override
+    def __str__(self) -> str:
+        return repr(self)
+
+    def __add__(self, other: Any, /) -> Self:
+        if not isinstance(other, int):  # pragma: no cover
+            return NotImplemented
+        years, month = divmod(self.month + other - 1, 12)
+        month += 1
+        year = self.year + years
+        return replace(self, year=year, month=month)
+
+    @overload
+    def __sub__(self, other: Self, /) -> int: ...
+    @overload
+    def __sub__(self, other: int, /) -> Self: ...
+    def __sub__(self, other: Self | int, /) -> Self | int:
+        if isinstance(other, int):  # pragma: no cover
+            return self + (-other)
+        if isinstance(other, type(self)):
+            self_as_int = 12 * self.year + self.month
+            other_as_int = 12 * other.year + other.month
+            return self_as_int - other_as_int
+        return NotImplemented  # pragma: no cover
+
+    @classmethod
+    def ensure(cls, obj: MonthLike, /) -> Month:
+        """Ensure the object is a month."""
+        match obj:
+            case Month() as month:
+                return month
+            case str() as text:
+                return cls.parse_common_iso(text)
+            case _ as never:
+                assert_never(never)
+
+    def format_common_iso(self) -> str:
+        return f"{self.year:04}-{self.month:02}"
+
+    @classmethod
+    def from_date(cls, date: Date, /) -> Self:
+        return cls(year=date.year, month=date.month)
+
+    @classmethod
+    def parse_common_iso(cls, text: str, /) -> Self:
+        try:
+            year, month = extract_groups(r"^(\d{2,4})[\-\. ]?(\d{2})$", text)
+        except ExtractGroupsError:
+            raise _MonthParseCommonISOError(text=text) from None
+        return cls(year=cls._parse_year(year), month=int(month))
+
+    def to_date(self, /, *, day: int = 1) -> Date:
+        return Date(self.year, self.month, day)
+
+    @classmethod
+    def _parse_year(cls, year: str, /) -> int:
+        match len(year):
+            case 4:
+                return int(year)
+            case 2:
+                min_year = DATE_TWO_DIGIT_YEAR_MIN.year
+                max_year = DATE_TWO_DIGIT_YEAR_MAX.year
+                years = range(min_year, max_year + 1)
+                (result,) = (y for y in years if y % 100 == int(year))
+                return result
+            case _:
+                raise _MonthParseCommonISOError(text=year) from None
+
+
+@dataclass(kw_only=True, slots=True)
+class MonthError(Exception): ...
+
+
+@dataclass(kw_only=True, slots=True)
+class _MonthInvalidError(MonthError):
+    year: int
+    month: int
+
+    @override
+    def __str__(self) -> str:
+        return f"Invalid year and month: {self.year}, {self.month}"
+
+
+@dataclass(kw_only=True, slots=True)
+class _MonthParseCommonISOError(MonthError):
+    text: str
+
+    @override
+    def __str__(self) -> str:
+        return f"Unable to parse month; got {self.text!r}"
+
+
+type DateOrMonth = Date | Month
+type MonthLike = MaybeStr[Month]
+MONTH_MIN = Month.from_date(DATE_MIN)
+MONTH_MAX = Month.from_date(DATE_MAX)
+
+
+##
+
+
 @overload
 def to_date(*, date: MaybeCallableDate) -> Date: ...
 @overload
@@ -579,12 +709,16 @@ __all__ = [
     "DATE_TIME_DELTA_MIN",
     "DATE_TIME_DELTA_PARSABLE_MAX",
     "DATE_TIME_DELTA_PARSABLE_MIN",
+    "DATE_TWO_DIGIT_YEAR_MAX",
+    "DATE_TWO_DIGIT_YEAR_MIN",
     "DAY",
     "HOUR",
     "MICROSECOND",
     "MILLISECOND",
     "MINUTE",
     "MONTH",
+    "MONTH_MAX",
+    "MONTH_MIN",
     "NOW_LOCAL",
     "PLAIN_DATE_TIME_MAX",
     "PLAIN_DATE_TIME_MIN",
@@ -601,8 +735,12 @@ __all__ = [
     "ZERO_TIME",
     "ZONED_DATE_TIME_MAX",
     "ZONED_DATE_TIME_MIN",
+    "DateOrMonth",
     "MeanDateTimeError",
     "MinMaxDateError",
+    "Month",
+    "MonthError",
+    "MonthLike",
     "ToDaysError",
     "ToNanosError",
     "WheneverLogRecord",

utilities/datetime.py

@@ -1,222 +0,0 @@
-from __future__ import annotations
-
-import datetime as dt
-from dataclasses import dataclass, replace
-from re import search, sub
-from typing import Any, Self, assert_never, overload, override
-
-from utilities.iterables import OneEmptyError, one
-from utilities.platform import SYSTEM
-from utilities.types import MaybeStr
-from utilities.zoneinfo import UTC
-
-
-def date_to_month(date: dt.date, /) -> Month:
-    """Collapse a date into a month."""
-    return Month(year=date.year, month=date.month)
-
-
-##
-
-
-def ensure_month(month: MonthLike, /) -> Month:
-    """Ensure the object is a month."""
-    if isinstance(month, Month):
-        return month
-    try:
-        return parse_month(month)
-    except ParseMonthError as error:
-        raise EnsureMonthError(month=error.month) from None
-
-
-@dataclass(kw_only=True, slots=True)
-class EnsureMonthError(Exception):
-    month: str
-
-    @override
-    def __str__(self) -> str:
-        return f"Unable to ensure month; got {self.month!r}"
-
-
-##
-
-
-def maybe_sub_pct_y(text: str, /) -> str:
-    """Substitute the `%Y' token with '%4Y' if necessary."""
-    match SYSTEM:
-        case "windows":  # skipif-not-windows
-            return text
-        case "mac":  # skipif-not-macos
-            return text
-        case "linux":  # skipif-not-linux
-            return sub("%Y", "%4Y", text)
-        case _ as never:
-            assert_never(never)
-
-
-##
-
-
-@dataclass(order=True, unsafe_hash=True, slots=True)
-class Month:
-    """Represents a month in time."""
-
-    year: int
-    month: int
-
-    def __post_init__(self) -> None:
-        try:
-            _ = dt.date(self.year, self.month, 1)
-        except ValueError:
-            raise MonthError(year=self.year, month=self.month) from None
-
-    @override
-    def __repr__(self) -> str:
-        return serialize_month(self)
-
-    @override
-    def __str__(self) -> str:
-        return repr(self)
-
-    def __add__(self, other: Any, /) -> Self:
-        if not isinstance(other, int):  # pragma: no cover
-            return NotImplemented
-        years, month = divmod(self.month + other - 1, 12)
-        month += 1
-        year = self.year + years
-        return replace(self, year=year, month=month)
-
-    @overload
-    def __sub__(self, other: Self, /) -> int: ...
-    @overload
-    def __sub__(self, other: int, /) -> Self: ...
-    def __sub__(self, other: Self | int, /) -> Self | int:
-        if isinstance(other, int):  # pragma: no cover
-            return self + (-other)
-        if isinstance(other, type(self)):
-            self_as_int = 12 * self.year + self.month
-            other_as_int = 12 * other.year + other.month
-            return self_as_int - other_as_int
-        return NotImplemented  # pragma: no cover
-
-    @classmethod
-    def from_date(cls, date: dt.date, /) -> Self:
-        return cls(year=date.year, month=date.month)
-
-    def to_date(self, /, *, day: int = 1) -> dt.date:
-        return dt.date(self.year, self.month, day)
-
-
-@dataclass(kw_only=True, slots=True)
-class MonthError(Exception):
-    year: int
-    month: int
-
-    @override
-    def __str__(self) -> str:
-        return f"Invalid year and month: {self.year}, {self.month}"
-
-
-type DateOrMonth = dt.date | Month
-type MonthLike = MaybeStr[Month]
-MIN_MONTH = Month(dt.date.min.year, dt.date.min.month)
-MAX_MONTH = Month(dt.date.max.year, dt.date.max.month)
-
-
-##
-
-
-_TWO_DIGIT_YEAR_MIN = 1969
-_TWO_DIGIT_YEAR_MAX = _TWO_DIGIT_YEAR_MIN + 99
-MIN_DATE_TWO_DIGIT_YEAR = dt.date(
-    _TWO_DIGIT_YEAR_MIN, dt.date.min.month, dt.date.min.day
-)
-MAX_DATE_TWO_DIGIT_YEAR = dt.date(
-    _TWO_DIGIT_YEAR_MAX, dt.date.max.month, dt.date.max.day
-)
-
-
-def parse_two_digit_year(year: int | str, /) -> int:
-    """Parse a 2-digit year into a year."""
-    match year:
-        case int():
-            years = range(_TWO_DIGIT_YEAR_MIN, _TWO_DIGIT_YEAR_MAX + 1)
-            try:
-                return one(y for y in years if y % 100 == year)
-            except OneEmptyError:
-                raise _ParseTwoDigitYearInvalidIntegerError(year=year) from None
-        case str():
-            if search(r"^\d{1,2}$", year):
-                return parse_two_digit_year(int(year))
-            raise _ParseTwoDigitYearInvalidStringError(year=year)
-        case _ as never:
-            assert_never(never)
-
-
-@dataclass(kw_only=True, slots=True)
-class ParseTwoDigitYearError(Exception):
-    year: int | str
-
-
-@dataclass(kw_only=True, slots=True)
-class _ParseTwoDigitYearInvalidIntegerError(Exception):
-    year: int | str
-
-    @override
-    def __str__(self) -> str:
-        return f"Unable to parse year; got {self.year!r}"
-
-
-@dataclass(kw_only=True, slots=True)
-class _ParseTwoDigitYearInvalidStringError(Exception):
-    year: int | str
-
-    @override
-    def __str__(self) -> str:
-        return f"Unable to parse year; got {self.year!r}"
-
-
-##
-
-
-def serialize_month(month: Month, /) -> str:
-    """Serialize a month."""
-    return f"{month.year:04}-{month.month:02}"
-
-
-def parse_month(month: str, /) -> Month:
-    """Parse a string into a month."""
-    for fmt in ["%Y-%m", "%Y%m", "%Y %m"]:
-        try:
-            date = dt.datetime.strptime(month, fmt).replace(tzinfo=UTC).date()
-        except ValueError:
-            pass
-        else:
-            return Month(date.year, date.month)
-    raise ParseMonthError(month=month)
-
-
-@dataclass(kw_only=True, slots=True)
-class ParseMonthError(Exception):
-    month: str
-
-    @override
-    def __str__(self) -> str:
-        return f"Unable to parse month; got {self.month!r}"
-
-
-__all__ = [
-    "MAX_DATE_TWO_DIGIT_YEAR",
-    "MAX_MONTH",
-    "MIN_DATE_TWO_DIGIT_YEAR",
-    "MIN_MONTH",
-    "DateOrMonth",
-    "EnsureMonthError",
-    "Month",
-    "MonthError",
-    "MonthLike",
-    "ParseMonthError",
-    "date_to_month",
-    "ensure_month",
-    "parse_two_digit_year",
-]