mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-21 10:22:18 +00:00
b0e47a98f9
The skin bug was one instance of a class: several subsystems build their
config dict directly from config.yaml instead of routing through
hermes_cli.config.load_config (which carries the managed merge), so they
silently ignored administrator-pinned values. Audited every config.yaml
reader and fixed the behavioral-read bypasses:
- gateway/config.py load_gateway_config (messaging gateway: session_reset,
quick_commands, stt, model, ...)
- gateway/run.py _load_gateway_config (its read_raw_config fast path also
skipped the merge — read_raw_config returns raw user YAML)
- tui_gateway/server.py _load_cfg (new TUI + desktop backend: skin,
reasoning_effort, service_tier, provider_routing)
- cron/scheduler.py (scheduled-job model/reasoning/toolsets/provider_routing)
- hermes_logging.py (logging.level/max_size_mb/backup_count)
- hermes_time.py (timezone)
- hermes_cli/doctor.py (memory-provider diagnostic reads effective config)
All route through a new shared managed_scope.apply_managed_overlay() helper
that mirrors _load_config_impl (env-only expansion so a user ${VAR} can't
shadow a managed literal, root-model-string normalization, leaf-merge) and is
fail-open. cli.py's earlier inline fix is refactored onto the same helper.
Write-back paths (slash_commands, telegram/yuanbao dm_topics, profile
distribution) are deliberately left reading raw user YAML — overlaying managed
values there would persist them into the user file. The dashboard
(web_server.py) already routes through load_config and needed no change.
TUI loader caches the RAW config so _save_cfg never writes managed values to
disk. Adds test_managed_scope_overlay.py (helper) and
test_managed_scope_loaders.py (per-surface integration); mutation-checked.
113 lines
4.3 KiB
Python
113 lines
4.3 KiB
Python
"""Each standalone config loader (gateway, TUI/desktop, cron) must honor managed scope.
|
|
|
|
These loaders build their own config dict instead of routing through
|
|
hermes_cli.config.load_config, so the managed overlay has to be wired into each.
|
|
This is the regression guard for the whole bug class (a managed display.skin was
|
|
silently ignored by the TUI; the same gap existed in the gateway and cron).
|
|
"""
|
|
import textwrap
|
|
|
|
import pytest
|
|
|
|
|
|
@pytest.fixture
|
|
def homes(tmp_path, monkeypatch):
|
|
home = tmp_path / "home"
|
|
home.mkdir()
|
|
managed = tmp_path / "managed"
|
|
managed.mkdir()
|
|
monkeypatch.setenv("HERMES_HOME", str(home))
|
|
monkeypatch.setenv("HERMES_MANAGED_DIR", str(managed))
|
|
import hermes_cli.config as cfg
|
|
from hermes_cli import managed_scope
|
|
|
|
cfg._LOAD_CONFIG_CACHE.clear()
|
|
cfg._RAW_CONFIG_CACHE.clear()
|
|
managed_scope.invalidate_managed_cache()
|
|
return home, managed
|
|
|
|
|
|
def _seed(home, managed, *, user, mgd):
|
|
(home / "config.yaml").write_text(textwrap.dedent(user), encoding="utf-8")
|
|
(managed / "config.yaml").write_text(textwrap.dedent(mgd), encoding="utf-8")
|
|
import hermes_cli.config as cfg
|
|
from hermes_cli import managed_scope
|
|
|
|
cfg._LOAD_CONFIG_CACHE.clear()
|
|
cfg._RAW_CONFIG_CACHE.clear()
|
|
managed_scope.invalidate_managed_cache()
|
|
|
|
|
|
def test_gateway_run_loader_honors_managed(homes, monkeypatch):
|
|
home, managed = homes
|
|
_seed(home, managed, user="model:\n default: user/m\n", mgd="model:\n default: org/m\n")
|
|
import gateway.run as gr
|
|
|
|
monkeypatch.setattr(gr, "_hermes_home", home, raising=False)
|
|
cfg = gr._load_gateway_config()
|
|
assert (cfg.get("model") or {}).get("default") == "org/m"
|
|
|
|
|
|
def test_gateway_config_loader_honors_managed(homes, monkeypatch):
|
|
home, managed = homes
|
|
_seed(
|
|
home,
|
|
managed,
|
|
user="group_sessions_per_user: false\n",
|
|
mgd="group_sessions_per_user: true\n",
|
|
)
|
|
import gateway.config as gc
|
|
|
|
# load_gateway_config resolves home via get_hermes_home() (HERMES_HOME env).
|
|
cfg = gc.load_gateway_config()
|
|
# Managed value should have flowed into the GatewayConfig.
|
|
assert cfg.group_sessions_per_user is True
|
|
|
|
|
|
def test_tui_loader_honors_managed(homes, monkeypatch):
|
|
home, managed = homes
|
|
_seed(home, managed, user="display:\n skin: user\n", mgd="display:\n skin: charizard\n")
|
|
import tui_gateway.server as ts
|
|
|
|
monkeypatch.setattr(ts, "_hermes_home", home, raising=False)
|
|
monkeypatch.setattr(ts, "_cfg_cache", None, raising=False)
|
|
monkeypatch.setattr(ts, "_cfg_mtime", None, raising=False)
|
|
monkeypatch.setattr(ts, "get_hermes_home_override", lambda: None, raising=False)
|
|
cfg = ts._load_cfg()
|
|
assert (cfg.get("display") or {}).get("skin") == "charizard"
|
|
|
|
|
|
def test_tui_loader_does_not_persist_managed_back(homes, monkeypatch):
|
|
"""The TUI caches RAW config so _save_cfg never writes managed values to disk."""
|
|
home, managed = homes
|
|
_seed(home, managed, user="display:\n skin: user\n", mgd="display:\n skin: charizard\n")
|
|
import tui_gateway.server as ts
|
|
|
|
monkeypatch.setattr(ts, "_hermes_home", home, raising=False)
|
|
monkeypatch.setattr(ts, "_cfg_cache", None, raising=False)
|
|
monkeypatch.setattr(ts, "_cfg_mtime", None, raising=False)
|
|
monkeypatch.setattr(ts, "get_hermes_home_override", lambda: None, raising=False)
|
|
ts._load_cfg() # populates the cache
|
|
# The cache must hold the RAW user value, not the managed overlay, so a
|
|
# subsequent _save_cfg can't bake the managed skin into the user file.
|
|
assert (ts._cfg_cache.get("display") or {}).get("skin") == "user"
|
|
|
|
|
|
def test_logging_config_honors_managed(homes, monkeypatch):
|
|
home, managed = homes
|
|
_seed(home, managed, user="logging:\n level: INFO\n", mgd="logging:\n level: DEBUG\n")
|
|
import hermes_logging
|
|
|
|
level, _max, _bk = hermes_logging._read_logging_config()
|
|
assert level == "DEBUG"
|
|
|
|
|
|
def test_timezone_honors_managed(homes, monkeypatch):
|
|
home, managed = homes
|
|
# hermes_time checks an env override first; ensure it's unset so config wins.
|
|
monkeypatch.delenv("HERMES_TIMEZONE", raising=False)
|
|
monkeypatch.delenv("TZ", raising=False)
|
|
_seed(home, managed, user="timezone: America/New_York\n", mgd="timezone: Asia/Tokyo\n")
|
|
import hermes_time
|
|
|
|
assert hermes_time._resolve_timezone_name() == "Asia/Tokyo"
|