dayhoff-tools 1.6.6__tar.gz → 1.6.8__tar.gz

{dayhoff_tools-1.6.6 → dayhoff_tools-1.6.8}/PKG-INFO

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

{dayhoff_tools-1.6.6 → dayhoff_tools-1.6.8}/dayhoff_tools/cli/engine_commands.py

@@ -1710,6 +1710,36 @@ 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
@@ -1734,6 +1764,12 @@ def attach_studio(
         last_error = None
 
         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),
+            # bail out early.
+            if _is_studio_attached(studio["studio_id"], engine["instance_id"]):
+                success = True
+                break
             success, error_msg = _attempt_studio_attach(
                 studio, engine, target_user, public_key
             )

{dayhoff_tools-1.6.6 → dayhoff_tools-1.6.8}/pyproject.toml

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