dycw-utilities 0.132.1__py3-none-any.whl → 0.132.3__py3-none-any.whl

{dycw_utilities-0.132.1.dist-info → dycw_utilities-0.132.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.132.1
+Version: 0.132.3
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12
@@ -17,7 +17,6 @@ Requires-Dist: pytest-asyncio<1.1,>=1.0.0; extra == 'test'
 Requires-Dist: pytest-cov<6.2,>=6.1.1; extra == 'test'
 Requires-Dist: pytest-instafail<0.6,>=0.5.0; extra == 'test'
 Requires-Dist: pytest-lazy-fixtures<1.2,>=1.1.4; extra == 'test'
-Requires-Dist: pytest-randomly<3.17,>=3.16.0; extra == 'test'
 Requires-Dist: pytest-regressions<2.9,>=2.8.0; extra == 'test'
 Requires-Dist: pytest-rerunfailures<16,>=15.1; extra == 'test'
 Requires-Dist: pytest-rng<1.1,>=1.0.0; extra == 'test'

{dycw_utilities-0.132.1.dist-info → dycw_utilities-0.132.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=PDNEVCX07_lBTxtKe5hvd9DUvYwh0iPoKmXmtdlxLdM,60
+utilities/__init__.py,sha256=9NsY4uZT1cOp7_D5RHpPZYyj4cpKLbQLR7K0gu5KJfU,60
 utilities/aiolimiter.py,sha256=mD0wEiqMgwpty4XTbawFpnkkmJS6R4JRsVXFUaoitSU,628
 utilities/altair.py,sha256=HeZBVUocjkrTNwwKrClppsIqgNFF-ykv05HfZSoHYno,9104
 utilities/asyncio.py,sha256=USWMMrHqPVRr20vlIn_n5JLimyqa-5xLhuqDYWJed8A,37586
@@ -55,7 +55,6 @@ utilities/psutil.py,sha256=0j4YxtVb8VjaaKKiHg6UEK95SUPkEcENgPtLgPJsNv0,3760
 utilities/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utilities/pydantic.py,sha256=aP6OKowg2Md4rgQuQ5qTSF4bTbBuq7WtRb7zS3JSRGY,1841
 utilities/pyinstrument.py,sha256=_Rfq6Gg4NKV2NF0dRYOpK2IRyyePxI7-3UmHIQLYrlQ,852
-utilities/pyrsistent.py,sha256=wVOVIe_68AAaa-lUE9y-TEzDawVp1uEIc_zfoDgr5ww,2287
 utilities/pytest.py,sha256=xSDybvkvdj7Ix-Tpc1INctKZV07qwrQvJlQonSimB7o,8273
 utilities/pytest_regressions.py,sha256=YI55B7EtLjhz7zPJZ6NK9bWrxrKCKabWZJe1cwcbA5o,5082
 utilities/python_dotenv.py,sha256=edXsvHZhZnYeqfMfrsRRpj7_9eJI6uizh3xLx8Q9B3w,3228
@@ -78,7 +77,7 @@ utilities/text.py,sha256=ymBFlP_cA8OgNnZRVNs7FAh7OG8HxE6YkiLEMZv5g_A,11297
 utilities/threading.py,sha256=GvBOp4CyhHfN90wGXZuA2VKe9fGzMaEa7oCl4f3nnPU,1009
 utilities/timer.py,sha256=oYqRQ-G-DMOOHB6a4yP5-PJDVimLnbNkMnkOj_jUmFg,2474
 utilities/traceback.py,sha256=i-790AQbTrDA8MiYyOcYPFpm48I558VR_kL_7x4ypfY,8503
-utilities/typed_settings.py,sha256=zUA0_CmVJT5rwrm3e-dZO83OdPXEel4NfVK24NAD5Vk,1779
+utilities/typed_settings.py,sha256=DqJsJjSit9wd_OA3KyMDpx2zatKIi5QhuARI9TPl3rk,3701
 utilities/types.py,sha256=fuJQiVjKYKL9g3F5H7oW_98Xm1-R5Xq4t4kU-aHxW0M,18826
 utilities/typing.py,sha256=kVWK6ciV8T0MKxnFQcMSEr_XlRisspH5aBTTosMUh30,13872
 utilities/tzdata.py,sha256=fgNVj66yUbCSI_-vrRVzSD3gtf-L_8IEJEPjP_Jel5Y,266
@@ -89,7 +88,7 @@ utilities/warnings.py,sha256=un1LvHv70PU-LLv8RxPVmugTzDJkkGXRMZTE2-fTQHw,1771
 utilities/whenever.py,sha256=tArX9unVEKhRYdvbUFa83e4hrzdtMKKCEN4QWTaYd8c,19524
 utilities/zipfile.py,sha256=24lQc9ATcJxHXBPc_tBDiJk48pWyRrlxO2fIsFxU0A8,699
 utilities/zoneinfo.py,sha256=oEH-nL3t4h9uawyZqWDtNtDAl6M-CLpLYGI_nI6DulM,1971
-dycw_utilities-0.132.1.dist-info/METADATA,sha256=cYm5yRE6A9tEMFSetIrL_VxIf2AaSpV6MFz_e29eHWs,1584
-dycw_utilities-0.132.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.132.1.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.132.1.dist-info/RECORD,,
+dycw_utilities-0.132.3.dist-info/METADATA,sha256=zfgSgg9oCTc9xP-C8UDS_9rET8qgWp9M5dOW9aZzhI0,1522
+dycw_utilities-0.132.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.132.3.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.132.3.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.132.1"
+__version__ = "0.132.3"

utilities/typed_settings.py

@@ -1,8 +1,15 @@
 from __future__ import annotations
 
+from dataclasses import dataclass
+from ipaddress import IPv4Address, IPv6Address
+from pathlib import Path
+from re import search
 from typing import TYPE_CHECKING, Any, TypeVar, override
 
+import typed_settings
+from typed_settings import EnvLoader, FileLoader, find
 from typed_settings.converters import TSConverter
+from typed_settings.loaders import TomlFormat
 from whenever import (
     Date,
     DateDelta,
@@ -13,13 +20,23 @@ from whenever import (
     ZonedDateTime,
 )
 
+from utilities.iterables import always_iterable
+
 if TYPE_CHECKING:
     from collections.abc import Callable
 
+    from typed_settings.loaders import Loader
+    from typed_settings.processors import Processor
+
+    from utilities.types import MaybeIterable, PathLike
+
 
 _T = TypeVar("_T")
 
 
+##
+
+
 class ExtendedTSConverter(TSConverter):
     """An extension of the TSConverter for custom types."""
 
@@ -35,6 +52,8 @@ class ExtendedTSConverter(TSConverter):
             (Date, Date.parse_common_iso),
             (DateDelta, DateDelta.parse_common_iso),
             (DateTimeDelta, DateTimeDelta.parse_common_iso),
+            (IPv4Address, IPv4Address),
+            (IPv6Address, IPv6Address),
             (PlainDateTime, PlainDateTime.parse_common_iso),
             (Time, Time.parse_common_iso),
             (TimeDelta, TimeDelta.parse_common_iso),
@@ -58,4 +77,48 @@ def _make_converter(
     return hook
 
 
-__all__ = ["ExtendedTSConverter"]
+##
+
+_BASE_DIR: Path = Path()
+
+
+def load_settings(
+    cls: type[_T],
+    app_name: str,
+    /,
+    *,
+    filenames: MaybeIterable[str] = "settings.toml",
+    start_dir: PathLike | None = None,
+    loaders: MaybeIterable[Loader] | None = None,
+    processors: MaybeIterable[Processor] = (),
+    base_dir: Path = _BASE_DIR,
+) -> _T:
+    if not search(r"^[A-Za-z]+(?:_[A-Za-z]+)*$", app_name):
+        raise LoadSettingsError(appname=app_name)
+    filenames_use = list(always_iterable(filenames))
+    start_dir_use = None if start_dir is None else Path(start_dir)
+    files = [find(filename, start_dir=start_dir_use) for filename in filenames_use]
+    file_loader = FileLoader(formats={"*.toml": TomlFormat(app_name)}, files=files)
+    env_loader = EnvLoader(f"{app_name.upper()}__", nested_delimiter="__")
+    loaders_use: list[Loader] = [file_loader, env_loader]
+    if loaders is not None:
+        loaders_use.extend(always_iterable(loaders))
+    return typed_settings.load_settings(
+        cls,
+        loaders_use,
+        processors=list(always_iterable(processors)),
+        converter=ExtendedTSConverter(),
+        base_dir=base_dir,
+    )
+
+
+@dataclass(kw_only=True, slots=True)
+class LoadSettingsError(Exception):
+    appname: str
+
+    @override
+    def __str__(self) -> str:
+        return f"Invalid app name; got {self.appname!r}"
+
+
+__all__ = ["ExtendedTSConverter", "LoadSettingsError", "load_settings"]

utilities/pyrsistent.py

@@ -1,89 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, Any, TypeVar, dataclass_transform, overload
-
-from pyrsistent import PRecord as _PRecord
-from pyrsistent import field as _field
-from pyrsistent._field_common import (
-    PFIELD_NO_FACTORY,
-    PFIELD_NO_INITIAL,
-    PFIELD_NO_INVARIANT,
-    PFIELD_NO_SERIALIZER,
-    PFIELD_NO_TYPE,
-)
-
-if TYPE_CHECKING:
-    from collections.abc import Callable
-
-    from utilities.types import TypeLike
-
-
-_T = TypeVar("_T")
-_U = TypeVar("_U")
-
-
-@overload
-def field(
-    *,
-    type: type[_T],
-    invariant: Callable[[Any], tuple[bool, Any]] = ...,
-    default: Any = ...,
-    mandatory: bool = ...,
-    factory: Callable[[_U], _U] = ...,
-    serializer: Callable[[Any, Any], Any] = ...,
-) -> _T: ...
-@overload
-def field(
-    *,
-    type: tuple[type[_T]],
-    invariant: Callable[[Any], tuple[bool, Any]] = ...,
-    default: Any = ...,
-    mandatory: bool = ...,
-    factory: Callable[[_U], _U] = ...,
-    serializer: Callable[[Any, Any], Any] = ...,
-) -> _T: ...
-@overload
-def field(
-    *,
-    type: tuple[type[_T], type[_U]],
-    invariant: Callable[[Any], tuple[bool, Any]] = ...,
-    default: Any = ...,
-    mandatory: bool = ...,
-    factory: Callable[[_U], _U] = ...,
-    serializer: Callable[[Any, Any], Any] = ...,
-) -> _T | _U: ...
-@overload
-def field(
-    *,
-    type: tuple[Any, ...] = ...,
-    invariant: Callable[[Any], tuple[bool, Any]] = ...,
-    default: Any = ...,
-    mandatory: bool = ...,
-    factory: Callable[[_U], _U] = ...,
-    serializer: Callable[[Any, Any], Any] = ...,
-) -> Any: ...
-def field(
-    *,
-    type: TypeLike[_T] = PFIELD_NO_TYPE,  # noqa: A002
-    invariant: Callable[[Any], tuple[bool, Any]] = PFIELD_NO_INVARIANT,
-    default: Any = PFIELD_NO_INITIAL,
-    mandatory: bool = False,
-    factory: Callable[[_U], _U] = PFIELD_NO_FACTORY,
-    serializer: Callable[[Any, Any], Any] = PFIELD_NO_SERIALIZER,
-) -> Any:
-    """Field specification factory for :py:class:`PRecord`."""
-    return _field(
-        type=type,
-        invariant=invariant,
-        initial=default,
-        mandatory=mandatory,
-        factory=factory,
-        serializer=serializer,
-    )
-
-
-@dataclass_transform(kw_only_default=True, field_specifiers=(field,))
-class PRecord(_PRecord): ...
-
-
-__all__ = ["PRecord", "field"]