dycw-utilities 0.168.2__py3-none-any.whl → 0.168.4__py3-none-any.whl

{dycw_utilities-0.168.2.dist-info → dycw_utilities-0.168.4.dist-info}/METADATA

@@ -1,22 +1,22 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.168.2
+Version: 0.168.4
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12
 Requires-Dist: atomicwrites<1.5,>=1.4.1
 Requires-Dist: typing-extensions<4.16,>=4.15.0
 Requires-Dist: tzlocal<5.4,>=5.3.1
-Requires-Dist: whenever<0.10,>=0.9.0
+Requires-Dist: whenever<0.10,>=0.9.2
 Provides-Extra: logging
 Requires-Dist: coloredlogs<15.1,>=15.0.1; extra == 'logging'
 Provides-Extra: test
 Requires-Dist: dycw-pytest-only<2.2,>=2.1.1; extra == 'test'
-Requires-Dist: hypothesis<6.141,>=6.140.2; extra == 'test'
+Requires-Dist: hypothesis<6.141,>=6.140.3; extra == 'test'
 Requires-Dist: pytest-asyncio<1.3,>=1.2.0; extra == 'test'
 Requires-Dist: pytest-cov<7.1,>=7.0.0; extra == 'test'
 Requires-Dist: pytest-instafail<0.6,>=0.5.0; extra == 'test'
-Requires-Dist: pytest-lazy-fixtures<1.4,>=1.3.4; extra == 'test'
+Requires-Dist: pytest-lazy-fixtures<1.5,>=1.4.0; extra == 'test'
 Requires-Dist: pytest-randomly<4.1,>=4.0.1; extra == 'test'
 Requires-Dist: pytest-regressions<2.9,>=2.8.3; extra == 'test'
 Requires-Dist: pytest-repeat<0.10,>=0.9.4; extra == 'test'

