dycw-utilities 0.137.0__py3-none-any.whl → 0.138.1__py3-none-any.whl

{dycw_utilities-0.137.0.dist-info → dycw_utilities-0.138.1.dist-info}/METADATA

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

{dycw_utilities-0.137.0.dist-info → dycw_utilities-0.138.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
-utilities/__init__.py,sha256=PUxpzAWl2k1kpcIxVjuaCvi36fODyVik-8mExgNWSXk,60
+utilities/__init__.py,sha256=Bd8dTrqjGxNQ6TwkIs-2waHukZTqr0rukeUuyCgkrj4,60
 utilities/aiolimiter.py,sha256=mD0wEiqMgwpty4XTbawFpnkkmJS6R4JRsVXFUaoitSU,628
 utilities/altair.py,sha256=HeZBVUocjkrTNwwKrClppsIqgNFF-ykv05HfZSoHYno,9104
 utilities/asyncio.py,sha256=dcGeKQzjLBXxKzZkVIk5oZsFXEcynVbRB9iNB5XEDZk,38526
 utilities/atomicwrites.py,sha256=geFjn9Pwn-tTrtoGjDDxWli9NqbYfy3gGL6ZBctiqSo,5393
 utilities/atools.py,sha256=9im2g8OCf-Iynqa8bAv8N0Ycj9QvrJmGO7yLCZEdgII,986
 utilities/cachetools.py,sha256=v1-9sXHLdOLiwmkq6NB0OUbxeKBuVVN6wmAWefWoaHI,2744
-utilities/click.py,sha256=rXCbuBi6xqRK2-2e0hXQ2vYBWJzT9vPY6KkRIu73_uI,16049
+utilities/click.py,sha256=PToheYTcKmBwKOMHasZ36CKcMNmM005nKdvOCFUo5dw,16989
 utilities/concurrent.py,sha256=ZdhcNeBl1-HaAPY3h7bZ5ccuYdfdq2ATHplvZdnzlhk,2858
 utilities/contextlib.py,sha256=lpaLJBy3X0UGLWjM98jkQZZq8so4fRmoK-Bheq0uOW4,1027
 utilities/contextvars.py,sha256=RsSGGrbQqqZ67rOydnM7WWIsM2lIE31UHJLejnHJPWY,505
@@ -23,7 +23,7 @@ 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=Ru3ZBhtGiuj-1vJjGuclymlYDAV_NC0WoUg9LY873d8,38044
+utilities/hypothesis.py,sha256=2VJy9Pxqjy4_ldAwZAR6XEGuG2ZmAN1ycpA_VIGnKew,38819
 utilities/importlib.py,sha256=mV1xT_O_zt_GnZZ36tl3xOmMaN_3jErDWY54fX39F6Y,429
 utilities/inflect.py,sha256=DbqB5Q9FbRGJ1NbvEiZBirRMxCxgrz91zy5jCO9ZIs0,347
 utilities/ipython.py,sha256=V2oMYHvEKvlNBzxDXdLvKi48oUq2SclRg5xasjaXStw,763
@@ -40,9 +40,9 @@ utilities/more_itertools.py,sha256=NEGXDT8COaxziaJFTiXYKX0gffwfKhCAMrq-Kgh0w8c,1
 utilities/numpy.py,sha256=Xn23sA2ZbVNqwUYEgNJD3XBYH6IbCri_WkHSNhg3NkY,26122
 utilities/operator.py,sha256=fZM2DBZdjtU8Lh9Z-eHC4ktNr0vO3JfX8hXgIYwdvBI,3826
 utilities/optuna.py,sha256=C-fhWYiXHVPo1l8QctYkFJ4DyhbSrGorzP1dJb_qvd8,1933
-utilities/orjson.py,sha256=y5ynSGhQjX7vikfvsHh_AklLnH7gjvsSkIC3h5tnx98,36474
+utilities/orjson.py,sha256=WWV2QukCIuwT8OAOtmKhLhxezXPVbeA_fQCucmGmbRA,37106
 utilities/os.py,sha256=yMNAKMyY8oFgQ1yN3TQYnwa5-A_FXz4tCDbhIctQHSs,3736
-utilities/parse.py,sha256=bCZW1bBfXM2j-yLGq0TGUshOnbL8V-U8amGu_OZTE_I,17907
+utilities/parse.py,sha256=JcJn5yXKhIWXBCwgBdPsyu7Hvcuw6kyEdqvaebCaI9k,17951
 utilities/pathlib.py,sha256=jCFPZm4rBKylEva9wDVTwQlTTVKMepu92WrTpoGa438,3248
 utilities/period.py,sha256=6jEff_qAiE7xdFaQ1DnKgNf10D2wHhzt7hQXCBoKlgc,6842
 utilities/pickle.py,sha256=MBT2xZCsv0pH868IXLGKnlcqNx2IRVKYNpRcqiQQqxw,653
@@ -77,18 +77,18 @@ utilities/text.py,sha256=ymBFlP_cA8OgNnZRVNs7FAh7OG8HxE6YkiLEMZv5g_A,11297
 utilities/threading.py,sha256=GvBOp4CyhHfN90wGXZuA2VKe9fGzMaEa7oCl4f3nnPU,1009
 utilities/timer.py,sha256=oXfTii6ymu57niP0BDGZjFD55LEHi2a19kqZKiTgaFQ,2588
 utilities/traceback.py,sha256=h9yt4C2XkGHXW9e9bz93IGluhIR_Qil8zu5dhC8DXY0,8884
-utilities/typed_settings.py,sha256=cZqA2IjG1erF1SUZFSsjIHmZX7BP5iIfPd6CixHllA0,4367
-utilities/types.py,sha256=98pwEfkBikg6UUrshNJZgc8l97FGBbi0twIsqVt-KNA,17247
+utilities/typed_settings.py,sha256=C2i2VK62us_Z5jjca9NLmDFiT3_mkoSCwgU6FDtDhMI,4501
+utilities/types.py,sha256=-_pXQvmpJhTgEbI13N_zZWINdt0ODBpZ3WdJQUML9GA,17397
 utilities/typing.py,sha256=Z-_XDaWyT_6wIo3qfNK-hvRlzxP2Jxa9PgXzm5rDYRA,13790
 utilities/tzdata.py,sha256=fgNVj66yUbCSI_-vrRVzSD3gtf-L_8IEJEPjP_Jel5Y,266
 utilities/tzlocal.py,sha256=KyCXEgCTjqGFx-389JdTuhMRUaT06U1RCMdWoED-qro,728
 utilities/uuid.py,sha256=32p7DGHGM2Btx6PcBvCZvERSWbpupMXqx6FppPoSoTU,612
 utilities/version.py,sha256=ufhJMmI6KPs1-3wBI71aj5wCukd3sP_m11usLe88DNA,5117
 utilities/warnings.py,sha256=un1LvHv70PU-LLv8RxPVmugTzDJkkGXRMZTE2-fTQHw,1771
-utilities/whenever.py,sha256=HdkS19yRIRfevH3kkDw1SJVVZbK3hgAXeb6ZFoUjh38,24094
+utilities/whenever.py,sha256=R5d9UCNCdAOyjwLUmfH2Vn8Ykee8OHQi2skRTFfbZMM,20492
 utilities/zipfile.py,sha256=24lQc9ATcJxHXBPc_tBDiJk48pWyRrlxO2fIsFxU0A8,699
 utilities/zoneinfo.py,sha256=oEH-nL3t4h9uawyZqWDtNtDAl6M-CLpLYGI_nI6DulM,1971
-dycw_utilities-0.137.0.dist-info/METADATA,sha256=S6dRJeuw2HB30BzEpinRuxWt8SORnzlVVs62Dk_0vD4,1637
-dycw_utilities-0.137.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.137.0.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.137.0.dist-info/RECORD,,
+dycw_utilities-0.138.1.dist-info/METADATA,sha256=50rXKdwfhrNV9nMtdxwwleIHXmBFm3v6rTZxopeRnV0,1637
+dycw_utilities-0.138.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.138.1.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.138.1.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.137.0"
+__version__ = "0.138.1"

utilities/click.py

@@ -16,7 +16,7 @@ from utilities.functions import EnsureStrError, ensure_str, get_class_name
 from utilities.iterables import is_iterable_not_str
 from utilities.parse import ParseObjectError, parse_object
 from utilities.text import split_str
-from utilities.whenever import FreqLike, _FreqParseError, _MonthParseCommonISOError
+from utilities.whenever import FreqLike, _FreqParseError
 
 if TYPE_CHECKING:
     from collections.abc import Iterable, Sequence
@@ -29,12 +29,13 @@ if TYPE_CHECKING:
         IPv4AddressLike,
         IPv6AddressLike,
         MaybeStr,
+        MonthDayLike,
         PlainDateTimeLike,
         TimeDeltaLike,
         TimeLike,
+        YearMonthLike,
         ZonedDateTimeLike,
     )
