mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-11-17 11:22:02 +03:00
adc9e2d1eb
_ensure_windows_gateway_venv_imports() addsitedir'd <root>/venv (or VIRTUAL_ENV) whenever PM had no committed generation, without checking which Python that venv was built for. PM launchers and activate_dependencies pop VIRTUAL_ENV, so the fallback was the leftover pre-PM <root>/venv: a cp311 tree loaded into a 3.14 gateway, which died importing pydantic_core as soon as the Group Chat worker imported tui_gateway.server. #122183's guard only covered the committed case. Skip a venv whose pyvenv.cfg version differs from the running interpreter. venv_python_version() now also reads `version_info`, the key uv and virtualenv write, so a matching uv-built venv still overlays. This stops the overlay from adding an incompatible venv. It does not remove a foreign-ABI path put on sys.path from outside Hermes, and it has not been run on native Windows, so #139085 stays open until a Windows retest. The same check is proposed in #122330 by @janviernine (the earliest, which also reads version_info), #122333, #122376, #123129, #123332, #123358, #123409, #123974 and #123981. Refs #134889 (KB-4) Refs #139162 Refs #139085 Co-authored-by: janviernine <janviernine@users.noreply.github.com>
109 lines
4.6 KiB
Python
109 lines
4.6 KiB
Python
"""Payload stores follow the payload, not the launching shell's home."""
|
|
|
|
import json
|
|
import os
|
|
|
|
import pytest
|
|
|
|
from pm.environments import site_packages, store_root, venv_python_version
|
|
from hermes_constants import get_default_hermes_root
|
|
|
|
|
|
def test_store_resolution_follows_relocated_payload(tmp_path, monkeypatch):
|
|
monkeypatch.delenv("HERMES_RUNTIME_DIR", raising=False)
|
|
payload = tmp_path / "agent-payload"
|
|
repo = payload / "hermes-agent"
|
|
repo.mkdir(parents=True)
|
|
stamp = repo / "install-stamp.json"
|
|
stamp.write_text(json.dumps({"payload": "bundled", "runtime": {
|
|
"repoDir": "hermes-agent", "toolsDir": "tools",
|
|
}}))
|
|
manifest = payload / "manifest.json"
|
|
manifest.write_text(json.dumps({"schema": 1, "repo": "hermes-agent",
|
|
"venv": "venv", "store": "tools",
|
|
"runtime": {"toolsDir": "tools"}}))
|
|
tools = payload / "tools"
|
|
tools.mkdir()
|
|
facts = {"schema": 1, "packages": {"node": {"entry": "node-test"}}}
|
|
(tools / "facts.json").write_text(json.dumps(facts))
|
|
(tools / "node-test").mkdir()
|
|
|
|
for destination in (payload, tmp_path / "relocated payload"):
|
|
if destination != payload:
|
|
payload.rename(destination)
|
|
repo = destination / "hermes-agent"
|
|
resolved = store_root(repo)
|
|
assert resolved == destination / "tools"
|
|
installed = json.loads((resolved / "facts.json").read_text())
|
|
assert (resolved / installed["packages"]["node"]["entry"]).is_dir()
|
|
|
|
override = tmp_path / "stage-tools"
|
|
monkeypatch.setenv("HERMES_RUNTIME_DIR", str(override))
|
|
assert store_root(repo) == override
|
|
monkeypatch.delenv("HERMES_RUNTIME_DIR")
|
|
(repo / "install-stamp.json").write_text(json.dumps({"runtimeDir": str(override)}))
|
|
(destination / "manifest.json").write_text(json.dumps({"repo": "other-repo"}))
|
|
assert store_root(repo) == override
|
|
(repo / "install-stamp.json").unlink()
|
|
assert store_root(repo) == get_default_hermes_root() / "tools"
|
|
|
|
|
|
@pytest.mark.parametrize("escape", ["relative", "absolute", "symlink"])
|
|
def test_payload_store_cannot_escape_payload(tmp_path, monkeypatch, escape):
|
|
monkeypatch.delenv("HERMES_RUNTIME_DIR", raising=False)
|
|
payload = tmp_path / "agent-payload"
|
|
repo = payload / "hermes-agent"
|
|
repo.mkdir(parents=True)
|
|
outside = tmp_path / "outside"
|
|
outside.mkdir()
|
|
values = {"relative": "../outside", "absolute": str(outside), "symlink": "tools"}
|
|
if escape == "symlink":
|
|
(payload / "tools").symlink_to(outside, target_is_directory=True)
|
|
(payload / "manifest.json").write_text(json.dumps({
|
|
"repo": "hermes-agent", "store": values[escape],
|
|
}))
|
|
with pytest.raises(RuntimeError, match="payload store escapes its root"):
|
|
store_root(repo)
|
|
monkeypatch.setenv("HERMES_RUNTIME_DIR", str(outside))
|
|
assert store_root(repo) == outside
|
|
|
|
def test_site_packages_follows_the_venv_python_not_the_caller(tmp_path):
|
|
"""Regression: the tree must be dated from the venv, not from this process.
|
|
|
|
An app-driven upgrade rebuilt the dependency environment with CPython 3.14
|
|
while the PATH shim ran 3.11, so site_packages() pointed at
|
|
lib/python3.11/site-packages inside a 3.14 venv. activate_dependencies()
|
|
then found no tree and failed the shim *after* a successful update -- it
|
|
only tolerates a missing tree when no generation was published.
|
|
"""
|
|
venv = tmp_path / "venv"
|
|
(venv / "lib" / "python3.9" / "site-packages").mkdir(parents=True)
|
|
(venv / "pyvenv.cfg").write_text("home = /usr/bin\nversion = 3.9.20\n", encoding="utf-8")
|
|
|
|
assert venv_python_version(venv) == (3, 9)
|
|
if os.name != "nt":
|
|
# The contract: the composed path is the venv's real tree. Dated from the
|
|
# caller instead, it names python<this-interpreter> and misses this dir.
|
|
assert site_packages(venv) == venv / "lib" / "python3.9" / "site-packages"
|
|
assert site_packages(venv).is_dir()
|
|
|
|
|
|
def test_venv_python_version_reads_uv_version_info(tmp_path):
|
|
# uv and virtualenv record ``version_info``; Windows has no lib/python3.X to fall back to.
|
|
venv = tmp_path / "venv"
|
|
venv.mkdir()
|
|
(venv / "pyvenv.cfg").write_text("home = C:\\Python311\nversion_info = 3.11.9\n", encoding="utf-8")
|
|
|
|
assert venv_python_version(venv) == (3, 11)
|
|
|
|
|
|
def test_venv_python_version_falls_back_to_the_lib_directory(tmp_path):
|
|
venv = tmp_path / "venv"
|
|
(venv / "lib" / "python3.12" / "site-packages").mkdir(parents=True)
|
|
|
|
assert venv_python_version(venv) == (3, 12)
|
|
|
|
|
|
def test_venv_python_version_is_none_without_evidence(tmp_path):
|
|
assert venv_python_version(tmp_path / "absent") is None
|