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

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

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

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

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

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

@@ -29,6 +29,10 @@ _TERMINAL_STATUSES = frozenset({
     "cancelled",
 })
 _POLL_INTERVAL_S = 5.0
+# Harbor often returns 201 minutes after Docker's header timeout. Wait
+# before the next docker push so the blob can be skipped instead of
+# starting a second multi-GB PUT while the first commit is still running.
+_TRANSIENT_PUSH_BACKOFF_S = (120, 240, 360)
 _DEFAULT_TIMEOUT_S = 3600.0
 
 
@@ -189,12 +193,19 @@ 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:
+            if (
+                is_transient_push_error(str(exc))
+                and transient_attempts < len(_TRANSIENT_PUSH_BACKOFF_S)
+            ):
+                wait = _TRANSIENT_PUSH_BACKOFF_S[transient_attempts]
                 transient_attempts += 1
+                print(f"Push interrupted: {exc}")
                 print(
-                    f"Push interrupted ({exc}); retrying the same repository "
-                    f"({transient_attempts}/3)..."
+                    f"Harbor may still be committing the layer. Waiting {wait}s, "
+                    f"then retrying the same repository "
+                    f"({transient_attempts}/{len(_TRANSIENT_PUSH_BACKOFF_S)})..."
                 )
+                time.sleep(wait)
                 continue
             print(str(exc))
             return None

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

@@ -41,6 +41,17 @@ def is_transient_push_error(message: str) -> bool:
     return any(marker in lower for marker in _TRANSIENT_PUSH_MARKERS)
 
 
+def _push_command(ref: str) -> list:
+    """``docker push`` args. Docker 25+ dropped ``--max-concurrent-uploads``."""
+    help_out = _docker(["push", "--help"])
+    help_text = (help_out.stdout or b"").decode() + (help_out.stderr or b"").decode()
+    args = ["docker", "push"]
+    if "--max-concurrent-uploads" in help_text:
+        args.append("--max-concurrent-uploads=1")
+    args.append(ref)
+    return args
+
+
 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)
@@ -96,7 +107,7 @@ def push_image(
                 raise PushFailed(f"docker login failed: {stderr[:300]}")
 
             push = subprocess.Popen(
-                ["docker", "push", "--max-concurrent-uploads=1", ref],
+                _push_command(ref),
                 stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env, text=True,
             )
             digest, last_lines = None, []

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

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

socaity_cli-0.1.6/test/test_registry_push.py

@@ -0,0 +1,32 @@
+from socaity_cli.registry_push import _push_command, 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("")
+
+
+def test_push_command_omits_unknown_max_concurrent_flag(monkeypatch):
+    class _Help:
+        stdout = b"Usage:  docker push [OPTIONS] NAME[:TAG]\n"
+        stderr = b""
+
+    monkeypatch.setattr("socaity_cli.registry_push._docker", lambda args, **kwargs: _Help())
+    assert _push_command("harbor.example/repo:tag") == ["docker", "push", "harbor.example/repo:tag"]
+
+
+def test_push_command_uses_max_concurrent_when_supported(monkeypatch):
+    class _Help:
+        stdout = b"      --max-concurrent-uploads int   Max concurrent uploads\n"
+        stderr = b""
+
+    monkeypatch.setattr("socaity_cli.registry_push._docker", lambda args, **kwargs: _Help())
+    assert _push_command("harbor.example/repo:tag") == [
+        "docker", "push", "--max-concurrent-uploads=1", "harbor.example/repo:tag",
+    ]

socaity_cli-0.1.4/test/test_registry_push.py

@@ -1,12 +0,0 @@
-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("")