dycw-utilities 0.109.24__tar.gz → 0.109.26__tar.gz

{dycw_utilities-0.109.24 → dycw_utilities-0.109.26}/PKG-INFO

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

{dycw_utilities-0.109.24 → dycw_utilities-0.109.26}/pyproject.toml

@@ -93,7 +93,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.109.24"
+version = "0.109.26"
 
 [project.optional-dependencies]
 test = [
@@ -336,7 +336,7 @@ zzz-test-zoneinfo = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.109.24"
+current_version = "0.109.26"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.109.24 → dycw_utilities-0.109.26}/src/tests/test_pqdm.py

@@ -14,11 +14,11 @@ from utilities.hypothesis import int32s, pairs, settings_with_reduced_examples
 from utilities.iterables import transpose
 from utilities.pqdm import _get_desc, pqdm_map, pqdm_starmap
 from utilities.sentinel import Sentinel, sentinel
-from utilities.types import Parallelism
+from utilities.types import Parallelism, StrStrMapping
 from utilities.typing import get_args
 
 if TYPE_CHECKING:
-    from collections.abc import Callable, Mapping
+    from collections.abc import Callable
 
 
 class TestGetDesc:
@@ -36,7 +36,7 @@ class TestGetDesc:
         *,
         desc: str | None | Sentinel,
         func: Callable[..., Any],
-        expected: Mapping[str, str],
+        expected: StrStrMapping,
     ) -> None:
         assert _get_desc(desc, func) == expected
 

{dycw_utilities-0.109.24 → dycw_utilities-0.109.26}/src/tests/test_text.py