-    from utilities.whenever import MonthLike
 
 
 FilePath = click.Path(file_okay=True, dir_okay=False, path_type=pathlib.Path)
@@ -252,10 +253,10 @@ class IPv6Address(ParamType):
                 assert_never(never)
 
 
-class Month(ParamType):
-    """A month-valued parameter."""
+class MonthDay(ParamType):
+    """A month-day parameter."""
 
-    name = "month"
+    name = "month-day"
 
     @override
     def __repr__(self) -> str:
@@ -263,13 +264,19 @@ class Month(ParamType):
 
     @override
     def convert(
-        self, value: MonthLike, param: Parameter | None, ctx: Context | None
-    ) -> utilities.whenever.Month:
-        """Convert a value into the `Month` type."""
-        try:
-            return utilities.whenever.Month.ensure(value)
-        except _MonthParseCommonISOError as error:
-            self.fail(str(error), param, ctx)
+        self, value: MonthDayLike, param: Parameter | None, ctx: Context | None
+    ) -> whenever.MonthDay:
+        """Convert a value into the `MonthDay` type."""
+        match value:
+            case whenever.MonthDay():
+                return value
+            case str():
+                try:
+                    return whenever.MonthDay.parse_common_iso(value)
+                except ValueError as error:
+                    self.fail(str(error), param, ctx)
+            case _ as never:
+                assert_never(never)
 
 
 class PlainDateTime(ParamType):
