mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-04-25 00:51:20 +00:00
Fixes and refactors enabled by recent updates to main.
This commit is contained in:
parent
1126284c97
commit
1b7473e702
5 changed files with 406 additions and 150 deletions
|
|
@ -6,6 +6,8 @@ import types
|
|||
from importlib.util import module_from_spec, spec_from_file_location
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
TOOLS_DIR = Path(__file__).resolve().parents[2] / "tools"
|
||||
|
||||
|
|
@ -25,7 +27,7 @@ def _reset_modules(prefixes: tuple[str, ...]):
|
|||
sys.modules.pop(name, None)
|
||||
|
||||
|
||||
def _install_fake_tools_package():
|
||||
def _install_fake_tools_package(*, credential_mounts=None):
|
||||
_reset_modules(("tools", "agent", "hermes_cli"))
|
||||
|
||||
hermes_cli = types.ModuleType("hermes_cli")
|
||||
|
|
@ -68,6 +70,9 @@ def _install_fake_tools_package():
|
|||
managed_mode=True,
|
||||
)
|
||||
)
|
||||
sys.modules["tools.credential_files"] = types.SimpleNamespace(
|
||||
get_credential_file_mounts=lambda: list(credential_mounts or []),
|
||||
)
|
||||
|
||||
return interrupt_event
|
||||
|
||||
|
|
@ -87,6 +92,7 @@ class _FakeResponse:
|
|||
def test_managed_modal_execute_polls_until_completed(monkeypatch):
|
||||
_install_fake_tools_package()
|
||||
managed_modal = _load_tool_module("tools.environments.managed_modal", "environments/managed_modal.py")
|
||||
modal_common = sys.modules["tools.environments.modal_common"]
|
||||
|
||||
calls = []
|
||||
poll_count = {"value": 0}
|
||||
|
|
@ -112,7 +118,7 @@ def test_managed_modal_execute_polls_until_completed(monkeypatch):
|
|||
raise AssertionError(f"Unexpected request: {method} {url}")
|
||||
|
||||
monkeypatch.setattr(managed_modal.requests, "request", fake_request)
|
||||
monkeypatch.setattr(managed_modal.time, "sleep", lambda _: None)
|
||||
monkeypatch.setattr(modal_common.time, "sleep", lambda _: None)
|
||||
|
||||
env = managed_modal.ManagedModalEnvironment(image="python:3.11")
|
||||
result = env.execute("echo hello")
|
||||
|
|
@ -149,6 +155,7 @@ def test_managed_modal_create_sends_a_stable_idempotency_key(monkeypatch):
|
|||
def test_managed_modal_execute_cancels_on_interrupt(monkeypatch):
|
||||
interrupt_event = _install_fake_tools_package()
|
||||
managed_modal = _load_tool_module("tools.environments.managed_modal", "environments/managed_modal.py")
|
||||
modal_common = sys.modules["tools.environments.modal_common"]
|
||||
|
||||
calls = []
|
||||
|
||||
|
|
@ -170,7 +177,7 @@ def test_managed_modal_execute_cancels_on_interrupt(monkeypatch):
|
|||
interrupt_event.set()
|
||||
|
||||
monkeypatch.setattr(managed_modal.requests, "request", fake_request)
|
||||
monkeypatch.setattr(managed_modal.time, "sleep", fake_sleep)
|
||||
monkeypatch.setattr(modal_common.time, "sleep", fake_sleep)
|
||||
|
||||
env = managed_modal.ManagedModalEnvironment(image="python:3.11")
|
||||
result = env.execute("sleep 30")
|
||||
|
|
@ -190,6 +197,7 @@ def test_managed_modal_execute_cancels_on_interrupt(monkeypatch):
|
|||
def test_managed_modal_execute_returns_descriptive_error_on_missing_exec(monkeypatch):
|
||||
_install_fake_tools_package()
|
||||
managed_modal = _load_tool_module("tools.environments.managed_modal", "environments/managed_modal.py")
|
||||
modal_common = sys.modules["tools.environments.modal_common"]
|
||||
|
||||
def fake_request(method, url, headers=None, json=None, timeout=None):
|
||||
if method == "POST" and url.endswith("/v1/sandboxes"):
|
||||
|
|
@ -203,7 +211,7 @@ def test_managed_modal_execute_returns_descriptive_error_on_missing_exec(monkeyp
|
|||
raise AssertionError(f"Unexpected request: {method} {url}")
|
||||
|
||||
monkeypatch.setattr(managed_modal.requests, "request", fake_request)
|
||||
monkeypatch.setattr(managed_modal.time, "sleep", lambda _: None)
|
||||
monkeypatch.setattr(modal_common.time, "sleep", lambda _: None)
|
||||
|
||||
env = managed_modal.ManagedModalEnvironment(image="python:3.11")
|
||||
result = env.execute("echo hello")
|
||||
|
|
@ -211,3 +219,91 @@ def test_managed_modal_execute_returns_descriptive_error_on_missing_exec(monkeyp
|
|||
|
||||
assert result["returncode"] == 1
|
||||
assert "not found" in result["output"].lower()
|
||||
|
||||
|
||||
def test_managed_modal_create_and_cleanup_preserve_gateway_persistence_fields(monkeypatch):
|
||||
_install_fake_tools_package()
|
||||
managed_modal = _load_tool_module("tools.environments.managed_modal", "environments/managed_modal.py")
|
||||
|
||||
create_payloads = []
|
||||
terminate_payloads = []
|
||||
|
||||
def fake_request(method, url, headers=None, json=None, timeout=None):
|
||||
if method == "POST" and url.endswith("/v1/sandboxes"):
|
||||
create_payloads.append(json)
|
||||
return _FakeResponse(200, {"id": "sandbox-1"})
|
||||
if method == "POST" and url.endswith("/terminate"):
|
||||
terminate_payloads.append(json)
|
||||
return _FakeResponse(200, {"status": "terminated"})
|
||||
raise AssertionError(f"Unexpected request: {method} {url}")
|
||||
|
||||
monkeypatch.setattr(managed_modal.requests, "request", fake_request)
|
||||
|
||||
env = managed_modal.ManagedModalEnvironment(
|
||||
image="python:3.11",
|
||||
task_id="task-managed-persist",
|
||||
persistent_filesystem=False,
|
||||
)
|
||||
env.cleanup()
|
||||
|
||||
assert create_payloads == [{
|
||||
"image": "python:3.11",
|
||||
"cwd": "/root",
|
||||
"cpu": 1.0,
|
||||
"memoryMiB": 5120.0,
|
||||
"timeoutMs": 3_600_000,
|
||||
"idleTimeoutMs": 300_000,
|
||||
"persistentFilesystem": False,
|
||||
"logicalKey": "task-managed-persist",
|
||||
}]
|
||||
assert terminate_payloads == [{"snapshotBeforeTerminate": False}]
|
||||
|
||||
|
||||
def test_managed_modal_rejects_host_credential_passthrough():
|
||||
_install_fake_tools_package(
|
||||
credential_mounts=[{
|
||||
"host_path": "/tmp/token.json",
|
||||
"container_path": "/root/.hermes/token.json",
|
||||
}]
|
||||
)
|
||||
managed_modal = _load_tool_module("tools.environments.managed_modal", "environments/managed_modal.py")
|
||||
|
||||
with pytest.raises(ValueError, match="credential-file passthrough"):
|
||||
managed_modal.ManagedModalEnvironment(image="python:3.11")
|
||||
|
||||
|
||||
def test_managed_modal_execute_times_out_and_cancels(monkeypatch):
|
||||
_install_fake_tools_package()
|
||||
managed_modal = _load_tool_module("tools.environments.managed_modal", "environments/managed_modal.py")
|
||||
modal_common = sys.modules["tools.environments.modal_common"]
|
||||
|
||||
calls = []
|
||||
monotonic_values = iter([0.0, 12.5])
|
||||
|
||||
def fake_request(method, url, headers=None, json=None, timeout=None):
|
||||
calls.append((method, url, json, timeout))
|
||||
if method == "POST" and url.endswith("/v1/sandboxes"):
|
||||
return _FakeResponse(200, {"id": "sandbox-1"})
|
||||
if method == "POST" and url.endswith("/execs"):
|
||||
return _FakeResponse(202, {"execId": json["execId"], "status": "running"})
|
||||
if method == "GET" and "/execs/" in url:
|
||||
return _FakeResponse(200, {"execId": url.rsplit("/", 1)[-1], "status": "running"})
|
||||
if method == "POST" and url.endswith("/cancel"):
|
||||
return _FakeResponse(202, {"status": "cancelling"})
|
||||
if method == "POST" and url.endswith("/terminate"):
|
||||
return _FakeResponse(200, {"status": "terminated"})
|
||||
raise AssertionError(f"Unexpected request: {method} {url}")
|
||||
|
||||
monkeypatch.setattr(managed_modal.requests, "request", fake_request)
|
||||
monkeypatch.setattr(modal_common.time, "monotonic", lambda: next(monotonic_values))
|
||||
monkeypatch.setattr(modal_common.time, "sleep", lambda _: None)
|
||||
|
||||
env = managed_modal.ManagedModalEnvironment(image="python:3.11")
|
||||
result = env.execute("sleep 30", timeout=2)
|
||||
env.cleanup()
|
||||
|
||||
assert result == {
|
||||
"output": "Managed Modal exec timed out after 2s",
|
||||
"returncode": 124,
|
||||
}
|
||||
assert any(call[0] == "POST" and call[1].endswith("/cancel") for call in calls)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue