dycw-utilities 0.108.3__tar.gz → 0.109.0__tar.gz

{dycw_utilities-0.108.3 → dycw_utilities-0.109.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.108.3
+Version: 0.109.0
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12
@@ -82,7 +82,7 @@ Requires-Dist: asyncpg<0.31,>=0.30.0; extra == 'zzz-test-hypothesis'
 Requires-Dist: greenlet<3.3,>=3.2.0; extra == 'zzz-test-hypothesis'
 Requires-Dist: hypothesis<6.132,>=6.131.6; extra == 'zzz-test-hypothesis'
 Requires-Dist: luigi<3.7,>=3.6.0; extra == 'zzz-test-hypothesis'
-Requires-Dist: numpy<2.3,>=2.2.4; extra == 'zzz-test-hypothesis'
+Requires-Dist: numpy<2.3,>=2.2.5; extra == 'zzz-test-hypothesis'
 Requires-Dist: pathvalidate<3.3,>=3.2.3; extra == 'zzz-test-hypothesis'
 Requires-Dist: redis<5.3,>=5.2.1; extra == 'zzz-test-hypothesis'
 Requires-Dist: sqlalchemy<2.1,>=2.0.40; extra == 'zzz-test-hypothesis'
@@ -112,14 +112,14 @@ Provides-Extra: zzz-test-luigi
 Requires-Dist: luigi<3.7,>=3.6.0; extra == 'zzz-test-luigi'
 Requires-Dist: whenever<0.8,>=0.7.3; extra == 'zzz-test-luigi'
 Provides-Extra: zzz-test-math
-Requires-Dist: numpy<2.3,>=2.2.4; extra == 'zzz-test-math'
+Requires-Dist: numpy<2.3,>=2.2.5; extra == 'zzz-test-math'
 Provides-Extra: zzz-test-memory-profiler
 Requires-Dist: memory-profiler<0.62,>=0.61.0; extra == 'zzz-test-memory-profiler'
 Provides-Extra: zzz-test-modules
 Provides-Extra: zzz-test-more-itertools
 Requires-Dist: more-itertools<10.7,>=10.6.0; extra == 'zzz-test-more-itertools'
 Provides-Extra: zzz-test-numpy
-Requires-Dist: numpy<2.3,>=2.2.4; extra == 'zzz-test-numpy'
+Requires-Dist: numpy<2.3,>=2.2.5; extra == 'zzz-test-numpy'
 Provides-Extra: zzz-test-operator
 Requires-Dist: polars-lts-cpu<1.28,>=1.27.1; extra == 'zzz-test-operator'
 Requires-Dist: whenever<0.8,>=0.7.3; extra == 'zzz-test-operator'
@@ -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.16; extra == 'zzz-test-slack-sdk'
+Requires-Dist: aiohttp<3.12,>=3.11.17; 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.108.3 → dycw_utilities-0.109.0}/pyproject.toml

