dayhoff-tools 1.6.5__tar.gz → 1.6.7__tar.gz

{dayhoff_tools-1.6.5 → dayhoff_tools-1.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dayhoff-tools
-Version: 1.6.5
+Version: 1.6.7
 Summary: Common tools for all the repos at Dayhoff Labs
 Author: Daniel Martin-Alarcon
 Author-email: dma@dayhofflabs.com

{dayhoff_tools-1.6.5 → dayhoff_tools-1.6.7}/dayhoff_tools/cli/engine_commands.py

@@ -1710,6 +1710,23 @@ def attach_studio(
 
     console.print(f"Attaching studio to engine [cyan]{engine['name']}[/cyan]...")
 
+    # Helper --------------------------------------------------------------
+    def _is_studio_attached(target_studio_id: str, target_vm_id: str) -> bool:
+        """Return True when the given studio already shows as attached to the VM.
+
+        Using this extra check lets us stop the outer retry loop as soon as the
+        asynchronous attach operation actually finishes, even in the unlikely
+        event that the operation-tracking DynamoDB record is not yet updated.
+        """
+        resp = make_api_request("GET", f"/studios/{target_studio_id}")
+        if resp.status_code != 200:
+            return False
+        data = resp.json()
+        return (
+            data.get("status") == "in-use"
+            and data.get("attached_vm_id") == target_vm_id
+        )
+
     # Determine retry strategy based on whether we just started the engine
     if engine_started_now:
         max_attempts = 40  # About 7 minutes total with exponential backoff
@@ -1734,6 +1751,12 @@ def attach_studio(
         last_error = None
 
         for attempt in range(max_attempts):
+            # If the attach already completed in the previous iteration (but we
+            # didn't notice because the operation table wasn’t updated yet),
+            # bail out early.
+            if _is_studio_attached(studio["studio_id"], engine["instance_id"]):
+                success = True
+                break
             success, error_msg = _attempt_studio_attach(
                 studio, engine, target_user, public_key
             )
@@ -1860,27 +1883,40 @@ def _attempt_studio_attach(studio, engine, target_user, public_key):
 
 
 def _poll_operation(operation_id: str, timeout: int = 600) -> Tuple[bool, str]:
-    """Poll /operations/<id> until COMPLETED or FAILED.
+    """Poll `/operations/<id>` until it reports COMPLETED or FAILED.
 
-    Returns (True, "") on success or (False, error_message) on failure / timeout.
-    Uses a simple status spinner to avoid nested Live displays.
+    Returns (True, "") on success or (False, error_message) on failure or
+    timeout.
+
+    IMPORTANT: This helper deliberately *avoids* creating its own Rich Live/
+    spinner so that it can be called from inside another Progress/Live context
+    (the outer "Attaching studio…" progress bar).  Nested Live renderables lead
+    to constant hide/show repaint cycles, which is what caused the flickering
+    the user observed.
     """
     start_ts = time.time()
-    with console.status("[cyan]Waiting for studio attach to complete…", spinner="dots") as status:
-        while True:
-            if time.time() - start_ts > timeout:
-                return False, "Timed out waiting for attach operation to complete"
-            op_resp = make_api_request("GET", f"/operations/{operation_id}")
-            if op_resp.status_code != 200:
-                return False, f"Failed to fetch operation status (HTTP {op_resp.status_code})"
-            data = op_resp.json()
-            op_status = data.get("status")
-            if op_status == "COMPLETED":
-                return True, ""
-            if op_status == "FAILED":
-                return False, data.get("error", "Operation failed")
-            # keep spinner steady – no constant message updates
-            time.sleep(3)
+    while True:
+        # ---- timeout guard -------------------------------------------------
+        if time.time() - start_ts > timeout:
+            return False, "Timed out waiting for attach operation to complete"
+
+        # ---- fetch status ---------------------------------------------------
+        op_resp = make_api_request("GET", f"/operations/{operation_id}")
+        if op_resp.status_code != 200:
+            return False, (
+                f"Failed to fetch operation status (HTTP {op_resp.status_code})"
+            )
+        data = op_resp.json()
+        op_status = data.get("status")
+
+        # ---- interpret state -----------------------------------------------
+        if op_status == "COMPLETED":
+            return True, ""
+        if op_status == "FAILED":
+            return False, data.get("error", "Operation failed")
+
+        # Not finished yet – wait a little and poll again (no live spinner)
+        time.sleep(3)
     
 
 @studio_app.command("detach")

{dayhoff_tools-1.6.5 → dayhoff_tools-1.6.7}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "dayhoff-tools"
-version = "1.6.5"
+version = "1.6.7"
 description = "Common tools for all the repos at Dayhoff Labs"
 authors = [
     {name = "Daniel Martin-Alarcon", email = "dma@dayhofflabs.com"}