dycw-utilities 0.149.0__tar.gz → 0.149.2__tar.gz

{dycw_utilities-0.149.0 → dycw_utilities-0.149.2}/PKG-INFO

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

{dycw_utilities-0.149.0 → dycw_utilities-0.149.2}/pyproject.toml

@@ -102,7 +102,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.149.0"
+version = "0.149.2"
 
 [project.entry-points.pytest11]
 pytest-randomly = "utilities.pytest_plugins.pytest_randomly"
@@ -135,7 +135,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.149.0"
+current_version = "0.149.2"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.149.0 → dycw_utilities-0.149.2}/src/tests/test_click.py

@@ -20,11 +20,13 @@ from hypothesis.strategies import (
     ip_addresses,
     lists,
     sampled_from,
+    uuids,
 )
 from pytest import mark, param
 
 from utilities.click import (
     CONTEXT_SETTINGS_HELP_OPTION_NAMES,
+    UUID,
     Date,
     DateDelta,
     DateTimeDelta,
@@ -320,6 +322,9 @@ class TestParameters:
             serialize=whenever.TimeDelta.format_common_iso,
             failable=True,
         ),
+        _Case(
+            param=UUID(), name="uuid", strategy=uuids(), serialize=str, failable=True
+        ),
         _Case(
             param=YearMonth(),
             name="year-month",

{dycw_utilities-0.149.0 → dycw_utilities-0.149.2}/src/tests/test_postgres.py

@@ -15,6 +15,7 @@ from utilities.postgres import (
     _ExtractURLDatabaseError,
     _ExtractURLHostError,
     _ExtractURLPortError,
+    _path_pg_dump,
     _PGDumpFormat,
     pg_dump,
     restore,
@@ -60,7 +61,6 @@ class TestPGDump:
     @given(
         url=urls(),
         path=temp_paths(),
-        format_=sampled_from(get_literal_elements(_PGDumpFormat)),
         jobs=integers(min_value=0) | none(),
         schemas=lists(text_ascii(min_size=1)) | none(),
         schemas_exc=lists(text_ascii(min_size=1)) | none(),
@@ -75,7 +75,6 @@ class TestPGDump:
         *,
         url: URL,
         path: Path,
-        format_: _PGDumpFormat,
         jobs: int | None,
         schemas: list[str] | None,
         schemas_exc: list[str] | None,
@@ -88,7 +87,6 @@ class TestPGDump:
         _ = _build_pg_dump(
             url,
             path,
-            format_=format_,
             jobs=jobs,
             schemas=schemas,
             schemas_exc=schemas_exc,
@@ -99,6 +97,11 @@ class TestPGDump:
             docker=docker,
         )
 
+    @given(path=temp_paths(), format_=sampled_from(get_literal_elements(_PGDumpFormat)))
+    def test_path(self, *, path: Path, format_: _PGDumpFormat) -> None:
+        path = _path_pg_dump(path, format_=format_)
+        assert path.suffix in [".sql", ".pgdump", "", ".tar"]
+
 
 class TestRestore:
     @given(url=urls(), path=temp_paths(), logger=text_ascii(min_size=1) | none())

{dycw_utilities-0.149.0 → dycw_utilities-0.149.2}/src/tests/test_typed_settings.py

@@ -3,6 +3,7 @@ from dataclasses import dataclass
 from ipaddress import IPv4Address, IPv6Address
 from pathlib import Path
 from typing import Any, ClassVar, assert_never
+from uuid import UUID
 
 import typed_settings
 from hypothesis import given
@@ -13,6 +14,7 @@ from hypothesis.strategies import (
     data,
     ip_addresses,
     tuples,
+    uuids,
 )
 from pytest import mark, param, raises
 from typed_settings import EnvLoader, FileLoader, TomlFormat
@@ -87,6 +89,7 @@ class TestExtendedTSConverter:
         _Case(
             cls=TimeDelta, strategy=time_deltas(), serialize=TimeDelta.format_common_iso
         ),
+        _Case(cls=UUID, strategy=uuids(), serialize=str),
         _Case(
             cls=YearMonth, strategy=year_months(), serialize=YearMonth.format_common_iso
         ),

{dycw_utilities-0.149.0 → dycw_utilities-0.149.2}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.149.0"
+__version__ = "0.149.2"

{dycw_utilities-0.149.0 → dycw_utilities-0.149.2}/src/utilities/click.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import enum
 import ipaddress
 import pathlib
+import uuid
 from typing import TYPE_CHECKING, TypedDict, assert_never, override
 
 import click
@@ -329,6 +330,32 @@ class TimeDelta(ParamType):
                 assert_never(never)
 
 
+class UUID(ParamType):
+    """A UUID-valued parameter."""
+
+    name = "uuid"
+
+    @override
+    def __repr__(self) -> str:
+        return self.name.upper()
+
+    @override
+    def convert(
+        self, value: uuid.UUID | str, param: Parameter | None, ctx: Context | None
+    ) -> uuid.UUID:
+        """Convert a value into the `UUID` type."""
+        match value:
+            case uuid.UUID():
+                return value
+            case str():
+                try:
+                    return uuid.UUID(value)
+                except ValueError as error:
+                    self.fail(str(error), param, ctx)
+            case _ as never:
+                assert_never(never)
+
+
 class YearMonth(ParamType):
     """A year-month parameter."""
 
@@ -561,6 +588,7 @@ def _make_metavar(param: Parameter, desc: str, /) -> str:
 
 __all__ = [
     "CONTEXT_SETTINGS_HELP_OPTION_NAMES",
+    "UUID",
     "Date",
     "DateDelta",
     "DateTimeDelta",

{dycw_utilities-0.149.0 → dycw_utilities-0.149.2}/src/utilities/postgres.py

@@ -45,7 +45,7 @@ async def pg_dump(
     logger: LoggerOrName | None = None,
 ) -> None:
     """Run `pg_dump`."""
-    path = Path(path)
+    path = _path_pg_dump(path, format_=format_)
     path.parent.mkdir(parents=True, exist_ok=True)
     cmd = _build_pg_dump(
         url,
@@ -107,25 +107,12 @@ def _build_pg_dump(
     docker: str | None = None,
 ) -> str:
     database, host, port = _extract_url(url)
-    match format_:
-        case "plain":
-            suffix = ".sql"
-        case "custom":
-            suffix = ".pgdump"
-        case "directory":
-            suffix = None
-        case "tar":
-            suffix = ".tar"
-        case _ as never:
-            assert_never(never)
-    file = Path(path)
-    if suffix is not None:
-        file = ensure_suffix(file, suffix)
+    path = _path_pg_dump(path, format_=format_)
     parts: list[str] = [
         "pg_dump",
         # general options
         f"--dbname={database}",
-        f"--file={str(file)!r}",
+        f"--file={str(path)!r}",
         f"--format={format_}",
         "--verbose",
         # output options
@@ -162,6 +149,24 @@ def _build_pg_dump(
     return " ".join(parts)
 
 
+def _path_pg_dump(path: PathLike, /, *, format_: _PGDumpFormat = "plain") -> Path:
+    match format_:
+        case "plain":
+            suffix = ".sql"
+        case "custom":
+            suffix = ".pgdump"
+        case "directory":
+            suffix = None
+        case "tar":
+            suffix = ".tar"
+        case _ as never:
+            assert_never(never)
+    path = Path(path)
+    if suffix is not None:
+        path = ensure_suffix(path, suffix)
+    return path
+
+
 ##
 
 

{dycw_utilities-0.149.0 → dycw_utilities-0.149.2}/src/utilities/typed_settings.py

@@ -7,6 +7,7 @@ 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
@@ -62,6 +63,7 @@ class ExtendedTSConverter(TSConverter):
             (PlainDateTime, PlainDateTime.parse_common_iso),
             (Time, Time.parse_common_iso),
             (TimeDelta, TimeDelta.parse_common_iso),
+            (UUID, UUID),
             (YearMonth, YearMonth.parse_common_iso),
             (ZonedDateTime, ZonedDateTime.parse_common_iso),
         ]