dayhoff-tools 1.5.9__tar.gz → 1.6.1__tar.gz

{dayhoff_tools-1.5.9 → dayhoff_tools-1.6.1}/PKG-INFO

@@ -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 → dayhoff_tools-1.6.1}/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 → dayhoff_tools-1.6.1}/pyproject.toml

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