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

dayhoff_tools/cli/engine_commands.py

@@ -710,19 +710,13 @@ def engine_status(
     
     # 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", [])
+        # Skip the API call for studios - use basic info we already have
+        attached_studios = []
+        studio_user = engine.get("user")  # Use the engine's user as studio owner
         
         # Fetch idle status via SSM with longer timeout
         ssm = boto3.client("ssm", region_name="us-east-1")
-        idle_data = {}
+        idle_data = None  # Use None to indicate no data received
         
         if engine["state"].lower() == "running":
             try:
@@ -751,11 +745,10 @@ def engine_status(
                     content = inv["StandardOutputContent"].strip()
                     if content and content != "{}":
                         idle_data = json.loads(content)
+                    else:
+                        idle_data = {}  # Empty response but SSM worked
             except Exception:
-                pass  # Best effort
-        
-        # Build status display
-        hourly_cost = HOURLY_COSTS.get(engine["engine_type"], 0)
+                idle_data = None  # SSM failed
         
         # Determine running state display
         running_state = engine["state"].lower()
@@ -773,48 +766,45 @@ def engine_status(
         # 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]"
+            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:
-                idle_disp = "  [green]Active[/green]"
+                # 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]"
         
-        # Build status lines
+        # Build status lines - minimal info for fast view
         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]")
+        if idle_data and idle_data.get("reasons"):
+            status_lines.append("")  # blank line before sensors
             
             sensor_map = {
                 "CoffeeLockSensor": ("☕", "Coffee"),
                 "ActiveLoginSensor": ("🐚", "SSH"),
-                "IDEConnectionSensor": ("🖥", "IDE"),
+                "IDEConnectionSensor": ("🖥 ", "IDE"),
                 "DockerWorkloadSensor": ("🐳", "Docker"),
             }
             
@@ -822,7 +812,7 @@ def engine_status(
                 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_str = "[green]YES[/green]" if active else "[dim]nope[/dim]"
                 status_lines.append(f"  {icon} {label:6} {status_str}")
         
         # Display in a nice panel
@@ -913,7 +903,11 @@ def engine_status(
             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]"
+                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:

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

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

{dayhoff_tools-1.9.6.dist-info → dayhoff_tools-1.9.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=A4EZtbU52HI1Xnm44cnko2l2r6eUDZej4zzgiXU3TaE,112781
+dayhoff_tools/cli/engine_commands.py,sha256=Ub-a5D93YvkciBZZ5Peny7ExEyvpZHUNhckwoVWb7iY,112861
 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.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,,
+dayhoff_tools-1.9.8.dist-info/METADATA,sha256=9BRSMjhcHQLYNDDAsAPv96bto0ql63f6d-83RMjXAVQ,2914
+dayhoff_tools-1.9.8.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.9.8.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.9.8.dist-info/RECORD,,