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

dayhoff_tools/cli/engine_commands.py

@@ -693,9 +693,10 @@ def list_engines(
 @engine_app.command("status")
 def engine_status(
     name_or_id: str = typer.Argument(help="Engine name or instance ID"),
-    show_log: bool = typer.Option(False, "--show-log", help="Show bootstrap log"),
+    detailed: bool = typer.Option(False, "--detailed", "-d", help="Show detailed status (slower)"),
+    show_log: bool = typer.Option(False, "--show-log", help="Show bootstrap log (requires --detailed)"),
 ):
-    """Show detailed engine status and information."""
+    """Show engine status and information."""
     check_aws_sso()
 
     # Get all engines to resolve name
@@ -706,8 +707,131 @@ def engine_status(
 
     engines = response.json().get("engines", [])
     engine = resolve_engine(name_or_id, engines)
+    
+    # Fast status display (default)
+    if not detailed:
+        # Get basic engine info and studios from API
+        response = make_api_request("GET", f"/engines/{engine['instance_id']}")
+        if response.status_code != 200:
+            console.print("[red]❌ Failed to fetch engine details[/red]")
+            raise typer.Exit(1)
+        
+        engine_details = response.json()
+        engine = engine_details.get("engine", engine)
+        attached_studios = engine_details.get("attached_studios", [])
+        
+        # Fetch idle status via SSM with longer timeout
+        ssm = boto3.client("ssm", region_name="us-east-1")
+        idle_data = {}
+        
+        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)
+            except Exception:
+                pass  # Best effort
+        
+        # Build status display
+        hourly_cost = HOURLY_COSTS.get(engine["engine_type"], 0)
+        
+        # Determine running state display
+        running_state = engine["state"].lower()
+        if running_state == "running":
+            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"].capitalize()
+        
+        # Determine idle/active status
+        idle_disp = ""
+        if running_state == "running":
+            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)
+                    idle_disp = f"  [yellow]Idle {idle_seconds//60}m/{timeout_sec//60}m: [red]{remaining//60}m {remaining%60}s[/red] left[/yellow]"
+                else:
+                    idle_disp = "  [yellow]Idle ?/?[/yellow]"
+            else:
+                idle_disp = "  [green]Active[/green]"
+        
+        # Build status lines
+        status_lines = [
+            f"[blue]{engine['name']}[/blue]  {run_disp}{idle_disp}\n",
+        ]
+        
+        # Add studios if attached
+        if attached_studios:
+            studio_names = [f"[magenta]{s.get('user', 'studio')}[/magenta]" for s in attached_studios]
+            status_lines.append(f"Studios: {', '.join(studio_names)}")
+        
+        status_lines.append("")  # blank line
+        
+        # Basic info
+        status_lines.extend([
+            f"Type:     {engine['engine_type']} ({engine['instance_type']})",
+            f"User:     {engine['user']}",
+            f"IP:       {engine.get('public_ip', 'N/A')}",
+            f"$/hour:   ${hourly_cost:.2f}",
+        ])
+        
+        # Add activity sensors if we have idle data
+        if idle_data.get("reasons"):
+            status_lines.append("")
+            status_lines.append("[bold]Activity:[/bold]")
+            
+            sensor_map = {
+                "CoffeeLockSensor": ("☕", "Coffee"),
+                "ActiveLoginSensor": ("🐚", "SSH"),
+                "IDEConnectionSensor": ("🖥", "IDE"),
+                "DockerWorkloadSensor": ("🐳", "Docker"),
+            }
+            
+            for r in idle_data.get("reasons", []):
+                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]no[/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")
+        )
+        return  # Exit early for fast status
 
-    # Get detailed engine status including idle detector info
+    # Get detailed engine status including idle detector info (for --detailed mode)
     response = make_api_request("GET", f"/engines/{engine['instance_id']}")
     if response.status_code != 200:
         console.print("[red]❌ Failed to fetch engine details[/red]")
@@ -778,15 +902,25 @@ def engine_status(
             return "[green]Active[/green]"
         if running_state in ("stopped", "stopping"):
             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]"
+        
+        # If we don't have idle info at all, show N/A
+        if not idle_info.get("available"):
+            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))
+                return f"[yellow]Idle {int(idle_seconds_v)//60}m/{int(thresh_v)//60}m: [red]{remaining//60}m {remaining%60}s[/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)
 
@@ -916,8 +1050,12 @@ def engine_status(
                 },
             )
             cid = res["Command"]["CommandId"]
-            time.sleep(1)
-            inv = ssm.get_command_invocation(CommandId=cid, InstanceId=instance_id)
+            # 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()
@@ -1037,23 +1175,10 @@ 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
+        # 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
@@ -1062,6 +1187,9 @@ def engine_status(
     )
 
     if show_log:
+        if not detailed:
+            console.print("[yellow]Note: --show-log requires --detailed flag[/yellow]")
+            return
         console.print("\n[bold]Bootstrap Log:[/bold]")
         try:
             ssm = boto3.client("ssm", region_name="us-east-1")
@@ -2631,6 +2759,7 @@ def idle_timeout_cmd(
     set: Optional[str] = typer.Option(
         None, "--set", "-s", help="New timeout (e.g., 2h30m, 45m)"
     ),
+
 ):
     """Show or set the engine idle-detector timeout."""
     check_aws_sso()
@@ -2647,7 +2776,7 @@ def idle_timeout_cmd(
     ssm = boto3.client("ssm", region_name="us-east-1")
 
     if set is None:
-        # Show current
+        # Show current timeout setting
         resp = ssm.send_command(
             InstanceIds=[engine["instance_id"]],
             DocumentName="AWS-RunShellScript",

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

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

{dayhoff_tools-1.9.4.dist-info → dayhoff_tools-1.9.6.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=sJroAFeJqHBMwONTLTFUNfuJf0PvN6xu-OBoVS_b4uU,107111
+dayhoff_tools/cli/engine_commands.py,sha256=A4EZtbU52HI1Xnm44cnko2l2r6eUDZej4zzgiXU3TaE,112781
 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.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,,
+dayhoff_tools-1.9.6.dist-info/METADATA,sha256=sDQKrTIcHUWSK3oUbacWbr2MuhAfat7SDrHdIXQXW48,2914
+dayhoff_tools-1.9.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.9.6.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.9.6.dist-info/RECORD,,