dycw-utilities 0.151.1__tar.gz → 0.151.3__tar.gz

{dycw_utilities-0.151.1 → dycw_utilities-0.151.3}/PKG-INFO

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

{dycw_utilities-0.151.1 → dycw_utilities-0.151.3}/pyproject.toml

@@ -232,7 +232,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.151.1"
+version = "0.151.3"
 
 [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.1"
+current_version = "0.151.3"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.151.1 → dycw_utilities-0.151.3}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.151.1"
+__version__ = "0.151.3"

{dycw_utilities-0.151.1 → dycw_utilities-0.151.3}/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.1 → dycw_utilities-0.151.3}/src/utilities/types.py

@@ -2,7 +2,15 @@ from __future__ import annotations
 
 import datetime as dt
 from asyncio import Event
-from collections.abc import Callable, Coroutine, Hashable, Iterable, Mapping, Sequence
+from collections.abc import (
+    Callable,
+    Collection,
+    Coroutine,
+    Hashable,
+    Iterable,
+    Mapping,
+    Sequence,
+)
 from enum import Enum
 from ipaddress import IPv4Address, IPv6Address
 from logging import Logger
@@ -115,12 +123,20 @@ IPv6AddressLike = MaybeStr[IPv6Address]
 
 
 # iterables
-type MaybeIterable[T] = T | Iterable[T]
 type IterableHashable[T: Hashable] = tuple[T, ...] | frozenset[T]
+type MaybeCollection[T] = T | Collection[T]
+type MaybeIterableHashable[T: Hashable] = T | IterableHashable[T]
+type MaybeIterable[T] = T | Iterable[T]
 type MaybeList[T] = T | list[T]
-type MaybeListStr = MaybeList[str]
 type MaybeSequence[T] = T | Sequence[T]
-type MaybeIterableHashable[T: Hashable] = T | IterableHashable[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
@@ -283,12 +299,15 @@ __all__ = [
     "MaybeCallablePathLike",
     "MaybeCallableStr",
     "MaybeCallableZonedDateTime",
+    "MaybeCollection",
+    "MaybeCollectionStr",
     "MaybeCoro",
     "MaybeIterable",
     "MaybeIterableHashable",
     "MaybeList",
     "MaybeListStr",
     "MaybeSequence",
+    "MaybeSequenceStr",
     "MaybeStr",
     "MaybeType",
     "MonthDayLike",
@@ -302,6 +321,7 @@ __all__ = [
     "PatternLike",
     "PlainDateTimeLike",
     "Seed",
+    "SequenceStr",
     "SerializeObjectExtra",
     "Sign",
     "StrMapping",