735ca9dfb2
Drop the swe-rex dependency for Modal terminal backend and use the Modal SDK directly (Sandbox.create + Sandbox.exec). This fixes: - AsyncUsageWarning from synchronous App.lookup() in async context - DeprecationError from unencrypted_ports / .url on unencrypted tunnels (deprecated 2026-03-05) The new implementation: - Uses modal.App.lookup.aio() for async-safe app creation - Uses Sandbox.create.aio() with 'sleep infinity' entrypoint - Uses Sandbox.exec.aio() for direct command execution (no HTTP server or tunnel needed) - Keeps all existing features: persistent filesystem snapshots, configurable resources (CPU/memory/disk), sudo support, interrupt handling, _AsyncWorker for event loop safety Consistent with the Docker backend precedent (PR #2804) where we removed mini-swe-agent in favor of direct docker run. Files changed: - tools/environments/modal.py - core rewrite - tools/terminal_tool.py - health check: modal instead of swerex - hermes_cli/setup.py - install modal instead of swe-rex[modal] - pyproject.toml - modal extra: modal>=1.0.0 instead of swe-rex[modal] - scripts/kill_modal.sh - grep for hermes-agent instead of swe-rex - tests/ - updated for new implementation - environments/README.md - updated patches section - website/docs - updated install command
77 lines
2.4 KiB
Python
77 lines
2.4 KiB
Python
import importlib
|
|
import logging
|
|
|
|
terminal_tool_module = importlib.import_module("tools.terminal_tool")
|
|
|
|
|
|
def _clear_terminal_env(monkeypatch):
|
|
"""Remove terminal env vars that could affect requirements checks."""
|
|
keys = [
|
|
"TERMINAL_ENV",
|
|
"TERMINAL_SSH_HOST",
|
|
"TERMINAL_SSH_USER",
|
|
"MODAL_TOKEN_ID",
|
|
"HOME",
|
|
"USERPROFILE",
|
|
]
|
|
for key in keys:
|
|
monkeypatch.delenv(key, raising=False)
|
|
|
|
|
|
def test_local_terminal_requirements(monkeypatch, caplog):
|
|
"""Local backend uses Hermes' own LocalEnvironment wrapper."""
|
|
_clear_terminal_env(monkeypatch)
|
|
monkeypatch.setenv("TERMINAL_ENV", "local")
|
|
|
|
with caplog.at_level(logging.ERROR):
|
|
ok = terminal_tool_module.check_terminal_requirements()
|
|
|
|
assert ok is True
|
|
assert "Terminal requirements check failed" not in caplog.text
|
|
|
|
|
|
def test_unknown_terminal_env_logs_error_and_returns_false(monkeypatch, caplog):
|
|
_clear_terminal_env(monkeypatch)
|
|
monkeypatch.setenv("TERMINAL_ENV", "unknown-backend")
|
|
|
|
with caplog.at_level(logging.ERROR):
|
|
ok = terminal_tool_module.check_terminal_requirements()
|
|
|
|
assert ok is False
|
|
assert any(
|
|
"Unknown TERMINAL_ENV 'unknown-backend'" in record.getMessage()
|
|
for record in caplog.records
|
|
)
|
|
|
|
|
|
def test_ssh_backend_without_host_or_user_logs_and_returns_false(monkeypatch, caplog):
|
|
_clear_terminal_env(monkeypatch)
|
|
monkeypatch.setenv("TERMINAL_ENV", "ssh")
|
|
|
|
with caplog.at_level(logging.ERROR):
|
|
ok = terminal_tool_module.check_terminal_requirements()
|
|
|
|
assert ok is False
|
|
assert any(
|
|
"SSH backend selected but TERMINAL_SSH_HOST and TERMINAL_SSH_USER" in record.getMessage()
|
|
for record in caplog.records
|
|
)
|
|
|
|
|
|
def test_modal_backend_without_token_or_config_logs_specific_error(monkeypatch, caplog, tmp_path):
|
|
_clear_terminal_env(monkeypatch)
|
|
monkeypatch.setenv("TERMINAL_ENV", "modal")
|
|
monkeypatch.setenv("HOME", str(tmp_path))
|
|
monkeypatch.setenv("USERPROFILE", str(tmp_path))
|
|
# Pretend modal is installed
|
|
monkeypatch.setattr(terminal_tool_module.importlib.util, "find_spec", lambda _name: object())
|
|
|
|
with caplog.at_level(logging.ERROR):
|
|
ok = terminal_tool_module.check_terminal_requirements()
|
|
|
|
assert ok is False
|
|
assert any(
|
|
"Modal backend selected but no MODAL_TOKEN_ID environment variable" in record.getMessage()
|
|
for record in caplog.records
|
|
)
|