dycw-utilities 0.151.2__py3-none-any.whl → 0.151.4__py3-none-any.whl

{dycw_utilities-0.151.2.dist-info → dycw_utilities-0.151.4.dist-info}/METADATA

@@ -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.dist-info → dycw_utilities-0.151.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=Db7AHp-oHna0M-k09B1taHjAQAZ8qv9CvudrDi3y72w,60
+utilities/__init__.py,sha256=AWZG62ObkkWl0zXPWFtqIU5oRl3bsTfN25MpOpwf7Pw,60
 utilities/altair.py,sha256=92E2lCdyHY4Zb-vCw6rEJIsWdKipuu-Tu2ab1ufUfAk,9079
 utilities/asyncio.py,sha256=2m2a2C-Qgc6OHTTHL332-t66A7xDITt_SORT7a1DJWo,16792
 utilities/atomicwrites.py,sha256=xcOWenTBRS0oat3kg7Sqe51AohNThMQ2ixPL7QCG8hw,5795
@@ -47,9 +47,9 @@ utilities/pathlib.py,sha256=FnteXeVeMOSc6QTN7oF6UrobjOX9gXv_5tG1slg83W8,8496
 utilities/period.py,sha256=hsHdAKAstfMzB2Ar5EbxjkbMff3CA-B5wtYNVZOXVXI,10127
 utilities/pickle.py,sha256=MBT2xZCsv0pH868IXLGKnlcqNx2IRVKYNpRcqiQQqxw,653
 utilities/platform.py,sha256=Ue9LSxYvg9yUXGKuz5aZoy_qkUEXde-v6B09exgSctU,2813
-utilities/polars.py,sha256=wusyiQTHMxcPrRzsjWWt975rgcMQBRcaY4cJgkNUzw4,72501
+utilities/polars.py,sha256=D9KzxCeLjqfv3dxplJtUuPKkyLbtPVcMHgMxL_im7tI,73313
 utilities/polars_ols.py,sha256=Uc9V5kvlWZ5cU93lKZ-cfAKdVFFw81tqwLW9PxtUvMs,5618
-utilities/postgres.py,sha256=48km6Mb6hRUb1-0FWg7FKEfrW75z8-7AY1jahtdu_KY,12406
+utilities/postgres.py,sha256=xArnonKtL5IR93LpoUYN2U16YswBCJlU5WQkDbv10A0,12553
 utilities/pottery.py,sha256=u0uvyGgYyujxftEMlsv6ppYTKQoVVjHt5jnVxxYz9s4,6596
 utilities/pqdm.py,sha256=BTsYPtbKQWwX-iXF4qCkfPG7DPxIB54J989n83bXrIo,3092
 utilities/psutil.py,sha256=KUlu4lrUw9Zg1V7ZGetpWpGb9DB8l_SSDWGbANFNCPU,2104
@@ -76,7 +76,7 @@ utilities/threading.py,sha256=GvBOp4CyhHfN90wGXZuA2VKe9fGzMaEa7oCl4f3nnPU,1009
 utilities/timer.py,sha256=oXfTii6ymu57niP0BDGZjFD55LEHi2a19kqZKiTgaFQ,2588
 utilities/traceback.py,sha256=zofhzIedpUHrzDNiRJDVzm_wuu_tlTQvVqK4quxVlgM,9151
 utilities/typed_settings.py,sha256=98OQQsXyfjxbGPjWqG45P_DoNgrzS4gZ7062oD2lgtE,4481
-utilities/types.py,sha256=gvi9bJDbX57nwA-V_TDRrdZoUXQ1FvXNUuiu0WdVk5g,18376
+utilities/types.py,sha256=4bHcAF4OVMjnaY9SAj8_bKiHfj6YurD6Y3cipV-5yFE,18551
 utilities/typing.py,sha256=Z-_XDaWyT_6wIo3qfNK-hvRlzxP2Jxa9PgXzm5rDYRA,13790
 utilities/tzdata.py,sha256=fgNVj66yUbCSI_-vrRVzSD3gtf-L_8IEJEPjP_Jel5Y,266
 utilities/tzlocal.py,sha256=KyCXEgCTjqGFx-389JdTuhMRUaT06U1RCMdWoED-qro,728
@@ -89,8 +89,8 @@ utilities/zoneinfo.py,sha256=oEH-nL3t4h9uawyZqWDtNtDAl6M-CLpLYGI_nI6DulM,1971
 utilities/pytest_plugins/__init__.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
 utilities/pytest_plugins/pytest_randomly.py,sha256=NXzCcGKbpgYouz5yehKb4jmxmi2SexKKpgF4M65bi10,414
 utilities/pytest_plugins/pytest_regressions.py,sha256=Iwhfv_OJH7UCPZCfoh7ugZ2Xjqjil-BBBsOb8sDwiGI,1471
-dycw_utilities-0.151.2.dist-info/METADATA,sha256=ZFPqnjQGCpOTu9TdbdK87-N9HnlXZfrSrTHA5YY8XSU,1696
-dycw_utilities-0.151.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.151.2.dist-info/entry_points.txt,sha256=BOD_SoDxwsfJYOLxhrSXhHP_T7iw-HXI9f2WVkzYxvQ,135
-dycw_utilities-0.151.2.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.151.2.dist-info/RECORD,,
+dycw_utilities-0.151.4.dist-info/METADATA,sha256=kScCz13Y3Z7tccr7IxJmdugqwfG4c5Mmxfa4TB3XzT4,1696
+dycw_utilities-0.151.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.151.4.dist-info/entry_points.txt,sha256=BOD_SoDxwsfJYOLxhrSXhHP_T7iw-HXI9f2WVkzYxvQ,135
+dycw_utilities-0.151.4.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.151.4.dist-info/RECORD,,

utilities/__init__.py

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

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"
+
+
 ##
 
 

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:

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",