dayhoff-tools 1.3.12__py3-none-any.whl → 1.3.14__py3-none-any.whl

dayhoff_tools/cli/engine_commands.py

@@ -959,6 +959,9 @@ def resize_engine(
     online: bool = typer.Option(
         False, "--online", help="Resize while running (requires manual filesystem expansion)"
     ),
+    force: bool = typer.Option(
+        False, "--force", "-f", help="Force resize and detach all studios"
+    ),
 ):
     """Resize an engine's boot disk."""
     check_aws_sso()
@@ -1024,29 +1027,68 @@ def resize_engine(
         resize_response = make_api_request(
             "POST", 
             f"/engines/{engine['instance_id']}/resize",
-            json_data={"size": size}
+            json_data={"size": size, "detach_studios": force}
         )
         
+        if resize_response.status_code == 409 and not force:
+            # Engine has attached studios
+            data = resize_response.json()
+            attached_studios = data.get("attached_studios", [])
+
+            console.print("\n[yellow]⚠️  This engine has attached studios:[/yellow]")
+            for studio in attached_studios:
+                console.print(f"  • {studio['user']} ({studio['studio_id']})")
+
+            if Confirm.ask("\nDetach all studios and resize the engine?"):
+                resize_response = make_api_request(
+                    "POST",
+                    f"/engines/{engine['instance_id']}/resize",
+                    json_data={"size": size, "detach_studios": True}
+                )
+            else:
+                console.print("Resize cancelled.")
+                return
+        
         if resize_response.status_code != 200:
             error = resize_response.json().get("error", "Unknown error")
             console.print(f"[red]❌ Failed to resize engine: {error}[/red]")
             raise typer.Exit(1)
         
-        # Wait for volume modification to complete
+        # Check if studios were detached
+        data = resize_response.json()
+        detached_studios = data.get("detached_studios", 0)
+        if detached_studios > 0:
+            console.print(f"[green]✓ Detached {detached_studios} studio(s) before resize[/green]")
+        
+        # Wait for modification to complete
         console.print("Waiting for volume modification to complete...")
         while True:
             mod_state = ec2.describe_volumes_modifications(VolumeIds=[root_volume_id])
             if not mod_state["VolumesModifications"]:
                 break  # Modification complete
-            state = mod_state["VolumesModifications"][0]["ModificationState"]
+            
+            modification = mod_state["VolumesModifications"][0]
+            state = modification["ModificationState"]
+            progress = modification.get("Progress", 0)
+            
+            # Show progress updates only for the resize phase
+            if state == "modifying":
+                console.print(f"[yellow]Progress: {progress}%[/yellow]")
+            
+            # Exit as soon as optimization starts (resize is complete)
+            if state == "optimizing":
+                console.print("[green]✓ Volume resized successfully[/green]")
+                console.print("[dim]AWS is optimizing the volume in the background (no action needed).[/dim]")
+                break
+            
             if state == "completed":
+                console.print("[green]✓ Volume resized successfully[/green]")
                 break
             elif state == "failed":
                 console.print("[red]❌ Volume modification failed[/red]")
                 raise typer.Exit(1)
-            time.sleep(5)
-        
-        console.print("[green]✓ Volume resized successfully[/green]")
+                
+            time.sleep(2)  # Check more frequently for better UX
         
         # If offline resize, start the instance back up
         if not online and engine["state"].lower() == "running":
@@ -1796,38 +1838,51 @@ def resize_studio(
     )
     
     if resize_response.status_code != 200:
-        # Add debugging to see the actual response
-        try:
-            error_body = resize_response.json()
-            error = error_body.get("error", "Unknown error")
-            console.print(f"[red]Debug: Full error response: {error_body}[/red]")
-        except Exception as e:
-            console.print(f"[red]Debug: Failed to parse error response: {e}[/red]")
-            console.print(f"[red]Debug: Raw response: {resize_response.text}[/red]")
-            error = "Unknown error"
-        
+        error = resize_response.json().get("error", "Unknown error")
         console.print(f"[red]❌ Failed to resize studio: {error}[/red]")
         raise typer.Exit(1)
     
     # Wait for volume modification to complete
     ec2 = boto3.client("ec2", region_name="us-east-1")
-    console.print("Waiting for volume modification to complete...")
+    console.print("Resizing volume...")
+    
+    # Track progress
+    last_progress = 0
+    
     while True:
         try:
             mod_state = ec2.describe_volumes_modifications(VolumeIds=[studio["studio_id"]])
             if not mod_state["VolumesModifications"]:
                 break  # Modification complete
-            state = mod_state["VolumesModifications"][0]["ModificationState"]
+            
+            modification = mod_state["VolumesModifications"][0]
+            state = modification["ModificationState"]
+            progress = modification.get("Progress", 0)
+            
+            # Show progress updates only for the resize phase
+            if state == "modifying" and progress > last_progress:
+                console.print(f"[yellow]Progress: {progress}%[/yellow]")
+                last_progress = progress
+            
+            # Exit as soon as optimization starts (resize is complete)
+            if state == "optimizing":
+                console.print(f"[green]✓ Studio resized successfully to {size}GB![/green]")
+                console.print("[dim]AWS is optimizing the volume in the background (no action needed).[/dim]")
+                break
+            
             if state == "completed":
+                console.print(f"[green]✓ Studio resized successfully to {size}GB![/green]")
                 break
             elif state == "failed":
                 console.print("[red]❌ Volume modification failed[/red]")
                 raise typer.Exit(1)
-            time.sleep(5)
+            
+            time.sleep(2)  # Check more frequently for better UX
+            
         except ClientError:
             # Modification might be complete
+            console.print(f"[green]✓ Studio resized successfully to {size}GB![/green]")
             break
     
-    console.print(f"[green]✓ Studio resized successfully to {size}GB![/green]")
     console.print("\n[dim]The filesystem will be automatically expanded when you next attach the studio.[/dim]")
     console.print(f"To attach: [cyan]dh studio attach <engine-name>[/cyan]")

{dayhoff_tools-1.3.12.dist-info → dayhoff_tools-1.3.14.dist-info}/METADATA

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

{dayhoff_tools-1.3.12.dist-info → dayhoff_tools-1.3.14.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=475Y-LaZVyAh085vELkz5j8M3wAI45w2T2vZBTufGr0,66847
+dayhoff_tools/cli/engine_commands.py,sha256=Oo_3I5gd8zP9esjUqwv2skL8Jz3KKd-DcYjCdV34FI8,69275
 dayhoff_tools/cli/main.py,sha256=rgeEHD9lJ8SBCR34BTLb7gVInHUUdmEBNXAJnq5yEU4,4795
 dayhoff_tools/cli/swarm_commands.py,sha256=5EyKj8yietvT5lfoz8Zx0iQvVaNgc3SJX1z2zQR6o6M,5614
 dayhoff_tools/cli/utility_commands.py,sha256=qs8vH9TBFHsOPC3X8cU3qZigM3dDn-2Ytq4o_F2WubU,27874
@@ -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=8YbnQ--usrEgDQGfvpV4MrMji55A0rq2hZaOgFGh6ag,15896
-dayhoff_tools-1.3.12.dist-info/METADATA,sha256=si_BtctF0Fv-X8JV-8OoEB1ZoCiYEC21MobJkZ3z_JI,2825
-dayhoff_tools-1.3.12.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.3.12.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.3.12.dist-info/RECORD,,
+dayhoff_tools-1.3.14.dist-info/METADATA,sha256=IkAuNoYuoRklhk6A6cgQl2x04MvK1AsirQixpV5rMs0,2825
+dayhoff_tools-1.3.14.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.3.14.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.3.14.dist-info/RECORD,,