dayhoff-tools 1.3.23__py3-none-any.whl → 1.3.25__py3-none-any.whl

dayhoff_tools/cli/engine_commands.py

@@ -934,26 +934,31 @@ def config_ssh(
             )
 
 
-@engine_app.command("keep-awake")
-def keep_awake(
+@engine_app.command("coffee")
+def coffee(
     name_or_id: str = typer.Argument(help="Engine name or instance ID"),
-    duration: str = typer.Argument("4h", help="Duration (e.g., 2h, 30m, 4h30m)"),
+    duration: str = typer.Argument("4h", help="Duration (e.g., 2h, 30m, 2h30m)"),
+    cancel: bool = typer.Option(False, "--cancel", help="Cancel existing coffee lock instead of extending"),
 ):
-    """Prevent an engine from auto-shutting down."""
+    """Pour ☕ for an engine: keeps it awake for the given duration (or cancel)."""
     username = check_aws_sso()
 
     # Parse duration
     import re
 
-    match = re.match(r"(?:(\d+)h)?(?:(\d+)m)?", duration)
-    if not match or (not match.group(1) and not match.group(2)):
-        console.print(f"[red]❌ Invalid duration format: {duration}[/red]")
-        console.print("Use format like: 4h, 30m, 2h30m")
-        raise typer.Exit(1)
+    if not cancel:
+        match = re.match(r"(?:(\d+)h)?(?:(\d+)m)?", duration)
+        if not match or (not match.group(1) and not match.group(2)):
+            console.print(f"[red]❌ Invalid duration format: {duration}[/red]")
+            console.print("Use format like: 4h, 30m, 2h30m")
+            raise typer.Exit(1)
 
-    hours = int(match.group(1) or 0)
-    minutes = int(match.group(2) or 0)
-    total_minutes = hours * 60 + minutes
+        hours = int(match.group(1) or 0)
+        minutes = int(match.group(2) or 0)
+        seconds_total = (hours * 60 + minutes) * 60
+        if seconds_total == 0:
+            console.print("[red]❌ Duration must be greater than zero[/red]")
+            raise typer.Exit(1)
 
     # Get all engines to resolve name
     response = make_api_request("GET", "/engines")
@@ -968,9 +973,10 @@ def keep_awake(
         console.print(f"[red]❌ Engine is not running (state: {engine['state']})[/red]")
         raise typer.Exit(1)
 
-    console.print(
-        f"Setting keep-awake for [cyan]{engine['name']}[/cyan] for {duration}..."
-    )
+    if cancel:
+        console.print(f"Cancelling coffee for [cyan]{engine['name']}[/cyan]…")
+    else:
+        console.print(f"Pouring coffee for [cyan]{engine['name']}[/cyan] for {duration}…")
 
     # Use SSM to run the engine keep-alive command
     ssm = boto3.client("ssm", region_name="us-east-1")
@@ -979,7 +985,9 @@ def keep_awake(
             InstanceIds=[engine["instance_id"]],
             DocumentName="AWS-RunShellScript",
             Parameters={
-                "commands": [f"engine keep-alive {duration}"],
+                "commands": [
+                    ("/usr/local/bin/engine-coffee --cancel" if cancel else f"/usr/local/bin/engine-coffee {seconds_total}")
+                ],
                 "executionTimeout": ["60"],
             },
         )
@@ -997,75 +1005,23 @@ def keep_awake(
                 break
 
         if result["Status"] == "Success":
-            console.print(f"[green]✓ Engine will stay awake for {duration}[/green]")
+            if cancel:
+                console.print("[green]✓ Coffee cancelled – auto-shutdown re-enabled[/green]")
+            else:
+                console.print(f"[green]✓ Coffee poured for {duration}[/green]")
             console.print(
                 "\n[dim]Note: Detached Docker containers (except dev containers) will also keep the engine awake.[/dim]"
             )
             console.print(
-                "[dim]Use keep-awake for nohup operations or other background tasks.[/dim]"
-            )
-        else:
-            console.print(
-                f"[red]❌ Failed to set keep-awake: {result.get('StatusDetails', 'Unknown error')}[/red]"
-            )
-
-    except ClientError as e:
-        console.print(f"[red]❌ Failed to set keep-awake: {e}[/red]")
-
-
-@engine_app.command("cancel-keep-awake")
-def cancel_keep_awake(
-    name_or_id: str = typer.Argument(help="Engine name or instance ID"),
-):
-    """Cancel keep-awake and re-enable auto-shutdown."""
-    username = check_aws_sso()
-
-    # Get all engines to resolve name
-    response = make_api_request("GET", "/engines")
-    if response.status_code != 200:
-        console.print("[red]❌ Failed to fetch engines[/red]")
-        raise typer.Exit(1)
-
-    engines = response.json().get("engines", [])
-    engine = resolve_engine(name_or_id, engines)
-
-    console.print(f"Cancelling keep-awake for [cyan]{engine['name']}[/cyan]...")
-
-    # Use SSM to run the engine cancel command
-    ssm = boto3.client("ssm", region_name="us-east-1")
-    try:
-        response = ssm.send_command(
-            InstanceIds=[engine["instance_id"]],
-            DocumentName="AWS-RunShellScript",
-            Parameters={
-                "commands": ["engine cancel"],
-                "executionTimeout": ["60"],
-            },
-        )
-
-        command_id = response["Command"]["CommandId"]
-
-        # Wait for command to complete
-        for _ in range(10):
-            time.sleep(1)
-            result = ssm.get_command_invocation(
-                CommandId=command_id,
-                InstanceId=engine["instance_id"],
-            )
-            if result["Status"] in ["Success", "Failed"]:
-                break
-
-        if result["Status"] == "Success":
-            console.print(
-                "[green]✓ Keep-awake cancelled, auto-shutdown re-enabled[/green]"
+                "[dim]Use coffee for nohup operations or other background tasks.[/dim]"
             )
         else:
             console.print(
-                f"[red]❌ Failed to cancel keep-awake: {result.get('StatusDetails', 'Unknown error')}[/red]"
+                f"[red]❌ Failed to manage coffee: {result.get('StatusDetails', 'Unknown error')}[/red]"
             )
 
     except ClientError as e:
-        console.print(f"[red]❌ Failed to cancel keep-awake: {e}[/red]")
+        console.print(f"[red]❌ Failed to manage coffee: {e}[/red]")
 
 
 @engine_app.command("resize")
@@ -1229,7 +1185,7 @@ def resize_engine(
         raise typer.Exit(1)
 
 
-@engine_app.command("create-ami")
+@engine_app.command("gami")
 def create_ami(
     name_or_id: str = typer.Argument(
         help="Engine name or instance ID to create AMI from"
@@ -2007,7 +1963,7 @@ def resize_studio(
 # ================= Idle timeout command =================
 
 
-@engine_app.command("idle-timeout")
+@engine_app.command("idle")
 def idle_timeout_cmd(
     name_or_id: str = typer.Argument(help="Engine name or instance ID"),
     set: Optional[str] = typer.Option(None, "--set", "-s", help="New timeout (e.g., 2h30m, 45m)")

{dayhoff_tools-1.3.23.dist-info → dayhoff_tools-1.3.25.dist-info}/METADATA

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

{dayhoff_tools-1.3.23.dist-info → dayhoff_tools-1.3.25.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=sSgz_4mBDfUazezpbcdW5S5sIsTzDWVSrJBozF-hutw,79904
+dayhoff_tools/cli/engine_commands.py,sha256=XVg03q0MG4DpzMxep3VRbEWZqDU_LHRD3j_xKui4Ync,78722
 dayhoff_tools/cli/main.py,sha256=rgeEHD9lJ8SBCR34BTLb7gVInHUUdmEBNXAJnq5yEU4,4795
 dayhoff_tools/cli/swarm_commands.py,sha256=5EyKj8yietvT5lfoz8Zx0iQvVaNgc3SJX1z2zQR6o6M,5614
 dayhoff_tools/cli/utility_commands.py,sha256=qs8vH9TBFHsOPC3X8cU3qZigM3dDn-2Ytq4o_F2WubU,27874
@@ -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=8YbnQ--usrEgDQGfvpV4MrMji55A0rq2hZaOgFGh6ag,15896
-dayhoff_tools-1.3.23.dist-info/METADATA,sha256=VTbAe-npnV8ApVkgUpu1z2ALJRZ6psWeAMJsT253mO8,2825
-dayhoff_tools-1.3.23.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.3.23.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.3.23.dist-info/RECORD,,
+dayhoff_tools-1.3.25.dist-info/METADATA,sha256=-M4-C9Y0ICSbkfUiaIGTw_Voh9QnrIcYNGmklHYyZUU,2825
+dayhoff_tools-1.3.25.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.3.25.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.3.25.dist-info/RECORD,,