mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-11-17 19:32:45 +03:00
a1bbd329ea
utils.py held three subjects in one 871-line file. It is now a package with one module per subject: utils/files.py (atomic writes, temp files, file mode and owner, signatures and digests, JSON and YAML file helpers), utils/urls.py (the base_url helpers) and utils/env.py (truthy values, env numbers, proxy env helpers). utils/__init__.py re-exports every public name, so no importer changes. Function bodies are unchanged, no function-level import moved, and the logger keeps the name "utils". Tests patch a name in the module that now defines it. Patches stay on the package where production reads the name through a function-level "from utils import". The tests of utils itself move to tests/utils/. A root module that becomes a folder drops out of anything that copies root *.py files plus a fixed list of packages, so the fixtures that build a partial source tree now list utils, as do pyproject's packages.find, three check scripts and the CI change classifier.
160 lines
5.4 KiB
Python
160 lines
5.4 KiB
Python
"""A saved model route is one publication, including stale credential removal."""
|
|
|
|
from pathlib import Path
|
|
import subprocess
|
|
import sys
|
|
|
|
import pytest
|
|
|
|
import hermes_yaml as yaml
|
|
from hermes_cli.model_switch import ModelSwitchResult, persist_model_selection
|
|
|
|
|
|
_SEED = (
|
|
"# Keep this header\n"
|
|
"model:\n"
|
|
" default: old-model\n"
|
|
" provider: custom:old\n"
|
|
" base_url: https://old.example.test/v1\n"
|
|
" api_mode: chat_completions\n"
|
|
" api_key: ${OLD_MODEL_KEY}\n"
|
|
" key_env: OLD_MODEL_KEY\n"
|
|
" api_key_env: OLD_MODEL_KEY\n"
|
|
" context_length: 32000\n"
|
|
" model_slots:\n"
|
|
' fast: "keep-this" # Keep this slot\n'
|
|
"auxiliary:\n"
|
|
" vision:\n"
|
|
" api_key: ${VISION_KEY}\n"
|
|
"display:\n"
|
|
' label: "off" # Keep these quotes\n'
|
|
)
|
|
_RESULT = ModelSwitchResult(
|
|
success=True,
|
|
new_model="new-model",
|
|
target_provider="custom:new",
|
|
base_url="https://new.example.test/v1",
|
|
api_mode="anthropic_messages",
|
|
is_global=True,
|
|
)
|
|
_EXPECTED = {
|
|
"default": "new-model",
|
|
"provider": "custom:new",
|
|
"base_url": "https://new.example.test/v1",
|
|
"api_mode": "anthropic_messages",
|
|
"model_slots": {"fast": "keep-this"},
|
|
}
|
|
|
|
|
|
@pytest.fixture
|
|
def profile_config(tmp_path, monkeypatch):
|
|
default_home = tmp_path / "default"
|
|
default_home.mkdir()
|
|
default_config = default_home / "config.yaml"
|
|
default_config.write_text("model: default-profile-model\n", encoding="utf-8")
|
|
monkeypatch.setenv("HERMES_HOME", str(default_home))
|
|
monkeypatch.setenv("OLD_MODEL_KEY", "synthetic-expanded-old-key")
|
|
monkeypatch.setenv("VISION_KEY", "synthetic-expanded-vision-key")
|
|
profile_home = tmp_path / "selected-profile"
|
|
profile_home.mkdir()
|
|
path = profile_home / "config.yaml"
|
|
path.write_text(_SEED, encoding="utf-8")
|
|
yield path
|
|
assert (
|
|
default_config.read_text(encoding="utf-8-sig") == "model: default-profile-model\n"
|
|
)
|
|
|
|
|
|
def test_persist_publishes_only_a_complete_model_route(profile_config, monkeypatch):
|
|
import utils.files
|
|
|
|
replace = utils.files.atomic_replace
|
|
published = []
|
|
|
|
def observe(source, target):
|
|
result = replace(source, target)
|
|
if Path(target) == profile_config:
|
|
published.append(
|
|
yaml.safe_load(profile_config.read_text(encoding="utf-8-sig"))["model"]
|
|
)
|
|
return result
|
|
|
|
monkeypatch.setattr(utils.files, "atomic_replace", observe)
|
|
persist_model_selection(_RESULT, profile_config)
|
|
|
|
assert published == [_EXPECTED]
|
|
|
|
|
|
def test_failed_route_publication_leaves_original_bytes(profile_config, monkeypatch):
|
|
import utils.files
|
|
|
|
original = profile_config.read_bytes()
|
|
replace = utils.files.atomic_replace
|
|
|
|
def reject_new_provider(source, target):
|
|
if Path(target) == profile_config:
|
|
pending = yaml.safe_load(Path(source).read_text(encoding="utf-8-sig"))
|
|
if pending["model"]["provider"] == _RESULT.target_provider:
|
|
raise OSError("synthetic publication failure")
|
|
return replace(source, target)
|
|
|
|
monkeypatch.setattr(utils.files, "atomic_replace", reject_new_provider)
|
|
with pytest.raises(OSError, match="synthetic publication failure"):
|
|
persist_model_selection(_RESULT, profile_config)
|
|
|
|
assert profile_config.read_bytes() == original
|
|
|
|
|
|
def test_setting_saved_while_route_is_decided_survives(profile_config, monkeypatch):
|
|
"""Another process saving a setting during the (I/O-capable) route decision is not erased."""
|
|
from hermes_cli import model_switch, route_identity
|
|
|
|
decide = route_identity.should_clear_context_pin
|
|
writer = (
|
|
"import sys, utils\n"
|
|
"utils.atomic_roundtrip_yaml_update(sys.argv[1], 'display.theme', 'dark')\n"
|
|
)
|
|
wrote = []
|
|
|
|
def decide_while_other_process_saves(*args):
|
|
if not wrote:
|
|
wrote.append(True)
|
|
subprocess.run(
|
|
[sys.executable, "-c", writer, str(profile_config)],
|
|
cwd=Path(model_switch.__file__).resolve().parents[1],
|
|
check=True,
|
|
capture_output=True,
|
|
timeout=60,
|
|
creationflags=getattr(subprocess, "CREATE_NO_WINDOW", 0),
|
|
)
|
|
return decide(*args)
|
|
|
|
monkeypatch.setattr(route_identity, "should_clear_context_pin", decide_while_other_process_saves)
|
|
persist_model_selection(_RESULT, profile_config)
|
|
|
|
saved = yaml.safe_load(profile_config.read_text(encoding="utf-8-sig"))
|
|
assert wrote and saved["display"]["theme"] == "dark"
|
|
assert saved["model"] == _EXPECTED
|
|
|
|
|
|
def test_anchored_model_route_reused_later_saves_the_new_route(tmp_path, monkeypatch):
|
|
"""``model: &route`` aliased later (``vision: *route``) must not resurrect the old route."""
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
path = tmp_path / "config.yaml"
|
|
path.write_text(
|
|
"model: &route\n"
|
|
" default: old-model\n"
|
|
" provider: custom:old\n"
|
|
" base_url: https://old.example.test/v1\n"
|
|
" api_mode: chat_completions\n"
|
|
"auxiliary:\n"
|
|
" vision: *route\n",
|
|
encoding="utf-8",
|
|
)
|
|
persist_model_selection(_RESULT, path)
|
|
|
|
saved = yaml.safe_load(path.read_text(encoding="utf-8-sig"))
|
|
route = {k: v for k, v in _EXPECTED.items() if k != "model_slots"}
|
|
assert saved["model"] == route
|
|
assert saved["auxiliary"]["vision"] == route # the alias still shares the node, as on main
|