dycw-utilities 0.108.2__tar.gz → 0.108.4__tar.gz

{dycw_utilities-0.108.2 → dycw_utilities-0.108.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.108.2
+Version: 0.108.4
 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.2 → dycw_utilities-0.108.4}/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.2"
+version = "0.108.4"
 
 [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.2"
+current_version = "0.108.4"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.108.2 → dycw_utilities-0.108.4}/src/tests/test_dataclasses.py

@@ -45,12 +45,17 @@ 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
@@ -65,6 +70,43 @@ from utilities.typing import get_args, is_list_type, is_literal_type, is_optiona
 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:
     @given(x=integers(), defaults=booleans())
     def test_field_without_defaults(self, *, x: int, defaults: bool) -> None:
@@ -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:

{dycw_utilities-0.108.2 → dycw_utilities-0.108.4}/src/tests/test_functions.py

@@ -5,6 +5,7 @@ from dataclasses import dataclass
 from functools import cache, cached_property, lru_cache, partial, wraps
 from itertools import chain
 from operator import neg
+from pathlib import Path
 from types import NoneType
 from typing import TYPE_CHECKING, Any, ClassVar, ParamSpec, TypeVar, cast
 
@@ -37,6 +38,7 @@ from utilities.functions import (
     EnsureMemberError,
     EnsureNotNoneError,
     EnsureNumberError,
+    EnsurePathError,
     EnsureSizedError,
     EnsureSizedNotStrError,
     EnsureStrError,
@@ -56,6 +58,7 @@ from utilities.functions import (
     ensure_member,
     ensure_not_none,
     ensure_number,
+    ensure_path,
     ensure_sized,
     ensure_sized_not_str,
     ensure_str,
@@ -336,6 +339,24 @@ class TestEnsureNumber:
             _ = ensure_number(sentinel, nullable=nullable)
 
 
+class TestEnsurePath:
+    @given(case=sampled_from([(Path.home(), False), (Path.home(), True), (None, True)]))
+    def test_main(self, *, case: tuple[int | None, bool]) -> None:
+        obj, nullable = case
+        _ = ensure_path(obj, nullable=nullable)
+
+    @given(
+        case=sampled_from([
+            (False, "Object '.*' of type '.*' must be a Path"),
+            (True, "Object '.*' of type '.*' must be a Path or None"),
+        ])
+    )
+    def test_error(self, *, case: tuple[bool, str]) -> None:
+        nullable, match = case
+        with raises(EnsurePathError, match=match):
+            _ = ensure_path(sentinel, nullable=nullable)
+
+
 class TestEnsureSized:
     @given(obj=sampled_from([[], (), ""]))
     def test_main(self, *, obj: Any) -> None:

{dycw_utilities-0.108.2 → dycw_utilities-0.108.4}/src/tests/test_parse.py

@@ -12,6 +12,7 @@ from hypothesis.strategies import booleans, dates, floats, integers, sampled_fro
 from pytest import raises
 
 from tests.test_operator import TruthEnum
+from utilities.functions import ensure_path
 from utilities.hypothesis import (
     local_datetimes,
     paths,
@@ -101,6 +102,13 @@ class TestParseText:
         result = parse_text(Path, text)
         assert result == path
 
+    @given(path=paths())
+    def test_path_expanded(self, *, path: Path) -> None:
+        path_use = Path("~", path)
+        text = str(path_use)
+        result = ensure_path(parse_text(Path, text))
+        assert result == result.expanduser()
+
     def test_sentinel(self) -> None:
         text = str(sentinel)
         result = parse_text(Sentinel, text)

dycw_utilities-0.108.4/src/tests/test_python_dotenv.py

@@ -0,0 +1,148 @@
+from __future__ import annotations
+
+import re
+from dataclasses import dataclass
+from re import DOTALL
+from typing import TYPE_CHECKING
+
+from hypothesis import given
+from hypothesis.strategies import DataObject, booleans, data, integers, sampled_from
+from pytest import raises
+
+from utilities.errors import ImpossibleCaseError
+from utilities.hypothesis import git_repos, settings_with_reduced_examples, text_ascii
+from utilities.os import temp_environ
+from utilities.python_dotenv import (
+    _LoadSettingsDuplicateKeysError,
+    _LoadSettingsEmptyError,
+    _LoadSettingsFileNotFoundError,
+    _LoadSettingsParseTextError,
+    load_settings,
+)
+
+if TYPE_CHECKING:
+    from pathlib import Path
+
+
+class TestLoadSettings:
+    @given(
+        data=data(),
+        root=git_repos(),
+        key_file=sampled_from(["key", "KEY"]),
+        value_file=text_ascii(),
+        use_env=booleans(),
+    )
+    @settings_with_reduced_examples()
+    def test_main(
+        self,
+        *,
+        data: DataObject,
+        root: Path,
+        key_file: str,
+        value_file: str,
+        use_env: bool,
+    ) -> None:
+        with root.joinpath(".env").open(mode="w") as fh:
+            _ = fh.write(f"{key_file} = {value_file}\n")
+
+        @dataclass(kw_only=True, slots=True)
+        class SettingsLower:
+            key: str
+
+        @dataclass(kw_only=True, slots=True)
+        class SettingsUpper:
+            KEY: str
+
+        SettingsUse = data.draw(sampled_from([SettingsLower, SettingsUpper]))  # noqa: N806
+        if use_env:
+            key_env = data.draw(sampled_from(["key", "KEY"]))
+            value_env = data.draw(text_ascii())
+            with temp_environ({key_env: value_env}):
+                settings = load_settings(SettingsUse, cwd=root)
+            exp_value = value_env
+        else:
+            settings = load_settings(SettingsUse, cwd=root)
+            exp_value = value_file
+
+        if SettingsUse is SettingsLower:
+            expected = SettingsLower(key=exp_value)
+        elif SettingsUse is SettingsUpper:
+            expected = SettingsUpper(KEY=exp_value)
+        else:
+            raise ImpossibleCaseError(case=[f"{SettingsUse=}"])
+        assert settings == expected
+
+    @given(root=git_repos(), value=text_ascii())
+    @settings_with_reduced_examples()
+    def test_file_extra_key(self, *, root: Path, value: str) -> None:
+        @dataclass(kw_only=True, slots=True)
+        class Settings:
+            key: str
+
+        with root.joinpath(".env").open(mode="w") as fh:
+            _ = fh.write(f"key = {value}\n")
+            _ = fh.write(f"other = {value}\n")
+
+        settings = load_settings(Settings, cwd=root)
+        expected = Settings(key=value)
+        assert settings == expected
+
+    @given(root=git_repos())
+    @settings_with_reduced_examples()
+    def test_error_file_not_found(self, *, root: Path) -> None:
+        @dataclass(kw_only=True, slots=True)
+        class Settings:
+            KEY: str
+
+        with raises(_LoadSettingsFileNotFoundError, match=r"Path '.*' must exist"):
+            _ = load_settings(Settings, cwd=root)
+
+    @given(root=git_repos(), value=integers())
+    @settings_with_reduced_examples()
+    def test_error_duplicate_keys(self, *, root: Path, value: int) -> None:
+        @dataclass(kw_only=True, slots=True)
+        class Settings:
+            key: str
+
+        with root.joinpath(".env").open(mode="w") as fh:
+            _ = fh.write(f"key = {value}\n")
+            _ = fh.write(f"KEY = {value}\n")
+
+        with raises(
+            _LoadSettingsDuplicateKeysError,
+            match=re.compile(
+                r"Mapping .* keys must not contain duplicates \(modulo case\); got .*",
+                flags=DOTALL,
+            ),
+        ):
+            _ = load_settings(Settings, cwd=root)
+
+    @given(root=git_repos())
+    @settings_with_reduced_examples()
+    def test_error_field_missing(self, *, root: Path) -> None:
+        @dataclass(kw_only=True, slots=True)
+        class Settings:
+            key: str
+
+        root.joinpath(".env").touch()
+
+        with raises(
+            _LoadSettingsEmptyError, match=r"Field 'key' must exist \(modulo case\)"
+        ):
+            _ = load_settings(Settings, cwd=root)
+
+    @given(root=git_repos())
+    @settings_with_reduced_examples()
+    def test_error_parse_text(self, *, root: Path) -> None:
+        @dataclass(kw_only=True, slots=True)
+        class Settings:
+            key: int
+
+        with root.joinpath(".env").open(mode="w") as fh:
+            _ = fh.write("key = '...'\n")
+
+        with raises(
+            _LoadSettingsParseTextError,
+            match=r"Unable to parse field 'key' of type <class 'int'>; got '...'",
+        ):
+            _ = load_settings(Settings, cwd=root)

{dycw_utilities-0.108.2 → dycw_utilities-0.108.4}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.108.2"
+__version__ = "0.108.4"