dayhoff-tools 1.9.1__py3-none-any.whl → 1.9.3__py3-none-any.whl

dayhoff_tools/cli/engine_commands.py

@@ -319,9 +319,6 @@ def format_status(state: str, ready: Optional[bool]) -> str:
         return state
 
 
-
-
-
 def resolve_engine(name_or_id: str, engines: List[Dict]) -> Dict:
     """Resolve engine by name or ID with interactive selection."""
     # Exact ID match
@@ -776,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",
@@ -927,23 +923,55 @@ def engine_status(
             if not content:
                 return None
             data = json.loads(content)
-            # Convert last_state schema to idle_detector schema used by CLI output
+            # Convert last_state schema (new or old) to idle_detector schema used by CLI output
             idle_info: Dict[str, Any] = {"available": True}
-            idle_info["status"] = "active" if not data.get("idle", True) else "idle"
-            # thresholds if present
+
+            # Active/idle
+            idle_flag = bool(data.get("idle", False))
+            idle_info["status"] = "idle" if idle_flag else "active"
+
+            # Threshold and elapsed
             if isinstance(data.get("timeout_sec"), (int, float)):
                 idle_info["idle_threshold"] = int(data["timeout_sec"])  # seconds
-            # keep raw reasons for sensor display
+            if isinstance(data.get("idle_seconds"), (int, float)):
+                idle_info["idle_seconds"] = int(data["idle_seconds"])
+
+            # Keep raw reasons for sensor display when available (new schema)
             if isinstance(data.get("reasons"), list):
                 idle_info["_reasons_raw"] = data["reasons"]
-            # derive details from sensors
-            for r in data.get("reasons", []):
+            else:
+                # Fallback: synthesize reasons from the old forensics layout
+                f_all = data.get("forensics", {}) or {}
+                synthesized = []
+
+                def _mk(sensor_name: str, key: str):
+                    entry = f_all.get(key, {}) or {}
+                    synthesized.append(
+                        {
+                            "sensor": sensor_name,
+                            "active": bool(entry.get("active", False)),
+                            "reason": entry.get("reason", ""),
+                            "forensic": entry.get("forensic", {}),
+                        }
+                    )
+
+                _mk("CoffeeLockSensor", "coffee")
+                _mk("ActiveLoginSensor", "ssh")
+                _mk("IDEConnectionSensor", "ide")
+                _mk("DockerWorkloadSensor", "docker")
+                idle_info["_reasons_raw"] = synthesized
+
+            # Derive details from sensors
+            for r in idle_info.get("_reasons_raw", []):
                 if not r.get("active"):
                     continue
                 sensor = (r.get("sensor") or "").lower()
                 forensic = r.get("forensic") or {}
                 if sensor == "ideconnectionsensor":
-                    cnt = forensic.get("matches")
+                    # Prefer unique_pid_count written by new detector
+                    cnt = forensic.get("unique_pid_count")
+                    if not isinstance(cnt, int):
+                        cnt = forensic.get("matches")
                     if isinstance(cnt, int):
                         idle_info["ide_connections"] = {"connection_count": cnt}
                     else:
@@ -955,12 +983,11 @@ def engine_status(
                             timedelta(seconds=int(rem))
                         )
                 elif sensor == "activeloginsensor":
-                    # Provide a single summarized SSH session if available
                     sess = {
-                        "tty": r.get("forensic", {}).get("tty", "pts/?"),
-                        "pid": r.get("forensic", {}).get("pid", "?"),
-                        "idle_time": r.get("forensic", {}).get("idle_sec", 0),
-                        "from_ip": r.get("forensic", {}).get("remote_addr", "unknown"),
+                        "tty": forensic.get("tty", "pts/?"),
+                        "pid": forensic.get("pid", "?"),
+                        "idle_time": forensic.get("idle_sec", 0),
+                        "from_ip": forensic.get("remote_addr", "unknown"),
                     }
                     idle_info.setdefault("ssh_sessions", []).append(sess)
             return idle_info
@@ -977,6 +1004,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("")
@@ -1002,7 +1036,23 @@ def engine_status(
         status_lines.append(_sensor_line(" IDE   ", "IDEConnectionSensor", "🖥"))
         status_lines.append(_sensor_line("Docker", "DockerWorkloadSensor", "🐳"))
 
-
+        # If we have elapsed idle seconds and threshold, reflect that in the header
+        try:
+            if idle_detector.get("status") == "idle":
+                idle_secs = int(idle_detector.get("idle_seconds", 0))
+                thresh_secs = int(idle_detector.get("idle_threshold", 0))
+                if thresh_secs > 0:
+                    active_disp = (
+                        f"[yellow]Idle {idle_secs//60}m/{thresh_secs//60}m[/yellow]"
+                    )
+                    # Rewrite top header line (index 0) to include updated display
+                    all_header = top_lines[0]
+                    # Replace the portion after two spaces (name and running state fixed)
+                    top_lines[0] = (
+                        f"[blue]{engine['name']}[/blue]  {run_disp}  {active_disp}\n"
+                    )
+        except Exception:
+            pass
 
     # Combine top summary and details
     all_lines = top_lines + status_lines
@@ -1041,9 +1091,6 @@ def engine_status(
             console.print(f"[red]❌ Error fetching log: {e}[/red]")
 
 
-
-
-
 @engine_app.command("stop")
 def stop_engine(
     name_or_id: str = typer.Argument(help="Engine name or instance ID"),

{dayhoff_tools-1.9.1.dist-info → dayhoff_tools-1.9.3.dist-info}/METADATA

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

{dayhoff_tools-1.9.1.dist-info → dayhoff_tools-1.9.3.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=HcMjlfxHWGp8J9ai2pOel6RkT3W-BcaaNk1KBBDWmLg,104796
+dayhoff_tools/cli/engine_commands.py,sha256=uq09BZJ4XEV6lOay2Zz2rylTU8AAAIzxeTDbKzNX-r4,107098
 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.1.dist-info/METADATA,sha256=m7wy7HkaFJon6aQO127tsXQ-GPYiK21NtYFS1FEdh58,2914
-dayhoff_tools-1.9.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.9.1.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.9.1.dist-info/RECORD,,
+dayhoff_tools-1.9.3.dist-info/METADATA,sha256=cGFFtcWLIkHTYq9PFUgZkddSxAKoSOQTuS0Ix2eYfDs,2914
+dayhoff_tools-1.9.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.9.3.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.9.3.dist-info/RECORD,,