dycw-utilities 0.136.8__py3-none-any.whl → 0.136.9__py3-none-any.whl

{dycw_utilities-0.136.8.dist-info → dycw_utilities-0.136.9.dist-info}/METADATA

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

{dycw_utilities-0.136.8.dist-info → dycw_utilities-0.136.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=LoQF7frj1FsC8oJrGrNGBrr9qRbSyAYP8xZLub7u6hI,60
+utilities/__init__.py,sha256=TfRJ5LJDqhQMm2y-jbpj1oPenJALJoqsiY7i5XiMjcE,60
 utilities/aiolimiter.py,sha256=mD0wEiqMgwpty4XTbawFpnkkmJS6R4JRsVXFUaoitSU,628
 utilities/altair.py,sha256=HeZBVUocjkrTNwwKrClppsIqgNFF-ykv05HfZSoHYno,9104
 utilities/asyncio.py,sha256=dcGeKQzjLBXxKzZkVIk5oZsFXEcynVbRB9iNB5XEDZk,38526
@@ -77,7 +77,7 @@ utilities/text.py,sha256=ymBFlP_cA8OgNnZRVNs7FAh7OG8HxE6YkiLEMZv5g_A,11297
 utilities/threading.py,sha256=GvBOp4CyhHfN90wGXZuA2VKe9fGzMaEa7oCl4f3nnPU,1009
 utilities/timer.py,sha256=oXfTii6ymu57niP0BDGZjFD55LEHi2a19kqZKiTgaFQ,2588
 utilities/traceback.py,sha256=YvNUQCTDLvrKYAsl5498a0zhfjJna0dEUvIaK7PmLlQ,8780
-utilities/typed_settings.py,sha256=niNxgvVKrTy1c0j0D0Jp2tO3m231f4yJJ-38ni-xY3Q,3739
+utilities/typed_settings.py,sha256=cZqA2IjG1erF1SUZFSsjIHmZX7BP5iIfPd6CixHllA0,4367
 utilities/types.py,sha256=98pwEfkBikg6UUrshNJZgc8l97FGBbi0twIsqVt-KNA,17247
 utilities/typing.py,sha256=Z-_XDaWyT_6wIo3qfNK-hvRlzxP2Jxa9PgXzm5rDYRA,13790
 utilities/tzdata.py,sha256=fgNVj66yUbCSI_-vrRVzSD3gtf-L_8IEJEPjP_Jel5Y,266
@@ -88,7 +88,7 @@ utilities/warnings.py,sha256=un1LvHv70PU-LLv8RxPVmugTzDJkkGXRMZTE2-fTQHw,1771
 utilities/whenever.py,sha256=A-yoOqBqrcVD1yDINDsTFDw7dq9-zgUGn_f8CxVUQJs,23332
 utilities/zipfile.py,sha256=24lQc9ATcJxHXBPc_tBDiJk48pWyRrlxO2fIsFxU0A8,699
 utilities/zoneinfo.py,sha256=oEH-nL3t4h9uawyZqWDtNtDAl6M-CLpLYGI_nI6DulM,1971
-dycw_utilities-0.136.8.dist-info/METADATA,sha256=rKDsTulyR9hUod-Rdng5s8hRoRgfivymmIuqq1TU-CA,1637
-dycw_utilities-0.136.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.136.8.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.136.8.dist-info/RECORD,,
+dycw_utilities-0.136.9.dist-info/METADATA,sha256=MOcxHEd2C4kHuMPGAw3BKehTyJMq0qejj7XF1I3KYYc,1637
+dycw_utilities-0.136.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.136.9.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.136.9.dist-info/RECORD,,

utilities/__init__.py

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

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()