dayhoff-tools 1.9.13__tar.gz → 1.9.15__tar.gz

{dayhoff_tools-1.9.13 → dayhoff_tools-1.9.15}/PKG-INFO

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

{dayhoff_tools-1.9.13 → dayhoff_tools-1.9.15}/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-1.9.13 → dayhoff_tools-1.9.15}/dayhoff_tools/cli/engine/engine_maintenance.py

@@ -185,7 +185,40 @@ def idle_timeout_cmd(
         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:
+    # Handle setting new timeout value
+    if set is not None:
+        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]"
+            )
+            raise typer.Exit(1)
+        hours = int(m.group(1) or 0)
+        minutes = int(m.group(2) or 0)
+        seconds = hours * 3600 + minutes * 60
+        if seconds == 0:
+            console.print("[red]❌ Duration must be greater than zero[/red]")
+            raise typer.Exit(1)
+
+        console.print(f"Setting idle timeout to {set} ({seconds} seconds)…")
+
+        cmd = (
+            "sudo sed -i '/^IDLE_TIMEOUT_SECONDS=/d' /etc/engine.env && "
+            f"echo 'IDLE_TIMEOUT_SECONDS={seconds}' | sudo tee -a /etc/engine.env >/dev/null && "
+            "sudo systemctl restart engine-idle-detector.service"
+        )
+
+        resp = ssm.send_command(
+            InstanceIds=[engine["instance_id"]],
+            DocumentName="AWS-RunShellScript",
+            Parameters={"commands": [cmd], "executionTimeout": ["60"]},
+        )
+        cid = resp["Command"]["CommandId"]
+        time.sleep(2)
+        console.print(f"[green]✓ Idle timeout updated to {set}[/green]")
+
+    # If no action was specified, show current timeout
+    if set is None and slack is None:
         # Show current timeout setting
         resp = ssm.send_command(
             InstanceIds=[engine["instance_id"]],
@@ -210,35 +243,6 @@ def idle_timeout_cmd(
             console.print("[red]❌ Could not retrieve idle timeout[/red]")
         return
 
-    # ----- 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]")
-        raise typer.Exit(1)
-    hours = int(m.group(1) or 0)
-    minutes = int(m.group(2) or 0)
-    seconds = hours * 3600 + minutes * 60
-    if seconds == 0:
-        console.print("[red]❌ Duration must be greater than zero[/red]")
-        raise typer.Exit(1)
-
-    console.print(f"Setting idle timeout to {set} ({seconds} seconds)…")
-
-    cmd = (
-        "sudo sed -i '/^IDLE_TIMEOUT_SECONDS=/d' /etc/engine.env && "
-        f"echo 'IDLE_TIMEOUT_SECONDS={seconds}' | sudo tee -a /etc/engine.env >/dev/null && "
-        "sudo systemctl restart engine-idle-detector.service"
-    )
-
-    resp = ssm.send_command(
-        InstanceIds=[engine["instance_id"]],
-        DocumentName="AWS-RunShellScript",
-        Parameters={"commands": [cmd], "executionTimeout": ["60"]},
-    )
-    cid = resp["Command"]["CommandId"]
-    time.sleep(2)
-    console.print(f"[green]✓ Idle timeout updated to {set}[/green]")
-
 
 def debug_engine(
     name_or_id: str = typer.Argument(help="Engine name or instance ID"),

{dayhoff_tools-1.9.13 → dayhoff_tools-1.9.15}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "dayhoff-tools"
-version = "1.9.13"
+version = "1.9.15"
 description = "Common tools for all the repos at Dayhoff Labs"
 authors = [
     {name = "Daniel Martin-Alarcon", email = "dma@dayhofflabs.com"}