dayhoff-tools 1.8.6__py3-none-any.whl → 1.8.8__py3-none-any.whl

dayhoff_tools/cli/engine_commands.py

@@ -847,16 +847,31 @@ def engine_status(
         run_disp = "[green]Running[/green]"
     elif running_state == "pending":
         run_disp = "[yellow]Starting...[/yellow]"
+    elif running_state == "stopping":
+        run_disp = "[yellow]Stopping...[/yellow]"
     elif running_state == "stopped":
         run_disp = "[dim]Stopped[/dim]"
     else:
-        run_disp = engine["state"]
+        run_disp = engine["state"].capitalize()
 
-    active_disp = (
-        "[green]Active[/green]"
-        if idle_detector.get("status") == "active"
-        else "[yellow]Idle[/yellow]"
-    )
+    # Compose Active/Idle header with extra detail when idle
+    if idle_detector.get("status") == "active":
+        active_disp = "[green]Active[/green]"
+    else:
+        # show Idle <elapsed>/<threshold> if available; else just N/A for stopped states
+        if running_state in ("stopped", "stopping"):
+            active_disp = "[dim]N/A[/dim]"
+        else:
+            idle_seconds = idle_detector.get("idle_seconds")
+            thresh = idle_detector.get("idle_threshold")
+            if isinstance(idle_seconds, (int, float)) and isinstance(
+                thresh, (int, float)
+            ):
+                active_disp = (
+                    f"[yellow]Idle {int(idle_seconds)//60}m/{int(thresh)//60}m[/yellow]"
+                )
+            else:
+                active_disp = "[yellow]Idle[/yellow]"
 
     top_lines = [
         f"[blue]{engine['name']}[/blue]  {run_disp}  {active_disp}\n",
@@ -892,6 +907,48 @@ def engine_status(
         disk_usage = get_disk_usage_via_ssm(engine["instance_id"]) or "-"
         status_lines.append(f"Disk:       {disk_usage}")
 
+    # Idle timeout (show even when not idle)
+    idle_threshold_secs: Optional[int] = None
+    # Prefer value from idle detector overlay if present
+    try:
+        if isinstance(idle_detector.get("idle_threshold"), (int, float)):
+            idle_threshold_secs = int(idle_detector["idle_threshold"])
+    except Exception:
+        idle_threshold_secs = None
+
+    if idle_threshold_secs is None and engine["state"].lower() == "running":
+        # Fallback: read /etc/engine.env via SSM
+        try:
+            ssm = boto3.client("ssm", region_name="us-east-1")
+            resp = ssm.send_command(
+                InstanceIds=[engine["instance_id"]],
+                DocumentName="AWS-RunShellScript",
+                Parameters={
+                    "commands": [
+                        "grep -E '^IDLE_TIMEOUT_SECONDS=' /etc/engine.env | cut -d'=' -f2 || echo 1800",
+                    ],
+                    "executionTimeout": ["5"],
+                },
+            )
+            cid = resp["Command"]["CommandId"]
+            time.sleep(1)
+            inv = ssm.get_command_invocation(
+                CommandId=cid, InstanceId=engine["instance_id"]
+            )
+            if inv.get("Status") == "Success":
+                out = (inv.get("StandardOutputContent") or "").strip()
+                if out:
+                    idle_threshold_secs = int(out.splitlines()[0].strip())
+        except Exception:
+            idle_threshold_secs = None
+
+    if idle_threshold_secs is None:
+        idle_threshold_secs = 1800
+
+    status_lines.append(
+        f"Idle timeout: {idle_threshold_secs//60}m ({idle_threshold_secs}s)"
+    )
+
     # Health report (only if bootstrap finished)
     if stage_val == "finished":
         try:

{dayhoff_tools-1.8.6.dist-info → dayhoff_tools-1.8.8.dist-info}/METADATA

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

{dayhoff_tools-1.8.6.dist-info → dayhoff_tools-1.8.8.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=UKX2B6DKAh82jiyocNMhtmWMhCbNyeOXONMmZ5yD1VE,107809
+dayhoff_tools/cli/engine_commands.py,sha256=o_7d4YhHO5U_WncIowx91v6qCPnalFPqayx5p9CnSug,110214
 dayhoff_tools/cli/main.py,sha256=LoFs3SI4fdCjP4pdxEAhri-_q0dmNYupmBCRE4KbBac,5933
 dayhoff_tools/cli/swarm_commands.py,sha256=5EyKj8yietvT5lfoz8Zx0iQvVaNgc3SJX1z2zQR6o6M,5614
 dayhoff_tools/cli/utility_commands.py,sha256=WQTHOh1MttuxaJjl2c6zMa4x7_JuaKMQgcyotYrU3GA,25883
@@ -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=UETBtZD3r7WgvURqfGbyHlT7cxoiVq8isjzMuerKw8I,24475
-dayhoff_tools-1.8.6.dist-info/METADATA,sha256=4FFmSPx7EIfi8eLzspHfAdOZtt_Gj0aLWMQnJ2R2mP4,2914
-dayhoff_tools-1.8.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.8.6.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.8.6.dist-info/RECORD,,
+dayhoff_tools-1.8.8.dist-info/METADATA,sha256=2zQrmTSb1lXvkeAdwIRdRWtm5rWfztsj7JFWtIISC30,2914
+dayhoff_tools-1.8.8.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.8.8.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.8.8.dist-info/RECORD,,