dycw-utilities 0.168.4__tar.gz → 0.168.6__tar.gz

{dycw_utilities-0.168.4 → dycw_utilities-0.168.6}/PKG-INFO

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

{dycw_utilities-0.168.4 → dycw_utilities-0.168.6}/pyproject.toml

@@ -149,6 +149,9 @@ pqdm = [
 psutil = [
   "psutil >=7.1.0, <7.2",
 ]
+pydantic = [
+  "pydantic >=2.12.0, <2.13",
+]
 pydantic-settings = [
   "pydantic-settings >=2.11.0, <2.12",
 ]
@@ -246,7 +249,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.168.4"
+version = "0.168.6"
 
 [project.entry-points.pytest11]
 pytest-randomly = "utilities.pytest_plugins.pytest_randomly"
@@ -279,7 +282,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.168.4"
+current_version = "0.168.6"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

dycw_utilities-0.168.6/src/tests/test_pydantic.py

@@ -0,0 +1,21 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+from pydantic import BaseModel
+
+from utilities.pydantic import ExpandedPath
+
+_ = ExpandedPath
+
+
+class TestExpandedPath:
+    def test_main(self) -> None:
+        class Example(BaseModel):
+            path: ExpandedPath
+
+        _ = Example.model_rebuild()
+
+        result = Example(path=Path("~")).path
+        expected = Path.home()
+        assert result == expected

{dycw_utilities-0.168.4 → dycw_utilities-0.168.6}/src/utilities/__init__.py

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

dycw_utilities-0.168.6/src/utilities/pydantic.py

@@ -0,0 +1,11 @@
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Annotated
+
+from pydantic import BeforeValidator
+
+ExpandedPath = Annotated[Path, BeforeValidator(lambda p: Path(p).expanduser())]
+
+
+__all__ = ["ExpandedPath"]

{dycw_utilities-0.168.4 → dycw_utilities-0.168.6}/src/utilities/pydantic_settings.py

@@ -220,7 +220,10 @@ def _load_settings_create_model[T: BaseSettings](
         if (ann := field.annotation) is None:
             raise ImpossibleCaseError(case=[f"{ann=}"])  # pragma: no cover
         value = getattr(values_use, name)
-        if issubclass(ann, BaseSettings):
+        if (
+            isinstance(cast("Any", ann), type)  # 'ann' is possible not a type
+            and issubclass(ann, BaseSettings)
+        ):
             kwargs[name] = _load_settings_create_model(ann, values=value)
         else:
             kwargs[name] = (field.annotation, Field(default=value))