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

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

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

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

@@ -1765,16 +1765,21 @@ def attach_studio(
 
         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),
+            # didn't notice because the operation table wasn't updated yet),
             # bail out early.
             if _is_studio_attached(studio["studio_id"], engine["instance_id"]):
+                console.print("[dim]DEBUG: Studio already attached (detected by _is_studio_attached)[/dim]")
                 success = True
                 break
+            
+            console.print(f"[dim]DEBUG: Attempt {attempt + 1}/{max_attempts}[/dim]")
             success, error_msg = _attempt_studio_attach(
                 studio, engine, target_user, public_key
             )
+            console.print(f"[dim]DEBUG: Attempt result: success={success}, error_msg={error_msg}[/dim]")
 
             if success:
+                console.print("[dim]DEBUG: Success! Breaking out of retry loop[/dim]")
                 break  # success!
 
             if error_msg:
@@ -1846,8 +1851,17 @@ def _attempt_studio_attach(studio, engine, target_user, public_key):
         },
     )
 
+    # DEBUG: Log what we're getting back
+    console.print(f"[dim]DEBUG: Attach response: {response.status_code}[/dim]")
+    if response.status_code not in (200, 202):
+        try:
+            console.print(f"[dim]DEBUG: Error: {response.json().get('error', 'No error field')}[/dim]")
+        except:
+            console.print(f"[dim]DEBUG: Could not parse error response[/dim]")
+
     # Fast-path success
     if response.status_code == 200:
+        console.print("[dim]DEBUG: Got 200 - immediate success[/dim]")
         return True, None
 
     # Asynchronous path – API returned 202 Accepted and operation tracking ID
@@ -1855,40 +1869,38 @@ def _attempt_studio_attach(studio, engine, target_user, public_key):
         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
 
     # --- determine if we should retry ---
     recoverable = False
+    error_text = response.json().get("error", "Unknown error")
+    err_msg = error_text.lower()
+    
+    # Check for "Studio is not available (status: in-use)" which means it's already attached
+    if response.status_code == 400 and "not available" in err_msg and "in-use" in err_msg:
+        # Studio is already attached somewhere - check if it's to THIS engine
+        if _is_studio_attached(studio["studio_id"], engine["instance_id"]):
+            return True, None  # It's attached to our target engine - success!
+        else:
+            return False, error_text  # It's attached elsewhere - fatal error
+    
     if response.status_code in (409, 503):
-        # Special-case: 409 because studio is already in-use. If it's attached to
-        # *this* engine we can safely treat it as success.
-        if response.status_code == 409:
-            try:
-                err_text = response.json().get("error", "").lower()
-            except Exception:
-                err_text = ""
-            # Fast path – avoid another API call when we know why we got 409.
-            if "in-use" in err_text or "already attached" in err_text:
-                if _is_studio_attached(studio["studio_id"], engine["instance_id"]):
-                    return True, None
         recoverable = True
     else:
-        err_msg = response.json().get("error", "").lower()
         RECOVERABLE_PATTERNS = [
             "not ready",
             "still starting",
             "initializing",
             "failed to mount",
             "device busy",
-            "not available",
             "pending",  # VM state pending
         ]
         FATAL_PATTERNS = [
-            "in-use",
-            "already attached",
             "permission",
         ]
         if any(p in err_msg for p in FATAL_PATTERNS):
@@ -1896,8 +1908,6 @@ def _attempt_studio_attach(studio, engine, target_user, public_key):
         elif any(p in err_msg for p in RECOVERABLE_PATTERNS):
             recoverable = True
 
-    error_text = response.json().get("error", "Unknown error")
-
     if not recoverable:
         # fatal – abort immediately
         return False, error_text

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

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