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

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

@@ -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.dist-info → dycw_utilities-0.136.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=_gHgMWM-7wftYvG3CuC0fVylv31uuRdfxSdp2fJbITs,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
@@ -36,7 +36,7 @@ utilities/luigi.py,sha256=wK7cB3y8NXeSa8d6r_yTKRmjMguNmIPmy52yg10vPaI,4774
 utilities/math.py,sha256=_6vrDyjtaqE_OFE-F2DNWrDG_J_kMl3nFAJsok9v_bY,26862
 utilities/memory_profiler.py,sha256=XzN56jDCa5aqXS_DxEjb_K4L6aIWh_5zyKi6OhcIxw0,853
 utilities/modules.py,sha256=iuvLluJya-hvl1Q25-Jk3dLgx2Es3ck4SjJiEkAlVTs,3195
-utilities/more_itertools.py,sha256=EX4P5JTc3p9fF3Ia3ZzPy9CEUe6OZcFqrrVplZ4pMaQ,10937
+utilities/more_itertools.py,sha256=NEGXDT8COaxziaJFTiXYKX0gffwfKhCAMrq-Kgh0w8c,10937
 utilities/numpy.py,sha256=Xn23sA2ZbVNqwUYEgNJD3XBYH6IbCri_WkHSNhg3NkY,26122
 utilities/operator.py,sha256=fZM2DBZdjtU8Lh9Z-eHC4ktNr0vO3JfX8hXgIYwdvBI,3826
 utilities/optuna.py,sha256=C-fhWYiXHVPo1l8QctYkFJ4DyhbSrGorzP1dJb_qvd8,1933
@@ -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.7.dist-info/METADATA,sha256=Y-Pj2EJoFNikG1cNjmfA9b8mzZdMzR_XpxuZX6hzBEc,1637
-dycw_utilities-0.136.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.136.7.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.136.7.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.7"
+__version__ = "0.136.9"

utilities/more_itertools.py

@@ -28,50 +28,59 @@ if TYPE_CHECKING:
 
 
 @overload
-def bucket_mapping[T, U, UH: Hashable](
+def bucket_mapping[T, UH: Hashable](
     iterable: Iterable[T],
     func: Callable[[T], UH],
     /,
     *,
-    pre: Callable[[T], U],
+    pre: None = None,
+    post: None = None,
+) -> Mapping[UH, Iterator[T]]: ...
+@overload
+def bucket_mapping[T, UH: Hashable](
+    iterable: Iterable[T],
+    func: Callable[[T], UH],
+    /,
+    *,
+    pre: None = None,
     post: Literal["list"],
-) -> Mapping[UH, list[U]]: ...
+) -> Mapping[UH, list[T]]: ...
 @overload
-def bucket_mapping[T, U, UH: Hashable](
+def bucket_mapping[T, UH: Hashable](
     iterable: Iterable[T],
     func: Callable[[T], UH],
     /,
     *,
-    pre: Callable[[T], U],
+    pre: None = None,
     post: Literal["tuple"],
-) -> Mapping[UH, tuple[U, ...]]: ...
+) -> Mapping[UH, tuple[T, ...]]: ...
 @overload
-def bucket_mapping[T, U, UH: Hashable](
+def bucket_mapping[T, UH: Hashable](
     iterable: Iterable[T],
     func: Callable[[T], UH],
     /,
     *,
-    pre: Callable[[T], U],
+    pre: None = None,
     post: Literal["set"],
-) -> Mapping[UH, set[U]]: ...
+) -> Mapping[UH, set[T]]: ...
 @overload
-def bucket_mapping[T, U, UH: Hashable](
+def bucket_mapping[T, UH: Hashable](
     iterable: Iterable[T],
     func: Callable[[T], UH],
     /,
     *,
-    pre: Callable[[T], U],
+    pre: None = None,
     post: Literal["frozenset"],
-) -> Mapping[UH, frozenset[U]]: ...
+) -> Mapping[UH, frozenset[T]]: ...
 @overload
-def bucket_mapping[T, U, UH: Hashable](
+def bucket_mapping[T, UH: Hashable](
     iterable: Iterable[T],
     func: Callable[[T], UH],
     /,
     *,
-    pre: Callable[[T], U] | None = None,
+    pre: None = None,
     post: Literal["unique"],
-) -> Mapping[UH, U]: ...
+) -> Mapping[UH, T]: ...
 @overload
 def bucket_mapping[T, U, UH: Hashable](
     iterable: Iterable[T],
@@ -82,59 +91,50 @@ def bucket_mapping[T, U, UH: Hashable](
     post: None = None,
 ) -> Mapping[UH, Iterator[U]]: ...
 @overload
-def bucket_mapping[T, UH: Hashable](
+def bucket_mapping[T, U, UH: Hashable](
     iterable: Iterable[T],
     func: Callable[[T], UH],
     /,
     *,
-    pre: None = None,
+    pre: Callable[[T], U],
     post: Literal["list"],
-) -> Mapping[UH, list[T]]: ...
+) -> Mapping[UH, list[U]]: ...
 @overload
-def bucket_mapping[T, UH: Hashable](
+def bucket_mapping[T, U, UH: Hashable](
     iterable: Iterable[T],
     func: Callable[[T], UH],
     /,
     *,
-    pre: None = None,
+    pre: Callable[[T], U],
     post: Literal["tuple"],
-) -> Mapping[UH, tuple[T, ...]]: ...
+) -> Mapping[UH, tuple[U, ...]]: ...
 @overload
-def bucket_mapping[T, UH: Hashable](
+def bucket_mapping[T, U, UH: Hashable](
     iterable: Iterable[T],
     func: Callable[[T], UH],
     /,
     *,
-    pre: None = None,
+    pre: Callable[[T], U],
     post: Literal["set"],
-) -> Mapping[UH, set[T]]: ...
+) -> Mapping[UH, set[U]]: ...
 @overload
-def bucket_mapping[T, UH: Hashable](
+def bucket_mapping[T, U, UH: Hashable](
     iterable: Iterable[T],
     func: Callable[[T], UH],
     /,
     *,
-    pre: None = None,
+    pre: Callable[[T], U],
     post: Literal["frozenset"],
-) -> Mapping[UH, frozenset[T]]: ...
+) -> Mapping[UH, frozenset[U]]: ...
 @overload
-def bucket_mapping[T, UH: Hashable](
+def bucket_mapping[T, U, UH: Hashable](
     iterable: Iterable[T],
     func: Callable[[T], UH],
     /,
     *,
-    pre: None = None,
+    pre: Callable[[T], U] | None = None,
     post: Literal["unique"],
-) -> Mapping[UH, T]: ...
-@overload
-def bucket_mapping[T, UH: Hashable](
-    iterable: Iterable[T],
-    func: Callable[[T], UH],
-    /,
-    *,
-    pre: None = None,
-    post: None = None,
-) -> Mapping[UH, Iterator[T]]: ...
+) -> Mapping[UH, U]: ...
 @overload
 def bucket_mapping[T, U, UH: Hashable](
     iterable: Iterable[T],

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