dayhoff-tools 1.6.6__py3-none-any.whl → 1.6.8__py3-none-any.whl

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

@@ -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.dist-info → dayhoff_tools-1.6.8.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=7wjf_LN2Woa3cZPcyG7nBY6w-vDTqVGj3JvQCU1nXxM,94059
+dayhoff_tools/cli/engine_commands.py,sha256=_S1JZHB_7qWXpae_eeILSTiN3lOd3-zluJGb4eiVlTU,95816
 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.6.dist-info/METADATA,sha256=UG7p9G_i-15hK8hWyeWmY8Sg3rvLoNjKQTt3VyprOpQ,2914
-dayhoff_tools-1.6.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.6.6.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.6.6.dist-info/RECORD,,
+dayhoff_tools-1.6.8.dist-info/METADATA,sha256=V5sgvfjlpSA4Lhk-i9SHA0G5lkiHtKp5SSngi_ovVhA,2914
+dayhoff_tools-1.6.8.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.6.8.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.6.8.dist-info/RECORD,,