dycw-utilities 0.109.6__tar.gz → 0.109.8__tar.gz

{dycw_utilities-0.109.6 → dycw_utilities-0.109.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.109.6
+Version: 0.109.8
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12
@@ -177,7 +177,7 @@ Requires-Dist: scipy<1.16,>=1.15.2; extra == 'zzz-test-scipy'
 Provides-Extra: zzz-test-sentinel
 Provides-Extra: zzz-test-shelve
 Provides-Extra: zzz-test-slack-sdk
-Requires-Dist: aiohttp<3.12,>=3.11.17; extra == 'zzz-test-slack-sdk'
+Requires-Dist: aiohttp<3.12,>=3.11.16; extra == 'zzz-test-slack-sdk'
 Requires-Dist: slack-sdk<3.36,>=3.35.0; extra == 'zzz-test-slack-sdk'
 Provides-Extra: zzz-test-socket
 Provides-Extra: zzz-test-sqlalchemy

{dycw_utilities-0.109.6 → dycw_utilities-0.109.8}/pyproject.toml

@@ -8,7 +8,7 @@ requires = ["hatchling"]
 # dependency groups
 [dependency-groups]
 dev = [
-  "aiohttp >= 3.11.17, < 3.12",  # for slack
+  "aiohttp >= 3.11.16, < 3.12",  # for slack
   "aiosqlite >= 0.21.0, < 0.22",
   "altair >= 5.5.0, < 5.6",
   "astor >= 0.8.1, < 0.9",
@@ -89,7 +89,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.109.6"
+version = "0.109.8"
 
 [project.optional-dependencies]
 test = [
@@ -268,7 +268,7 @@ zzz-test-scipy = ["scipy >= 1.15.2, < 1.16"]
 zzz-test-sentinel = []
 zzz-test-shelve = []
 zzz-test-slack-sdk = [
-  "aiohttp >= 3.11.17, < 3.12",  # for slack
+  "aiohttp >= 3.11.16, < 3.12",  # for slack
   "slack-sdk >= 3.35.0, < 3.36",
 ]
 zzz-test-socket = []
@@ -332,7 +332,7 @@ zzz-test-zoneinfo = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.109.6"
+current_version = "0.109.8"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.109.6 → dycw_utilities-0.109.8}/src/tests/test_parse.py

@@ -14,9 +14,14 @@ from pytest import raises
 from tests.test_operator import TruthEnum
 from tests.test_typing_funcs.with_future import (
     DataClassFutureInt,
+    DataClassFutureIntEven,
+    DataClassFutureIntEvenOrOddTypeUnion,
+    DataClassFutureIntEvenOrOddUnion,
+    DataClassFutureIntOdd,
     TrueOrFalseFutureLit,
     TrueOrFalseFutureTypeLit,
 )
+from utilities.errors import ImpossibleCaseError
 from utilities.functions import ensure_path
 from utilities.hypothesis import (
     datetime_durations,
@@ -78,7 +83,7 @@ class TestParseText:
         assert result is truth
 
     @given(value=integers())
-    def test_extra(self, *, value: int) -> None:
+    def test_extra_type(self, *, value: int) -> None:
         text = str(value)
         result = parse_text(
             DataClassFutureInt,
@@ -200,6 +205,60 @@ class TestParseText:
         result = parse_text(TrueOrFalseFutureTypeLit, truth)
         assert result == truth
 
+    @given(value=integers())
+    def test_type_union_with_extra(self, *, value: int) -> None:
+        def parse_even_or_odd(text: str, /) -> DataClassFutureIntEvenOrOddTypeUnion:
+            value = int(text)
+            match value % 2:
+                case 0:
+                    return DataClassFutureIntEven(even_int=value)
+                case 1:
+                    return DataClassFutureIntOdd(odd_int=value)
+                case _:
+                    raise ImpossibleCaseError(case=[f"{value=}"])
+
+        text = str(value)
+        result = parse_text(
+            DataClassFutureIntEvenOrOddTypeUnion,
+            text,
+            extra={DataClassFutureIntEvenOrOddTypeUnion: parse_even_or_odd},
+        )
+        match value % 2:
+            case 0:
+                expected = DataClassFutureIntEven(even_int=value)
+            case 1:
+                expected = DataClassFutureIntOdd(odd_int=value)
+            case _:
+                raise ImpossibleCaseError(case=[f"{value=}"])
+        assert result == expected
+
+    @given(value=integers())
+    def test_union_with_extra(self, *, value: int) -> None:
+        def parse_even_or_odd(text: str, /) -> DataClassFutureIntEvenOrOddUnion:
+            value = int(text)
+            match value % 2:
+                case 0:
+                    return DataClassFutureIntEven(even_int=value)
+                case 1:
+                    return DataClassFutureIntOdd(odd_int=value)
+                case _:
+                    raise ImpossibleCaseError(case=[f"{value=}"])
+
+        text = str(value)
+        result = parse_text(
+            DataClassFutureIntEvenOrOddUnion,
+            text,
+            extra={DataClassFutureIntEvenOrOddUnion: parse_even_or_odd},
+        )
+        match value % 2:
+            case 0:
+                expected = DataClassFutureIntEven(even_int=value)
+            case 1:
+                expected = DataClassFutureIntOdd(odd_int=value)
+            case _:
+                raise ImpossibleCaseError(case=[f"{value=}"])
+        assert result == expected
+
     @given(version=versions())
     def test_version(self, *, version: Version) -> None:
         text = str(version)
@@ -272,6 +331,13 @@ class TestParseText:
                 },
             )
 
+    def test_error_union_type_extra(self) -> None:
+        with raises(
+            _ParseTextParseError,
+            match=r"Unable to parse tests\.test_typing_funcs\.with_future\.DataClassFutureIntEven \| tests\.test_typing_funcs\.with_future\.DataClassFutureIntOdd; got 'invalid'",
+        ):
+            _ = parse_text(DataClassFutureIntEvenOrOddUnion, "invalid", extra={})
+
     def test_error_float(self) -> None:
         with raises(
             _ParseTextParseError, match="Unable to parse <class 'float'>; got 'invalid'"
@@ -364,9 +430,10 @@ class TestParseText:
 
     def test_error_unknown_union_type(self) -> None:
         with raises(
-            _ParseTextParseError, match=r"Unable to parse <class '.*'>; got 'invalid'"
+            _ParseTextParseError,
+            match=r"Unable to parse tests\.test_typing_funcs\.with_future\.DataClassFutureIntEven \| tests\.test_typing_funcs\.with_future\.DataClassFutureIntOdd; got 'invalid'",
         ):
-            _ = parse_text(DataClassFutureInt | DataClassFutureInt, "invalid")
+            _ = parse_text(DataClassFutureIntEvenOrOddUnion, "invalid")
 
     def test_error_version(self) -> None:
         with raises(

{dycw_utilities-0.109.6 → dycw_utilities-0.109.8}/src/tests/test_typing_funcs/with_future.py

@@ -54,6 +54,22 @@ class DataClassFutureIntDefault:
     int_: int = 0
 
 
+@dataclass(order=True, unsafe_hash=True, kw_only=True)
+class DataClassFutureIntEven:
+    even_int: int
+
+
+@dataclass(order=True, unsafe_hash=True, kw_only=True)
+class DataClassFutureIntOdd:
+    odd_int: int
+
+
+DataClassFutureIntEvenOrOddUnion = DataClassFutureIntEven | DataClassFutureIntOdd
+type DataClassFutureIntEvenOrOddTypeUnion = (
+    DataClassFutureIntEven | DataClassFutureIntOdd
+)
+
+
 @dataclass(order=True, unsafe_hash=True, kw_only=True)
 class DataClassFutureIntNullable:
     int_: int | None = None

{dycw_utilities-0.109.6 → dycw_utilities-0.109.8}/src/utilities/__init__.py

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

{dycw_utilities-0.109.6 → dycw_utilities-0.109.8}/src/utilities/dataclasses.py

@@ -24,7 +24,7 @@ from utilities.iterables import OneStrEmptyError, OneStrNonUniqueError, one_str
 from utilities.operator import is_equal
 from utilities.parse import ParseTextError, parse_text
 from utilities.sentinel import Sentinel, sentinel
-from utilities.types import TDataclass
+from utilities.types import ParseTextExtra, TDataclass
 from utilities.typing import get_type_hints
 
 if TYPE_CHECKING:
@@ -454,7 +454,7 @@ def text_to_dataclass(
     head: bool = False,
     case_sensitive: bool = False,
     allow_extra_keys: bool = False,
-    extra_parsers: Mapping[type[_T], Callable[[str], _T]] | None = None,
+    extra_parsers: ParseTextExtra | None = None,
 ) -> TDataclass:
     """Construct a dataclass from a string or a mapping or strings."""
     match text_or_mapping:
@@ -524,7 +524,7 @@ def _text_to_dataclass_parse(
     *,
     head: bool = False,
     case_sensitive: bool = False,
-    extra: Mapping[type[_T], Callable[[str], _T]] | None = None,
+    extra: ParseTextExtra | None = None,
 ) -> Any:
     try:
         return parse_text(

{dycw_utilities-0.109.6 → dycw_utilities-0.109.8}/src/utilities/parse.py

@@ -7,7 +7,7 @@ from enum import Enum
 from pathlib import Path
 from re import DOTALL
 from types import NoneType
-from typing import TYPE_CHECKING, Any, TypeVar, override
+from typing import Any, override
 
 from utilities.datetime import is_subclass_date_not_datetime
 from utilities.enum import ParseEnumError, parse_enum
@@ -17,7 +17,7 @@ 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.types import Duration, Number
+from utilities.types import Duration, Number, ParseTextExtra
 from utilities.typing import (
     get_args,
     is_literal_type,
@@ -27,12 +27,6 @@ from utilities.typing import (
 )
 from utilities.version import ParseVersionError, Version, parse_version
 
-if TYPE_CHECKING:
-    from collections.abc import Callable, Mapping
-
-
-_T = TypeVar("_T")
-
 
 def parse_text(
     obj: Any,
@@ -41,7 +35,7 @@ def parse_text(
     *,
     head: bool = False,
     case_sensitive: bool = False,
-    extra: Mapping[type[_T], Callable[[str], _T]] | None = None,
+    extra: ParseTextExtra | None = None,
 ) -> Any:
     """Parse text."""
     if obj is None:
@@ -76,7 +70,7 @@ def parse_text(
             for arg, text in zip(args, texts, strict=True)
         )
     if is_union_type(obj):
-        return _parse_text_union_type(obj, text)
+        return _parse_text_union_type(obj, text, extra=extra)
     raise _ParseTextParseError(obj=obj, text=text) from None
 
 
@@ -86,7 +80,7 @@ def _parse_text_type(
     /,
     *,
     case_sensitive: bool = False,
-    extra: Mapping[type[_T], Callable[[str], _T]] | None = None,
+    extra: ParseTextExtra | None = None,
 ) -> Any:
     """Parse text."""
     if issubclass(cls, NoneType):
@@ -170,7 +164,9 @@ def _parse_text_type(
     raise _ParseTextParseError(obj=cls, text=text) from None
 
 
-def _parse_text_union_type(obj: Any, text: str, /) -> Any:
+def _parse_text_union_type(
+    obj: Any, text: str, /, *, extra: ParseTextExtra | None = None
+) -> Any:
     if obj is Number:
         try:
             return parse_number(text)
@@ -183,6 +179,13 @@ def _parse_text_union_type(obj: Any, text: str, /) -> Any:
             return parse_duration(text)
         except ParseDurationError:
             raise _ParseTextParseError(obj=obj, text=text) from None
+    if extra is not None:
+        try:
+            parser = one(p for c, p in extra.items() if c is obj)
+        except OneEmptyError:
+            pass
+        else:
+            return parser(text)
     raise _ParseTextParseError(obj=obj, text=text) from None
 
 

{dycw_utilities-0.109.6 → dycw_utilities-0.109.8}/src/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, TypeVar, override
+from typing import TYPE_CHECKING, override
 
 from dotenv import dotenv_values
 
@@ -13,14 +13,11 @@ from utilities.pathlib import PWD
 from utilities.reprlib import get_repr
 
 if TYPE_CHECKING:
-    from collections.abc import Callable, Mapping
+    from collections.abc import Mapping
     from collections.abc import Set as AbstractSet
     from pathlib import Path
 
-    from utilities.types import PathLike, StrMapping, TDataclass
-
-
-_T = TypeVar("_T")
+    from utilities.types import ParseTextExtra, PathLike, StrMapping, TDataclass
 
 
 def load_settings(
@@ -33,7 +30,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,
+    extra_parsers: ParseTextExtra | None = None,
 ) -> TDataclass:
     """Load a set of settings from the `.env` file."""
     path = get_repo_root(cwd=cwd).joinpath(".env")

{dycw_utilities-0.109.6 → dycw_utilities-0.109.8}/src/utilities/types.py

@@ -229,6 +229,10 @@ class SupportsRound(Protocol[_T_co]):
     def __round__(self, ndigits: int, /) -> _T_co: ...
 
 
+# parse
+type ParseTextExtra = Mapping[Any, Callable[[str], Any]]
+
+
 # pathlib
 type PathLike = MaybeStr[Path]
 type PathLikeOrCallable = PathLike | Callable[[], PathLike]
@@ -278,6 +282,7 @@ __all__ = [
     "OpenMode",
     "OptExcInfo",
     "Parallelism",
+    "ParseTextExtra",
     "PathLike",
     "PathLikeOrCallable",
     "RoundMode",