dayhoff-tools 1.9.2__py3-none-any.whl → 1.9.4__py3-none-any.whl

dayhoff_tools/cli/engine_commands.py

@@ -773,23 +773,22 @@ def engine_status(
         run_disp = engine["state"].capitalize()
 
     # 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
+    def _compute_active_disp(idle_info: Dict[str, Any]) -> str:
+        if idle_info.get("status") == "active":
+            return "[green]Active[/green]"
         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]"
+            return "[dim]N/A[/dim]"
+        idle_seconds_v = idle_info.get("idle_seconds")
+        thresh_v = idle_info.get("idle_threshold")
+        if isinstance(idle_seconds_v, (int, float)) and isinstance(
+            thresh_v, (int, float)
+        ):
+            return (
+                f"[yellow]Idle {int(idle_seconds_v)//60}m/{int(thresh_v)//60}m[/yellow]"
+            )
+        return "[yellow]Idle[/yellow]"
+
+    active_disp = _compute_active_disp(idle_detector)
 
     top_lines = [
         f"[blue]{engine['name']}[/blue]  {run_disp}  {active_disp}\n",
@@ -895,9 +894,10 @@ def engine_status(
                 status_lines.append(
                     f"  • GPU Drivers: {'OK' if health.get('drivers_ok') else 'MISSING'}"
                 )
-                status_lines.append(
-                    f"  • Idle Detector: {health.get('idle_detector_timer', 'unknown')}"
+                idle_stat = health.get("idle_detector_service") or health.get(
+                    "idle_detector_timer", "unknown"
                 )
+                status_lines.append(f"  • Idle Detector: {idle_stat}")
         except Exception:
             pass
 
@@ -1005,6 +1005,13 @@ def engine_status(
             for k, v in overlay.items():
                 idle_detector.setdefault(k, v)
 
+        # Recompute header display using enriched overlay values
+        try:
+            active_disp = _compute_active_disp(idle_detector)
+            top_lines[0] = f"[blue]{engine['name']}[/blue]  {run_disp}  {active_disp}\n"
+        except Exception:
+            pass
+
     # Activity Sensors (show all with YES/no)
     if idle_detector.get("available"):
         status_lines.append("")
@@ -2681,7 +2688,7 @@ def idle_timeout_cmd(
     cmd = (
         "sudo sed -i '/^IDLE_TIMEOUT_SECONDS=/d' /etc/engine.env && "
         f"echo 'IDLE_TIMEOUT_SECONDS={seconds}' | sudo tee -a /etc/engine.env >/dev/null && "
-        "sudo systemctl restart engine-idle-detector.timer"
+        "sudo systemctl restart engine-idle-detector.service"
     )
 
     resp = ssm.send_command(
@@ -2820,8 +2827,7 @@ def repair_engine(
         "echo 'finished' | sudo tee /opt/dayhoff/state/engine-init.stage > /dev/null",
         # Ensure SSM agent is running
         "sudo systemctl restart amazon-ssm-agent 2>/dev/null || true",
-        # Restart idle detector
-        "sudo systemctl restart engine-idle-detector.timer 2>/dev/null || true",
+        # Restart idle detector (service only)
         "sudo systemctl restart engine-idle-detector.service 2>/dev/null || true",
         # Report status
         "echo '=== Repair Complete ===' && echo 'Sentinel: ' && ls -la /opt/dayhoff/first_boot_complete.sentinel",

{dayhoff_tools-1.9.2.dist-info → dayhoff_tools-1.9.4.dist-info}/METADATA

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

{dayhoff_tools-1.9.2.dist-info → dayhoff_tools-1.9.4.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=MHwufx82Fv_2_b5Rw2RQlDlTwXXZ4cum3C3iWY8k1bg,106897
+dayhoff_tools/cli/engine_commands.py,sha256=sJroAFeJqHBMwONTLTFUNfuJf0PvN6xu-OBoVS_b4uU,107111
 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.9.2.dist-info/METADATA,sha256=Da2zCfX4_gYuAGWdRhiBAivATAehMFCsyoXbZtp0dys,2914
-dayhoff_tools-1.9.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.9.2.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.9.2.dist-info/RECORD,,
+dayhoff_tools-1.9.4.dist-info/METADATA,sha256=fZi-XFFqeuhdjIIEJKkVN2bpMjyIO6q2G6RcaCURZLk,2914
+dayhoff_tools-1.9.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.9.4.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.9.4.dist-info/RECORD,,