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

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

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

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

@@ -1718,14 +1718,27 @@ def attach_studio(
         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:
-            return False
-        data = resp.json()
-        return (
-            data.get("status") == "in-use"
-            and data.get("attached_vm_id") == target_vm_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:
@@ -1850,6 +1863,17 @@ def _attempt_studio_attach(studio, engine, target_user, public_key):
     # --- determine if we should retry ---
     recoverable = False
     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()

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

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