dycw-utilities 0.151.2__tar.gz → 0.151.4__tar.gz

{dycw_utilities-0.151.2 → dycw_utilities-0.151.4}/PKG-INFO

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

{dycw_utilities-0.151.2 → dycw_utilities-0.151.4}/pyproject.toml

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

{dycw_utilities-0.151.2 → dycw_utilities-0.151.4}/src/tests/test_polars.py

@@ -8,7 +8,7 @@ from enum import auto
 from itertools import chain, repeat
 from math import isfinite, nan
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, ClassVar, Literal, cast
+from typing import TYPE_CHECKING, Any, ClassVar, Literal, assert_never, cast
 from uuid import UUID, uuid4
 
 import hypothesis.strategies
@@ -114,6 +114,7 @@ from utilities.polars import (
     _FiniteEWMWeightsError,
     _GetDataTypeOrSeriesTimeZoneNotDateTimeError,
     _GetDataTypeOrSeriesTimeZoneNotZonedError,
+    _GetDataTypeOrSeriesTimeZoneStructNonUniqueError,
     _GetSeriesNumberOfDecimalsAllNullError,
     _GetSeriesNumberOfDecimalsNotFloatError,
     _InsertBetweenMissingColumnsError,
@@ -1483,18 +1484,32 @@ class TestFloorDateTime:
 
 class TestGetDataTypeOrSeriesTimeZone:
     @given(
-        time_zone=sampled_from([HongKong, UTC]), case=sampled_from(["dtype", "series"])
+        time_zone=sampled_from([HongKong, UTC]),
+        flat_or_struct=sampled_from(["flat", "struct"]),
+        dtype_or_series=sampled_from(["dtype", "series"]),
     )
     def test_main(
-        self, *, time_zone: ZoneInfo, case: Literal["dtype", "series"]
+        self,
+        *,
+        time_zone: ZoneInfo,
+        flat_or_struct: Literal["flat", "struct"],
+        dtype_or_series: Literal["dtype", "series"],
     ) -> None:
-        dtype = zoned_datetime_dtype(time_zone=time_zone)
-        match case:
+        match flat_or_struct:
+            case "flat":
+                dtype = zoned_datetime_dtype(time_zone=time_zone)
+            case "struct":
+                dtype = zoned_datetime_period_dtype(time_zone=time_zone)
+            case _ as never:
+                assert_never(never)
+        match dtype_or_series:
             case "dtype":
-                dtype_or_series = dtype
+                obj = dtype
             case "series":
-                dtype_or_series = Series(dtype=dtype)
-        result = get_data_type_or_series_time_zone(dtype_or_series)
+                obj = Series(dtype=dtype)
+            case _ as never:
+                assert_never(never)
+        result = get_data_type_or_series_time_zone(obj)
         assert result is time_zone
 
     def test_error_not_datetime(self) -> None:
@@ -1511,6 +1526,15 @@ class TestGetDataTypeOrSeriesTimeZone:
         ):
             _ = get_data_type_or_series_time_zone(Datetime)
 
+    def test_error_struct_non_unique(self) -> None:
+        with raises(
+            _GetDataTypeOrSeriesTimeZoneStructNonUniqueError,
+            match="Struct data type must contain exactly one time zone; got .*, .* and perhaps more",
+        ):
+            _ = get_data_type_or_series_time_zone(
+                struct_dtype(start=DatetimeHongKong, end=DatetimeUTC)
+            )
+
 
 class TestGetExprName:
     @given(n=hypothesis.strategies.integers(0, 10), name=text_ascii())

{dycw_utilities-0.151.2 → dycw_utilities-0.151.4}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.151.2"
+__version__ = "0.151.4"

{dycw_utilities-0.151.2 → dycw_utilities-0.151.4}/src/utilities/polars.py

