dycw-utilities 0.136.7__tar.gz → 0.136.9__tar.gz

{dycw_utilities-0.136.7 → dycw_utilities-0.136.9}/PKG-INFO

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

{dycw_utilities-0.136.7 → dycw_utilities-0.136.9}/pyproject.toml

@@ -105,7 +105,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.136.7"
+version = "0.136.9"
 
 [project.optional-dependencies]
 logging = [
@@ -133,7 +133,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.136.7"
+current_version = "0.136.9"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.136.7 → dycw_utilities-0.136.9}/src/tests/test_pottery.py

@@ -66,7 +66,7 @@ class TestYieldAccess:
     ) -> None:
         with Timer() as timer:
             await _func_access(num_tasks, unique_str(), num_locks=num_locks)
-        assert (min_multiple * _DELTA) <= timer <= (3 * min_multiple * _DELTA)
+        assert (min_multiple * _DELTA) <= timer <= (5 * min_multiple * _DELTA)
 
     async def test_error_num_locks(self) -> None:
         key = unique_str()

{dycw_utilities-0.136.7 → dycw_utilities-0.136.9}/src/tests/test_typed_settings.py

@@ -2,10 +2,18 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from ipaddress import IPv4Address, IPv6Address
 from pathlib import Path
+from typing import assert_never
 
 import typed_settings
 from hypothesis import given
-from hypothesis.strategies import DataObject, SearchStrategy, data, ip_addresses, tuples
+from hypothesis.strategies import (
+    DataObject,
+    SearchStrategy,
+    booleans,
+    data,
+    ip_addresses,
+    tuples,
+)
 from pytest import mark, param, raises
 from typed_settings import EnvLoader, FileLoader, TomlFormat
 from whenever import (
@@ -23,6 +31,7 @@ from utilities.hypothesis import (
     date_time_deltas,
     dates,
     freqs,
+    paths,
     plain_datetimes,
     temp_paths,
     text_ascii,
@@ -99,6 +108,68 @@ class TestExtendedTSConverter:
         )
         assert settings_loaded.value == value
 
+    @given(
+        root=temp_paths(),
+        app_name=app_names,
+        env_name=text_ascii(min_size=1).map(lambda text: f"TEST_{text}".upper()),
+        env_value=text_ascii(min_size=1),
+    )
+    def test_path_env_var(
+        self, *, root: str, app_name: str, env_name: str, env_value: str
+    ) -> None:
+        @dataclass(frozen=True, kw_only=True, slots=True)
+        class Settings:
+            value: Path
+
+        file = Path(root, "file.toml")
+        _ = file.write_text(
+            strip_and_dedent(f"""
+                [{app_name}]
+                value = '${env_name}'
+            """)
+        )
+        with temp_environ({env_name: env_value}):
+            settings = typed_settings.load_settings(
+                Settings,
+                loaders=[
+                    FileLoader(formats={"*.toml": TomlFormat(app_name)}, files=[file])
+                ],
+                converter=ExtendedTSConverter(resolve_paths=False),
+            )
+        expected = Path(env_value)
+        assert settings.value == expected
+
+    @given(root=temp_paths(), app_name=app_names, path=paths(), resolve=booleans())
+    def test_path_resolution(
+        self, *, root: str, app_name: str, path: Path, resolve: bool
+    ) -> None:
+        @dataclass(frozen=True, kw_only=True, slots=True)
+        class Settings:
+            value: Path
+
+        file = Path(root, "file.toml")
+        _ = file.write_text(
+            strip_and_dedent(f"""
+                [{app_name}]
+                value = '{path!s}'
+            """)
+        )
+        settings = typed_settings.load_settings(
+            Settings,
+            loaders=[
+                FileLoader(formats={"*.toml": TomlFormat(app_name)}, files=[file])
+            ],
+            converter=ExtendedTSConverter(resolve_paths=resolve),
+        )
+        match resolve:
+            case True:
+                expected = Path.cwd().joinpath(path)
+            case False:
+                expected = Path(path)
+            case _ as never:
+                assert_never(never)
+        assert settings.value == expected
+
 
 class TestLoadSettings:
     @given(root=temp_paths(), datetime=zoned_datetimes())

{dycw_utilities-0.136.7 → dycw_utilities-0.136.9}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.136.7"
+__version__ = "0.136.9"

{dycw_utilities-0.136.7 → dycw_utilities-0.136.9}/src/utilities/typed_settings.py

@@ -1,10 +1,12 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+from functools import partial
 from ipaddress import IPv4Address, IPv6Address
+from os import environ
 from pathlib import Path
 from re import search
-from typing import TYPE_CHECKING, Any, override
+from typing import TYPE_CHECKING, Any, assert_never, override
 
 import typed_settings
 from typed_settings import EnvLoader, FileLoader, find
@@ -21,6 +23,8 @@ from whenever import (
 )
 
 from utilities.iterables import always_iterable
+from utilities.pathlib import get_path
+from utilities.string import substitute_environ
 from utilities.whenever import Freq
 
 if TYPE_CHECKING:
@@ -29,7 +33,7 @@ if TYPE_CHECKING:
     from typed_settings.loaders import Loader
     from typed_settings.processors import Processor
 
-    from utilities.types import MaybeIterable, PathLike
+    from utilities.types import MaybeCallablePathLike, MaybeIterable, PathLike
 
 
 ##
@@ -53,6 +57,7 @@ class ExtendedTSConverter(TSConverter):
             (Freq, Freq.parse),
             (IPv4Address, IPv4Address),
             (IPv6Address, IPv6Address),
+            (Path, partial(_parse_path, resolve=resolve_paths, pwd=Path.cwd())),
             (PlainDateTime, PlainDateTime.parse_common_iso),
             (Time, Time.parse_common_iso),
             (TimeDelta, TimeDelta.parse_common_iso),
@@ -76,6 +81,19 @@ def _make_converter[T](
     return hook
 
 
+def _parse_path(
+    path: str, /, *, resolve: bool = False, pwd: MaybeCallablePathLike | None = None
+) -> Path:
+    path = substitute_environ(path, **environ)
+    match resolve:
+        case True:
+            return get_path(path=pwd).joinpath(path).resolve()
+        case False:
+            return Path(path)
+        case _ as never:
+            assert_never(never)
+
+
 ##
 
 _BASE_DIR: Path = Path()