mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-31 06:51:29 +00:00
66827f8947
Remove unused imports (F401) and duplicate/shadowed import redefinitions (F811) across the codebase using ruff's safe autofixes. No behavioral changes -- imports only. - ~1400 safe autofixes applied across 644 files (net -1072 lines) - __init__.py re-exports preserved (excluded from F401 removal so public re-export surfaces stay intact) - Re-exports that are imported or monkeypatched by tests but look unused in their defining module are kept with explicit # noqa: F401 (gateway/run.py load_dotenv; run_agent re-exports from agent.message_sanitization, agent.context_compressor, agent.retry_utils, agent.prompt_builder, agent.process_bootstrap, agent.codex_responses_adapter) - Unsafe F841 (unused-variable) fixes deliberately skipped -- those can change behavior when the RHS has side effects - ruff lints remain disabled in pyproject.toml (only PLW1514 is selected); this is a one-time cleanup, not a config change Verification: - python -m compileall: clean - pytest --collect-only: all 27161 tests collect (zero import errors) - core entry points import clean (run_agent, model_tools, cli, toolsets, hermes_state, batch_runner, gateway) - static scan: every name any test imports directly from an edited module still resolves
187 lines
7.2 KiB
Python
187 lines
7.2 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_CONTAINER_CPU",
|
|
"TERMINAL_CONTAINER_DISK",
|
|
"TERMINAL_CONTAINER_MEMORY",
|
|
"TERMINAL_DOCKER_FORWARD_ENV",
|
|
"TERMINAL_DOCKER_VOLUMES",
|
|
"TERMINAL_LIFETIME_SECONDS",
|
|
"TERMINAL_MODAL_MODE",
|
|
"TERMINAL_SSH_HOST",
|
|
"TERMINAL_SSH_PORT",
|
|
"TERMINAL_SSH_USER",
|
|
"TERMINAL_TIMEOUT",
|
|
"MODAL_TOKEN_ID",
|
|
"MODAL_TOKEN_SECRET",
|
|
"HOME",
|
|
"USERPROFILE",
|
|
]
|
|
for key in keys:
|
|
monkeypatch.delenv(key, raising=False)
|
|
# Default: no Nous subscription — patch both the terminal_tool local
|
|
# binding and tool_backend_helpers (used by resolve_modal_backend_state).
|
|
monkeypatch.setattr(terminal_tool_module, "managed_nous_tools_enabled", lambda: False)
|
|
import tools.tool_backend_helpers as _tbh
|
|
monkeypatch.setattr(_tbh, "managed_nous_tools_enabled", lambda: 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))
|
|
monkeypatch.setattr(terminal_tool_module, "is_managed_tool_gateway_ready", lambda _vendor: False)
|
|
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 direct Modal credentials/config was found" in record.getMessage()
|
|
for record in caplog.records
|
|
)
|
|
|
|
|
|
def test_modal_backend_with_managed_gateway_does_not_require_direct_creds_or_minisweagent(monkeypatch, tmp_path):
|
|
_clear_terminal_env(monkeypatch)
|
|
monkeypatch.setattr(terminal_tool_module, "managed_nous_tools_enabled", lambda: True)
|
|
import tools.tool_backend_helpers as _tbh
|
|
monkeypatch.setattr(_tbh, "managed_nous_tools_enabled", lambda: True)
|
|
monkeypatch.setenv("TERMINAL_ENV", "modal")
|
|
monkeypatch.setenv("HOME", str(tmp_path))
|
|
monkeypatch.setenv("USERPROFILE", str(tmp_path))
|
|
monkeypatch.setenv("TERMINAL_MODAL_MODE", "managed")
|
|
monkeypatch.setattr(terminal_tool_module, "is_managed_tool_gateway_ready", lambda _vendor: True)
|
|
monkeypatch.setattr(
|
|
terminal_tool_module.importlib.util,
|
|
"find_spec",
|
|
lambda _name: (_ for _ in ()).throw(AssertionError("should not be called")),
|
|
)
|
|
|
|
assert terminal_tool_module.check_terminal_requirements() is True
|
|
|
|
|
|
def test_modal_backend_auto_mode_prefers_managed_gateway_over_direct_creds(monkeypatch, tmp_path):
|
|
_clear_terminal_env(monkeypatch)
|
|
monkeypatch.setattr(terminal_tool_module, "managed_nous_tools_enabled", lambda: True)
|
|
import tools.tool_backend_helpers as _tbh
|
|
monkeypatch.setattr(_tbh, "managed_nous_tools_enabled", lambda: True)
|
|
monkeypatch.setenv("TERMINAL_ENV", "modal")
|
|
monkeypatch.setenv("MODAL_TOKEN_ID", "tok-id")
|
|
monkeypatch.setenv("MODAL_TOKEN_SECRET", "tok-secret")
|
|
monkeypatch.setenv("HOME", str(tmp_path))
|
|
monkeypatch.setenv("USERPROFILE", str(tmp_path))
|
|
monkeypatch.setattr(terminal_tool_module, "is_managed_tool_gateway_ready", lambda _vendor: True)
|
|
monkeypatch.setattr(
|
|
terminal_tool_module.importlib.util,
|
|
"find_spec",
|
|
lambda _name: (_ for _ in ()).throw(AssertionError("should not be called")),
|
|
)
|
|
|
|
assert terminal_tool_module.check_terminal_requirements() is True
|
|
|
|
|
|
def test_modal_backend_direct_mode_does_not_fall_back_to_managed(monkeypatch, caplog, tmp_path):
|
|
_clear_terminal_env(monkeypatch)
|
|
monkeypatch.setenv("TERMINAL_ENV", "modal")
|
|
monkeypatch.setenv("TERMINAL_MODAL_MODE", "direct")
|
|
monkeypatch.setenv("HOME", str(tmp_path))
|
|
monkeypatch.setenv("USERPROFILE", str(tmp_path))
|
|
monkeypatch.setattr(terminal_tool_module, "is_managed_tool_gateway_ready", lambda _vendor: True)
|
|
|
|
with caplog.at_level(logging.ERROR):
|
|
ok = terminal_tool_module.check_terminal_requirements()
|
|
|
|
assert ok is False
|
|
assert any(
|
|
"TERMINAL_MODAL_MODE=direct" in record.getMessage()
|
|
for record in caplog.records
|
|
)
|
|
|
|
|
|
def test_modal_backend_managed_mode_does_not_fall_back_to_direct(monkeypatch, caplog, tmp_path):
|
|
_clear_terminal_env(monkeypatch)
|
|
monkeypatch.setenv("TERMINAL_ENV", "modal")
|
|
monkeypatch.setenv("TERMINAL_MODAL_MODE", "managed")
|
|
monkeypatch.setenv("MODAL_TOKEN_ID", "tok-id")
|
|
monkeypatch.setenv("MODAL_TOKEN_SECRET", "tok-secret")
|
|
monkeypatch.setenv("HOME", str(tmp_path))
|
|
monkeypatch.setenv("USERPROFILE", str(tmp_path))
|
|
monkeypatch.setattr(terminal_tool_module, "is_managed_tool_gateway_ready", lambda _vendor: False)
|
|
|
|
with caplog.at_level(logging.ERROR):
|
|
ok = terminal_tool_module.check_terminal_requirements()
|
|
|
|
assert ok is False
|
|
assert any(
|
|
"Nous Tool Gateway access is not currently available" in record.getMessage()
|
|
for record in caplog.records
|
|
)
|
|
|
|
|
|
def test_modal_backend_managed_mode_without_feature_flag_logs_clear_error(monkeypatch, caplog, tmp_path):
|
|
_clear_terminal_env(monkeypatch)
|
|
monkeypatch.setenv("TERMINAL_ENV", "modal")
|
|
monkeypatch.setenv("TERMINAL_MODAL_MODE", "managed")
|
|
monkeypatch.setenv("HOME", str(tmp_path))
|
|
monkeypatch.setenv("USERPROFILE", str(tmp_path))
|
|
monkeypatch.setattr(terminal_tool_module, "is_managed_tool_gateway_ready", lambda _vendor: False)
|
|
|
|
with caplog.at_level(logging.ERROR):
|
|
ok = terminal_tool_module.check_terminal_requirements()
|
|
|
|
assert ok is False
|
|
assert any(
|
|
"Nous Tool Gateway access is not currently available" in record.getMessage()
|
|
for record in caplog.records
|
|
)
|