@@ -350,6 +357,32 @@ class TimeDelta(ParamType):
                 assert_never(never)
 
 
+class YearMonth(ParamType):
+    """A year-month parameter."""
+
+    name = "year-month"
+
+    @override
+    def __repr__(self) -> str:
+        return self.name.upper()
+
+    @override
+    def convert(
+        self, value: YearMonthLike, param: Parameter | None, ctx: Context | None
+    ) -> whenever.YearMonth:
+        """Convert a value into the `YearMonth` type."""
+        match value:
+            case whenever.YearMonth():
+                return value
+            case str():
+                try:
+                    return whenever.YearMonth.parse_common_iso(value)
+                except ValueError as error:
+                    self.fail(str(error), param, ctx)
+            case _ as never:
+                assert_never(never)
+
+
 class ZonedDateTime(ParamType):
     """A zoned-datetime-valued parameter."""
 
@@ -559,8 +592,10 @@ __all__ = [
     "ListEnums",
     "ListParameter",
     "ListStrs",
+    "MonthDay",
     "PlainDateTime",
     "Time",
     "TimeDelta",
+    "YearMonth",
     "ZonedDateTime",
 ]

utilities/hypothesis.py

@@ -38,12 +38,14 @@ from whenever import (
     Date,
     DateDelta,
     DateTimeDelta,
+    MonthDay,
     PlainDateTime,
     RepeatedTime,
     SkippedTime,
     Time,
     TimeDelta,
     TimeZoneNotFoundError,
+    YearMonth,
     ZonedDateTime,
 )
 
