dayhoff-tools 1.3.21__py3-none-any.whl → 1.3.23__py3-none-any.whl

dayhoff_tools/cli/engine_commands.py

@@ -532,7 +532,6 @@ def list_engines(
         table.add_column("Type")
         table.add_column("User")
         table.add_column("Status")
-        table.add_column("Stage")
         table.add_column("Disk Usage")
         table.add_column("Uptime/Since")
         table.add_column("$/hour", justify="right")
@@ -555,15 +554,12 @@ def list_engines(
                 time_str = launch_time.strftime("%Y-%m-%d %H:%M")
                 disk_usage = "-"
 
-            stage_display = _colour_stage(stages_map.get(engine["instance_id"], "-"))
-
             table.add_row(
                 engine["name"],
                 engine["instance_id"],
                 engine["engine_type"],
                 engine["user"],
                 format_status(engine["state"], engine.get("ready")),
-                stage_display,
                 disk_usage,
                 time_str,
                 f"${hourly_cost:.2f}",
@@ -808,8 +804,13 @@ def terminate_engine(
 @engine_app.command("ssh")
 def ssh_engine(
     name_or_id: str = typer.Argument(help="Engine name or instance ID"),
+    admin: bool = typer.Option(False, "--admin", help="Connect as ec2-user instead of the engine owner user"),
 ):
-    """Connect to an engine via SSH."""
+    """Connect to an engine via SSH.
+
+    By default the CLI connects using the engine's owner username (the same one stored in the `User` tag).
+    Pass `--admin` to connect with the underlying [`ec2-user`] account for break-glass or debugging.
+    """
     username = check_aws_sso()
 
     # Get all engines to resolve name
@@ -825,8 +826,8 @@ def ssh_engine(
         console.print(f"[red]❌ Engine is not running (state: {engine['state']})[/red]")
         raise typer.Exit(1)
 
-    # Determine which SSH user to use (your username for your engines, ec2-user otherwise)
-    ssh_user = username if engine["user"] == username else "ec2-user"
+    # Choose SSH user
+    ssh_user = "ec2-user" if admin else username
 
     # Update SSH config
     console.print(f"Updating SSH config for [cyan]{engine['name']}[/cyan] (user: {ssh_user})...")
@@ -843,6 +844,7 @@ def config_ssh(
     all_engines: bool = typer.Option(
         False, "--all", "-a", help="Include all engines from all users"
     ),
+    admin: bool = typer.Option(False, "--admin", help="Generate entries that use ec2-user instead of per-engine owner user"),
 ):
     """Update SSH config with available engines."""
     username = check_aws_sso()
@@ -901,8 +903,8 @@ def config_ssh(
     # Add new entries if not cleaning
     if not clean:
         for engine in running_engines:
-            # Use engine owner's username when it's your own engine; otherwise default to ec2-user
-            ssh_user = engine['user'] if engine['user'] == username else 'ec2-user'
+            # Determine ssh user based on --admin flag
+            ssh_user = 'ec2-user' if admin else username
             new_lines.extend(
                 [
                     "",

{dayhoff_tools-1.3.21.dist-info → dayhoff_tools-1.3.23.dist-info}/METADATA

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

{dayhoff_tools-1.3.21.dist-info → dayhoff_tools-1.3.23.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=LzHTmcUQUOcJJCGHghBMRr8TdQsfb3Fj4s8T575MutM,79766
+dayhoff_tools/cli/engine_commands.py,sha256=sSgz_4mBDfUazezpbcdW5S5sIsTzDWVSrJBozF-hutw,79904
 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.21.dist-info/METADATA,sha256=Xz7PBOgBq2Wn2Sh1zSAaogaOqyXz6AaYG0YbSD6ONIs,2825
-dayhoff_tools-1.3.21.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.3.21.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.3.21.dist-info/RECORD,,
+dayhoff_tools-1.3.23.dist-info/METADATA,sha256=VTbAe-npnV8ApVkgUpu1z2ALJRZ6psWeAMJsT253mO8,2825
+dayhoff_tools-1.3.23.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.3.23.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.3.23.dist-info/RECORD,,