dayhoff-tools 1.6.12__tar.gz → 1.6.14__tar.gz

{dayhoff_tools-1.6.12 → dayhoff_tools-1.6.14}/PKG-INFO

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

{dayhoff_tools-1.6.12 → dayhoff_tools-1.6.14}/dayhoff_tools/cli/engine_commands.py

@@ -1610,6 +1610,36 @@ def studio_status(
     console.print(panel)
 
 
+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.
+    """
+    # First try the per-studio endpoint – fastest.
+    resp = make_api_request("GET", f"/studios/{target_studio_id}")
+    if resp.status_code == 200:
+        data = resp.json()
+        if (
+            data.get("status") == "in-use"
+            and data.get("attached_vm_id") == target_vm_id
+        ):
+            return True
+    # Fallback: list + filter (covers edge-cases where the direct endpoint
+    # is slower to update IAM/APIGW mapping than the list endpoint).
+    list_resp = make_api_request("GET", "/studios")
+    if list_resp.status_code == 200:
+        for stu in list_resp.json().get("studios", []):
+            if (
+                stu.get("studio_id") == target_studio_id
+                and stu.get("status") == "in-use"
+                and stu.get("attached_vm_id") == target_vm_id
+            ):
+                return True
+    return False
+
+
 @studio_app.command("attach")
 def attach_studio(
     engine_name_or_id: str = typer.Argument(help="Engine name or instance ID"),
@@ -1710,36 +1740,6 @@ 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.
-        """
-        # First try the per-studio endpoint – fastest.
-        resp = make_api_request("GET", f"/studios/{target_studio_id}")
-        if resp.status_code == 200:
-            data = resp.json()
-            if (
-                data.get("status") == "in-use"
-                and data.get("attached_vm_id") == target_vm_id
-            ):
-                return True
-        # Fallback: list + filter (covers edge-cases where the direct endpoint
-        # is slower to update IAM/APIGW mapping than the list endpoint).
-        list_resp = make_api_request("GET", "/studios")
-        if list_resp.status_code == 200:
-            for stu in list_resp.json().get("studios", []):
-                if (
-                    stu.get("studio_id") == target_studio_id
-                    and stu.get("status") == "in-use"
-                    and stu.get("attached_vm_id") == target_vm_id
-                ):
-                    return True
-        return False
-
     # 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
@@ -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

{dayhoff_tools-1.6.12 → dayhoff_tools-1.6.14}/pyproject.toml

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