dayhoff-tools 1.9.12__py3-none-any.whl → 1.9.13__py3-none-any.whl

dayhoff_tools/cli/engine/engine_core.py

@@ -217,8 +217,12 @@ def list_engines(
 
 def engine_status(
     name_or_id: str = typer.Argument(help="Engine name or instance ID"),
-    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)"),
+    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 engine status and information."""
     check_aws_sso()
@@ -477,6 +481,47 @@ def engine_status(
         except Exception:
             pass
 
+    # Slack notifications status (detailed view only)
+    try:
+        ssm = boto3.client("ssm", region_name="us-east-1")
+        resp = ssm.send_command(
+            InstanceIds=[engine["instance_id"]],
+            DocumentName="AWS-RunShellScript",
+            Parameters={
+                "commands": ["grep '^SLACK_NOTIFY_' /etc/engine.env || true"],
+                "executionTimeout": ["10"],
+            },
+        )
+        cid = resp["Command"]["CommandId"]
+        time.sleep(1)
+        inv = ssm.get_command_invocation(
+            CommandId=cid, InstanceId=engine["instance_id"]
+        )
+        if inv["Status"] == "Success":
+            settings_raw = inv["StandardOutputContent"].strip()
+            settings = {}
+            for line in settings_raw.splitlines():
+                if "=" in line:
+                    key, value = line.split("=", 1)
+                    settings[key.strip()] = value.strip().lower()
+
+            status_lines.append("")
+            status_lines.append("[bold]Slack Notifications:[/bold]")
+
+            def _setting_line(label: str, key: str) -> str:
+                val = settings.get(key, "false")  # Default to false if not set
+                status = "[green]on[/green]" if val == "true" else "[dim]off[/dim]"
+                return f"  - {label:15} {status}"
+
+            status_lines.append(_setting_line("Idle Start", "SLACK_NOTIFY_IDLE_START"))
+            status_lines.append(
+                _setting_line("IDE Disconnect", "SLACK_NOTIFY_IDE_DISCONNECT")
+            )
+            status_lines.append(_setting_line("Warnings", "SLACK_NOTIFY_WARNINGS"))
+            status_lines.append(_setting_line("Shutdown", "SLACK_NOTIFY_SHUTDOWN"))
+    except Exception:
+        pass
+
     # Activity Sensors (show all with YES/no)
     if idle_detector.get("available"):
         status_lines.append("")
@@ -564,10 +609,14 @@ def _format_idle_status_display(
         ):
             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]"
+            remaining_secs = remaining % 60
+
+            if remaining < 60:
+                time_left_str = f"[red]{remaining}s[/red] left"
             else:
-                return f"[yellow]Idle {int(idle_seconds_v)//60}m/{int(thresh_v)//60}m: [red]{remaining_mins}m[/red] left[/yellow]"
+                time_left_str = f"[red]{remaining_mins}m {remaining_secs}s[/red] left"
+
+            return f"[yellow]Idle {int(idle_seconds_v)//60}m/{int(thresh_v)//60}m: {time_left_str}[/yellow]"
         elif isinstance(thresh_v, (int, float)):
             return f"[yellow]Idle ?/{int(thresh_v)//60}m[/yellow]"
         else:

dayhoff_tools/cli/engine/engine_maintenance.py

@@ -11,12 +11,7 @@ from botocore.exceptions import ClientError
 from rich.progress import Progress, SpinnerColumn, TextColumn
 from rich.prompt import Confirm
 
-from .shared import (
-    check_aws_sso,
-    console,
-    make_api_request,
-    resolve_engine,
-)
+from .shared import check_aws_sso, console, make_api_request, resolve_engine
 
 
 def coffee(
@@ -123,9 +118,11 @@ def idle_timeout_cmd(
     set: Optional[str] = typer.Option(
         None, "--set", "-s", help="New timeout (e.g., 2h30m, 45m)"
     ),
-
+    slack: Optional[str] = typer.Option(
+        None, "--slack", help="Set Slack notifications: none, default, all"
+    ),
 ):
-    """Show or set the engine idle-detector timeout."""
+    """Show or set engine idle-detector settings."""
     check_aws_sso()
 
     # Resolve engine
@@ -139,7 +136,56 @@ def idle_timeout_cmd(
 
     ssm = boto3.client("ssm", region_name="us-east-1")
 
-    if set is None:
+    # Handle slack notifications change
+    if slack:
+        slack = slack.lower()
+        if slack not in ["none", "default", "all"]:
+            console.print("[red]❌ Invalid slack option. Use: none, default, all[/red]")
+            raise typer.Exit(1)
+
+        console.print(f"Setting Slack notifications to [bold]{slack}[/bold]...")
+
+        if slack == "none":
+            settings = {
+                "SLACK_NOTIFY_WARNINGS": "false",
+                "SLACK_NOTIFY_IDLE_START": "false",
+                "SLACK_NOTIFY_IDE_DISCONNECT": "false",
+                "SLACK_NOTIFY_SHUTDOWN": "false",
+            }
+        elif slack == "default":
+            settings = {
+                "SLACK_NOTIFY_WARNINGS": "true",
+                "SLACK_NOTIFY_IDLE_START": "false",
+                "SLACK_NOTIFY_IDE_DISCONNECT": "false",
+                "SLACK_NOTIFY_SHUTDOWN": "true",
+            }
+        else:  # all
+            settings = {
+                "SLACK_NOTIFY_WARNINGS": "true",
+                "SLACK_NOTIFY_IDLE_START": "true",
+                "SLACK_NOTIFY_IDE_DISCONNECT": "true",
+                "SLACK_NOTIFY_SHUTDOWN": "true",
+            }
+
+        commands = []
+        for key, value in settings.items():
+            # Use a robust sed command that adds the line if it doesn't exist
+            commands.append(
+                f"grep -q '^{key}=' /etc/engine.env && sudo sed -i 's|^{key}=.*|{key}={value}|' /etc/engine.env || echo '{key}={value}' | sudo tee -a /etc/engine.env > /dev/null"
+            )
+
+        commands.append("sudo systemctl restart engine-idle-detector.service")
+
+        resp = ssm.send_command(
+            InstanceIds=[engine["instance_id"]],
+            DocumentName="AWS-RunShellScript",
+            Parameters={"commands": commands, "executionTimeout": ["60"]},
+        )
+        cid = resp["Command"]["CommandId"]
+        time.sleep(2)  # Give it a moment to process
+        console.print(f"[green]✓ Slack notifications updated to '{slack}'[/green]")
+
+    if set is None and not slack:
         # Show current timeout setting
         resp = ssm.send_command(
             InstanceIds=[engine["instance_id"]],
@@ -164,7 +210,7 @@ def idle_timeout_cmd(
             console.print("[red]❌ Could not retrieve idle timeout[/red]")
         return
 
-    # ----- set new value -----
+    # ----- set new value for timeout -----
     m = re.match(r"^(?:(\d+)h)?(?:(\d+)m)?$", set)
     if not m:
         console.print("[red]❌ Invalid duration format. Use e.g. 2h, 45m, 1h30m[/red]")

{dayhoff_tools-1.9.12.dist-info → dayhoff_tools-1.9.13.dist-info}/METADATA

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

{dayhoff_tools-1.9.12.dist-info → dayhoff_tools-1.9.13.dist-info}/RECORD

@@ -4,9 +4,9 @@ dayhoff_tools/chemistry/utils.py,sha256=jt-7JgF-GeeVC421acX-bobKbLU_X94KNOW24p_P
 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/__init__.py,sha256=CGJ2blhWIIEsVb8HoLibZjSlMFRTSYZOO4zDQTtY3SY,9300
-dayhoff_tools/cli/engine/engine_core.py,sha256=IEU2m93qArFx-EdVHnepWKvLwlNUAcT7ytIAqeOY6a0,25147
+dayhoff_tools/cli/engine/engine_core.py,sha256=ItfqW3ZWoHEWLOgtWPYT-SO1idxk5RBBCIe8w9xxf3w,26959
 dayhoff_tools/cli/engine/engine_lifecycle.py,sha256=_Dk-EZs_qbm8APdOuGOuxhlbK6RgkkoLk2nrwKoo1-A,4519
-dayhoff_tools/cli/engine/engine_maintenance.py,sha256=Vz4FpbM0eyfl9tTM6Q8z0ZzS2Ug5gAE-uKVbqBHkznU,13761
+dayhoff_tools/cli/engine/engine_maintenance.py,sha256=xZgEgpjwTDI2RpoN7P6E7MEGiIA8RJpb0MkCT9u2R14,15889
 dayhoff_tools/cli/engine/engine_management.py,sha256=s_H3FtMlKsdfzR8pwV-j2W2QX-Fypkqj2kPC0aTqC1A,19072
 dayhoff_tools/cli/engine/shared.py,sha256=Ecx6I1jtzmxQDn3BezKpgpQ4SJeZf4SZjUCLg-67p80,16844
 dayhoff_tools/cli/engine/studio_commands.py,sha256=VwTQujz32-uMcYusDRE73SdzRpgvIkv7ZAF4zRv6AzA,30266
@@ -33,7 +33,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.12.dist-info/METADATA,sha256=EkiO1dejnv9KxAs8X7ycLdfGUlph70tyIeNPWQc-12U,2915
-dayhoff_tools-1.9.12.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.9.12.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.9.12.dist-info/RECORD,,
+dayhoff_tools-1.9.13.dist-info/METADATA,sha256=Sf1ILU9mg5Cvs7NepbxAB0NJSuKM_gMqrKopTykTqDM,2915
+dayhoff_tools-1.9.13.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.9.13.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.9.13.dist-info/RECORD,,