{dycw_utilities-0.168.2.dist-info → dycw_utilities-0.168.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=laZOGwJ0RsMH0EaRNvyAIgJfYrO34zI83hxIX2m8SuE,60
+utilities/__init__.py,sha256=x6cOFdPHlRzAKGeDLMvNM_wBBnw0yuamoyX4OmYbECY,60
 utilities/aeventkit.py,sha256=OmDBhYGgbsKrB7cdC5FFpJHUatX9O76eTeKVVTksp2Y,12673
 utilities/altair.py,sha256=nHdpWt8ZwdUwRQN970MvHd5bRWokNqzHcZQEdSHKRuE,9033
 utilities/asyncio.py,sha256=60l1IwjnRGeaVphAFiwDIHyfKoZYKY-XGpptUxGiU-M,17034
@@ -55,7 +55,7 @@ utilities/pottery.py,sha256=nA0SsF9irvfC0tk68YAr08tuL9lGRSlBKihSx7Ibk84,3963
 utilities/pqdm.py,sha256=idv2seRVP2f6NeSfpeEnT5A-tQezaHZKDyeu16g2-0E,3091
 utilities/psutil.py,sha256=KUlu4lrUw9Zg1V7ZGetpWpGb9DB8l_SSDWGbANFNCPU,2104
 utilities/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-utilities/pydantic_settings.py,sha256=F_0dRYT9D5rdZamG73G9tMFVoc-dAxroAfMly6gkbtA,5345
+utilities/pydantic_settings.py,sha256=dUDGQZLlydPncxBblM1DPBfeSNqhQMb7CghNhF1ojJM,7501
 utilities/pydantic_settings_sops.py,sha256=9Ou6Cx6PiYOU49vtkKqqW1Sdp_i3WlVyg8KkUUKNliM,2310
 utilities/pyinstrument.py,sha256=hnXaL-4HE7wWBI5JKaPfYTpsrXe68YiuZKahHV0VJn8,841
 utilities/pytest.py,sha256=6o2qoAPygQLveU8t1JOdzAGmZ96Hs5jFn9OT_mcDNCk,10062
@@ -79,7 +79,6 @@ utilities/text.py,sha256=7SvwcSR2l_5cOrm1samGnR4C-ZI6qyFLHLzSpO1zeHQ,13958
 utilities/threading.py,sha256=GvBOp4CyhHfN90wGXZuA2VKe9fGzMaEa7oCl4f3nnPU,1009
 utilities/timer.py,sha256=BGlwEVznx67scuLOUohyWJ4d5rTnwtk-IR4yLXFiNfo,2574
 utilities/traceback.py,sha256=B_sc0TRUv-mGDnF-ek05nbqjmBiHr3-wvxliAqIF5hI,9608
-utilities/typed_settings.py,sha256=WJikhgV_92GkjqdQQ2VxfVrwABE5d_Z6tczmcr3H57w,4581
 utilities/types.py,sha256=IlRrCtPdLkGYVfpe-QIg2qNUgBr8OJNN7BhTKxnhh-M,18817
 utilities/typing.py,sha256=QYoCIc71e_u5W-kBeiNzrD-GXxpLtMOGc9PqgZjMXeE,25274
 utilities/tzdata.py,sha256=fgNVj66yUbCSI_-vrRVzSD3gtf-L_8IEJEPjP_Jel5Y,266
@@ -93,8 +92,8 @@ utilities/zoneinfo.py,sha256=tdIScrTB2-B-LH0ukb1HUXKooLknOfJNwHk10MuMYvA,3619
 utilities/pytest_plugins/__init__.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
 utilities/pytest_plugins/pytest_randomly.py,sha256=B1qYVlExGOxTywq2r1SMi5o7btHLk2PNdY_b1p98dkE,409
 utilities/pytest_plugins/pytest_regressions.py,sha256=mnHYBfdprz50UGVkVzV1bZERZN5CFfoF8YbokGxdFwU,1639
-dycw_utilities-0.168.2.dist-info/METADATA,sha256=sRnW_rmJprz7rM-vWg-RijzrqooNKDqAwu1OTOWEI3w,1699
-dycw_utilities-0.168.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.168.2.dist-info/entry_points.txt,sha256=BOD_SoDxwsfJYOLxhrSXhHP_T7iw-HXI9f2WVkzYxvQ,135
-dycw_utilities-0.168.2.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.168.2.dist-info/RECORD,,
+dycw_utilities-0.168.4.dist-info/METADATA,sha256=Po9OuIZ1OfNbLNOHnI38-vG210E3jNV08z5fpw-lWXw,1699
+dycw_utilities-0.168.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.168.4.dist-info/entry_points.txt,sha256=BOD_SoDxwsfJYOLxhrSXhHP_T7iw-HXI9f2WVkzYxvQ,135
+dycw_utilities-0.168.4.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.168.4.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.168.2"
+__version__ = "0.168.4"

utilities/pydantic_settings.py

@@ -2,10 +2,12 @@ from __future__ import annotations
 
 from functools import reduce
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, ClassVar, assert_never, override
+from typing import TYPE_CHECKING, Any, ClassVar, assert_never, cast, override
 
+from pydantic import Field, create_model
 from pydantic_settings import (
     BaseSettings,
+    CliSettingsSource,
     JsonConfigSettingsSource,
     PydanticBaseSettingsSource,
     SettingsConfigDict,
@@ -14,6 +16,7 @@ from pydantic_settings import (
 )
 from pydantic_settings.sources import DEFAULT_PATH
 
+from utilities.errors import ImpossibleCaseError
 from utilities.iterables import always_iterable
 
 if TYPE_CHECKING:
@@ -76,11 +79,6 @@ class CustomBaseSettings(BaseSettings):
             )
 
 
-def load_settings[T: BaseSettings](cls: type[T], /) -> T:
-    """Load a set of settings."""
-    return cls()
-
-
 class JsonConfigSectionSettingsSource(JsonConfigSettingsSource):
     @override
     def __init__(
@@ -168,6 +166,67 @@ class HashableBaseSettings(BaseSettings):
     model_config: ClassVar[SettingsConfigDict] = SettingsConfigDict(frozen=True)
 
 
+##
+
+
+def load_settings[T: BaseSettings](cls: type[T], /, *, cli: bool = False) -> T:
+    """Load a set of settings."""
+    _ = cls.model_rebuild()
+    if cli:
+        cls_with_defaults = _load_settings_create_model(cls)
+
+        @classmethod
+        def settings_customise_sources(
+            cls: type[BaseSettings],
+            settings_cls: type[BaseSettings],
+            init_settings: PydanticBaseSettingsSource,
+            env_settings: PydanticBaseSettingsSource,
+            dotenv_settings: PydanticBaseSettingsSource,
+            file_secret_settings: PydanticBaseSettingsSource,
+        ) -> tuple[PydanticBaseSettingsSource, ...]:
+            parent = cast(
+                "Any", super(cls_with_defaults, cls)
+            ).settings_customise_sources(
+                settings_cls=settings_cls,
+                init_settings=init_settings,
+                env_settings=env_settings,
+                dotenv_settings=dotenv_settings,
+                file_secret_settings=file_secret_settings,
+            )
+            return (
+                CliSettingsSource(
+                    settings_cls, cli_parse_args=True, case_sensitive=False
+                ),
+                *parent,
+            )
+
+        cls_use = type(
+            cls.__name__,
+            (cls_with_defaults,),
+            {"settings_customise_sources": settings_customise_sources},
+        )
+        cls_use = cast("type[T]", cls_use)
+    else:
+        cls_use = cls
+    return cls_use()
+
+
+def _load_settings_create_model[T: BaseSettings](
+    cls: type[T], /, *, values: T | None = None
+) -> type[T]:
+    values_use = cls() if values is None else values
+    kwargs: dict[str, Any] = {}
+    for name, field in cls.model_fields.items():
+        if (ann := field.annotation) is None:
+            raise ImpossibleCaseError(case=[f"{ann=}"])  # pragma: no cover
+        value = getattr(values_use, name)
+        if issubclass(ann, BaseSettings):
+            kwargs[name] = _load_settings_create_model(ann, values=value)
+        else:
+            kwargs[name] = (field.annotation, Field(default=value))
+    return create_model(cls.__name__, __base__=cls, **kwargs)
+
+
 __all__ = [
     "CustomBaseSettings",
     "HashableBaseSettings",

utilities/typed_settings.py

@@ -1,152 +0,0 @@
-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, assert_never, override
-from uuid import UUID
-
-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,
-    DateTimeDelta,
-    MonthDay,
-    PlainDateTime,
-    Time,
-    TimeDelta,
-    YearMonth,
-    ZonedDateTime,
-)
-
-from utilities.iterables import always_iterable
-from utilities.pathlib import to_path
-from utilities.string import substitute_environ
-
-if TYPE_CHECKING:
-    from collections.abc import Callable, Iterable
-
-    from typed_settings.loaders import Loader
-    from typed_settings.processors import Processor
-
-    from utilities.types import MaybeCallablePathLike, MaybeIterable, PathLike
-
-
-type _ConverterItem = tuple[type[Any], Callable[..., Any]]
-
-
-##
-
-
-class ExtendedTSConverter(TSConverter):
-    """An extension of the TSConverter for custom types."""
-
-    @override
-    def __init__(
-        self,
-        *,
-        resolve_paths: bool = True,
-        strlist_sep: str | Callable[[str], list] | None = ":",
-        extra: Iterable[_ConverterItem] = (),
-    ) -> None:
-        super().__init__(resolve_paths=resolve_paths, strlist_sep=strlist_sep)
-        cases: list[_ConverterItem] = [
-            (Date, Date.parse_iso),
-            (DateDelta, DateDelta.parse_iso),
-            (DateTimeDelta, DateTimeDelta.parse_iso),
-            (IPv4Address, IPv4Address),
-            (IPv6Address, IPv6Address),
-            (MonthDay, MonthDay.parse_iso),
-            (Path, partial(_parse_path, resolve=resolve_paths, pwd=Path.cwd())),
-            (PlainDateTime, PlainDateTime.parse_iso),
-            (Time, Time.parse_iso),
-            (TimeDelta, TimeDelta.parse_iso),
-            (UUID, UUID),
-            (YearMonth, YearMonth.parse_iso),
-            (ZonedDateTime, ZonedDateTime.parse_iso),
-            *extra,
-        ]
-        extras = {cls: _make_converter(cls, func) for cls, func in cases}
-        self.scalar_converters |= extras
-
-
-def _make_converter[T](
-    cls: type[T], parser: Callable[[str], T], /
-) -> Callable[[Any, type[Any]], Any]:
-    def hook(value: T | str, _: type[T] = cls, /) -> Any:
-        if not isinstance(value, (cls, str)):  # pragma: no cover
-            msg = f"Invalid type {type(value).__name__!r}; expected '{cls.__name__}' or 'str'"
-            raise TypeError(msg)
-        if isinstance(value, str):
-            return parser(value)
-        return value
-
-    return hook
-
-
-def _parse_path(
-    path: str, /, *, resolve: bool = False, pwd: MaybeCallablePathLike = Path.cwd
-) -> Path:
-    path = substitute_environ(path, **environ)
-    match resolve:
-        case True:
-            return to_path(pwd).joinpath(path).resolve()
-        case False:
-            return Path(path)
-        case never:
-            assert_never(never)
-
-
-##
-
-
-_BASE_DIR: Path = Path()
-
-
-def load_settings[T](
-    cls: type[T],
-    app_name: str,
-    /,
-    *,
-    filenames: MaybeIterable[str] = "settings.toml",
-    start_dir: PathLike | None = None,
-    loaders: MaybeIterable[Loader] | None = None,
-    processors: MaybeIterable[Processor] = (),
-    converters: Iterable[_ConverterItem] = (),
-    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(extra=converters),
-        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"]