dycw-utilities 0.109.4__py3-none-any.whl → 0.109.6__py3-none-any.whl

{dycw_utilities-0.109.4.dist-info → dycw_utilities-0.109.6.dist-info}/METADATA

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

{dycw_utilities-0.109.4.dist-info → dycw_utilities-0.109.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=TfQi7UYijWAmuZ8wsQ7kQKbgWiSQWgaXE80fBUn8qx8,60
+utilities/__init__.py,sha256=w3npT3XHHPgayXlB2cRHRSo29zUPb2MDUTT0HCvkrhI,60
 utilities/altair.py,sha256=NSyDsm8QlkAGmsGdxVwCkHnPxt_35yJBa9Lg7bz9Ays,9054
 utilities/astor.py,sha256=xuDUkjq0-b6fhtwjhbnebzbqQZAjMSHR1IIS5uOodVg,777
 utilities/asyncio.py,sha256=41oQUurWMvadFK5gFnaG21hMM0Vmfn2WS6OpC0R9mas,14757
@@ -11,7 +11,7 @@ utilities/contextlib.py,sha256=OOIIEa5lXKGzFAnauaul40nlQnQko6Na4ryiMJcHkIg,478
 utilities/contextvars.py,sha256=RsSGGrbQqqZ67rOydnM7WWIsM2lIE31UHJLejnHJPWY,505
 utilities/cryptography.py,sha256=HyOewI20cl3uRXsKivhIaeLVDInQdzgXZGaly7hS5dE,771
 utilities/cvxpy.py,sha256=Rv1-fD-XYerosCavRF8Pohop2DBkU3AlFaGTfD8AEAA,13776
-utilities/dataclasses.py,sha256=4siQUalzjYckhJ7R9Cn4Pmerxzx18_mjPIwUmeuwwKs,23049
+utilities/dataclasses.py,sha256=Rh5QajjwyXGpQqndeOFRT-VnPJXF0jWI515GjCSprS0,23326
 utilities/datetime.py,sha256=GOs-MIEW_A49kzqa1yhIoeNeSqqPVgGO-h2AThtgTDk,37326
 utilities/enum.py,sha256=HoRwVCWzsnH0vpO9ZEcAAIZLMv0Sn2vJxxA4sYMQgDs,5793
 utilities/errors.py,sha256=BtSNP0JC3ik536ddPyTerLomCRJV9f6kdMe6POz0QHM,361
@@ -31,7 +31,7 @@ utilities/jupyter.py,sha256=ft5JA7fBxXKzP-L9W8f2-wbF0QeYc_2uLQNFDVk4Z-M,2917
 utilities/logging.py,sha256=opIwFjGKOYyMntVeCsFNXOmTY2z02hMf2UtCB76SaI4,25142
 utilities/loguru.py,sha256=MEMQVWrdECxk1e3FxGzmOf21vWT9j8CAir98SEXFKPA,3809
 utilities/luigi.py,sha256=fpH9MbxJDuo6-k9iCXRayFRtiVbUtibCJKugf7ygpv0,5988
-utilities/math.py,sha256=AtUqrZ1Re9rwJjvp3QSlaa9GGIgBMKkslt77YxaNibw,26240
+utilities/math.py,sha256=TexfvLCI12d9Sw5_W4pKVBZ3nRr3zk2iPkcEU7xdEWU,26771
 utilities/memory_profiler.py,sha256=tf2C51P2lCujPGvRt2Rfc7VEw5LDXmVPCG3z_AvBmbU,962
 utilities/modules.py,sha256=SnhsRHRUS1po_acejrINauihGQpPvVsp8RDNCei1OLQ,3173
 utilities/more_itertools.py,sha256=CPUxrMAcTwRxbzbhiqPKi3Xx9hxqI0t6gkWjutaibGk,5534
@@ -40,7 +40,7 @@ utilities/operator.py,sha256=0M2yZJ0PODH47ogFEnkGMBe_cfxwZR02T_92LZVZvHo,3715
 utilities/optuna.py,sha256=loyJGWTzljgdJaoLhP09PT8Jz6o_pwBOwehY33lHkhw,1923
 utilities/orjson.py,sha256=Wj5pzG_VdgoAy14a7Luhem-BgYrRtRFvvl_POiszRd0,36930
 utilities/os.py,sha256=D_FyyT-6TtqiN9KSS7c9g1fnUtgxmyMtzAjmYLkk46A,3587
-utilities/parse.py,sha256=q1A1-bsXltdAh8We5Acy-lPuVIClWTxsRXQWq5wYyKk,6382
+utilities/parse.py,sha256=hzMDMUA9h3IpgsR48-Dk4CaojXofLm-eAn_bvJ8o6k8,7081
 utilities/pathlib.py,sha256=31WPMXdLIyXgYOMMl_HOI2wlo66MGSE-cgeelk-Lias,1410
 utilities/period.py,sha256=ikHXsWtDLr553cfH6p9mMaiCnIAP69B7q84ckWV3HaA,10884
 utilities/pickle.py,sha256=Bhvd7cZl-zQKQDFjUerqGuSKlHvnW1K2QXeU5UZibtg,657
@@ -53,7 +53,7 @@ utilities/pyinstrument.py,sha256=ROq2txPwbe2ZUuYJ2IDNbfT97lu2ca0v5_C_yn6sSlM,800
 utilities/pyrsistent.py,sha256=TLJfiiKO4cKNU_pCoM3zDqmSM421qpuoaeaBNnyC_Ac,2489
 utilities/pytest.py,sha256=85QUax4g2VBBAqAHtM9wekcSLB7_9O8AKFTaCshztL8,7989
 utilities/pytest_regressions.py,sha256=-SVT9647Dg6-JcdsiaDKXe3NdOmmrvGevLKWwGjxq3c,5088
-utilities/python_dotenv.py,sha256=10DHEB7AVeZqH7I4wr6nACdJQYQJanlEj6EsyLvCN9w,3059
+utilities/python_dotenv.py,sha256=ZIz45FjpwoMs5fdYr9kRM6f4qEp2GNM5rKLnrRe8_7c,3218
 utilities/random.py,sha256=lYdjgxB7GCfU_fwFVl5U-BIM_HV3q6_urL9byjrwDM8,4157
 utilities/re.py,sha256=5J4d8VwIPFVrX2Eb8zfoxImDv7IwiN_U7mJ07wR2Wvs,3958
 utilities/redis.py,sha256=CsDQqc9V6ASLzLQwtbQXZQEndyG9pJiCOhPlPeszt7Y,21203
@@ -81,10 +81,10 @@ utilities/tzlocal.py,sha256=42BCquGF54oIqIKe5RGziP4K8Nbm3Ey7uqcNn6m5ge8,534
 utilities/uuid.py,sha256=jJTFxz-CWgltqNuzmythB7iEQ-Q1mCwPevUfKthZT3c,611
 utilities/version.py,sha256=QFuyEeQA6jI0ruBEcmhqG36f-etg1AEiD1drBBqhQrs,5358
 utilities/warnings.py,sha256=yUgjnmkCRf6QhdyAXzl7u0qQFejhQG3PrjoSwxpbHrs,1819
-utilities/whenever.py,sha256=5x2t47VJmJRWcd_NLFy54NkB3uom-XQYxEbLtEfL1bs,17775
+utilities/whenever.py,sha256=TjoTAJ1R27-rKXiXzdE4GzPidmYqm0W58XydDXp-QZM,17786
 utilities/zipfile.py,sha256=24lQc9ATcJxHXBPc_tBDiJk48pWyRrlxO2fIsFxU0A8,699
 utilities/zoneinfo.py,sha256=-DQz5a0Ikw9jfSZtL0BEQkXOMC9yGn_xiJYNCLMiqEc,1989
-dycw_utilities-0.109.4.dist-info/METADATA,sha256=-fU_tSw6cCv59Fg6s0I0pUlV3YzXeuq15kfirsKUmik,13004
-dycw_utilities-0.109.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.109.4.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.109.4.dist-info/RECORD,,
+dycw_utilities-0.109.6.dist-info/METADATA,sha256=QrUiasc-0kk8qhmb20T1rZsXPJMTTunfG4QMbba9F6E,13004
+dycw_utilities-0.109.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.109.6.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.109.6.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.109.4"
+__version__ = "0.109.6"

utilities/dataclasses.py

@@ -453,7 +453,8 @@ def text_to_dataclass(
     warn_name_errors: bool = False,
     head: bool = False,
     case_sensitive: bool = False,
-    allow_extra: bool = False,
+    allow_extra_keys: bool = False,
+    extra_parsers: Mapping[type[_T], Callable[[str], _T]] | None = None,
 ) -> TDataclass:
     """Construct a dataclass from a string or a mapping or strings."""
     match text_or_mapping:
@@ -477,10 +478,12 @@ def text_to_dataclass(
         warn_name_errors=warn_name_errors,
         head=head,
         case_sensitive=case_sensitive,
-        allow_extra=allow_extra,
+        allow_extra=allow_extra_keys,
     )
     field_names_to_values = {
-        f.name: _text_to_dataclass_parse(f, t, cls, case_sensitive=case_sensitive)
+        f.name: _text_to_dataclass_parse(
+            f, t, cls, head=head, case_sensitive=case_sensitive, extra=extra_parsers
+        )
         for f, t in fields_to_serializes.items()
     }
     return mapping_to_dataclass(
@@ -492,7 +495,7 @@ def text_to_dataclass(
         warn_name_errors=warn_name_errors,
         head=head,
         case_sensitive=case_sensitive,
-        allow_extra=allow_extra,
+        allow_extra=allow_extra_keys,
     )
 
 
@@ -519,10 +522,14 @@ def _text_to_dataclass_parse(
     cls: type[Dataclass],
     /,
     *,
+    head: bool = False,
     case_sensitive: bool = False,
+    extra: Mapping[type[_T], Callable[[str], _T]] | None = None,
 ) -> Any:
     try:
-        return parse_text(field.type_, text, case_sensitive=case_sensitive)
+        return parse_text(
+            field.type_, text, head=head, case_sensitive=case_sensitive, extra=extra
+        )
     except ParseTextError:
         raise _TextToDataClassParseValueError(cls=cls, field=field, text=text) from None
 

utilities/math.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import re
+from contextlib import suppress
 from dataclasses import dataclass
 from math import ceil, exp, floor, isclose, isfinite, isinf, isnan, log, log10, modf
 from re import Match, search
@@ -9,7 +10,8 @@ from typing import TYPE_CHECKING, Literal, assert_never, overload, override
 from utilities.errors import ImpossibleCaseError
 
 if TYPE_CHECKING:
-    from utilities.types import RoundMode
+    from utilities.types import Number, RoundMode
+
 
 MIN_FLOAT32, MAX_FLOAT32 = -3.4028234663852886e38, 3.4028234663852886e38
 MIN_FLOAT64, MAX_FLOAT64 = -1.7976931348623157e308, 1.7976931348623157e308
@@ -681,6 +683,27 @@ def order_of_magnitude(x: float, /, *, round_: bool = False) -> float:
 ##
 
 
+def parse_number(number: str, /) -> Number:
+    """Convert text into a number."""
+    with suppress(ValueError):
+        return int(number)
+    with suppress(ValueError):
+        return float(number)
+    raise ParseNumberError(number=number)
+
+
+@dataclass(kw_only=True, slots=True)
+class ParseNumberError(Exception):
+    number: str
+
+    @override
+    def __str__(self) -> str:
+        return f"Unable to parse number; got {self.number!r}"
+
+
+##
+
+
 def round_(
     x: float,
     /,
@@ -887,6 +910,7 @@ __all__ = [
     "MIN_UINT64",
     "CheckIntegerError",
     "EWMParametersError",
+    "ParseNumberError",
     "SafeRoundError",
     "check_integer",
     "ewm_parameters",
@@ -934,6 +958,7 @@ __all__ = [
     "is_zero_or_non_micro_or_nan",
     "number_of_decimals",
     "order_of_magnitude",
+    "parse_number",
     "round_",
     "round_float_imprecisions",
     "round_to_float",

utilities/parse.py

@@ -13,10 +13,18 @@ from utilities.datetime import is_subclass_date_not_datetime
 from utilities.enum import ParseEnumError, parse_enum
 from utilities.functions import is_subclass_int_not_bool
 from utilities.iterables import OneEmptyError, OneNonUniqueError, one, one_str
+from utilities.math import ParseNumberError, parse_number
 from utilities.re import ExtractGroupError, extract_group
 from utilities.sentinel import ParseSentinelError, Sentinel, parse_sentinel
 from utilities.text import ParseBoolError, ParseNoneError, parse_bool, parse_none
-from utilities.typing import get_args, is_literal_type, is_optional_type, is_tuple_type
+from utilities.types import Duration, Number
+from utilities.typing import (
+    get_args,
+    is_literal_type,
+    is_optional_type,
+    is_tuple_type,
+    is_union_type,
+)
 from utilities.version import ParseVersionError, Version, parse_version
 
 if TYPE_CHECKING:
@@ -31,8 +39,8 @@ def parse_text(
     text: str,
     /,
     *,
-    case_sensitive: bool = False,
     head: bool = False,
+    case_sensitive: bool = False,
     extra: Mapping[type[_T], Callable[[str], _T]] | None = None,
 ) -> Any:
     """Parse text."""
@@ -49,13 +57,12 @@ def parse_text(
         with suppress(ParseNoneError):
             return parse_none(text)
         inner = one(arg for arg in get_args(obj) if arg is not NoneType)
-        if isinstance(
-            inner := one(arg for arg in get_args(obj) if arg is not NoneType), type
-        ):
-            try:
-                return _parse_text_type(inner, text, case_sensitive=case_sensitive)
-            except _ParseTextParseError:
-                raise _ParseTextParseError(obj=obj, text=text) from None
+        try:
+            return parse_text(
+                inner, text, head=head, case_sensitive=case_sensitive, extra=extra
+            )
+        except _ParseTextParseError:
+            raise _ParseTextParseError(obj=obj, text=text) from None
     if is_tuple_type(obj):
         args = get_args(obj)
         try:
@@ -65,9 +72,11 @@ def parse_text(
         if len(args) != len(texts):
             raise _ParseTextParseError(obj=obj, text=text)
         return tuple(
-            parse_text(arg, text, case_sensitive=case_sensitive, head=head)
+            parse_text(arg, text, head=head, case_sensitive=case_sensitive, extra=extra)
             for arg, text in zip(args, texts, strict=True)
         )
+    if is_union_type(obj):
+        return _parse_text_union_type(obj, text)
     raise _ParseTextParseError(obj=obj, text=text) from None
 
 
@@ -161,6 +170,22 @@ def _parse_text_type(
     raise _ParseTextParseError(obj=cls, text=text) from None
 
 
+def _parse_text_union_type(obj: Any, text: str, /) -> Any:
+    if obj is Number:
+        try:
+            return parse_number(text)
+        except ParseNumberError:
+            raise _ParseTextParseError(obj=obj, text=text) from None
+    if obj is Duration:
+        from utilities.whenever import ParseDurationError, parse_duration
+
+        try:
+            return parse_duration(text)
+        except ParseDurationError:
+            raise _ParseTextParseError(obj=obj, text=text) from None
+    raise _ParseTextParseError(obj=obj, text=text) from None
+
+
 @dataclass
 class ParseTextError(Exception):
     obj: Any

utilities/python_dotenv.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from os import environ
-from typing import TYPE_CHECKING, override
+from typing import TYPE_CHECKING, TypeVar, override
 
 from dotenv import dotenv_values
 
@@ -13,13 +13,16 @@ from utilities.pathlib import PWD
 from utilities.reprlib import get_repr
 
 if TYPE_CHECKING:
-    from collections.abc import Mapping
+    from collections.abc import Callable, Mapping
     from collections.abc import Set as AbstractSet
     from pathlib import Path
 
     from utilities.types import PathLike, StrMapping, TDataclass
 
 
+_T = TypeVar("_T")
+
+
 def load_settings(
     cls: type[TDataclass],
     /,
@@ -30,6 +33,7 @@ def load_settings(
     warn_name_errors: bool = False,
     head: bool = False,
     case_sensitive: bool = False,
+    extra_parsers: Mapping[type[_T], Callable[[str], _T]] | None = None,
 ) -> TDataclass:
     """Load a set of settings from the `.env` file."""
     path = get_repo_root(cwd=cwd).joinpath(".env")
@@ -57,7 +61,8 @@ def load_settings(
             warn_name_errors=warn_name_errors,
             head=head,
             case_sensitive=case_sensitive,
-            allow_extra=True,
+            allow_extra_keys=True,
+            extra_parsers=extra_parsers,
         )
     except MappingToDataclassError as error:
         raise _LoadSettingsMissingKeysError(path=path, fields=error.fields) from None

utilities/whenever.py

@@ -17,6 +17,7 @@ from utilities.datetime import (
     parse_two_digit_year,
     timedelta_to_microseconds,
 )
+from utilities.math import ParseNumberError, parse_number
 from utilities.re import (
     ExtractGroupError,
     ExtractGroupsError,
@@ -298,10 +299,8 @@ class ParseDateTimeError(Exception):
 
 def parse_duration(duration: str, /) -> Duration:
     """Parse a string into a Duration."""
-    with suppress(ValueError):
-        return int(duration)
-    with suppress(ValueError):
-        return float(duration)
+    with suppress(ParseNumberError):
+        return parse_number(duration)
     try:
         return parse_timedelta(duration)
     except ParseTimedeltaError: