dayhoff-tools 1.3.12__tar.gz → 1.3.13__tar.gz

{dayhoff_tools-1.3.12 → dayhoff_tools-1.3.13}/PKG-INFO

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

{dayhoff_tools-1.3.12 → dayhoff_tools-1.3.13}/dayhoff_tools/cli/engine_commands.py

@@ -1032,21 +1032,35 @@ def resize_engine(
             console.print(f"[red]❌ Failed to resize engine: {error}[/red]")
             raise typer.Exit(1)
         
-        # Wait for volume modification to complete
+        # 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 +1810,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 → dayhoff_tools-1.3.13}/pyproject.toml

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