dayhoff-tools 1.9.10__tar.gz → 1.9.11__tar.gz

{dayhoff_tools-1.9.10 → dayhoff_tools-1.9.11}/PKG-INFO

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

{dayhoff_tools-1.9.10 → dayhoff_tools-1.9.11}/dayhoff_tools/cli/engine/engine_core.py

@@ -231,45 +231,12 @@ def engine_status(
 
     engines = response.json().get("engines", [])
     engine = resolve_engine(name_or_id, engines)
-    
+
+    # Always try to fetch live idle data from the engine for both views
+    live_idle_data = _fetch_live_idle_data(engine["instance_id"])
+
     # Fast status display (default)
-    if not detailed:       
-        # Fetch idle status via SSM with longer timeout
-        ssm = boto3.client("ssm", region_name="us-east-1")
-        idle_data = None  # Use None to indicate no data received
-        
-        if engine["state"].lower() == "running":
-            try:
-                resp = ssm.send_command(
-                    InstanceIds=[engine["instance_id"]],
-                    DocumentName="AWS-RunShellScript",
-                    Parameters={
-                        "commands": [
-                            "cat /var/run/idle-detector/last_state.json 2>/dev/null || echo '{}'"
-                        ],
-                        "executionTimeout": ["10"],
-                    },
-                )
-                cid = resp["Command"]["CommandId"]
-                
-                # Wait up to 3 seconds for result
-                for _ in range(6):  # 6 * 0.5 = 3 seconds
-                    time.sleep(0.5)
-                    inv = ssm.get_command_invocation(
-                        CommandId=cid, InstanceId=engine["instance_id"]
-                    )
-                    if inv["Status"] in ["Success", "Failed"]:
-                        break
-                
-                if inv["Status"] == "Success":
-                    content = inv["StandardOutputContent"].strip()
-                    if content and content != "{}":
-                        idle_data = json.loads(content)
-                    else:
-                        idle_data = {}  # Empty response but SSM worked
-            except Exception:
-                idle_data = None  # SSM failed
-        
+    if not detailed:
         # Determine running state display
         running_state = engine["state"].lower()
         if running_state == "running":
@@ -282,59 +249,33 @@ def engine_status(
             run_disp = "[dim]Stopped[/dim]"
         else:
             run_disp = engine["state"].capitalize()
-        
-        # Determine idle/active status
-        idle_disp = ""
-        if running_state == "running":
-            if idle_data is None:
-                # SSM failed - we don't know the status
-                idle_disp = "  [dim]N/A[/dim]"
-            elif not idle_data:
-                # Empty data - likely very early in boot
-                idle_disp = "  [dim]N/A[/dim]"
-            else:
-                # We have data
-                is_idle = idle_data.get("idle", False)
-                timeout_sec = idle_data.get("timeout_sec")
-                idle_seconds = idle_data.get("idle_seconds", 0) if is_idle else 0
-                
-                if is_idle:
-                    if isinstance(timeout_sec, int) and isinstance(idle_seconds, int):
-                        remaining = max(0, timeout_sec - idle_seconds)
-                        remaining_mins = remaining // 60
-                        if remaining_mins == 0:
-                            idle_disp = f"  [yellow]Idle {idle_seconds//60}m/{timeout_sec//60}m: [red]<1m[/red] left[/yellow]"
-                        else:
-                            idle_disp = f"  [yellow]Idle {idle_seconds//60}m/{timeout_sec//60}m: [red]{remaining_mins}m[/red] left[/yellow]"
-                    else:
-                        idle_disp = "  [yellow]Idle ?/?[/yellow]"
-                else:
-                    # Actively not idle
-                    idle_disp = "  [green]Active[/green]"
-        
+
+        # Format idle display using the unified function
+        idle_disp = "  " + _format_idle_status_display(live_idle_data, running_state)
+
         # Build status lines - minimal info for fast view
         status_lines = [
             f"[blue]{engine['name']}[/blue]  {run_disp}{idle_disp}",
         ]
-        
-        # Add activity sensors if we have idle data
-        if idle_data and idle_data.get("reasons"):
+
+        # Add activity sensors if we have live data
+        if live_idle_data and live_idle_data.get("_reasons_raw"):
             status_lines.append("")  # blank line before sensors
-            
+
             sensor_map = {
                 "CoffeeLockSensor": ("☕", "Coffee"),
                 "ActiveLoginSensor": ("🐚", "SSH"),
                 "IDEConnectionSensor": ("🖥 ", "IDE"),
                 "DockerWorkloadSensor": ("🐳", "Docker"),
             }
-            
-            for r in idle_data.get("reasons", []):
+
+            for r in live_idle_data.get("_reasons_raw", []):
                 sensor = r.get("sensor", "Unknown")
                 active = r.get("active", False)
                 icon, label = sensor_map.get(sensor, ("?", sensor))
                 status_str = "[green]YES[/green]" if active else "[dim]nope[/dim]"
                 status_lines.append(f"  {icon} {label:6} {status_str}")
-        
+
         # Display in a nice panel
         console.print(
             Panel("\n".join(status_lines), title="Engine Status", border_style="blue")
@@ -352,6 +293,18 @@ def engine_status(
     idle_detector = engine_details.get("idle_detector", {}) or {}
     attached_studios = engine_details.get("attached_studios", [])
 
+    # Overlay stale API data with fresh data from the engine
+    if live_idle_data:
+        # If API didn't indicate availability, replace entirely; otherwise, update.
+        if not idle_detector.get("available"):
+            idle_detector = live_idle_data
+        else:
+            idle_detector.update(live_idle_data)
+    else:
+        # SSM failed - mark as unavailable if we don't have good data from API
+        if not idle_detector.get("available"):
+            idle_detector = {"available": False}  # Mark as unavailable
+
     # Calculate costs
     launch_time = parse_launch_time(engine["launch_time"])
     uptime = datetime.now(timezone.utc) - launch_time
@@ -406,37 +359,8 @@ def engine_status(
     else:
         run_disp = engine["state"].capitalize()
 
-    # Compose Active/Idle header with extra detail when idle
-    def _compute_active_disp(idle_info: Dict[str, Any]) -> str:
-        # If we don't have idle info or it's explicitly unavailable, show N/A
-        if not idle_info or idle_info.get("available") == False:
-            return "[dim]N/A[/dim]"
-            
-        if idle_info.get("status") == "active":
-            return "[green]Active[/green]"
-        if running_state in ("stopped", "stopping"):
-            return "[dim]N/A[/dim]"
-            
-        # If idle, show time/threshold with time remaining if available
-        if idle_info.get("status") == "idle":
-            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)):
-                remaining = max(0, int(thresh_v) - int(idle_seconds_v))
-                remaining_mins = remaining // 60
-                if remaining_mins == 0:
-                    return f"[yellow]Idle {int(idle_seconds_v)//60}m/{int(thresh_v)//60}m: [red]<1m[/red] left[/yellow]"
-                else:
-                    return f"[yellow]Idle {int(idle_seconds_v)//60}m/{int(thresh_v)//60}m: [red]{remaining_mins}m[/red] left[/yellow]"
-            elif isinstance(thresh_v, (int, float)):
-                return f"[yellow]Idle ?/{int(thresh_v)//60}m[/yellow]"
-            else:
-                return "[yellow]Idle ?/?[/yellow]"
-        
-        # Default to N/A if we can't determine status
-        return "[dim]N/A[/dim]"
-
-    active_disp = _compute_active_disp(idle_detector)
+    # Recompute header display with latest data
+    active_disp = _format_idle_status_display(idle_detector, running_state)
 
     top_lines = [
         f"[blue]{engine['name']}[/blue]  {run_disp}  {active_disp}\n",
@@ -553,122 +477,6 @@ def engine_status(
         except Exception:
             pass
 
-    # Try to enrich/fallback idle-detector details from on-engine summary file via SSM
-    def _fetch_idle_summary_via_ssm(instance_id: str) -> Optional[Dict]:
-        try:
-            ssm = boto3.client("ssm", region_name="us-east-1")
-            res = ssm.send_command(
-                InstanceIds=[instance_id],
-                DocumentName="AWS-RunShellScript",
-                Parameters={
-                    "commands": [
-                        "cat /var/run/idle-detector/last_state.json 2>/dev/null || true",
-                    ],
-                    "executionTimeout": ["5"],
-                },
-            )
-            cid = res["Command"]["CommandId"]
-            # Wait up to 2 seconds for SSM command to complete (was 1 second)
-            for _ in range(4):  # 4 * 0.5 = 2 seconds
-                time.sleep(0.5)
-                inv = ssm.get_command_invocation(CommandId=cid, InstanceId=instance_id)
-                if inv["Status"] in ["Success", "Failed"]:
-                    break
-            if inv["Status"] != "Success":
-                return None
-            content = inv["StandardOutputContent"].strip()
-            if not content:
-                return None
-            data = json.loads(content)
-            # Convert last_state schema (new or old) to idle_detector schema used by CLI output
-            idle_info: Dict[str, Any] = {"available": True}
-
-            # 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
-            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"]
-            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":
-                    # 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:
-                        idle_info["ide_connections"] = {"connection_count": 1}
-                elif sensor == "coffeelocksensor":
-                    rem = forensic.get("remaining_sec")
-                    if isinstance(rem, (int, float)) and rem > 0:
-                        idle_info["coffee_lock"] = format_duration(
-                            timedelta(seconds=int(rem))
-                        )
-                elif sensor == "activeloginsensor":
-                    sess = {
-                        "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
-        except Exception:
-            return None
-
-    # Always try to enrich from on-engine summary (fast, best-effort)
-    overlay = _fetch_idle_summary_via_ssm(engine["instance_id"])
-    if overlay:
-        # If API didn't indicate availability, replace entirely; otherwise fill gaps
-        if not idle_detector.get("available"):
-            idle_detector = overlay
-        else:
-            for k, v in overlay.items():
-                idle_detector.setdefault(k, v)
-    else:
-        # SSM failed - mark as unavailable if we don't have good data
-        if not idle_detector.get("available"):
-            idle_detector = {"available": False}  # Mark as unavailable
-
-    # Recompute header display with latest data
-    active_disp = _compute_active_disp(idle_detector)
-    top_lines[0] = f"[blue]{engine['name']}[/blue]  {run_disp}  {active_disp}\n"
-
     # Activity Sensors (show all with YES/no)
     if idle_detector.get("available"):
         status_lines.append("")
@@ -694,11 +502,6 @@ def engine_status(
         status_lines.append(_sensor_line(" IDE   ", "IDEConnectionSensor", "🖥"))
         status_lines.append(_sensor_line("Docker", "DockerWorkloadSensor", "🐳"))
 
-        # Recompute display with latest idle detector data
-        active_disp = _compute_active_disp(idle_detector)
-        # Rewrite top header line (index 0) to include updated display
-        top_lines[0] = f"[blue]{engine['name']}[/blue]  {run_disp}  {active_disp}\n"
-
     # Combine top summary and details
     all_lines = top_lines + status_lines
     console.print(
@@ -737,3 +540,114 @@ def engine_status(
                 console.print("[red]❌ Could not retrieve bootstrap log[/red]")
         except Exception as e:
             console.print(f"[red]❌ Error fetching log: {e}[/red]")
+
+
+def _format_idle_status_display(
+    idle_info: Optional[Dict[str, Any]], running_state: str
+) -> str:
+    """Computes the rich string for active/idle status display."""
+    # If we don't have idle info or it's explicitly unavailable, show N/A
+    if not idle_info or idle_info.get("available") is False:
+        return "[dim]N/A[/dim]"
+
+    if idle_info.get("status") == "active":
+        return "[green]Active[/green]"
+    if running_state in ("stopped", "stopping"):
+        return "[dim]N/A[/dim]"
+
+    # If idle, show time/threshold with time remaining if available
+    if idle_info.get("status") == "idle":
+        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)
+        ):
+            remaining = max(0, int(thresh_v) - int(idle_seconds_v))
+            remaining_mins = remaining // 60
+            if remaining_mins == 0:
+                return f"[yellow]Idle {int(idle_seconds_v)//60}m/{int(thresh_v)//60}m: [red]<1m[/red] left[/yellow]"
+            else:
+                return f"[yellow]Idle {int(idle_seconds_v)//60}m/{int(thresh_v)//60}m: [red]{remaining_mins}m[/red] left[/yellow]"
+        elif isinstance(thresh_v, (int, float)):
+            return f"[yellow]Idle ?/{int(thresh_v)//60}m[/yellow]"
+        else:
+            return "[yellow]Idle ?/?[/yellow]"
+
+    # Default to N/A if we can't determine status
+    return "[dim]N/A[/dim]"
+
+
+def _fetch_live_idle_data(instance_id: str) -> Optional[Dict]:
+    """
+    Fetch and parse the live idle detector state from an engine via SSM.
+
+    This is the single source of truth for on-engine idle status. It fetches
+    the `last_state.json` file, parses it, and transforms it into the schema
+    used by the CLI for display logic.
+    """
+    try:
+        ssm = boto3.client("ssm", region_name="us-east-1")
+        res = ssm.send_command(
+            InstanceIds=[instance_id],
+            DocumentName="AWS-RunShellScript",
+            Parameters={
+                "commands": [
+                    "cat /var/run/idle-detector/last_state.json 2>/dev/null || true",
+                ],
+                "executionTimeout": ["5"],
+            },
+        )
+        cid = res["Command"]["CommandId"]
+        # Wait up to 3 seconds for SSM command to complete
+        for _ in range(6):  # 6 * 0.5 = 3 seconds
+            time.sleep(0.5)
+            inv = ssm.get_command_invocation(CommandId=cid, InstanceId=instance_id)
+            if inv["Status"] in ["Success", "Failed"]:
+                break
+        if inv["Status"] != "Success":
+            return None
+        content = inv["StandardOutputContent"].strip()
+        if not content:
+            return None
+        data = json.loads(content)
+        # Convert last_state schema (new or old) to idle_detector schema used by CLI output
+        idle_info: Dict[str, Any] = {"available": True}
+
+        # 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
+        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"]
+        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
+
+        return idle_info
+    except Exception:
+        return None

{dayhoff_tools-1.9.10 → dayhoff_tools-1.9.11}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "dayhoff-tools"
-version = "1.9.10"
+version = "1.9.11"
 description = "Common tools for all the repos at Dayhoff Labs"
 authors = [
     {name = "Daniel Martin-Alarcon", email = "dma@dayhofflabs.com"}