dayhoff-tools 1.3.18__py3-none-any.whl → 1.3.20__py3-none-any.whl

dayhoff_tools/cli/engine_commands.py

@@ -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 ec2-user
     ProxyCommand sh -c "aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p'"
 """
 
@@ -632,7 +632,7 @@ def engine_status(
             res = ssm.send_command(
                 InstanceIds=[engine["instance_id"]],
                 DocumentName="AWS-RunShellScript",
-                Parameters={"commands": ["cat /var/run/engine-health.json || true"], "executionTimeout": ["10"]},
+                Parameters={"commands": ["cat /opt/dayhoff/state/engine-health.json 2>/dev/null || cat /var/run/engine-health.json 2>/dev/null || true"], "executionTimeout": ["10"]},
             )
             cid = res["Command"]["CommandId"]
             time.sleep(1)
@@ -903,7 +903,7 @@ def config_ssh(
                     "",
                     f"Host {engine['name']} {SSH_MANAGED_COMMENT}",
                     f"    HostName {engine['instance_id']}",
-                    f"    User {username}",
+                    f"    User ec2-user",
                     f"    ProxyCommand sh -c \"aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p'\"",
                 ]
             )
@@ -2090,8 +2090,8 @@ def debug_engine(
     
     # Check multiple files and systemd status
     checks = [
-        ("Stage file", "cat /var/run/engine-init.stage 2>/dev/null || echo 'MISSING'"),
-        ("Health file", "cat /var/run/engine-health.json 2>/dev/null || echo 'MISSING'"),
+        ("Stage file", "cat /opt/dayhoff/state/engine-init.stage 2>/dev/null || cat /var/run/engine-init.stage 2>/dev/null || echo 'MISSING'"),
+        ("Health file", "cat /opt/dayhoff/state/engine-health.json 2>/dev/null || cat /var/run/engine-health.json 2>/dev/null || echo 'MISSING'"),
         ("Sentinel file", "ls -la /opt/dayhoff/first_boot_complete.sentinel 2>/dev/null || echo 'MISSING'"),
         ("Setup service", "systemctl status setup-aws-vm.service --no-pager || echo 'Service not found'"),
         ("Bootstrap log tail", "tail -20 /var/log/engine-setup.log 2>/dev/null || echo 'No log'"),

{dayhoff_tools-1.3.18.dist-info → dayhoff_tools-1.3.20.dist-info}/METADATA

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

{dayhoff_tools-1.3.18.dist-info → dayhoff_tools-1.3.20.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=4Z00VAwAaZKv0z1cXimH_JF6UKgGnX4rUawLxfFf8Zs,79197
+dayhoff_tools/cli/engine_commands.py,sha256=TadX64j5t6b9tDYIyIpu4oMj_LYWaAAVQuHGHUIQs1s,79375
 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.18.dist-info/METADATA,sha256=hQN8_0h-PnFGTHJw8p775acWefGqk3y1klZuUkhmJO8,2825
-dayhoff_tools-1.3.18.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.3.18.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.3.18.dist-info/RECORD,,
+dayhoff_tools-1.3.20.dist-info/METADATA,sha256=_-UfE9AGWCsqIE1aeS9WwQtodsryxZCrIRMAqhUq6T8,2825
+dayhoff_tools-1.3.20.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.3.20.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.3.20.dist-info/RECORD,,