@@ -21,6 +21,8 @@ from utilities.text import (
     ParseBoolError,
     ParseNoneError,
     SplitStrError,
+    _SplitKeyValuePairsDuplicateKeysError,
+    _SplitKeyValuePairsSplitError,
     join_strs,
     parse_bool,
     parse_none,
@@ -92,6 +94,25 @@ class TestSplitKeyValuePairs:
         result = split_key_value_pairs(text)
         assert result == expected
 
+    def test_mapping(self) -> None:
+        result = split_key_value_pairs("a=1,b=22,c=333", mapping=True)
+        expected = {"a": "1", "b": "22", "c": "333"}
+        assert result == expected
+
+    def test_error_split(self) -> None:
+        with raises(
+            _SplitKeyValuePairsSplitError,
+            match=r"Unable to split 'a=1,b=22=22,c=333' into key-value pairs; got 'b=22=22'",
+        ):
+            _ = split_key_value_pairs("a=1,b=22=22,c=333")
+
+    def test_error_duplicate_keys(self) -> None:
+        with raises(
+            _SplitKeyValuePairsDuplicateKeysError,
+            match=r"Unable to split 'a=1,a=22,a=333' into a mapping since there are duplicate keys; got \{'a': 3\}",
+        ):
+            _ = split_key_value_pairs("a=1,a=22,a=333", mapping=True)
+
 
 class TestSplitStrAndJoinStr:
     @given(

{dycw_utilities-0.109.24 → dycw_utilities-0.109.26}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.109.24"
+__version__ = "0.109.26"

{dycw_utilities-0.109.24 → dycw_utilities-0.109.26}/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 ParseTextExtra, TDataclass
+from utilities.types import ParseTextExtra, StrStrMapping, TDataclass
 from utilities.typing import get_type_hints
 
 if TYPE_CHECKING:
@@ -444,7 +444,7 @@ class StrMappingToFieldMappingError(Exception):
 
 
 def text_to_dataclass(
-    text_or_mapping: str | Mapping[str, str],
+    text_or_mapping: str | StrStrMapping,
     cls: type[TDataclass],
     /,
     *,
@@ -499,9 +499,7 @@ def text_to_dataclass(
     )
 
 
-def _text_to_dataclass_split_text(
-    text: str, cls: type[TDataclass], /
-) -> Mapping[str, str]:
+def _text_to_dataclass_split_text(text: str, cls: type[TDataclass], /) -> StrStrMapping:
     pairs = (t for t in text.split(",") if t != "")
     return dict(_text_to_dataclass_split_key_value_pair(pair, cls) for pair in pairs)
 

{dycw_utilities-0.109.24 → dycw_utilities-0.109.26}/src/utilities/text.py

@@ -6,8 +6,13 @@ from re import IGNORECASE, Match, search
 from textwrap import dedent
 from typing import TYPE_CHECKING, Any, Literal, overload, override
 
+from utilities.iterables import CheckDuplicatesError, check_duplicates
+from utilities.reprlib import get_repr
+
 if TYPE_CHECKING:
-    from collections.abc import Iterable, Sequence
+    from collections.abc import Iterable, Mapping, Sequence
+
+    from utilities.types import StrStrMapping
 
 
 def parse_bool(text: str, /) -> bool:
@@ -81,14 +86,81 @@ def _snake_case_title(match: Match[str], /) -> str:
 ##
 
 
+@overload
+def split_key_value_pairs(
+    text: str,
+    /,
+    *,
+    list_separator: str = ",",
+    pair_separator: str = "=",
+    mapping: Literal[True],
+) -> StrStrMapping: ...
+@overload
+def split_key_value_pairs(
+    text: str,
+    /,
+    *,
+    list_separator: str = ",",
+    pair_separator: str = "=",
+    mapping: Literal[False] = False,
+) -> Sequence[tuple[str, str]]: ...
+@overload
+def split_key_value_pairs(
+    text: str,
+    /,
+    *,
+    list_separator: str = ",",
+    pair_separator: str = "=",
+    mapping: bool = False,
+) -> Sequence[tuple[str, str]] | StrStrMapping: ...
 def split_key_value_pairs(
-    text: str, /, *, list_separator: str = ",", pair_separator: str = "="
-) -> Sequence[tuple[str, str]]:
+    text: str,
+    /,
+    *,
+    list_separator: str = ",",
+    pair_separator: str = "=",
+    mapping: bool = False,
+) -> Sequence[tuple[str, str]] | StrStrMapping:
     """Split a string into key-value pairs."""
-    return [
-        split_str(text_i, separator=pair_separator, n=2)
-        for text_i in split_str(text, separator=list_separator)
-    ]
+    try:
+        pairs = [
+            split_str(text_i, separator=pair_separator, n=2)
+            for text_i in split_str(text, separator=list_separator)
+        ]
+    except SplitStrError as error:
+        raise _SplitKeyValuePairsSplitError(text=text, inner=error.text) from None
+    if not mapping:
+        return pairs
+    try:
+        check_duplicates(k for k, _ in pairs)
+    except CheckDuplicatesError as error:
+        raise _SplitKeyValuePairsDuplicateKeysError(
+            text=text, counts=error.counts
+        ) from None
+    return dict(pairs)
+
+
+@dataclass(kw_only=True, slots=True)
+class SplitKeyValuePairsError(Exception):
+    text: str
+
+
+@dataclass(kw_only=True, slots=True)
+class _SplitKeyValuePairsSplitError(SplitKeyValuePairsError):
+    inner: str
+
+    @override
+    def __str__(self) -> str:
+        return f"Unable to split {self.text!r} into key-value pairs; got {self.inner!r}"
+
+
+@dataclass(kw_only=True, slots=True)
+class _SplitKeyValuePairsDuplicateKeysError(SplitKeyValuePairsError):
+    counts: Mapping[str, int]
+
+    @override
+    def __str__(self) -> str:
+        return f"Unable to split {self.text!r} into a mapping since there are duplicate keys; got {get_repr(self.counts)}"
 
 
 ##
@@ -182,6 +254,7 @@ def strip_and_dedent(text: str, /, *, trailing: bool = False) -> str:
 __all__ = [
     "ParseBoolError",
     "ParseNoneError",
+    "SplitKeyValuePairsError",
     "SplitStrError",
     "join_strs",
     "parse_bool",

{dycw_utilities-0.109.24 → dycw_utilities-0.109.26}/src/utilities/types.py

@@ -46,6 +46,7 @@ type OpenMode = Literal[
     "a+b",
 ]
 type StrMapping = Mapping[str, Any]
+type StrStrMapping = Mapping[str, str]
 type TupleOrStrMapping = tuple[Any, ...] | StrMapping
 type MaybeCallable[_T] = _T | Callable[[], _T]
 type MaybeStr[_T] = _T | str
@@ -288,6 +289,7 @@ __all__ = [
     "RoundMode",
     "Seed",
     "StrMapping",
+    "StrStrMapping",
     "SupportsAbs",
     "SupportsAdd",
     "SupportsBytes",