dayhoff-tools 1.6.11__tar.gz → 1.6.13__tar.gz

{dayhoff_tools-1.6.11 → dayhoff_tools-1.6.13}/PKG-INFO

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

{dayhoff_tools-1.6.11 → dayhoff_tools-1.6.13}/dayhoff_tools/cli/engine_commands.py

@@ -1867,14 +1867,22 @@ def _attempt_studio_attach(studio, engine, target_user, public_key):
     # Asynchronous path – API returned 202 Accepted and operation tracking ID
     if response.status_code == 202:
         op_id = response.json().get("operation_id")
-        if not op_id:
-            return False, "Async operation started but no operation_id returned"
-        console.print(f"[dim]DEBUG: Got 202 - polling operation {op_id}[/dim]")
-        poll_ok, poll_err = _poll_operation(op_id)
-        console.print(f"[dim]DEBUG: Poll result: ok={poll_ok}, err={poll_err}[/dim]")
-        if poll_ok:
-            return True, None
-        return False, poll_err
+        console.print(f"[dim]DEBUG: Got 202 - operation {op_id} started[/dim]")
+        
+        # Instead of polling the operation status (which seems broken),
+        # just wait a bit and check if the studio is actually attached
+        # This is what dh studio status does and it works reliably
+        time.sleep(5)  # Give the async operation a moment to start
+        
+        # Now check periodically if the studio is attached
+        for check in range(20):  # Check for up to 60 seconds
+            if _is_studio_attached(studio["studio_id"], engine["instance_id"]):
+                console.print("[dim]DEBUG: Studio attachment detected via status check[/dim]")
+                return True, None
+            time.sleep(3)
+        
+        # If we get here, attachment didn't complete in reasonable time
+        return False, None  # Return None to trigger retry
 
     # --- determine if we should retry ---
     recoverable = False
@@ -1937,16 +1945,20 @@ def _poll_operation(operation_id: str, timeout: int = 600) -> Tuple[bool, str]:
         # ---- fetch status ---------------------------------------------------
         op_resp = make_api_request("GET", f"/operations/{operation_id}")
         if op_resp.status_code != 200:
+            console.print(f"[dim]DEBUG: Operation poll failed: HTTP {op_resp.status_code}[/dim]")
             return False, (
                 f"Failed to fetch operation status (HTTP {op_resp.status_code})"
             )
         data = op_resp.json()
         op_status = data.get("status")
+        console.print(f"[dim]DEBUG: Operation status: {op_status}[/dim]")
 
         # ---- interpret state -----------------------------------------------
         if op_status == "COMPLETED":
+            console.print("[dim]DEBUG: Operation completed successfully[/dim]")
             return True, ""
         if op_status == "FAILED":
+            console.print(f"[dim]DEBUG: Operation failed: {data.get('error', 'Operation failed')}[/dim]")
             return False, data.get("error", "Operation failed")
 
         # Not finished yet – wait a little and poll again (no live spinner)

{dayhoff_tools-1.6.11 → dayhoff_tools-1.6.13}/pyproject.toml

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