socaity-cli 0.1.3__tar.gz → 0.1.4__tar.gz

{socaity_cli-0.1.3 → socaity_cli-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: socaity-cli
-Version: 0.1.3
+Version: 0.1.4
 Summary: Socaity platform CLI: login, catalog browsing, SDK installs and APIPod deployment commands.
 Author: SocAIty
 License: MIT

{socaity_cli-0.1.3 → socaity_cli-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "socaity-cli"
-version = "0.1.3"
+version = "0.1.4"
 description = "Socaity platform CLI: login, catalog browsing, SDK installs and APIPod deployment commands."
 requires-python = ">=3.8"
 authors = [

{socaity_cli-0.1.3 → socaity_cli-0.1.4}/socaity_cli/deployment.py

@@ -17,6 +17,7 @@ from socaity_cli.registry_push import (
     DockerNotAvailable,
     PushFailed,
     image_size_bytes,
+    is_transient_push_error,
     push_image,
 )
 
@@ -160,7 +161,9 @@ def push_image_to_registry(
         print("Could not obtain registry push credentials.")
         return None
 
-    for attempt in range(2):
+    refreshed = False
+    transient_attempts = 0
+    while True:
         try:
             digest, _size = push_image(
                 registry=creds["registry"],
@@ -172,12 +175,13 @@ def push_image_to_registry(
             )
             return digest
         except CredentialsExpired:
-            if attempt == 0:
+            if not refreshed:
                 print("Push credentials expired; requesting fresh credentials...")
                 creds = client.get_push_credentials(deployment_id, estimated_size_bytes=estimated_size)
                 if creds is None:
                     print("Could not refresh registry push credentials.")
                     return None
+                refreshed = True
                 continue
             print("Registry rejected the push credentials again.")
             return None
@@ -185,9 +189,15 @@ def push_image_to_registry(
             print(str(exc))
             return None
         except PushFailed as exc:
+            if is_transient_push_error(str(exc)) and transient_attempts < 2:
+                transient_attempts += 1
+                print(
+                    f"Push interrupted ({exc}); retrying the same repository "
+                    f"({transient_attempts}/3)..."
+                )
+                continue
             print(str(exc))
             return None
-    return None
 
 
 def poll_deployment_until_terminal(

{socaity_cli-0.1.3 → socaity_cli-0.1.4}/socaity_cli/registry_push.py

@@ -13,6 +13,14 @@ import tempfile
 from typing import Optional, Tuple
 
 _DIGEST_RE = re.compile(r"digest:\s*(sha256:[0-9a-f]{64})")
+_TRANSIENT_PUSH_MARKERS = (
+    "timeout",
+    "eof",
+    "disconnected",
+    "connection reset",
+    "tls handshake",
+    "unexpected eof",
+)
 
 
 class DockerNotAvailable(RuntimeError):
@@ -27,6 +35,12 @@ class PushFailed(RuntimeError):
     """Any other push failure; message is safe to print."""
 
 
+def is_transient_push_error(message: str) -> bool:
+    """True when a docker push failed due to a drop or header timeout, not auth."""
+    lower = (message or "").lower()
+    return any(marker in lower for marker in _TRANSIENT_PUSH_MARKERS)
+
+
 def _docker(args: list, *, env: Optional[dict] = None, input_bytes: Optional[bytes] = None) -> subprocess.CompletedProcess:
     try:
         return subprocess.run(["docker", *args], capture_output=True, env=env, input=input_bytes)
@@ -82,7 +96,7 @@ def push_image(
                 raise PushFailed(f"docker login failed: {stderr[:300]}")
 
             push = subprocess.Popen(
-                ["docker", "push", ref],
+                ["docker", "push", "--max-concurrent-uploads=1", ref],
                 stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env, text=True,
             )
             digest, last_lines = None, []

{socaity_cli-0.1.3 → socaity_cli-0.1.4}/socaity_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: socaity-cli
-Version: 0.1.3
+Version: 0.1.4
 Summary: Socaity platform CLI: login, catalog browsing, SDK installs and APIPod deployment commands.
 Author: SocAIty
 License: MIT

{socaity_cli-0.1.3 → socaity_cli-0.1.4}/socaity_cli.egg-info/SOURCES.txt

@@ -30,4 +30,5 @@ socaity_cli/clients/projects.py
 socaity_cli/clients/sdk_install.py
 test/test_cli.py
 test/test_credentials.py
-test/test_private_slot_error.py
+test/test_private_slot_error.py
+test/test_registry_push.py

socaity_cli-0.1.4/test/test_registry_push.py

@@ -0,0 +1,12 @@
+from socaity_cli.registry_push import is_transient_push_error
+
+
+def test_is_transient_push_error_matches_harbor_timeouts():
+    assert is_transient_push_error(
+        'docker push failed: timeout awaiting response headers'
+    )
+    assert is_transient_push_error("client disconnected during blob PUT")
+    assert is_transient_push_error("unexpected EOF")
+    assert is_transient_push_error("connection reset by peer")
+    assert not is_transient_push_error("denied: requested access to the resource is denied")
+    assert not is_transient_push_error("")