dycw-utilities 0.174.1__py3-none-any.whl → 0.174.2__py3-none-any.whl

{dycw_utilities-0.174.1.dist-info → dycw_utilities-0.174.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dycw-utilities
-Version: 0.174.1
+Version: 0.174.2
 Author: Derek Wan
 Author-email: Derek Wan <d.wan@icloud.com>
 Requires-Dist: atomicwrites>=1.4.1,<1.5

{dycw_utilities-0.174.1.dist-info → dycw_utilities-0.174.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=tLO7x-PFRNnbxnNKusLHsRm5KouG5gC6-6CMhoP9aSQ,60
+utilities/__init__.py,sha256=eQ7qF5gZG8QDtJhV_65EUYKkQ_P0qw2ExXVGxnEVcaU,60
 utilities/aeventkit.py,sha256=OmDBhYGgbsKrB7cdC5FFpJHUatX9O76eTeKVVTksp2Y,12673
 utilities/altair.py,sha256=rUK99g9x6CYDDfiZrf-aTx5fSRbL1Q8ctgKORowzXHg,9060
 utilities/asyncio.py,sha256=aJySVxBY0gqsIYnoNmH7-1r8djKuf4vSsU69VCD08t8,16772
@@ -80,7 +80,7 @@ utilities/sqlalchemy.py,sha256=HQYpd7LFxdTF5WYVWYtCJeEBI71EJm7ytvCGyAH9B-U,37163
 utilities/sqlalchemy_polars.py,sha256=JCGhB37raSR7fqeWV5dTsciRTMVzIdVT9YSqKT0piT0,13370
 utilities/statsmodels.py,sha256=koyiBHvpMcSiBfh99wFUfSggLNx7cuAw3rwyfAhoKpQ,3410
 utilities/string.py,sha256=shmBK87zZwzGyixuNuXCiUbqzfeZ9xlrFwz6JTaRvDk,582
-utilities/subprocess.py,sha256=8kGrQLnPnlbdXeWE7OPk9Pih2KBNyjBKbntdiloQVrY,13066
+utilities/subprocess.py,sha256=t_kbBQ7YG9LMBBpkqNcOWuhq6kwaLJBSlWRIn7rkWwY,15587
 utilities/tempfile.py,sha256=Lx6qa16lL1XVH6WdmD_G9vlN6gLI8nrIurxmsFkPKvg,3022
 utilities/testbook.py,sha256=j1KmaVbrX9VrbeMgtPh5gk55myAsn3dyRUn7jGbPbRk,1294
 utilities/text.py,sha256=7SvwcSR2l_5cOrm1samGnR4C-ZI6qyFLHLzSpO1zeHQ,13958
@@ -97,7 +97,7 @@ utilities/warnings.py,sha256=un1LvHv70PU-LLv8RxPVmugTzDJkkGXRMZTE2-fTQHw,1771
 utilities/whenever.py,sha256=F4ek0-OBWxHYrZdmoZt76N2RnNyKY5KrEHt7rqO4AQE,60183
 utilities/zipfile.py,sha256=24lQc9ATcJxHXBPc_tBDiJk48pWyRrlxO2fIsFxU0A8,699
 utilities/zoneinfo.py,sha256=tdIScrTB2-B-LH0ukb1HUXKooLknOfJNwHk10MuMYvA,3619
-dycw_utilities-0.174.1.dist-info/WHEEL,sha256=ZyFSCYkV2BrxH6-HRVRg3R9Fo7MALzer9KiPYqNxSbo,79
-dycw_utilities-0.174.1.dist-info/entry_points.txt,sha256=ykGI1ArwOPHqm2g5Cqh3ENdMxEej_a_FcOUov5EM5Oc,155
-dycw_utilities-0.174.1.dist-info/METADATA,sha256=olH83qMZVFRCSDboBVmfiiCV1d4hKdtVyvCFi6s1Gp0,1709
-dycw_utilities-0.174.1.dist-info/RECORD,,
+dycw_utilities-0.174.2.dist-info/WHEEL,sha256=ZyFSCYkV2BrxH6-HRVRg3R9Fo7MALzer9KiPYqNxSbo,79
+dycw_utilities-0.174.2.dist-info/entry_points.txt,sha256=ykGI1ArwOPHqm2g5Cqh3ENdMxEej_a_FcOUov5EM5Oc,155
+dycw_utilities-0.174.2.dist-info/METADATA,sha256=e3WUzrZEJzZU0tF6f8M2ZCOT6hyXaCaNo6MBp_K88pI,1709
+dycw_utilities-0.174.2.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.174.1"
+__version__ = "0.174.2"

utilities/subprocess.py

@@ -7,6 +7,7 @@ from pathlib import Path
 from string import Template
 from subprocess import PIPE, CalledProcessError, Popen
 from threading import Thread
+from time import sleep
 from typing import IO, TYPE_CHECKING, Literal, assert_never, overload
 
 from utilities.errors import ImpossibleCaseError
@@ -16,6 +17,8 @@ from utilities.text import strip_and_dedent
 if TYPE_CHECKING:
     from collections.abc import Iterator
 
+    from whenever import TimeDelta
+
     from utilities.types import LoggerLike, PathLike, StrMapping, StrStrMapping
 
 
@@ -300,6 +303,7 @@ def ssh(
     return_stdout: bool = False,
     return_stderr: bool = False,
     logger: LoggerLike | None = None,
+    retry: tuple[int, TimeDelta] | None = None,
 ) -> str: ...
 @overload
 def ssh(
@@ -318,6 +322,7 @@ def ssh(
     return_stdout: Literal[True],
     return_stderr: bool = False,
     logger: LoggerLike | None = None,
+    retry: tuple[int, TimeDelta] | None = None,
 ) -> str: ...
 @overload
 def ssh(
@@ -336,6 +341,7 @@ def ssh(
     return_stdout: bool = False,
     return_stderr: Literal[True],
     logger: LoggerLike | None = None,
+    retry: tuple[int, TimeDelta] | None = None,
 ) -> str: ...
 @overload
 def ssh(
@@ -354,7 +360,27 @@ def ssh(
     return_stdout: Literal[False] = False,
     return_stderr: Literal[False] = False,
     logger: LoggerLike | None = None,
+    retry: tuple[int, TimeDelta] | None = None,
 ) -> None: ...
+@overload
+def ssh(
+    user: str,
+    hostname: str,
+    /,
+    *cmd_and_cmds_or_args: str,
+    batch_mode: bool = True,
+    host_key_algorithms: list[str] = _HOST_KEY_ALGORITHMS,
+    strict_host_key_checking: bool = True,
+    input: str | None = None,
+    print: bool = False,
+    print_stdout: bool = False,
+    print_stderr: bool = False,
+    return_: bool = False,
+    return_stdout: bool = False,
+    return_stderr: bool = False,
+    logger: LoggerLike | None = None,
+    retry: tuple[int, TimeDelta] | None = None,
+) -> str | None: ...
 def ssh(
     user: str,
     hostname: str,
@@ -371,6 +397,7 @@ def ssh(
     return_stdout: bool = False,
     return_stderr: bool = False,
     logger: LoggerLike | None = None,
+    retry: tuple[int, TimeDelta] | None = None,
 ) -> str | None:
     cmd_and_args = ssh_cmd(  # skipif-ci
         user,
@@ -380,17 +407,61 @@ def ssh(
         host_key_algorithms=host_key_algorithms,
         strict_host_key_checking=strict_host_key_checking,
     )
-    return run(  # skipif-ci
-        *cmd_and_args,
-        input=input,
-        print=print,
-        print_stdout=print_stdout,
-        print_stderr=print_stderr,
-        return_=return_,
-        return_stdout=return_stdout,
-        return_stderr=return_stderr,
-        logger=logger,
-    )
+    try:  # skipif-ci
+        return run(
+            *cmd_and_args,
+            input=input,
+            print=print,
+            print_stdout=print_stdout,
+            print_stderr=print_stderr,
+            return_=return_,
+            return_stdout=return_stdout,
+            return_stderr=return_stderr,
+            logger=logger,
+        )
+    except CalledProcessError as error:  # skipif-ci
+        if retry is None:
+            raise
+        attempts, delta = retry
+        if attempts <= 0:
+            raise
+        if logger is not None:
+            msg = strip_and_dedent(f"""
+'ssh' failed with:
+ - user                     = {user}
+ - hostname                 = {hostname}
+ - cmd_and_cmds_or_args     = {cmd_and_cmds_or_args}
+ - batch_mode               = {batch_mode}
+ - host_key_algorithms      = {host_key_algorithms}
+ - strict_host_key_checking = {strict_host_key_checking}
+ - input                    = {input}
+
+-- stdout ---------------------------------------------------------------------
+{error.stdout}-------------------------------------------------------------------------------
+-- stderr ---------------------------------------------------------------------
+{error.stderr}-------------------------------------------------------------------------------
+
+Retrying {attempts} more time(s) after {delta}...
+""")
+            to_logger(logger).error(msg)
+        sleep(delta.in_seconds())
+        return ssh(
+            user,
+            hostname,
+            *cmd_and_cmds_or_args,
+            batch_mode=batch_mode,
+            host_key_algorithms=host_key_algorithms,
+            strict_host_key_checking=strict_host_key_checking,
+            input=input,
+            print=print,
+            print_stdout=print_stdout,
+            print_stderr=print_stderr,
+            return_=return_,
+            return_stdout=return_stdout,
+            return_stderr=return_stderr,
+            logger=logger,
+            retry=(attempts - 1, delta),
+        )
 
 
 def ssh_cmd(