dycw-utilities 0.148.2__py3-none-any.whl → 0.148.4__py3-none-any.whl

{dycw_utilities-0.148.2.dist-info → dycw_utilities-0.148.4.dist-info}/METADATA

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

{dycw_utilities-0.148.2.dist-info → dycw_utilities-0.148.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=m_DwQBDM6mu20FbZm09EDxCL3F1uosm2-eDTmVZa6FI,60
+utilities/__init__.py,sha256=VDgRGy8SY-uljlJ76REYaNomUoE5yqIY42dKSUSpjuY,60
 utilities/altair.py,sha256=92E2lCdyHY4Zb-vCw6rEJIsWdKipuu-Tu2ab1ufUfAk,9079
 utilities/asyncio.py,sha256=z0w3fb-U5Ml5YXVaFFPClizXaQmjDO6YgZg-V9QL0VQ,16021
 utilities/atomicwrites.py,sha256=xcOWenTBRS0oat3kg7Sqe51AohNThMQ2ixPL7QCG8hw,5795
@@ -48,7 +48,7 @@ utilities/pickle.py,sha256=MBT2xZCsv0pH868IXLGKnlcqNx2IRVKYNpRcqiQQqxw,653
 utilities/platform.py,sha256=Ue9LSxYvg9yUXGKuz5aZoy_qkUEXde-v6B09exgSctU,2813
 utilities/polars.py,sha256=BgiDryAVOapi41ddfJqN0wYh_sDj8BNEYtPB36LaHdo,71824
 utilities/polars_ols.py,sha256=Uc9V5kvlWZ5cU93lKZ-cfAKdVFFw81tqwLW9PxtUvMs,5618
-utilities/postgres.py,sha256=dbQrUFOoV6huNeuYTnSpNhSNq-QhXkBfrJPMtoAGJtY,7877
+utilities/postgres.py,sha256=Q1auvVqwUrIP6yhwvjCXg7zQbWgQ9czuJIa99eK6soM,8993
 utilities/pottery.py,sha256=w2X80PXWwzdHdqSYJP6ESrPNNDP3xzpyuJn-fp-Vt3M,5969
 utilities/pqdm.py,sha256=BTsYPtbKQWwX-iXF4qCkfPG7DPxIB54J989n83bXrIo,3092
 utilities/psutil.py,sha256=KUlu4lrUw9Zg1V7ZGetpWpGb9DB8l_SSDWGbANFNCPU,2104
@@ -88,8 +88,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.148.2.dist-info/METADATA,sha256=_L65zJDZ0YXSSVqa71OQZmXvlaAE9iDLJXYbiYP2wmM,1697
-dycw_utilities-0.148.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.148.2.dist-info/entry_points.txt,sha256=BOD_SoDxwsfJYOLxhrSXhHP_T7iw-HXI9f2WVkzYxvQ,135
-dycw_utilities-0.148.2.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.148.2.dist-info/RECORD,,
+dycw_utilities-0.148.4.dist-info/METADATA,sha256=VH2ptiCLL6fP3q4XBpXw-0nsTyTeHnHrxpuyT0A5tFE,1697
+dycw_utilities-0.148.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.148.4.dist-info/entry_points.txt,sha256=BOD_SoDxwsfJYOLxhrSXhHP_T7iw-HXI9f2WVkzYxvQ,135
+dycw_utilities-0.148.4.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.148.4.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.148.2"
+__version__ = "0.148.4"

utilities/postgres.py

@@ -5,17 +5,21 @@ from pathlib import Path
 from shutil import rmtree
 from typing import TYPE_CHECKING, Literal, assert_never, override
 
+from sqlalchemy import Table
+from sqlalchemy.orm import DeclarativeBase
+
 from utilities.asyncio import stream_command
 from utilities.iterables import always_iterable
 from utilities.logging import get_logger
 from utilities.os import temp_environ
-from utilities.sqlalchemy import TableOrORMInstOrClass, get_table_name
+from utilities.sqlalchemy import get_table_name
 from utilities.timer import Timer
 from utilities.types import PathLike
 
 if TYPE_CHECKING:
     from sqlalchemy import URL
 
+    from utilities.sqlalchemy import TableOrORMInstOrClass
     from utilities.types import LoggerOrName, MaybeListStr, MaybeSequence, PathLike
 
 
@@ -31,7 +35,10 @@ async def pg_dump(
     format_: _PGDumpFormat = "plain",
     jobs: int | None = None,
     schemas: MaybeListStr | None = None,
-    tables: MaybeSequence[TableOrORMInstOrClass] | None = None,
+    schemas_exc: MaybeListStr | None = None,
+    tables: MaybeSequence[TableOrORMInstOrClass | str] | None = None,
+    tables_exc: MaybeSequence[TableOrORMInstOrClass | str] | None = None,
+    inserts: bool = False,
     logger: LoggerOrName | None = None,
     dry_run: bool = False,
 ) -> None:
@@ -69,14 +76,22 @@ async def pg_dump(
         parts.append(f"--jobs={jobs}")
     if schemas is not None:
         parts.extend([f"--schema={s}" for s in always_iterable(schemas)])
+    if schemas_exc is not None:
+        parts.extend([f"--exclude-schema={s}" for s in always_iterable(schemas_exc)])
     if tables is not None:
-        parts.extend([f"--table={get_table_name(t)}" for t in always_iterable(tables)])
+        parts.extend([f"--table={_get_table_name(t)}" for t in always_iterable(tables)])
+    if tables_exc is not None:
+        parts.extend([
+            f"--exclude-table={_get_table_name(t)}" for t in always_iterable(tables_exc)
+        ])
+    if inserts:
+        parts.append("--inserts")
     if url.username is not None:
         parts.append(f"--username={url.username}")
     cmd = " ".join(parts)
     if dry_run:
         if logger is not None:
-            get_logger(logger=logger).info("Would run %r", str(path))
+            get_logger(logger=logger).info("Would run %r", str(cmd))
         return
     with temp_environ(PGPASSWORD=url.password), Timer() as timer:  # pragma: no cover
         try:
@@ -144,7 +159,8 @@ async def pg_restore(
     data_only: bool = False,
     jobs: int | None = None,
     schemas: MaybeListStr | None = None,
-    tables: MaybeSequence[TableOrORMInstOrClass] | None = None,
+    schemas_exc: MaybeListStr | None = None,
+    tables: MaybeSequence[TableOrORMInstOrClass | str] | None = None,
     logger: LoggerOrName | None = None,
     dry_run: bool = False,
 ) -> None:
@@ -174,7 +190,6 @@ async def pg_restore(
         "--exit-on-error",
         "--no-owner",
         "--no-privileges",
-        "--if-exists",
         # connection options
         f"--host={url.host}",
         f"--port={url.port}",
@@ -183,20 +198,22 @@ async def pg_restore(
     if data_only:
         parts.append("--data-only")
     else:
-        parts.append("--clean")
+        parts.extend(["--clean", "--if-exists"])
     if jobs is not None:
         parts.append(f"--jobs={jobs}")
     if schemas is not None:
         parts.extend([f"--schema={s}" for s in always_iterable(schemas)])
+    if schemas_exc is not None:
+        parts.extend([f"--exclude-schema={s}" for s in always_iterable(schemas_exc)])
     if tables is not None:
-        parts.extend([f"--table={get_table_name(t)}" for t in always_iterable(tables)])
+        parts.extend([f"--table={_get_table_name(t)}" for t in always_iterable(tables)])
     if url.username is not None:
         parts.append(f"--username={url.username}")
     parts.append(str(path))
     cmd = " ".join(parts)
     if dry_run:
         if logger is not None:
-            get_logger(logger=logger).info("Would run %r", str(path))
+            get_logger(logger=logger).info("Would run %r", str(cmd))
         return
     with temp_environ(PGPASSWORD=url.password), Timer() as timer:  # pragma: no cover
         try:
@@ -249,4 +266,18 @@ class _PGRestorePortError(PGRestoreError):
         return f"Expected URL to contain a 'port'; got {self.url}"
 
 
+##
+
+
+def _get_table_name(obj: TableOrORMInstOrClass | str, /) -> str:
+    """Get the table name from a Table or mapped class."""
+    match obj:
+        case Table() | DeclarativeBase() | type() as table_or_orm:
+            return get_table_name(table_or_orm)
+        case str() as name:
+            return name
+        case _ as never:
+            assert_never(never)
+
+
 __all__ = ["PGDumpError", "PGRestoreError", "pg_dump", "pg_restore"]