@@ -76,8 +78,6 @@ from utilities.whenever import (
     DATE_DELTA_MIN,
     DATE_DELTA_PARSABLE_MAX,
     DATE_DELTA_PARSABLE_MIN,
-    DATE_MAX,
-    DATE_MIN,
     DATE_TIME_DELTA_MAX,
     DATE_TIME_DELTA_MIN,
     DATE_TIME_DELTA_PARSABLE_MAX,
@@ -85,16 +85,9 @@ from utilities.whenever import (
     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,
     Freq,
-    Month,
     to_date_time_delta,
     to_days,
     to_nanos,
@@ -255,14 +248,14 @@ def dates(
     min_value_, max_value_ = [draw2(draw, v) for v in [min_value, max_value]]
     match min_value_:
         case None:
-            min_value_ = DATE_MIN
+            min_value_ = Date.MIN
         case Date():
             ...
         case _ as never:
             assert_never(never)
     match max_value_:
         case None:
-            max_value_ = DATE_MAX
+            max_value_ = Date.MAX
         case Date():
             ...
         case _ as never:
@@ -695,33 +688,32 @@ def lists_fixed_length[T](
 
 
 @composite
-def months(
+def month_days(
     draw: DrawFn,
     /,
     *,
-    min_value: MaybeSearchStrategy[Month | None] = None,
-    max_value: MaybeSearchStrategy[Month | None] = None,
-    two_digit: MaybeSearchStrategy[bool] = False,
-) -> Month:
-    """Strategy for generating months."""
+    min_value: MaybeSearchStrategy[MonthDay | None] = None,
+    max_value: MaybeSearchStrategy[MonthDay | None] = None,
+) -> MonthDay:
+    """Strategy for generating month-days."""
     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():
+            min_value_ = MonthDay.MIN
+        case MonthDay():
             ...
         case _ as never:
             assert_never(never)
     match max_value_:
         case None:
-            max_value_ = MONTH_MAX
-        case Month():
+            max_value_ = MonthDay.MAX
+        case MonthDay():
             ...
         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)
+    min_date, max_date = [m.in_year(2000) for m in [min_value_, max_value_]]
+    date = draw(dates(min_value=min_date, max_value=max_date))
+    return date.month_day()
 
 
 ##
@@ -843,14 +835,14 @@ def plain_datetimes(
     min_value_, max_value_ = [draw2(draw, v) for v in [min_value, max_value]]
     match min_value_:
         case None:
-            min_value_ = PLAIN_DATE_TIME_MIN
+            min_value_ = PlainDateTime.MIN
         case PlainDateTime():
             ...
         case _ as never:
             assert_never(never)
     match max_value_:
         case None:
-            max_value_ = PLAIN_DATE_TIME_MAX
+            max_value_ = PlainDateTime.MAX
         case PlainDateTime():
             ...
         case _ as never:
@@ -1219,14 +1211,14 @@ def times(
     min_value_, max_value_ = [draw2(draw, v) for v in [min_value, max_value]]
     match min_value_:
         case None:
-            min_value_ = TIME_MIN
+            min_value_ = Time()
         case Time():
             ...
         case _ as never:
             assert_never(never)
     match max_value_:
         case None:
-            max_value_ = TIME_MAX
+            max_value_ = Time.MAX
         case Time():
             ...
         case _ as never:
@@ -1308,6 +1300,39 @@ def versions(draw: DrawFn, /, *, suffix: MaybeSearchStrategy[bool] = False) -> V
 ##
 
 
+@composite
+def year_months(
+    draw: DrawFn,
+    /,
+    *,
+    min_value: MaybeSearchStrategy[YearMonth | None] = None,
+    max_value: MaybeSearchStrategy[YearMonth | None] = None,
+    two_digit: MaybeSearchStrategy[bool] = False,
+) -> YearMonth:
+    """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_ = YearMonth.MIN
+        case YearMonth():
+            ...
+        case _ as never:
+            assert_never(never)
+    match max_value_:
+        case None:
+            max_value_ = YearMonth.MAX
+        case YearMonth():
+            ...
+        case _ as never:
+            assert_never(never)
+    min_date, max_date = [m.on_day(1) for m in [min_value_, max_value_]]
+    date = draw(dates(min_value=min_date, max_value=max_date, two_digit=two_digit))
+    return date.year_month()
+
+
+##
+
+
 @composite
 def zoned_datetimes(
     draw: DrawFn,
@@ -1345,7 +1370,7 @@ def zoned_datetimes(
     ):
         zoned = plain.assume_tz(time_zone_.key, disambiguate="raise")
     with assume_does_not_raise(OverflowError, match="date value out of range"):
-        if not ((DATE_MIN + DAY) <= zoned.date() <= (DATE_MAX - DAY)):
+        if not ((Date.MIN + DAY) <= zoned.date() <= (Date.MAX - DAY)):
             _ = zoned.py_datetime()
     return zoned
 
@@ -1373,7 +1398,7 @@ __all__ = [
     "int64s",
     "int_arrays",
     "lists_fixed_length",
-    "months",
+    "month_days",
     "namespace_mixins",
     "numbers",
     "pairs",
@@ -1399,5 +1424,6 @@ __all__ = [
     "uint32s",
     "uint64s",
     "versions",
+    "year_months",
     "zoned_datetimes",
 ]

utilities/orjson.py

@@ -26,9 +26,11 @@ from whenever import (
     Date,
     DateDelta,
     DateTimeDelta,
+    MonthDay,
     PlainDateTime,
     Time,
     TimeDelta,
+    YearMonth,
     ZonedDateTime,
 )
 
@@ -71,6 +73,7 @@ class _Prefixes(Enum):
     float_ = "fl"
     frozenset_ = "fr"
     list_ = "l"
+    month_day = "md"
     none = "none"
     path = "p"
     plain_date_time = "pd"
@@ -81,6 +84,7 @@ class _Prefixes(Enum):
     unserializable = "un"
     uuid = "uu"
     version = "v"
+    year_month = "ym"
     zoned_date_time = "zd"
 
 
@@ -172,6 +176,8 @@ def _pre_process(
             if MIN_INT64 <= int_ <= MAX_INT64:
                 return int_
             raise _SerializeIntegerError(obj=int_)
+        case MonthDay() as month_day:
+            return f"[{_Prefixes.month_day.value}]{month_day!s}"
         case Path() as path:
             return f"[{_Prefixes.path.value}]{path!s}"
         case PlainDateTime() as datetime:
@@ -187,7 +193,9 @@ def _pre_process(
         case UUID() as uuid:
             return f"[{_Prefixes.uuid.value}]{uuid}"
         case Version() as version:
-            return f"[{_Prefixes.version.value}]{version!s}"
+            return f"[{_Prefixes.version.value}]{version}"
+        case YearMonth() as year_month:
+            return f"[{_Prefixes.year_month.value}]{year_month}"
         case ZonedDateTime() as datetime:
             return f"[{_Prefixes.zoned_date_time.value}]{datetime}"
         # contains
@@ -339,6 +347,7 @@ def deserialize(
     _DATE_DELTA_PATTERN,
     _DATE_TIME_DELTA_PATTERN,
     _FLOAT_PATTERN,
+    _MONTH_DAY_PATTERN,
     _NONE_PATTERN,
     _PATH_PATTERN,
     _PLAIN_DATE_TIME_PATTERN,
@@ -346,6 +355,7 @@ def deserialize(
     _TIME_DELTA_PATTERN,
     _UUID_PATTERN,
     _VERSION_PATTERN,
+    _YEAR_MONTH_PATTERN,
     _ZONED_DATE_TIME_PATTERN,
 ) = [
     re.compile(r"^\[" + p.value + r"\](" + ".*" + ")$")
@@ -354,6 +364,7 @@ def deserialize(
         _Prefixes.date_delta,
         _Prefixes.date_time_delta,
         _Prefixes.float_,
+        _Prefixes.month_day,
         _Prefixes.none,
         _Prefixes.path,
         _Prefixes.plain_date_time,
@@ -361,6 +372,7 @@ def deserialize(
         _Prefixes.time_delta,
         _Prefixes.uuid,
         _Prefixes.version,
+        _Prefixes.year_month,
         _Prefixes.zoned_date_time,
     ]
 ]
@@ -413,6 +425,8 @@ def _object_hook(
                 return DateTimeDelta.parse_common_iso(match.group(1))
             if match := _FLOAT_PATTERN.search(text):
                 return float(match.group(1))
+            if match := _MONTH_DAY_PATTERN.search(text):
+                return MonthDay.parse_common_iso(match.group(1))
             if match := _PATH_PATTERN.search(text):
                 return Path(match.group(1))
             if match := _PLAIN_DATE_TIME_PATTERN.search(text):
@@ -425,6 +439,8 @@ def _object_hook(
                 return UUID(match.group(1))
             if match := _VERSION_PATTERN.search(text):
                 return parse_version(match.group(1))
+            if match := _YEAR_MONTH_PATTERN.search(text):
+                return YearMonth.parse_common_iso(match.group(1))
             if match := _ZONED_DATE_TIME_PATTERN.search(text):
                 return ZonedDateTime.parse_common_iso(match.group(1))
             if (

utilities/parse.py

@@ -13,9 +13,11 @@ from whenever import (
     Date,
     DateDelta,
     DateTimeDelta,
+    MonthDay,
     PlainDateTime,
     Time,
     TimeDelta,
+    YearMonth,
     ZonedDateTime,
 )
 
@@ -51,7 +53,6 @@ from utilities.typing import (
     is_union_type,
 )
 from utilities.version import ParseVersionError, Version, parse_version
-from utilities.whenever import Month
 
 if TYPE_CHECKING:
     from collections.abc import Iterable, Mapping, Sequence
@@ -194,10 +195,11 @@ def _parse_object_type(
             Date,
             DateDelta,
             DateTimeDelta,
-            Month,
+            MonthDay,
             PlainDateTime,
             Time,
             TimeDelta,
+            YearMonth,
             ZonedDateTime,
         ),
     ):
@@ -467,10 +469,11 @@ def serialize_object(
             Date,
             DateDelta,
             DateTimeDelta,
-            Month,
+            MonthDay,
             PlainDateTime,
             Time,
             TimeDelta,
+            YearMonth,
             ZonedDateTime,
         ),
     ):

utilities/typed_settings.py

@@ -16,9 +16,11 @@ from whenever import (
     Date,
     DateDelta,
     DateTimeDelta,
+    MonthDay,
     PlainDateTime,
     Time,
     TimeDelta,
+    YearMonth,
     ZonedDateTime,
 )
 
@@ -57,10 +59,12 @@ class ExtendedTSConverter(TSConverter):
             (Freq, Freq.parse),
             (IPv4Address, IPv4Address),
             (IPv6Address, IPv6Address),
+            (MonthDay, MonthDay.parse_common_iso),
             (Path, partial(_parse_path, resolve=resolve_paths, pwd=Path.cwd())),
             (PlainDateTime, PlainDateTime.parse_common_iso),
             (Time, Time.parse_common_iso),
             (TimeDelta, TimeDelta.parse_common_iso),
+            (YearMonth, YearMonth.parse_common_iso),
             (ZonedDateTime, ZonedDateTime.parse_common_iso),
         ]
         extras = {cls: _make_converter(cls, func) for cls, func in cases}
@@ -96,6 +100,7 @@ def _parse_path(
 
 ##
 
+
 _BASE_DIR: Path = Path()
 
 

utilities/types.py

@@ -25,9 +25,11 @@ from whenever import (
     Date,
     DateDelta,
     DateTimeDelta,
+    MonthDay,
     PlainDateTime,
     Time,
     TimeDelta,
+    YearMonth,
     ZonedDateTime,
 )
 
@@ -214,9 +216,11 @@ type DateLike = MaybeStr[Date]
 type DateTimeDeltaLike = MaybeStr[DateTimeDelta]
 type MaybeCallableDate = MaybeCallable[Date]
 type MaybeCallableZonedDateTime = MaybeCallable[ZonedDateTime]
+type MonthDayLike = MaybeStr[MonthDay]
 type PlainDateTimeLike = MaybeStr[PlainDateTime]
 type TimeDeltaLike = MaybeStr[TimeDelta]
 type TimeLike = MaybeStr[Time]
+type YearMonthLike = MaybeStr[YearMonth]
 type ZonedDateTimeLike = MaybeStr[ZonedDateTime]
 type DateTimeRoundUnit = Literal[
     "day", "hour", "minute", "second", "millisecond", "microsecond", "nanosecond"
@@ -265,6 +269,7 @@ __all__ = [
     "MaybeIterableHashable",
     "MaybeStr",
     "MaybeType",
+    "MonthDayLike",
     "Number",
     "OpenMode",
     "OptExcInfo",
@@ -296,5 +301,6 @@ __all__ = [
     "TupleOrStrMapping",
     "TypeLike",
     "WeekDay",
+    "YearMonthLike",
     "ZonedDateTimeLike",
 ]

utilities/whenever.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from collections.abc import Callable, Iterable, Mapping
-from dataclasses import dataclass, replace
+from dataclasses import dataclass
 from functools import cache
 from logging import LogRecord
 from statistics import fmean
@@ -25,6 +25,7 @@ from whenever import (
     PlainDateTime,
     Time,
     TimeDelta,
+    YearMonth,
     ZonedDateTime,
 )
 
@@ -49,16 +50,8 @@ if TYPE_CHECKING:
 ## bounds
 
 
-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)
+ZONED_DATE_TIME_MIN = PlainDateTime.MIN.assume_tz(UTC.key)
+ZONED_DATE_TIME_MAX = PlainDateTime.MAX.assume_tz(UTC.key)
 
 
 DATE_TIME_DELTA_MIN = DateTimeDelta(
@@ -170,7 +163,7 @@ def format_compact(
             obj_use = date.py_date()
             fmt_use = "%Y%m%d" if fmt is None else fmt
         case Time() as time:
-            obj_use = time.py_time()
+            obj_use = time.round().py_time()
             fmt_use = "%H%M%S" if fmt is None else fmt
         case PlainDateTime() as datetime:
             obj_use = datetime.round().py_datetime()
@@ -465,124 +458,6 @@ 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
@@ -796,6 +671,18 @@ def to_zoned_date_time(
 ##
 
 
+def two_digit_year_month(year: int, month: int, /) -> YearMonth:
+    """Construct a year-month from a 2-digit year."""
+    min_year = DATE_TWO_DIGIT_YEAR_MIN.year
+    max_year = DATE_TWO_DIGIT_YEAR_MAX.year
+    years = range(min_year, max_year + 1)
+    (year_use,) = (y for y in years if y % 100 == year)
+    return YearMonth(year_use, month)
+
+
+##
+
+
 class WheneverLogRecord(LogRecord):
     """Log record powered by `whenever`."""
 
@@ -851,8 +738,6 @@ __all__ = [
     "DATE_DELTA_MIN",
     "DATE_DELTA_PARSABLE_MAX",
     "DATE_DELTA_PARSABLE_MIN",
-    "DATE_MAX",
-    "DATE_MIN",
     "DATE_TIME_DELTA_MAX",
     "DATE_TIME_DELTA_MIN",
     "DATE_TIME_DELTA_PARSABLE_MAX",
@@ -865,16 +750,10 @@ __all__ = [
     "MILLISECOND",
     "MINUTE",
     "MONTH",
-    "MONTH_MAX",
-    "MONTH_MIN",
     "NOW_LOCAL",
-    "PLAIN_DATE_TIME_MAX",
-    "PLAIN_DATE_TIME_MIN",
     "SECOND",
     "TIME_DELTA_MAX",
     "TIME_DELTA_MIN",
-    "TIME_MAX",
-    "TIME_MIN",
     "TODAY_LOCAL",
     "TODAY_UTC",
     "WEEK",
@@ -883,15 +762,11 @@ __all__ = [
     "ZERO_TIME",
     "ZONED_DATE_TIME_MAX",
     "ZONED_DATE_TIME_MIN",
-    "DateOrMonth",
     "Freq",
     "FreqError",
     "FreqLike",
     "MeanDateTimeError",
     "MinMaxDateError",
-    "Month",
-    "MonthError",
-    "MonthLike",
     "ToDaysError",
     "ToNanosError",
     "WheneverLogRecord",
@@ -912,4 +787,5 @@ __all__ = [
     "to_local_plain",
     "to_nanos",
     "to_zoned_date_time",
+    "two_digit_year_month",
 ]