@@ -1340,11 +1340,22 @@ def get_data_type_or_series_time_zone(
             dtype = series.dtype
         case _ as never:
             assert_never(never)
-    if not isinstance(dtype, Datetime):
-        raise _GetDataTypeOrSeriesTimeZoneNotDateTimeError(dtype=dtype)
-    if dtype.time_zone is None:
-        raise _GetDataTypeOrSeriesTimeZoneNotZonedError(dtype=dtype)
-    return ZoneInfo(dtype.time_zone)
+    match dtype:
+        case Datetime() as datetime:
+            if datetime.time_zone is None:
+                raise _GetDataTypeOrSeriesTimeZoneNotZonedError(dtype=datetime)
+            return ZoneInfo(datetime.time_zone)
+        case Struct() as struct:
+            try:
+                return one({
+                    get_data_type_or_series_time_zone(f.dtype) for f in struct.fields
+                })
+            except OneNonUniqueError as error:
+                raise _GetDataTypeOrSeriesTimeZoneStructNonUniqueError(
+                    dtype=struct, first=error.first, second=error.second
+                ) from None
+        case _:
+            raise _GetDataTypeOrSeriesTimeZoneNotDateTimeError(dtype=dtype)
 
 
 @dataclass(kw_only=True, slots=True)
@@ -1366,6 +1377,18 @@ class _GetDataTypeOrSeriesTimeZoneNotZonedError(GetDataTypeOrSeriesTimeZoneError
         return f"Data type must be zoned; got {self.dtype}"
 
 
+@dataclass(kw_only=True, slots=True)
+class _GetDataTypeOrSeriesTimeZoneStructNonUniqueError(
+    GetDataTypeOrSeriesTimeZoneError
+):
+    first: ZoneInfo
+    second: ZoneInfo
+
+    @override
+    def __str__(self) -> str:
+        return f"Struct data type must contain exactly one time zone; got {self.first}, {self.second} and perhaps more"
+
+
 ##
 
 

{dycw_utilities-0.151.2 → dycw_utilities-0.151.4}/src/utilities/postgres.py

@@ -21,7 +21,12 @@ if TYPE_CHECKING:
     from sqlalchemy import URL
 
     from utilities.sqlalchemy import TableOrORMInstOrClass
-    from utilities.types import LoggerOrName, MaybeListStr, MaybeSequence, PathLike
+    from utilities.types import (
+        LoggerOrName,
+        MaybeCollection,
+        MaybeCollectionStr,
+        PathLike,
+    )
 
 
 type _PGDumpFormat = Literal["plain", "custom", "directory", "tar"]
@@ -37,12 +42,12 @@ async def pg_dump(
     data_only: bool = False,
     clean: bool = False,
     create: bool = False,
-    extension: MaybeListStr | None = None,
-    extension_exc: MaybeListStr | None = None,
-    schema: MaybeListStr | None = None,
-    schema_exc: MaybeListStr | None = None,
-    table: MaybeSequence[TableOrORMInstOrClass | str] | None = None,
-    table_exc: MaybeSequence[TableOrORMInstOrClass | str] | None = None,
+    extension: MaybeCollectionStr | None = None,
+    extension_exc: MaybeCollectionStr | None = None,
+    schema: MaybeCollectionStr | None = None,
+    schema_exc: MaybeCollectionStr | None = None,
+    table: MaybeCollection[TableOrORMInstOrClass | str] | None = None,
+    table_exc: MaybeCollection[TableOrORMInstOrClass | str] | None = None,
     inserts: bool = False,
     on_conflict_do_nothing: bool = False,
     role: str | None = None,
@@ -113,12 +118,12 @@ def _build_pg_dump(
     data_only: bool = False,
     clean: bool = False,
     create: bool = False,
-    extension: MaybeListStr | None = None,
-    extension_exc: MaybeListStr | None = None,
-    schema: MaybeListStr | None = None,
-    schema_exc: MaybeListStr | None = None,
-    table: MaybeSequence[TableOrORMInstOrClass | str] | None = None,
-    table_exc: MaybeSequence[TableOrORMInstOrClass | str] | None = None,
+    extension: MaybeCollectionStr | None = None,
+    extension_exc: MaybeCollectionStr | None = None,
+    schema: MaybeCollectionStr | None = None,
+    schema_exc: MaybeCollectionStr | None = None,
+    table: MaybeCollection[TableOrORMInstOrClass | str] | None = None,
+    table_exc: MaybeCollection[TableOrORMInstOrClass | str] | None = None,
     inserts: bool = False,
     on_conflict_do_nothing: bool = False,
     role: str | None = None,
@@ -206,9 +211,9 @@ async def restore(
     clean: bool = False,
     create: bool = False,
     jobs: int | None = None,
-    schema: MaybeListStr | None = None,
-    schema_exc: MaybeListStr | None = None,
-    table: MaybeSequence[TableOrORMInstOrClass | str] | None = None,
+    schema: MaybeCollectionStr | None = None,
+    schema_exc: MaybeCollectionStr | None = None,
+    table: MaybeCollection[TableOrORMInstOrClass | str] | None = None,
     role: str | None = None,
     docker: str | None = None,
     dry_run: bool = False,
@@ -271,9 +276,9 @@ def _build_pg_restore_or_psql(
     clean: bool = False,
     create: bool = False,
     jobs: int | None = None,
-    schema: MaybeListStr | None = None,
-    schema_exc: MaybeListStr | None = None,
-    table: MaybeSequence[TableOrORMInstOrClass | str] | None = None,
+    schema: MaybeCollectionStr | None = None,
+    schema_exc: MaybeCollectionStr | None = None,
+    table: MaybeCollection[TableOrORMInstOrClass | str] | None = None,
     role: str | None = None,
     docker: str | None = None,
 ) -> str:
@@ -304,9 +309,9 @@ def _build_pg_restore(
     clean: bool = False,
     create: bool = False,
     jobs: int | None = None,
-    schemas: MaybeListStr | None = None,
-    schemas_exc: MaybeListStr | None = None,
-    tables: MaybeSequence[TableOrORMInstOrClass | str] | None = None,
+    schemas: MaybeCollectionStr | None = None,
+    schemas_exc: MaybeCollectionStr | None = None,
+    tables: MaybeCollection[TableOrORMInstOrClass | str] | None = None,
     role: str | None = None,
     docker: str | None = None,
 ) -> str:

{dycw_utilities-0.151.2 → dycw_utilities-0.151.4}/src/utilities/types.py

@@ -123,15 +123,20 @@ IPv6AddressLike = MaybeStr[IPv6Address]
 
 
 # iterables
-type CollectionStr = frozenset[str] | list[str] | set[str] | tuple[str, ...]
 type IterableHashable[T: Hashable] = tuple[T, ...] | frozenset[T]
 type MaybeCollection[T] = T | Collection[T]
-type MaybeCollectionStr = str | CollectionStr
 type MaybeIterableHashable[T: Hashable] = T | IterableHashable[T]
 type MaybeIterable[T] = T | Iterable[T]
-type MaybeListStr = MaybeList[str]
 type MaybeList[T] = T | list[T]
 type MaybeSequence[T] = T | Sequence[T]
+# iterables - str
+type CollectionStr = (
+    dict[str, Any] | frozenset[str] | list[str] | set[str] | tuple[str, ...]
+)
+type MaybeCollectionStr = str | CollectionStr
+type MaybeListStr = MaybeList[str]
+type MaybeSequenceStr = str | SequenceStr
+type SequenceStr = list[str] | tuple[str, ...]
 
 
 # logging
@@ -302,6 +307,7 @@ __all__ = [
     "MaybeList",
     "MaybeListStr",
     "MaybeSequence",
+    "MaybeSequenceStr",
     "MaybeStr",
     "MaybeType",
     "MonthDayLike",
@@ -315,6 +321,7 @@ __all__ = [
     "PatternLike",
     "PlainDateTimeLike",
     "Seed",
+    "SequenceStr",
     "SerializeObjectExtra",
     "Sign",
     "StrMapping",