dayhoff-tools 1.6.9__py3-none-any.whl → 1.6.11__py3-none-any.whl

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.dist-info → dayhoff_tools-1.6.11.dist-info}/METADATA

@@ -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.dist-info → dayhoff_tools-1.6.11.dist-info}/RECORD

@@ -3,7 +3,7 @@ dayhoff_tools/chemistry/standardizer.py,sha256=uMn7VwHnx02nc404eO6fRuS4rsl4dvSPf
 dayhoff_tools/chemistry/utils.py,sha256=jt-7JgF-GeeVC421acX-bobKbLU_X94KNOW24p_P-_M,2257
 dayhoff_tools/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dayhoff_tools/cli/cloud_commands.py,sha256=33qcWLmq-FwEXMdL3F0OHm-5Stlh2r65CldyEZgQ1no,40904
-dayhoff_tools/cli/engine_commands.py,sha256=YIuMs1dgZ4a8MGE20E1pdXSND7JfB-GDUam-PqCR4c8,96415
+dayhoff_tools/cli/engine_commands.py,sha256=ssaYgeQDa3vWbPBlHxZdDPtJpfArZZ7POb6eJBKHong,97240
 dayhoff_tools/cli/main.py,sha256=tRN7WCBHg6uyNp6rA54pKTCoVmBntta2i0Yas3bUpZ4,4853
 dayhoff_tools/cli/swarm_commands.py,sha256=5EyKj8yietvT5lfoz8Zx0iQvVaNgc3SJX1z2zQR6o6M,5614
 dayhoff_tools/cli/utility_commands.py,sha256=FRZTPrjsG_qmIIqoNxd1Q1vVkS_5w8aY33IrVYVNCLg,18131
@@ -27,7 +27,7 @@ dayhoff_tools/intake/uniprot.py,sha256=BZYJQF63OtPcBBnQ7_P9gulxzJtqyorgyuDiPeOJq
 dayhoff_tools/logs.py,sha256=DKdeP0k0kliRcilwvX0mUB2eipO5BdWUeHwh-VnsICs,838
 dayhoff_tools/sqlite.py,sha256=jV55ikF8VpTfeQqqlHSbY8OgfyfHj8zgHNpZjBLos_E,18672
 dayhoff_tools/warehouse.py,sha256=heaYc64qplgN3_1WVPFmqj53goStioWwY5NqlWc4c0s,24453
-dayhoff_tools-1.6.9.dist-info/METADATA,sha256=mprj_aYEKyRIruTqy290fO5vdTQK4VoeY-OLPvbBpmw,2914
-dayhoff_tools-1.6.9.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.6.9.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.6.9.dist-info/RECORD,,
+dayhoff_tools-1.6.11.dist-info/METADATA,sha256=puTF_Rt1kbAL-R8hz0BpxBjNacbGcJlACatfMSsSwgU,2915
+dayhoff_tools-1.6.11.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.6.11.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.6.11.dist-info/RECORD,,