mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-11-17 04:11:35 +00:00
Merge fallout (my resolution errors, all caught by CI): - hermes_cli/backup.py + gateway.py: `theirs` on those hunks re-imported clusters HEAD had already moved to backup_restore.py / kept in the facade. backup.py loses the 349-line duplicate (main's #110179 fix is ported into backup_restore._import_db_member); the systemd service-unit cluster returns to gateway.py (PM's _prepare_service_launcher / _pm_managed_node_dirs / _systemd_command have no home in main's extraction) with main's utf-8-sig read. gateway_service_unit.py is dropped. - gateway/run.py: main's plugin-update chore is not profile-scoped (the housekeeping ordering test pins the scope/drain sequence). - pyproject + 30 test files: `import yaml` -> `import hermes_yaml as yaml` (pm-clean has no pyyaml); gateway/config._bundled_platform_manifest_name reads through hermes_yaml. - tests re-seamed onto pm-clean's shape: residency admission (installed_engine), supervisor child env (binary is a constructor argument), update import guard (update_cmd_deps is gone; our probe already scrubs PYTHONPATH — both #115032 invariants pass), shallow-count git responses (stash path asks `status --porcelain -z`); dropped tests for retired code (_run_node_bootstrap/_ensure_tui_node, Windows resume demotion). - tests/tools/test_local_env_blocklist.py: restore the two helpers the suite-reduction commit dropped and the blocklist import. Real fixes: - pm: classify_uv_failure/ResolutionConflict move beside the uv runner (pm.environment, stdlib-only). pm.workspace imports tomllib at module level and cannot load on the 3.10 bootstrap python that streams uv output in the Docker arm64 image. - tools/browser_tool.warm_agent_browser_npx_cache: back as a permanent definition — it is on the frozen old-updater surface, and the revert-scheduled compat pointer does not count. - hermes_cli/memory_setup: the dashboard's pip row uses pm.environments. running_from_selected_environment for installed vs restart_required. - scripts/windows-build-deps.ps1: export DISTUTILS_USE_SDK/MSSdk so setuptools trusts the primed MSVC environment instead of asking vswhere (`env -i` test runner on win32-arm64 compiling ruamel-yaml-clib); run_tests.sh forwards them. - tests/pm/test_windows_build_deps.py: start the protocol test from a parent env without the toolchain variables the runner job already exports. - tests/conftest.py scrubs HERMES_BUNDLED_PLUGINS (Nix-wrapped hermes on the dev host); tests/home_io_guard.py treats sys.path site-packages under the real home as the interpreter's installation (PM-activated developer shell). - tests-js: four `curly` lint errors from main's new scripts.
106 lines
5 KiB
Python
106 lines
5 KiB
Python
"""Residency admission is priced against the card, not a constant count.
|
|
|
|
Residency was bounded by ``models_max`` alone, so a second model was admitted against an
|
|
already-full card; on Windows/WDDM the over-commit is paged instead of refused and that child
|
|
decodes at a third of its speed for the rest of its life. The cap handed to the router is now
|
|
derived from the hardware budget, with the configured value as a ceiling. The budgets and model
|
|
sizes here are injected — the logic must hold on a machine with no GPU at all.
|
|
"""
|
|
from pathlib import Path
|
|
from types import SimpleNamespace
|
|
|
|
import pytest
|
|
|
|
from hermes_cli.local_runtime import presets
|
|
from hermes_cli.local_runtime.estimator import HardwareBudget, ModelProfile
|
|
|
|
GIB = 1 << 30
|
|
|
|
# The card from the report: RTX 3070 Laptop, 8 GiB, desktop co-residents reserved away. A 6 GiB
|
|
# model plus runtime overhead fits once, never twice.
|
|
TIGHT = HardwareBudget(usable_vram_bytes=6 * GIB, total_device_bytes=8 * GIB,
|
|
ram_available_bytes=8 * GIB)
|
|
# A 48 GiB card: four 6 GiB models fit with room to spare.
|
|
ROOMY = HardwareBudget(usable_vram_bytes=48 * GIB, total_device_bytes=48 * GIB,
|
|
ram_available_bytes=64 * GIB)
|
|
|
|
|
|
def _staged(tmp_path, monkeypatch, weights: dict[str, int]):
|
|
"""A models dir of touched GGUFs whose parsed weights are the given bytes (keyed by stem)."""
|
|
mdir = tmp_path / "models"
|
|
mdir.mkdir(parents=True, exist_ok=True)
|
|
for stem in weights:
|
|
(mdir / f"{stem}.gguf").touch()
|
|
monkeypatch.setattr(presets, "read_gguf_header",
|
|
lambda p: SimpleNamespace(path=p, sampling_defaults={}))
|
|
monkeypatch.setattr(presets, "profile_from_gguf", lambda h: ModelProfile(
|
|
name=Path(h.path).stem, weights_bytes=weights[Path(h.path).stem],
|
|
embd_table_bytes=0, n_ctx_train=65536, layers=[]))
|
|
return mdir
|
|
|
|
|
|
NO_DEVICE = HardwareBudget(usable_vram_bytes=0, total_device_bytes=0, ram_available_bytes=8 * GIB)
|
|
|
|
|
|
@pytest.mark.parametrize("weights,budget,configured,expected", [
|
|
# The report's exact shape: 6 GiB and 3.9 GiB staged on an 8 GiB card. Admitting both pages
|
|
# the second one; the cap must say one so llama.cpp evicts before the load.
|
|
({"nine-b": 6 * GIB, "gemma-e4b": int(3.9 * GIB)}, TIGHT, 4, 1),
|
|
# No regression for big cards: the budget raises nothing, and 4 residents fit.
|
|
({"a": 6 * GIB, "b": 6 * GIB}, ROOMY, 4, 4),
|
|
# ``models_max`` stays a ceiling — the user's knob still means what it said.
|
|
({"a": 1 * GIB}, ROOMY, 1, 1),
|
|
# No usable device memory (no probe) must leave the count exactly as configured.
|
|
({"a": 6 * GIB}, NO_DEVICE, 4, 4),
|
|
# A model the physics check refuses outright never loads, so it must not force evictions
|
|
# of the models that do (200 GiB against 48 + 64 GiB is refused, not merely spilled).
|
|
({"tiny": 2 * GIB, "huge": 200 * GIB}, ROOMY, 4, 4),
|
|
])
|
|
def test_residency_cap_is_priced_against_the_card(tmp_path, monkeypatch, weights, budget, configured, expected):
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path / ".hermes"))
|
|
mdir = _staged(tmp_path, monkeypatch, weights)
|
|
assert presets.admitted_residency_count(mdir, budget, configured) == expected
|
|
|
|
|
|
def _boom(**_kw):
|
|
raise OSError("nvidia-smi vanished mid-session")
|
|
|
|
|
|
@pytest.mark.parametrize("configured,probe,expected", [
|
|
(4, lambda **kw: TIGHT, 1),
|
|
(1, lambda **kw: TIGHT, 1),
|
|
# The cap is policy, not a prerequisite: a probe failure must fall back to the config.
|
|
(4, _boom, 4),
|
|
])
|
|
def test_boot_hands_the_router_the_derived_cap(tmp_path, monkeypatch, configured, probe, expected):
|
|
"""The wiring, not just the math: what ``ensure_local_runtime`` passes as ``--models-max``."""
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path / ".hermes"))
|
|
import hermes_cli.local_runtime.bootstrap as bs
|
|
from hermes_cli.local_runtime import binaries, hardware, supervisor
|
|
from hermes_cli.local_runtime import endpoint
|
|
|
|
mdir = _staged(tmp_path, monkeypatch, {"nine-b": 6 * GIB})
|
|
monkeypatch.setattr(bs, "models_dir", lambda: mdir)
|
|
monkeypatch.setattr(hardware, "probe_budget", probe)
|
|
monkeypatch.setattr(bs, "_SUPERVISOR", None)
|
|
monkeypatch.setattr(bs, "_generate_presets", lambda mdir, preset_path: None)
|
|
monkeypatch.setattr(bs, "_detect_gpu_vendor", lambda: None)
|
|
monkeypatch.setattr(binaries, "installed_engine",
|
|
lambda backend="auto", **k: binaries.Engine("cpu", "build-1", tmp_path / "install" / "llama-server"))
|
|
monkeypatch.setattr(endpoint, "_state_endpoint", lambda: None)
|
|
|
|
captured: dict = {}
|
|
|
|
class FakeSupervisor:
|
|
def __init__(self, install_dir, models_dir, **kwargs):
|
|
captured.update(kwargs)
|
|
self.proc = None
|
|
self.base_url = "http://127.0.0.1:1/v1"
|
|
|
|
def start(self) -> None:
|
|
return None
|
|
|
|
monkeypatch.setattr(supervisor, "LlamaServerSupervisor", FakeSupervisor)
|
|
config = {"local_runtime": {"enabled": True, "models_max": configured}}
|
|
assert bs.ensure_local_runtime(config) is not None
|
|
assert captured["models_max"] == expected
|