dayhoff-tools 1.5.9__py3-none-any.whl → 1.6.1__py3-none-any.whl

dayhoff_tools/cli/engine_commands.py

@@ -1477,27 +1477,49 @@ def create_ami(
             for s in attached_studios:
                 console.print(f"  • {s['user']} ({s['studio_id']})")
 
+            detach_failed = []
             for s in attached_studios:
                 resp = make_api_request("POST", f"/studios/{s['studio_id']}/detach")
                 if resp.status_code != 200:
+                    # Check if actually detached despite error
+                    time.sleep(2)
+                    check_resp = make_api_request("GET", f"/studios/{s['studio_id']}")
+                    if check_resp.status_code == 200:
+                        studio_data = check_resp.json()
+                        if studio_data.get("status") == "available":
+                            console.print(
+                                f"  [yellow]⚠ {s['studio_id']} reported error but is detached[/yellow]"
+                            )
+                            continue  # It's actually detached, continue
+                    
                     console.print(
-                        f"[red]❌ Failed to detach {s['studio_id']} – aborting.[/red]"
+                        f"  [red]❌ Failed to detach {s['studio_id']}[/red]"
                     )
-                    return
+                    detach_failed.append(s['studio_id'])
+
+            if detach_failed:
+                console.print(
+                    f"[red]Failed to detach {len(detach_failed)} studio(s). Aborting AMI creation.[/red]"
+                )
+                return
 
             # Wait briefly for volumes to become available (max 2 min)
             # (time is already imported at module level)
             ec2_wait = boto3.client("ec2", region_name="us-east-1")
             vol_ids = [s["studio_id"] for s in attached_studios]
             console.print("Waiting for volumes to detach…")
-            waiter = ec2_wait.get_waiter("volume_available")
-            try:
-                waiter.wait(
-                    VolumeIds=vol_ids, WaiterConfig={"Delay": 5, "MaxAttempts": 24}
-                )
-            except Exception:
+            
+            # Check volume states directly instead of using waiter
+            for attempt in range(24):  # Max 2 minutes
+                time.sleep(5)
+                volumes = ec2_wait.describe_volumes(VolumeIds=vol_ids)["Volumes"]
+                all_available = all(v["State"] == "available" for v in volumes)
+                if all_available:
+                    console.print("[green]✓ All studios detached[/green]")
+                    break
+            else:
                 console.print(
-                    "[yellow]Proceeding even though some volumes may still be detaching.[/yellow]"
+                    "[yellow]⚠ Some volumes may still be detaching, but proceeding...[/yellow]"
                 )
 
         # Create the AMI

{dayhoff_tools-1.5.9.dist-info → dayhoff_tools-1.6.1.dist-info}/METADATA

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

{dayhoff_tools-1.5.9.dist-info → dayhoff_tools-1.6.1.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=RSbZK2hN3bTBQrZxAgooqMsqSiw0hnhmzTVkL44xdD4,97147
+dayhoff_tools/cli/engine_commands.py,sha256=iZdl1eyJqwGVVm0vukY8sbnMv_k7CaesdnGBjE3cF0c,98283
 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.5.9.dist-info/METADATA,sha256=mGdK_rLBA7HwjkUI7e2sQ5oGExLsBU8A-GIBD9-xyaM,2914
-dayhoff_tools-1.5.9.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.5.9.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.5.9.dist-info/RECORD,,
+dayhoff_tools-1.6.1.dist-info/METADATA,sha256=HL_pHrcjy_JbaTdP8O0mAP0xUzrEDp7VWpcFfuWwzbM,2914
+dayhoff_tools-1.6.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.6.1.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.6.1.dist-info/RECORD,,