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

dayhoff_tools/cli/engine_commands.py

@@ -365,8 +365,8 @@ def get_ssh_public_key() -> str:
     )
 
 
-def update_ssh_config_entry(engine_name: str, instance_id: str, username: str):
-    """Add or update a single SSH config entry."""
+def update_ssh_config_entry(engine_name: str, instance_id: str, ssh_user: str):
+    """Add or update a single SSH config entry for the given SSH user."""
     config_path = Path.home() / ".ssh" / "config"
     config_path.parent.mkdir(mode=0o700, exist_ok=True)
 
@@ -381,7 +381,7 @@ def update_ssh_config_entry(engine_name: str, instance_id: str, username: str):
     new_entry = f"""
 Host {engine_name} {SSH_MANAGED_COMMENT}
     HostName {instance_id}
-    User {username}
+    User {ssh_user}
     ProxyCommand sh -c "aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p'"
 """
 
@@ -825,9 +825,12 @@ 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"
+
     # Update SSH config
-    console.print(f"Updating SSH config for [cyan]{engine['name']}[/cyan]...")
-    update_ssh_config_entry(engine["name"], engine["instance_id"], username)
+    console.print(f"Updating SSH config for [cyan]{engine['name']}[/cyan] (user: {ssh_user})...")
+    update_ssh_config_entry(engine["name"], engine["instance_id"], ssh_user)
 
     # Connect
     console.print(f"[green]✓ Connecting to {engine['name']}...[/green]")
@@ -898,12 +901,14 @@ 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'
             new_lines.extend(
                 [
                     "",
                     f"Host {engine['name']} {SSH_MANAGED_COMMENT}",
                     f"    HostName {engine['instance_id']}",
-                    f"    User {username}",
+                    f"    User {ssh_user}",
                     f"    ProxyCommand sh -c \"aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p'\"",
                 ]
             )

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

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

{dayhoff_tools-1.3.19.dist-info → dayhoff_tools-1.3.21.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=CZ38jrOpwW7Pch5CMIYZdFDHAncofjfNhqGPNOaQzZg,79379
+dayhoff_tools/cli/engine_commands.py,sha256=LzHTmcUQUOcJJCGHghBMRr8TdQsfb3Fj4s8T575MutM,79766
 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.19.dist-info/METADATA,sha256=DDxXzIPCAMsCjkPHNSHI9zu81N8XDS1SwHX9cu_9NmM,2825
-dayhoff_tools-1.3.19.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.3.19.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.3.19.dist-info/RECORD,,
+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,,