From 7f9777a0b045583bf86518c5c17f2380e5e5e636 Mon Sep 17 00:00:00 2001 From: teknium1 Date: Wed, 4 Mar 2026 03:29:05 -0800 Subject: [PATCH] feat: add container resource configuration prompts in setup wizard Introduced interactive prompts for configuring container resource settings (CPU, memory, disk, persistence) during the setup wizard. Updated the default configuration to include these settings and improved user guidance on their implications for Docker, Singularity, and Modal backends. This enhancement aims to streamline the setup process and provide users with clearer options for resource management. --- cli-config.yaml.example | 8 +++---- hermes_cli/config.py | 7 +++++- hermes_cli/setup.py | 50 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 5 deletions(-) diff --git a/cli-config.yaml.example b/cli-config.yaml.example index 170c142b..0ca40635 100644 --- a/cli-config.yaml.example +++ b/cli-config.yaml.example @@ -120,10 +120,10 @@ terminal: # --- Container resource limits (docker, singularity, modal -- ignored for local/ssh) --- # These settings apply to all container backends. They control the resources # allocated to the sandbox and whether its filesystem persists across sessions. -# container_cpu: 1 # CPU cores (default: 1) -# container_memory: 5120 # Memory in MB (default: 5120 = 5GB) -# container_disk: 51200 # Disk in MB (default: 51200 = 50GB) -# container_persistent: true # Persist filesystem across sessions (default: true) + container_cpu: 1 # CPU cores + container_memory: 5120 # Memory in MB (5120 = 5GB) + container_disk: 51200 # Disk in MB (51200 = 50GB) + container_persistent: true # Persist filesystem across sessions (false = ephemeral) # ----------------------------------------------------------------------------- # SUDO SUPPORT (works with ALL backends above) diff --git a/hermes_cli/config.py b/hermes_cli/config.py index cb62db9d..2330c2cb 100644 --- a/hermes_cli/config.py +++ b/hermes_cli/config.py @@ -71,6 +71,11 @@ DEFAULT_CONFIG = { "docker_image": "nikolaik/python-nodejs:python3.11-nodejs20", "singularity_image": "docker://nikolaik/python-nodejs:python3.11-nodejs20", "modal_image": "nikolaik/python-nodejs:python3.11-nodejs20", + # Container resource limits (docker, singularity, modal — ignored for local/ssh) + "container_cpu": 1, + "container_memory": 5120, # MB (default 5GB) + "container_disk": 51200, # MB (default 50GB) + "container_persistent": True, # Persist filesystem across sessions }, "browser": { @@ -139,7 +144,7 @@ DEFAULT_CONFIG = { "command_allowlist": [], # Config schema version - bump this when adding new required fields - "_config_version": 4, + "_config_version": 5, } # ============================================================================= diff --git a/hermes_cli/setup.py b/hermes_cli/setup.py index d7339dab..8ed0ed07 100644 --- a/hermes_cli/setup.py +++ b/hermes_cli/setup.py @@ -389,6 +389,46 @@ def _print_setup_summary(config: dict, hermes_home): print() +def _prompt_container_resources(config: dict): + """Prompt for container resource settings (Docker, Singularity, Modal).""" + terminal = config.setdefault('terminal', {}) + + print() + print_info("Container Resource Settings:") + + # Persistence + current_persist = terminal.get('container_persistent', True) + persist_label = "yes" if current_persist else "no" + print_info(f" Persistent filesystem keeps files between sessions.") + print_info(f" Set to 'no' for ephemeral sandboxes that reset each time.") + persist_str = prompt(f" Persist filesystem across sessions? (yes/no)", persist_label) + terminal['container_persistent'] = persist_str.lower() in ('yes', 'true', 'y', '1') + + # CPU + current_cpu = terminal.get('container_cpu', 1) + cpu_str = prompt(f" CPU cores", str(current_cpu)) + try: + terminal['container_cpu'] = float(cpu_str) + except ValueError: + pass + + # Memory + current_mem = terminal.get('container_memory', 5120) + mem_str = prompt(f" Memory in MB (5120 = 5GB)", str(current_mem)) + try: + terminal['container_memory'] = int(mem_str) + except ValueError: + pass + + # Disk + current_disk = terminal.get('container_disk', 51200) + disk_str = prompt(f" Disk in MB (51200 = 50GB)", str(current_disk)) + try: + terminal['container_disk'] = int(disk_str) + except ValueError: + pass + + def run_setup_wizard(args): """Run the interactive setup wizard.""" ensure_hermes_home() @@ -985,6 +1025,10 @@ def run_setup_wizard(args): cwd_expanded = cwd_input save_env_value("MESSAGING_CWD", cwd_expanded) + print() + print_info("Note: Container resource settings (CPU, memory, disk, persistence)") + print_info("are in your config but only apply to Docker/Singularity/Modal backends.") + if prompt_yes_no(" Enable sudo support? (allows agent to run sudo commands)", False): print_warning(" SECURITY WARNING: Sudo password will be stored in plaintext") sudo_pass = prompt(" Sudo password (leave empty to skip)", password=True) @@ -1004,6 +1048,7 @@ def run_setup_wizard(args): print_info("Requires Docker Desktop for Windows") docker_image = prompt(" Docker image", default_docker) config['terminal']['docker_image'] = docker_image + _prompt_container_resources(config) print_success("Terminal set to Docker") elif selected_backend == 'singularity': @@ -1013,6 +1058,7 @@ def run_setup_wizard(args): print_info("Requires apptainer or singularity to be installed") singularity_image = prompt(" Image (docker:// prefix for Docker Hub)", default_singularity) config['terminal']['singularity_image'] = singularity_image + _prompt_container_resources(config) print_success("Terminal set to Singularity/Apptainer") elif selected_backend == 'modal': @@ -1063,6 +1109,7 @@ def run_setup_wizard(args): if token_secret: save_env_value("MODAL_TOKEN_SECRET", token_secret) + _prompt_container_resources(config) print_success("Terminal set to Modal") elif selected_backend == 'ssh': @@ -1092,6 +1139,9 @@ def run_setup_wizard(args): if ssh_key: save_env_value("TERMINAL_SSH_KEY", ssh_key) + print() + print_info("Note: Container resource settings (CPU, memory, disk, persistence)") + print_info("are in your config but only apply to Docker/Singularity/Modal backends.") print_success("Terminal set to SSH") # else: Keep current (selected_backend is None)