dayhoff-tools 1.9.7__py3-none-any.whl → 1.9.9__py3-none-any.whl

dayhoff_tools/cli/engine_commands.py

@@ -709,11 +709,7 @@ def engine_status(
     engine = resolve_engine(name_or_id, engines)
     
     # Fast status display (default)
-    if not detailed:
-        # 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
-        
+    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
@@ -781,7 +777,11 @@ def engine_status(
                 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]"
+                        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:
@@ -790,17 +790,12 @@ def engine_status(
         
         # Build status lines - minimal info for fast view
         status_lines = [
-            f"[blue]{engine['name']}[/blue]  {run_disp}{idle_disp}\n",
+            f"[blue]{engine['name']}[/blue]  {run_disp}{idle_disp}",
         ]
         
-        # Add studio owner if known
-        if studio_user:
-            status_lines.append(f"Studio: [magenta]{studio_user}[/magenta]")
-        
         # Add activity sensors if we have idle data
         if idle_data and idle_data.get("reasons"):
-            status_lines.append("")
-            status_lines.append("[bold]Activity:[/bold]")
+            status_lines.append("")  # blank line before sensors
             
             sensor_map = {
                 "CoffeeLockSensor": ("☕", "Coffee"),
@@ -889,14 +884,14 @@ def engine_status(
 
     # 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 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":
@@ -904,7 +899,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:
@@ -949,47 +948,51 @@ def engine_status(
         disk_usage = get_disk_usage_via_ssm(engine["instance_id"]) or "-"
         status_lines.append(f"Disk:       {disk_usage}")
 
-    # Idle timeout (show even when not idle)
-    idle_threshold_secs: Optional[int] = None
-    # Prefer value from idle detector overlay if present
-    try:
-        if isinstance(idle_detector.get("idle_threshold"), (int, float)):
-            idle_threshold_secs = int(idle_detector["idle_threshold"])
-    except Exception:
-        idle_threshold_secs = None
-
-    if idle_threshold_secs is None and engine["state"].lower() == "running":
-        # Fallback: read /etc/engine.env via SSM
+    # Idle timeout (show even when not idle) - but only if we have data
+    if idle_detector.get("available"):
+        idle_threshold_secs: Optional[int] = None
+        # Prefer value from idle detector overlay if present
         try:
-            ssm = boto3.client("ssm", region_name="us-east-1")
-            resp = ssm.send_command(
-                InstanceIds=[engine["instance_id"]],
-                DocumentName="AWS-RunShellScript",
-                Parameters={
-                    "commands": [
-                        "grep -E '^IDLE_TIMEOUT_SECONDS=' /etc/engine.env | cut -d'=' -f2 || echo 1800",
-                    ],
-                    "executionTimeout": ["5"],
-                },
-            )
-            cid = resp["Command"]["CommandId"]
-            time.sleep(1)
-            inv = ssm.get_command_invocation(
-                CommandId=cid, InstanceId=engine["instance_id"]
-            )
-            if inv.get("Status") == "Success":
-                out = (inv.get("StandardOutputContent") or "").strip()
-                if out:
-                    idle_threshold_secs = int(out.splitlines()[0].strip())
+            if isinstance(idle_detector.get("idle_threshold"), (int, float)):
+                idle_threshold_secs = int(idle_detector["idle_threshold"])
         except Exception:
             idle_threshold_secs = None
 
-    if idle_threshold_secs is None:
-        idle_threshold_secs = 1800
+        if idle_threshold_secs is None and engine["state"].lower() == "running":
+            # Fallback: read /etc/engine.env via SSM
+            try:
+                ssm = boto3.client("ssm", region_name="us-east-1")
+                resp = ssm.send_command(
+                    InstanceIds=[engine["instance_id"]],
+                    DocumentName="AWS-RunShellScript",
+                    Parameters={
+                        "commands": [
+                            "grep -E '^IDLE_TIMEOUT_SECONDS=' /etc/engine.env | cut -d'=' -f2 || echo '?'",
+                        ],
+                        "executionTimeout": ["5"],
+                    },
+                )
+                cid = resp["Command"]["CommandId"]
+                time.sleep(1)
+                inv = ssm.get_command_invocation(
+                    CommandId=cid, InstanceId=engine["instance_id"]
+                )
+                if inv.get("Status") == "Success":
+                    out = (inv.get("StandardOutputContent") or "").strip()
+                    if out and out != "?" and out.isdigit():
+                        idle_threshold_secs = int(out)
+            except Exception:
+                idle_threshold_secs = None
 
-    status_lines.append(
-        f"Idle timeout: {idle_threshold_secs//60}m ({idle_threshold_secs}s)"
-    )
+        if idle_threshold_secs is not None:
+            status_lines.append(
+                f"Idle timeout: {idle_threshold_secs//60}m ({idle_threshold_secs}s)"
+            )
+        else:
+            status_lines.append("Idle timeout: unknown")
+    else:
+        # No idle detector data available
+        status_lines.append("Idle timeout: N/A")
 
     # Health report (only if bootstrap finished)
     if stage_val == "finished":
@@ -1133,13 +1136,14 @@ def engine_status(
         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 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
+    # 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"):

{dayhoff_tools-1.9.7.dist-info → dayhoff_tools-1.9.9.dist-info}/METADATA

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

{dayhoff_tools-1.9.7.dist-info → dayhoff_tools-1.9.9.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=6dvAYmpg4H3ulTx3duPCd5JzQtMl6lgh1MsnotzxEC8,112564
+dayhoff_tools/cli/engine_commands.py,sha256=OHaaF28Dh1WSh2c-YKTRfIlYNCrlld0LvgyRIP9e_Hc,113202
 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.7.dist-info/METADATA,sha256=JUzRKthCiuuhJ7UA71zTnHTTqmBm64_hjKdBR-qUgyc,2914
-dayhoff_tools-1.9.7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.9.7.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.9.7.dist-info/RECORD,,
+dayhoff_tools-1.9.9.dist-info/METADATA,sha256=01FYQCJJf9a5Y0BngfeSTZesnMURFjXTFPgHK30CWdA,2914
+dayhoff_tools-1.9.9.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.9.9.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.9.9.dist-info/RECORD,,