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

dayhoff_tools/cli/engine/__init__.py

@@ -1,5 +1,7 @@
 """Engine and Studio management commands for DHT CLI."""
 
+from typing import Optional
+
 import typer
 
 # Initialize Typer apps
@@ -9,6 +11,7 @@ studio_app = typer.Typer(help="Manage persistent development studios.")
 # Use lazy loading pattern similar to main.py swarm commands
 # Import functions only when commands are actually called
 
+
 # Engine commands
 @engine_app.command("launch")
 def launch_engine_cmd(
@@ -34,6 +37,7 @@ def launch_engine_cmd(
 ):
     """Launch a new engine instance."""
     from .engine_core import launch_engine
+
     return launch_engine(name, engine_type, user, boot_disk_size, availability_zone)
 
 
@@ -52,17 +56,23 @@ def list_engines_cmd(
 ):
     """List engines (shows all engines by default)."""
     from .engine_core import list_engines
+
     return list_engines(user, running_only, stopped_only, detailed)
 
 
 @engine_app.command("status")
 def engine_status_cmd(
     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."""
     from .engine_core import engine_status
+
     return engine_status(name_or_id, detailed, show_log)
 
 
@@ -72,6 +82,7 @@ def start_engine_cmd(
 ):
     """Start a stopped engine."""
     from .engine_lifecycle import start_engine
+
     return start_engine(name_or_id)
 
 
@@ -84,6 +95,7 @@ def stop_engine_cmd(
 ):
     """Stop an engine."""
     from .engine_lifecycle import stop_engine
+
     return stop_engine(name_or_id, force)
 
 
@@ -93,6 +105,7 @@ def terminate_engine_cmd(
 ):
     """Permanently terminate an engine."""
     from .engine_lifecycle import terminate_engine
+
     return terminate_engine(name_or_id)
 
 
@@ -110,6 +123,7 @@ def ssh_engine_cmd(
 ):
     """Connect to an engine via SSH."""
     from .engine_management import ssh_engine
+
     return ssh_engine(name_or_id, admin, idle_timeout)
 
 
@@ -127,6 +141,7 @@ def config_ssh_cmd(
 ):
     """Update SSH config with available engines."""
     from .engine_management import config_ssh
+
     return config_ssh(clean, all_engines, admin)
 
 
@@ -145,6 +160,7 @@ def resize_engine_cmd(
 ):
     """Resize an engine's boot disk."""
     from .engine_management import resize_engine
+
     return resize_engine(name_or_id, size, online, force)
 
 
@@ -156,6 +172,7 @@ def create_ami_cmd(
 ):
     """Create a 'Golden AMI' from a running engine."""
     from .engine_management import create_ami
+
     return create_ami(name_or_id)
 
 
@@ -169,19 +186,24 @@ def coffee_cmd(
 ):
     """Pour ☕ for an engine: keeps it awake for the given duration (or cancel)."""
     from .engine_maintenance import coffee
+
     return coffee(name_or_id, duration, cancel)
 
 
 @engine_app.command("idle")
 def idle_timeout_cmd_wrapper(
     name_or_id: str = typer.Argument(help="Engine name or instance ID"),
-    set: str = typer.Option(
+    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."""
     from .engine_maintenance import idle_timeout_cmd
-    return idle_timeout_cmd(name_or_id, set)
+
+    return idle_timeout_cmd(name_or_id=name_or_id, set=set, slack=slack)
 
 
 @engine_app.command("debug")
@@ -190,6 +212,7 @@ def debug_engine_cmd(
 ):
     """Debug engine bootstrap status and files."""
     from .engine_maintenance import debug_engine
+
     return debug_engine(name_or_id)
 
 
@@ -199,6 +222,7 @@ def repair_engine_cmd(
 ):
     """Repair an engine that's stuck in a bad state (e.g., after GAMI creation)."""
     from .engine_maintenance import repair_engine
+
     return repair_engine(name_or_id)
 
 
@@ -209,6 +233,7 @@ def create_studio_cmd(
 ):
     """Create a new studio for the current user."""
     from .studio_commands import create_studio
+
     return create_studio(size_gb)
 
 
@@ -220,6 +245,7 @@ def studio_status_cmd(
 ):
     """Show status of your studio."""
     from .studio_commands import studio_status
+
     return studio_status(user)
 
 
@@ -232,6 +258,7 @@ def attach_studio_cmd(
 ):
     """Attach your studio to an engine."""
     from .studio_commands import attach_studio
+
     return attach_studio(engine_name_or_id, user)
 
 
@@ -243,6 +270,7 @@ def detach_studio_cmd(
 ):
     """Detach your studio from its current engine."""
     from .studio_commands import detach_studio
+
     return detach_studio(user)
 
 
@@ -254,6 +282,7 @@ def delete_studio_cmd(
 ):
     """Delete your studio permanently."""
     from .studio_commands import delete_studio
+
     return delete_studio(user)
 
 
@@ -265,6 +294,7 @@ def list_studios_cmd(
 ):
     """List studios."""
     from .studio_commands import list_studios
+
     return list_studios(all_users)
 
 
@@ -276,6 +306,7 @@ def reset_studio_cmd(
 ):
     """Reset a stuck studio (admin operation)."""
     from .studio_commands import reset_studio
+
     return reset_studio(user)
 
 
@@ -288,4 +319,5 @@ def resize_studio_cmd(
 ):
     """Resize your studio volume (requires detachment)."""
     from .studio_commands import resize_studio
-    return resize_studio(size, user)
+
+    return resize_studio(size, user)

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.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dayhoff-tools
-Version: 1.9.12
+Version: 1.9.14
 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.14.dist-info}/RECORD

@@ -3,10 +3,10 @@ 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/__init__.py,sha256=CGJ2blhWIIEsVb8HoLibZjSlMFRTSYZOO4zDQTtY3SY,9300
-dayhoff_tools/cli/engine/engine_core.py,sha256=IEU2m93qArFx-EdVHnepWKvLwlNUAcT7ytIAqeOY6a0,25147
+dayhoff_tools/cli/engine/__init__.py,sha256=RE45X2IPCNUvQp6_OHI2lbjwoqexkH3roUPccIHkeJo,9540
+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.14.dist-info/METADATA,sha256=EewV69EQMTMaa0DUiq2t7J9w6WzsTv7Qd7Pz0Jcjg-w,2915
+dayhoff_tools-1.9.14.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.9.14.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.9.14.dist-info/RECORD,,