02b38b93cb
Drop the mini-swe-agent git submodule. All terminal backends now use hermes-agent's own environment implementations directly. Docker backend: - Inline the `docker run -d` container startup (was 15 lines in minisweagent's DockerEnvironment). Our wrapper already handled execute(), cleanup(), security hardening, volumes, and resource limits. Modal backend: - Import swe-rex's ModalDeployment directly instead of going through minisweagent's 90-line passthrough wrapper. - Bake the _AsyncWorker pattern (from environments/patches.py) directly into ModalEnvironment for Atropos compatibility without monkey-patching. Cleanup: - Remove minisweagent_path.py (submodule path resolution helper) - Remove submodule init/install from install.sh and setup-hermes.sh - Remove mini-swe-agent from .gitmodules - environments/patches.py is now a no-op (kept for backward compat) - terminal_tool.py no longer does sys.path hacking for minisweagent - mini_swe_runner.py guards imports (optional, for RL training only) - Update all affected tests to mock the new direct subprocess calls - Update README.md, CONTRIBUTING.md No functionality change — all Docker, Modal, local, SSH, Singularity, and Daytona backends behave identically. 6093 tests pass.
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 swerex 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
|
|
)
|