dayhoff-tools 1.13.6__tar.gz → 1.13.8__tar.gz

{dayhoff_tools-1.13.6 → dayhoff_tools-1.13.8}/PKG-INFO

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

{dayhoff_tools-1.13.6 → dayhoff_tools-1.13.8}/dayhoff_tools/cli/engines_studios/engine_commands.py

@@ -69,11 +69,15 @@ def _update_ssh_config_silent(client: StudioManagerClient, env: str) -> bool:
             if state != "running":
                 continue
 
+            # Map environment to AWS profile
+            profile = f"{env}-devaccess"
+
             config_entries.append(f"\nHost {name}\n")
             config_entries.append(f"    HostName {instance_id}\n")
             config_entries.append(f"    User {user}\n")
+            config_entries.append(f"    ForwardAgent yes\n")
             config_entries.append(
-                f"    ProxyCommand aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p'\n"
+                f"    ProxyCommand aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p' --profile {profile}\n"
             )
 
         config_entries.append(managed_end)
@@ -213,46 +217,71 @@ def launch_engine(
 
     except Exception as e:
         error_msg = str(e)
-        
+
         # Check for quota/limit errors
         if "VcpuLimitExceeded" in error_msg or "vCPU limit" in error_msg:
             click.echo(f"✗ Failed to launch engine: vCPU quota exceeded", err=True)
             click.echo("", err=True)
-            click.echo(f"The {env} AWS account has insufficient vCPU quota for {engine_type} instances.", err=True)
+            click.echo(
+                f"The {env} AWS account has insufficient vCPU quota for {engine_type} instances.",
+                err=True,
+            )
             click.echo("", err=True)
             click.echo("Solutions:", err=True)
-            click.echo("  1. Use a different instance type (e.g., --type cpu)", err=True)
+            click.echo(
+                "  1. Use a different instance type (e.g., --type cpu)", err=True
+            )
             click.echo("  2. Request a quota increase:", err=True)
             click.echo("     • AWS Console → Service Quotas → Amazon EC2", err=True)
             click.echo("     • Find quota for the instance family", err=True)
-            click.echo("     • Request increase (typically approved within 24h)", err=True)
+            click.echo(
+                "     • Request increase (typically approved within 24h)", err=True
+            )
             click.echo("", err=True)
-            click.echo("For testing infrastructure, use CPU instances instead of GPU.", err=True)
+            click.echo(
+                "For testing infrastructure, use CPU instances instead of GPU.",
+                err=True,
+            )
             raise click.Abort()
-        
+
         # Check for insufficient capacity errors
         if "InsufficientInstanceCapacity" in error_msg:
-            click.echo(f"✗ Failed to launch engine: insufficient EC2 capacity", err=True)
+            click.echo(
+                f"✗ Failed to launch engine: insufficient EC2 capacity", err=True
+            )
             click.echo("", err=True)
-            click.echo(f"AWS does not have available {engine_type} capacity in your region/AZ.", err=True)
+            click.echo(
+                f"AWS does not have available {engine_type} capacity in your region/AZ.",
+                err=True,
+            )
             click.echo("", err=True)
             click.echo("Solutions:", err=True)
-            click.echo("  1. Try again in a few minutes (capacity fluctuates)", err=True)
+            click.echo(
+                "  1. Try again in a few minutes (capacity fluctuates)", err=True
+            )
             click.echo("  2. Use a different instance type", err=True)
             click.echo("  3. Contact AWS support for capacity reservations", err=True)
             raise click.Abort()
-        
+
         # Check for instance limit errors
-        if "InstanceLimitExceeded" in error_msg or "instance limit" in error_msg.lower():
+        if (
+            "InstanceLimitExceeded" in error_msg
+            or "instance limit" in error_msg.lower()
+        ):
             click.echo(f"✗ Failed to launch engine: instance limit exceeded", err=True)
             click.echo("", err=True)
-            click.echo(f"You have reached the maximum number of running instances in {env}.", err=True)
+            click.echo(
+                f"You have reached the maximum number of running instances in {env}.",
+                err=True,
+            )
             click.echo("", err=True)
             click.echo("Solutions:", err=True)
-            click.echo("  1. Terminate unused engines: dh engine2 list --env {env}", err=True)
+            click.echo(
+                "  1. Terminate unused engines: dh engine2 list --env {env}", err=True
+            )
             click.echo("  2. Request a limit increase via AWS Service Quotas", err=True)
             raise click.Abort()
-        
+
         # Generic error
         click.echo(f"✗ Failed to launch engine: {e}", err=True)
         raise click.Abort()
@@ -594,19 +623,24 @@ def engine_status(name_or_id: str, env: Optional[str]):
                     remaining = readiness["estimated_time_remaining_seconds"]
                     click.echo(f"Estimated Time Remaining: {remaining}s")
 
-        # Show attached studios (always, even without idle state)
-        attached_studios = status_data.get("attached_studios", [])
-        if attached_studios:
-            studio_names = ", ".join([f"\033[35m{s.get('user', 'unknown')}\033[0m" for s in attached_studios])
-            click.echo(f"\nAttached Studios: {studio_names}")
-        else:
-            click.echo(f"\nAttached Studios: None")
-        
         # Show idle state (only for running engines) - always detailed per user request
+        attached_studios = status_data.get("attached_studios", [])
         if status_data.get("idle_state"):
             click.echo(
                 f"\n{format_idle_state(status_data['idle_state'], detailed=True, attached_studios=attached_studios)}"
             )
+        else:
+            # If no idle state yet, still show attached studios
+            if attached_studios:
+                studio_names = ", ".join(
+                    [
+                        f"\033[35m{s.get('user', 'unknown')}\033[0m"
+                        for s in attached_studios
+                    ]
+                )
+                click.echo(f"\nAttached Studios: {studio_names}")
+            else:
+                click.echo(f"\nAttached Studios: None")
 
     except Exception as e:
         click.echo(f"✗ Error: {e}", err=True)
@@ -853,6 +887,7 @@ def config_ssh(clean: bool, all: bool, admin: bool, env: Optional[str]):
             config_entries.append(f"\nHost {name}\n")
             config_entries.append(f"    HostName {instance_id}\n")
             config_entries.append(f"    User {username}\n")
+            config_entries.append(f"    ForwardAgent yes\n")
             config_entries.append(
                 f"    ProxyCommand aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p' --profile {aws_profile}\n"
             )

{dayhoff_tools-1.13.6 → dayhoff_tools-1.13.8}/pyproject.toml

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