@@ -8,7 +8,7 @@ requires = ["hatchling"]
 # dependency groups
 [dependency-groups]
 dev = [
-  "aiohttp >= 3.11.16, < 3.12",  # for slack
+  "aiohttp >= 3.11.17, < 3.12",  # for slack
   "aiosqlite >= 0.21.0, < 0.22",
   "altair >= 5.5.0, < 5.6",
   "astor >= 0.8.1, < 0.9",
@@ -35,7 +35,7 @@ dev = [
   "more-itertools >= 10.6.0, < 10.7",
   "nest-asyncio >= 1.6.0, < 1.7",  # for sqlalchemy async
   "nox >= 2025.2.9, < 2025.3",
-  "numpy >= 2.2.4, < 2.3",
+  "numpy >= 2.2.5, < 2.3",
   "optuna >= 4.3.0, < 4.4",
   "orjson >= 3.10.16, < 3.11",
   "pathvalidate >= 3.2.3, < 3.3",
@@ -89,7 +89,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.108.3"
+version = "0.109.0"
 
 [project.optional-dependencies]
 test = [
@@ -173,7 +173,7 @@ zzz-test-hypothesis = [
   "greenlet >= 3.2.0, < 3.3",  # for sqlalchemy async
   "hypothesis >= 6.131.6, < 6.132",
   "luigi >= 3.6.0, < 3.7",
-  "numpy >= 2.2.4, < 2.3",
+  "numpy >= 2.2.5, < 2.3",
   "pathvalidate >= 3.2.3, < 3.3",
   "redis >= 5.2.1, < 5.3",
   "sqlalchemy >= 2.0.40, < 2.1",
@@ -205,11 +205,11 @@ zzz-test-luigi = [
   "luigi >= 3.6.0, < 3.7",
   "whenever >= 0.7.3, < 0.8",
 ]
-zzz-test-math = ["numpy >= 2.2.4, < 2.3"]
+zzz-test-math = ["numpy >= 2.2.5, < 2.3"]
 zzz-test-memory-profiler = ["memory-profiler >= 0.61.0, < 0.62"]
 zzz-test-modules = []
 zzz-test-more-itertools = ["more-itertools >= 10.6.0, < 10.7"]
-zzz-test-numpy = ["numpy >= 2.2.4, < 2.3"]
+zzz-test-numpy = ["numpy >= 2.2.5, < 2.3"]
 zzz-test-operator = [
   "polars-lts-cpu >= 1.27.1, < 1.28",
   "whenever >= 0.7.3, < 0.8",
@@ -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.16, < 3.12",  # for slack
+  "aiohttp >= 3.11.17, < 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.108.3"
+current_version = "0.109.0"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.108.3 → dycw_utilities-0.109.0}/src/tests/test_dataclasses.py

@@ -5,7 +5,7 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from re import DOTALL
 from types import NoneType
-from typing import Any, Literal, cast, override
+from typing import Any, cast, override
 
 from hypothesis import given
 from hypothesis.strategies import (
@@ -40,17 +40,24 @@ from tests.test_typing_funcs.with_future import (
     DataClassFutureStr,
     DataClassFutureTypeLiteral,
     DataClassFutureTypeLiteralNullable,
+    TrueOrFalseFutureLit,
+    TrueOrFalseFutureTypeLit,
 )
 from utilities.dataclasses import (
     YieldFieldsError,
     _MappingToDataclassCaseInsensitiveNonUniqueError,
     _MappingToDataclassEmptyError,
+    _TextToDataClassGetFieldEmptyError,
+    _TextToDataClassGetFieldNonUniqueError,
+    _TextToDataClassParseValueError,
+    _TextToDataClassSplitKeyValuePairError,
     _YieldFieldsClass,
     _YieldFieldsInstance,
     dataclass_repr,
     dataclass_to_dict,
     mapping_to_dataclass,
     replace_non_sentinel,
+    text_to_dataclass,
     yield_fields,
 )
 from utilities.functions import get_class_name
@@ -62,7 +69,42 @@ from utilities.sentinel import sentinel
 from utilities.types import Dataclass, StrMapping
 from utilities.typing import get_args, is_list_type, is_literal_type, is_optional_type
 
-TruthLit = Literal["true", "false"]  # in 3.12, use type TruthLit = ...
+
+class TestDataClassRepr:
+    def test_overriding_repr(self) -> None:
+        @dataclass(kw_only=True, slots=True)
+        class Example(DataClassFutureIntDefault):
+            @override
+            def __repr__(self) -> str:
+                return dataclass_repr(self)
+
+        obj = Example()
+        result = repr(obj)
+        expected = "Example()"
+        assert result == expected
+
+    def test_overriding_repr_defaults(self) -> None:
+        @dataclass(kw_only=True)
+        class Example(DataClassFutureIntDefault):
+            @override
+            def __repr__(self) -> str:
+                return dataclass_repr(self, defaults=True)
+
+        obj = Example()
+        result = repr(obj)
+        expected = "Example(int_=0)"
+        assert result == expected
+
+    @given(x=integers())
+    def test_non_repr_field(self, *, x: int) -> None:
+        @dataclass(kw_only=True, slots=True)
+        class Example:
+            x: int = field(default=0, repr=False)
+
+        obj = Example(x=x)
+        result = dataclass_repr(obj)
+        expected = "Example()"
+        assert result == expected
 
 
 class TestDataclassToDictAndDataclassRepr:
@@ -328,31 +370,51 @@ class TestReplaceNonSentinel:
         assert obj.int_ == 1
 
 
-class TestReprWithoutDefaults:
-    def test_overriding_repr(self) -> None:
-        @dataclass(kw_only=True, slots=True)
-        class Example:
-            x: int = 0
-
-            @override
-            def __repr__(self) -> str:
-                return dataclass_repr(self)
+class TestTextToDataClass:
+    @given(int_=integers())
+    def test_main_text(self, *, int_: int) -> None:
+        result = text_to_dataclass(f"int_={int_}", DataClassFutureInt)
+        expected = DataClassFutureInt(int_=int_)
+        assert result == expected
 
-        obj = Example()
-        result = repr(obj)
-        expected = "Example()"
+    @given(int_=integers())
+    def test_main_mapping(self, *, int_: int) -> None:
+        result = text_to_dataclass({"int_": str(int_)}, DataClassFutureInt)
+        expected = DataClassFutureInt(int_=int_)
         assert result == expected
 
-    @given(x=integers())
-    def test_non_repr_field(self, *, x: int) -> None:
-        @dataclass(kw_only=True, slots=True)
+    def test_error_split_key_value_pair(self) -> None:
+        with raises(
+            _TextToDataClassSplitKeyValuePairError,
+            match="Unable to construct 'DataClassFutureInt'; failed to split key-value pair 'keyvalue'",
+        ):
+            _ = text_to_dataclass("keyvalue", DataClassFutureInt)
+
+    def test_error_get_field_empty(self) -> None:
+        with raises(
+            _TextToDataClassGetFieldEmptyError,
+            match=r"Dataclass 'DataClassFutureInt' does not contain any field starting with 'k' \(modulo case\)",
+        ):
+            _ = text_to_dataclass("k=value", DataClassFutureInt)
+
+    def test_error_get_field_non_unique(self) -> None:
+        @dataclass(order=True, unsafe_hash=True, kw_only=True)
         class Example:
-            x: int = field(default=0, repr=False)
+            int1: int
+            int2: int
 
-        obj = Example(x=x)
-        result = dataclass_repr(obj)
-        expected = "Example()"
-        assert result == expected
+        with raises(
+            _TextToDataClassGetFieldNonUniqueError,
+            match=r"Dataclass 'Example' must contain exactly one field starting with 'int' \(modulo case\); got 'int1', 'int2' and perhaps more",
+        ):
+            _ = text_to_dataclass("int=value", Example)
+
+    def test_error_parse_value(self) -> None:
+        with raises(
+            _TextToDataClassParseValueError,
+            match="Unable to construct 'DataClassFutureInt'; unable to parse field 'int_' of type <class 'int'>; got 'invalid'",
+        ):
+            _ = text_to_dataclass("int_=invalid", DataClassFutureInt)
 
 
 class TestYieldFields:
@@ -400,21 +462,23 @@ class TestYieldFields:
         assert get_args(result.type_) == (int,)
 
     def test_class_future_literal(self) -> None:
-        result = one(yield_fields(DataClassFutureLiteral))
-        expected = _YieldFieldsClass(name="truth", type_=TruthLit, kw_only=True)
+        result = one(yield_fields(DataClassFutureLiteral, globalns=globals()))
+        expected = _YieldFieldsClass(
+            name="truth", type_=TrueOrFalseFutureLit, kw_only=True
+        )
         assert result == expected
         assert is_literal_type(result.type_)
         assert get_args(result.type_) == ("true", "false")
 
     def test_class_future_literal_nullable(self) -> None:
-        result = one(yield_fields(DataClassFutureLiteralNullable))
+        result = one(yield_fields(DataClassFutureLiteralNullable, globalns=globals()))
         expected = _YieldFieldsClass(
-            name="truth", type_=TruthLit | None, default=None, kw_only=True
+            name="truth", type_=TrueOrFalseFutureLit | None, default=None, kw_only=True
         )
         assert result == expected
         assert is_optional_type(result.type_)
         args = get_args(result.type_)
-        assert args == (Literal["true", "false"],)
+        assert args == (TrueOrFalseFutureLit,)
         arg = one(args)
         assert get_args(arg) == ("true", "false")
 
@@ -429,8 +493,14 @@ class TestYieldFields:
         assert result.type_ is DataClassFutureNestedOuterFirstInner
 
     def test_class_future_type_literal(self) -> None:
-        result = one(yield_fields(DataClassFutureTypeLiteral, globalns=globals()))
-        expected = _YieldFieldsClass(name="truth", type_=TruthLit, kw_only=True)
+        result = one(
+            yield_fields(
+                DataClassFutureTypeLiteral, globalns=globals(), localns=locals()
+            )
+        )
+        expected = _YieldFieldsClass(
+            name="truth", type_=TrueOrFalseFutureTypeLit, kw_only=True
+        )
         assert result == expected
         assert is_literal_type(result.type_)
         assert get_args(result.type_) == ("true", "false")
@@ -440,12 +510,15 @@ class TestYieldFields:
             yield_fields(DataClassFutureTypeLiteralNullable, globalns=globals())
         )
         expected = _YieldFieldsClass(
-            name="truth", type_=TruthLit | None, default=None, kw_only=True
+            name="truth",
+            type_=TrueOrFalseFutureTypeLit | None,
+            default=None,
+            kw_only=True,
         )
         assert result == expected
         assert is_optional_type(result.type_)
         args = get_args(result.type_)
-        assert args == (Literal["true", "false"],)
+        assert args == (TrueOrFalseFutureTypeLit,)
         arg = one(args)
         assert get_args(arg) == ("true", "false")
 

{dycw_utilities-0.108.3 → dycw_utilities-0.109.0}/src/tests/test_operator.py

@@ -43,6 +43,8 @@ from tests.test_typing_funcs.with_future import (
     DataClassFutureNestedInnerFirstOuter,
     DataClassFutureNestedOuterFirstOuter,
     DataClassFutureNone,
+    DataClassFutureTypeLiteral,
+    DataClassFutureTypeLiteralNullable,
 )
 from utilities.hypothesis import (
     assume_does_not_raise,
@@ -76,6 +78,8 @@ def base_objects(
     dataclass_literal_nullable: bool = False,
     dataclass_nested: bool = False,
     dataclass_none: bool = False,
+    dataclass_type_literal: bool = False,
+    dataclass_type_literal_nullable: bool = False,
     enum: bool = False,
     exception_class: bool = False,
     exception_instance: bool = False,
@@ -132,6 +136,15 @@ def base_objects(
         )
     if dataclass_none:
         base |= builds(DataClassFutureNone)
+    if dataclass_type_literal:
+        base |= builds(
+            DataClassFutureTypeLiteral, truth=sampled_from(["true", "false"])
+        )
+    if dataclass_type_literal_nullable:
+        base |= builds(
+            DataClassFutureTypeLiteralNullable,
+            truth=sampled_from(["true", "false"]) | none(),
+        )
     if enum:
         base |= sampled_from(TruthEnum)
     if exception_class:
@@ -151,6 +164,8 @@ def make_objects(
     dataclass_literal_nullable: bool = False,
     dataclass_nested: bool = False,
     dataclass_none: bool = False,
+    dataclass_type_literal: bool = False,
+    dataclass_type_literal_nullable: bool = False,
     enum: bool = False,
     exception_class: bool = False,
     exception_instance: bool = False,
@@ -173,6 +188,8 @@ def make_objects(
         dataclass_literal_nullable=dataclass_literal_nullable,
         dataclass_nested=dataclass_nested,
         dataclass_none=dataclass_none,
+        dataclass_type_literal=dataclass_type_literal,
+        dataclass_type_literal_nullable=dataclass_type_literal_nullable,
         enum=enum,
         exception_class=exception_class,
         exception_instance=exception_instance,
@@ -272,6 +289,8 @@ class TestIsEqual:
             dataclass_literal_nullable=True,
             dataclass_nested=True,
             dataclass_none=True,
+            dataclass_type_literal=True,
+            dataclass_type_literal_nullable=True,
             enum=True,
             sub_frozenset=True,
             sub_list=True,
@@ -287,12 +306,15 @@ class TestIsEqual:
         objs=pairs(
             make_objects(
                 dataclass_custom_equality=True,
+                dataclass_default_in_init_child=True,
                 dataclass_int=True,
                 dataclass_int_default=True,
                 dataclass_literal=True,
                 dataclass_literal_nullable=True,
                 dataclass_nested=True,
                 dataclass_none=True,
+                dataclass_type_literal=True,
+                dataclass_type_literal_nullable=True,
                 enum=True,
                 sub_frozenset=True,
                 sub_list=True,

{dycw_utilities-0.108.3 → dycw_utilities-0.109.0}/src/tests/test_orjson.py

@@ -48,6 +48,8 @@ from tests.test_typing_funcs.with_future import (
     DataClassFutureNestedOuterFirstInner,
     DataClassFutureNestedOuterFirstOuter,
     DataClassFutureNone,
+    DataClassFutureTypeLiteral,
+    DataClassFutureTypeLiteralNullable,
 )
 from utilities.datetime import MINUTE, SECOND, get_now, get_now_local
 from utilities.functions import is_sequence_of
@@ -435,12 +437,15 @@ class TestSerializeAndDeserialize:
     @given(
         obj=make_objects(
             dataclass_custom_equality=True,
+            dataclass_default_in_init_child=False,
             dataclass_int=True,
             dataclass_int_default=True,
             dataclass_literal=True,
             dataclass_literal_nullable=True,
             dataclass_nested=True,
             dataclass_none=True,
+            dataclass_type_literal=True,
+            dataclass_type_literal_nullable=True,
             enum=True,
             exception_class=True,
             exception_instance=True,
@@ -467,6 +472,8 @@ class TestSerializeAndDeserialize:
                 DataClassFutureNestedOuterFirstInner,
                 DataClassFutureNestedOuterFirstOuter,
                 DataClassFutureNone,
+                DataClassFutureTypeLiteral,
+                DataClassFutureTypeLiteralNullable,
                 SubFrozenSet,
                 SubList,
                 SubSet,
@@ -559,6 +566,19 @@ class TestSerializeAndDeserialize:
         result = deserialize(ser, objects={DataClassFutureNone})
         assert is_equal(result, obj)
 
+    @given(obj=make_objects(dataclass_type_literal=True))
+    def test_dataclass_type_literal(self, *, obj: Any) -> None:
+        result = deserialize(serialize(obj), objects={DataClassFutureTypeLiteral})
+        assert is_equal(result, obj)
+
+    @given(obj=make_objects(dataclass_type_literal_nullable=True))
+    def test_dataclass_type_literal_nullable(self, *, obj: Any) -> None:
+        result = deserialize(
+            serialize(obj), objects={DataClassFutureTypeLiteralNullable}
+        )
+        with assume_does_not_raise(IsEqualError):
+            assert is_equal(result, obj)
+
     @given(obj=builds(DataClassFutureNone))
     def test_dataclass_no_objects_error(self, *, obj: DataClassFutureNone) -> None:
         ser = serialize(obj)

{dycw_utilities-0.108.3 → dycw_utilities-0.109.0}/src/tests/test_parse.py

@@ -12,6 +12,10 @@ from hypothesis.strategies import booleans, dates, floats, integers, sampled_fro
 from pytest import raises
 
 from tests.test_operator import TruthEnum
+from tests.test_typing_funcs.with_future import (
+    TrueOrFalseFutureLit,
+    TrueOrFalseFutureTypeLit,
+)
 from utilities.functions import ensure_path
 from utilities.hypothesis import (
     local_datetimes,
@@ -72,7 +76,7 @@ class TestParseText:
 
     @given(truth=sampled_from(["true", "false"]))
     def test_literal(self, *, truth: Literal["true", "false"]) -> None:
-        result = parse_text(Literal["true", "false"], truth)
+        result = parse_text(TrueOrFalseFutureLit, truth)
         assert result == truth
 
     def test_nullable_int_none(self) -> None:
@@ -131,6 +135,11 @@ class TestParseText:
         result = parse_text(dt.timedelta, text)
         assert result == timedelta
 
+    @given(truth=sampled_from(["true", "false"]))
+    def test_type_literal(self, *, truth: Literal["true", "false"]) -> None:
+        result = parse_text(TrueOrFalseFutureTypeLit, truth)
+        assert result == truth
+
     @given(version=versions())
     def test_version(self, *, version: Version) -> None:
         text = str(version)