dayhoff-tools 1.5.8__py3-none-any.whl → 1.6.0__py3-none-any.whl

dayhoff_tools/cli/engine_commands.py

@@ -409,37 +409,35 @@ def update_ssh_config_entry(engine_name: str, instance_id: str, ssh_user: str, i
 
     # Read existing config
     content = config_path.read_text()
+    lines = content.splitlines() if content else []
 
-    # Create new entry
-    new_entry = f"""
-Host {engine_name} {SSH_MANAGED_COMMENT}
-    HostName {instance_id}
-    User {ssh_user}
-    ProxyCommand sh -c \"AWS_SSM_IDLE_TIMEOUT={idle_timeout} aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p'\"\n"""
-
-    # Check if entry already exists
-    host_line = f"Host {engine_name} {SSH_MANAGED_COMMENT}"
-    if host_line in content:
-        # Update existing entry
-        lines = content.splitlines()
-        new_lines = []
-        skip_count = 0
-        for line in lines:
-            if line.strip() == host_line.strip():
-                new_lines.extend(new_entry.strip().splitlines())
-                skip_count = 4  # Skip the next 4 lines (old entry)
-            elif skip_count > 0:
-                skip_count -= 1
-                continue
-            else:
-                new_lines.append(line)
-        content = "\n".join(new_lines)
-    else:
-        # Append new entry
-        content = content.rstrip() + "\n" + new_entry
+    # Remove any existing entry for this engine
+    new_lines = []
+    skip_until_next_host = False
+    for line in lines:
+        # Check if this is our managed host
+        if line.strip().startswith(f"Host {engine_name}") and SSH_MANAGED_COMMENT in line:
+            skip_until_next_host = True
+        elif line.strip().startswith("Host ") and skip_until_next_host:
+            skip_until_next_host = False
+            # This is a different host entry, keep it
+            new_lines.append(line)
+        elif not skip_until_next_host:
+            new_lines.append(line)
+
+    # Add the new entry
+    if new_lines and new_lines[-1].strip():  # Add blank line if needed
+        new_lines.append("")
+    
+    new_lines.extend([
+        f"Host {engine_name} {SSH_MANAGED_COMMENT}",
+        f"    HostName {instance_id}",
+        f"    User {ssh_user}",
+        f"    ProxyCommand sh -c \"AWS_SSM_IDLE_TIMEOUT={idle_timeout} aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p'\"",
+    ])
 
     # Write back
-    config_path.write_text(content)
+    config_path.write_text("\n".join(new_lines))
     config_path.chmod(0o600)
 
 
@@ -547,6 +545,9 @@ def list_engines(
     stopped_only: bool = typer.Option(
         False, "--stopped", help="Show only stopped engines"
     ),
+    detailed: bool = typer.Option(
+        False, "--detailed", "-d", help="Show detailed status (slower)"
+    ),
 ):
     """List engines (shows all engines by default)."""
     current_user = check_aws_sso()
@@ -554,6 +555,8 @@ def list_engines(
     params = {}
     if user:
         params["user"] = user
+    if detailed:
+        params["check_ready"] = "true"
 
     response = make_api_request("GET", "/engines", params=params)
 
@@ -571,8 +574,10 @@ def list_engines(
             console.print("No engines found.")
             return
 
-        # Fetch bootstrap stages once
-        stages_map = _fetch_init_stages([e["instance_id"] for e in engines])
+        # Only fetch detailed info if requested (slow)
+        stages_map = {}
+        if detailed:
+            stages_map = _fetch_init_stages([e["instance_id"] for e in engines])
 
         # Create table
         table = Table(title="Engines", box=box.ROUNDED)
@@ -581,7 +586,8 @@ def list_engines(
         table.add_column("Type")
         table.add_column("User")
         table.add_column("Status")
-        table.add_column("Disk Usage")
+        if detailed:
+            table.add_column("Disk Usage")
         table.add_column("Uptime/Since")
         table.add_column("$/hour", justify="right")
 
@@ -592,24 +598,34 @@ def list_engines(
 
             if engine["state"].lower() == "running":
                 time_str = format_duration(uptime)
-                # Get disk usage for running engines
-                disk_usage = get_disk_usage_via_ssm(engine["instance_id"]) or "-"
+                # Only get disk usage if detailed mode
+                if detailed:
+                    disk_usage = get_disk_usage_via_ssm(engine["instance_id"]) or "-"
+                else:
+                    disk_usage = None
             else:
                 time_str = launch_time.strftime("%Y-%m-%d %H:%M")
-                disk_usage = "-"
+                disk_usage = "-" if detailed else None
 
-            table.add_row(
+            row_data = [
                 engine["name"],
                 engine["instance_id"],
                 engine["engine_type"],
                 engine["user"],
                 format_status(engine["state"], engine.get("ready")),
-                disk_usage,
+            ]
+            if detailed:
+                row_data.append(disk_usage)
+            row_data.extend([
                 time_str,
                 f"${hourly_cost:.2f}",
-            )
+            ])
+            
+            table.add_row(*row_data)
 
         console.print(table)
+        if not detailed and any(e["state"].lower() == "running" for e in engines):
+            console.print("\n[dim]Tip: Use --detailed to see disk usage and bootstrap status (slower)[/dim]")
     else:
         error = response.json().get("error", "Unknown error")
         console.print(f"[red]❌ Failed to list engines: {error}[/red]")

{dayhoff_tools-1.5.8.dist-info → dayhoff_tools-1.6.0.dist-info}/METADATA

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

{dayhoff_tools-1.5.8.dist-info → dayhoff_tools-1.6.0.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=oY291nhCsU470Alol8VxXn_e2fbB7ykXFayH3AICK9g,96371
+dayhoff_tools/cli/engine_commands.py,sha256=RSbZK2hN3bTBQrZxAgooqMsqSiw0hnhmzTVkL44xdD4,97147
 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.8.dist-info/METADATA,sha256=M5694yUrFz-O9IfiuxskFZZae8mXnJ5xA1GiRJfHHJQ,2914
-dayhoff_tools-1.5.8.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.5.8.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.5.8.dist-info/RECORD,,
+dayhoff_tools-1.6.0.dist-info/METADATA,sha256=aXQi1sUTKyyRPmViY6r7pWBnTaTDV2v8krFQK1wLvNY,2914
+dayhoff_tools-1.6.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.6.0.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.6.0.dist-info/RECORD,,