mirror of
https://github.com/HKUDS/nanobot.git
synced 2026-04-30 06:45:55 +00:00
c9a21d96d8
`resolve_config_env_vars` unconditionally dumped the config via `model_dump(mode="json")` and revalidated it, which silently dropped any field declared with `exclude=True` (e.g. `DreamConfig.cron` — introduced by the Dream rename refactor in #2717). Result: `agents.defaults.dream.cron` was never honored at runtime — the gateway always fell back to the default `every 2h` schedule even when `cron` was set in config.json. Fix: skip the roundtrip entirely when the config has no `${VAR}` references. Env-var interpolation still works unchanged when refs exist; the legacy `cron` override now survives the common case of fully-resolved config. Regression test covers the bug path.
105 lines
3.7 KiB
Python
105 lines
3.7 KiB
Python
import json
|
|
|
|
import pytest
|
|
|
|
from nanobot.config.loader import (
|
|
_resolve_env_vars,
|
|
load_config,
|
|
resolve_config_env_vars,
|
|
save_config,
|
|
)
|
|
|
|
|
|
class TestResolveEnvVars:
|
|
def test_replaces_string_value(self, monkeypatch):
|
|
monkeypatch.setenv("MY_SECRET", "hunter2")
|
|
assert _resolve_env_vars("${MY_SECRET}") == "hunter2"
|
|
|
|
def test_partial_replacement(self, monkeypatch):
|
|
monkeypatch.setenv("HOST", "example.com")
|
|
assert _resolve_env_vars("https://${HOST}/api") == "https://example.com/api"
|
|
|
|
def test_multiple_vars_in_one_string(self, monkeypatch):
|
|
monkeypatch.setenv("USER", "alice")
|
|
monkeypatch.setenv("PASS", "secret")
|
|
assert _resolve_env_vars("${USER}:${PASS}") == "alice:secret"
|
|
|
|
def test_nested_dicts(self, monkeypatch):
|
|
monkeypatch.setenv("TOKEN", "abc123")
|
|
data = {"channels": {"telegram": {"token": "${TOKEN}"}}}
|
|
result = _resolve_env_vars(data)
|
|
assert result["channels"]["telegram"]["token"] == "abc123"
|
|
|
|
def test_lists(self, monkeypatch):
|
|
monkeypatch.setenv("VAL", "x")
|
|
assert _resolve_env_vars(["${VAL}", "plain"]) == ["x", "plain"]
|
|
|
|
def test_ignores_non_strings(self):
|
|
assert _resolve_env_vars(42) == 42
|
|
assert _resolve_env_vars(True) is True
|
|
assert _resolve_env_vars(None) is None
|
|
assert _resolve_env_vars(3.14) == 3.14
|
|
|
|
def test_plain_strings_unchanged(self):
|
|
assert _resolve_env_vars("no vars here") == "no vars here"
|
|
|
|
def test_missing_var_raises(self):
|
|
with pytest.raises(ValueError, match="DOES_NOT_EXIST"):
|
|
_resolve_env_vars("${DOES_NOT_EXIST}")
|
|
|
|
|
|
class TestResolveConfig:
|
|
def test_resolves_env_vars_in_config(self, tmp_path, monkeypatch):
|
|
monkeypatch.setenv("TEST_API_KEY", "resolved-key")
|
|
config_path = tmp_path / "config.json"
|
|
config_path.write_text(
|
|
json.dumps(
|
|
{"providers": {"groq": {"apiKey": "${TEST_API_KEY}"}}}
|
|
),
|
|
encoding="utf-8",
|
|
)
|
|
|
|
raw = load_config(config_path)
|
|
assert raw.providers.groq.api_key == "${TEST_API_KEY}"
|
|
|
|
resolved = resolve_config_env_vars(raw)
|
|
assert resolved.providers.groq.api_key == "resolved-key"
|
|
|
|
def test_save_preserves_templates(self, tmp_path, monkeypatch):
|
|
monkeypatch.setenv("MY_TOKEN", "real-token")
|
|
config_path = tmp_path / "config.json"
|
|
config_path.write_text(
|
|
json.dumps(
|
|
{"channels": {"telegram": {"token": "${MY_TOKEN}"}}}
|
|
),
|
|
encoding="utf-8",
|
|
)
|
|
|
|
raw = load_config(config_path)
|
|
save_config(raw, config_path)
|
|
|
|
saved = json.loads(config_path.read_text(encoding="utf-8"))
|
|
assert saved["channels"]["telegram"]["token"] == "${MY_TOKEN}"
|
|
|
|
def test_preserves_excluded_fields_when_no_env_refs(self, tmp_path):
|
|
"""Regression: fields with ``exclude=True`` (e.g. DreamConfig.cron)
|
|
must survive ``resolve_config_env_vars`` when the config has no
|
|
``${VAR}`` references. Previously the unconditional dump→revalidate
|
|
roundtrip silently dropped them."""
|
|
config_path = tmp_path / "config.json"
|
|
config_path.write_text(
|
|
json.dumps(
|
|
{"agents": {"defaults": {"dream": {"cron": "5 11 * * *"}}}}
|
|
),
|
|
encoding="utf-8",
|
|
)
|
|
|
|
raw = load_config(config_path)
|
|
assert raw.agents.defaults.dream.cron == "5 11 * * *"
|
|
|
|
resolved = resolve_config_env_vars(raw)
|
|
assert resolved.agents.defaults.dream.cron == "5 11 * * *"
|
|
assert resolved.agents.defaults.dream.describe_schedule() == (
|
|
"cron 5 11 * * * (legacy)"
|
|
)
|