d10bb2ab6f
`scripts/run_tests.sh tests/<dir>/` is how a change gets its regression
coverage run, so a test filed under the wrong directory is a test nobody
runs when that code changes. Two kinds of drift had accumulated.
Parallel directories for one source package, folded into the mirror:
tests/acp -> tests/acp_adapter (its __init__/conftest move with it)
tests/cli -> tests/hermes_cli (prompt_toolkit fixture merged into
hermes_cli/conftest.py)
tests/run_agent -> tests/agent (backoff fixture becomes
agent/conftest.py)
tests/relay -> tests/gateway/relay
tests/state -> tests/hermes_state
246 loose files at tests/ root, routed by the package they import/patch:
hermes_cli, hermes_state, agent, gateway, tools, plugins, tui_gateway, cron.
Installer and desktop-update script tests go to tests/scripts/{install,
desktop_update}/. 43 tests of root-level modules (batch_runner, utils,
hermes_constants, packaging) stay at the root.
Filenames drop their issue numbers (95 files: test_89315_x.py -> test_x.py);
the number stays in the module docstring where it has context.
Collisions: test_cli_skin_integration.py existed in both tests/ and tests/cli
with different subsets — merged into one (10 tests, all kept);
run_agent/test_pre_compress_memory_context.py -> agent/..._handoff.py;
tests/test_account_usage.py -> agent/test_account_usage_fetch.py;
tests/test_web_server.py -> hermes_cli/test_web_server_ws_ping.py.
Deleted: test_minisweagent_path.py (empty since PR #2804),
test_model_picker_scroll.py (tested a private copy of the logic, imported
nothing), test_process_loop_event_loop_warning.py (asserted asyncio behaviour,
imported nothing from Hermes).
Repo-root path arithmetic (Path(__file__).parents[N], dirname chains) is
bumped for the 202 files that changed depth and verified by evaluating every
such expression against the new location. classify_changes' desktop-updater
lane prefix, tests-os.yml's ignore glob and every in-tree path comment follow
the moves. tests/test_tests_tree_layout.py keeps the tree from drifting back.
134 lines
5.5 KiB
Python
134 lines
5.5 KiB
Python
"""Regression test for #17929: AIAgent.__init__ should try fallback_model
|
|
when primary provider credentials are exhausted."""
|
|
import pytest
|
|
from unittest.mock import patch, MagicMock
|
|
from run_agent import AIAgent
|
|
|
|
|
|
def _make_tool_defs():
|
|
return [{"type": "function", "function": {"name": "web_search",
|
|
"description": "search", "parameters": {"type": "object", "properties": {}}}}]
|
|
|
|
|
|
def _mock_client(api_key="fb-key-1234567890", base_url="https://fb.example.com/v1"):
|
|
c = MagicMock()
|
|
c.api_key = api_key
|
|
c.base_url = base_url
|
|
c._default_headers = None
|
|
return c
|
|
|
|
|
|
def test_init_tries_fallback_when_primary_returns_none():
|
|
"""When resolve_provider_client returns None for primary but succeeds for
|
|
a fallback entry, __init__ should NOT raise RuntimeError."""
|
|
fb = _mock_client()
|
|
|
|
def fake_resolve(provider, model=None, raw_codex=False,
|
|
explicit_base_url=None, explicit_api_key=None):
|
|
if provider == "tencent-token-plan":
|
|
return fb, "kimi2.5"
|
|
return None, None # primary exhausted
|
|
|
|
with patch("agent.auxiliary_client.resolve_provider_client", side_effect=fake_resolve), \
|
|
patch("model_tools.get_tool_definitions", return_value=_make_tool_defs()), \
|
|
patch("model_tools.check_toolset_requirements", return_value={}), \
|
|
patch("agent.process_bootstrap.OpenAI", return_value=MagicMock()):
|
|
|
|
agent = AIAgent(
|
|
provider="alibaba-coding-plan",
|
|
model="qwen3.6-plus",
|
|
api_key=None,
|
|
base_url=None,
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
fallback_model=[{"provider": "tencent-token-plan", "model": "kimi2.5"}],
|
|
)
|
|
assert agent.provider == "tencent-token-plan"
|
|
assert agent.model == "kimi2.5"
|
|
assert agent._fallback_activated is True
|
|
|
|
|
|
def test_init_raises_when_no_fallback_configured():
|
|
"""When primary returns None and no fallback is set, should raise."""
|
|
with patch("agent.auxiliary_client.resolve_provider_client", return_value=(None, None)), \
|
|
patch("model_tools.get_tool_definitions", return_value=_make_tool_defs()), \
|
|
patch("model_tools.check_toolset_requirements", return_value={}), \
|
|
patch("agent.process_bootstrap.OpenAI", return_value=MagicMock()):
|
|
|
|
with pytest.raises(RuntimeError, match="no API key was found"):
|
|
AIAgent(
|
|
provider="alibaba-coding-plan",
|
|
model="qwen3.6-plus",
|
|
api_key=None,
|
|
base_url=None,
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
fallback_model=None,
|
|
)
|
|
|
|
|
|
def test_init_tries_fallback_when_openrouter_pool_exhausted():
|
|
"""Regression: an exhausted ``openrouter`` pool (single credential entry
|
|
in 429-cooldown) must still reach fallback_providers at init.
|
|
|
|
Before the fix, the init-time fallback block was nested inside the
|
|
``_explicit not in {auto, openrouter, custom}`` guard, so the default
|
|
openrouter setup skipped the chain entirely and raised the misleading
|
|
"No LLM provider configured" RuntimeError (2026-08-23 outage).
|
|
"""
|
|
fb = _mock_client(api_key="local-key-1234567890",
|
|
base_url="http://127.0.0.1:11434/v1")
|
|
|
|
def fake_resolve(provider, model=None, raw_codex=False,
|
|
explicit_base_url=None, explicit_api_key=None):
|
|
if provider == "custom" and explicit_base_url:
|
|
return fb, "qwen3.5:4b"
|
|
return None, None # openrouter pool exhausted
|
|
|
|
with patch("agent.auxiliary_client.resolve_provider_client", side_effect=fake_resolve), \
|
|
patch("model_tools.get_tool_definitions", return_value=_make_tool_defs()), \
|
|
patch("model_tools.check_toolset_requirements", return_value={}), \
|
|
patch("agent.process_bootstrap.OpenAI", return_value=MagicMock()):
|
|
|
|
agent = AIAgent(
|
|
provider="openrouter",
|
|
model="z-ai/glm-5.2:free",
|
|
api_key=None,
|
|
base_url=None,
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
fallback_model=[
|
|
{"provider": "openrouter", "model": "poolside/laguna-s-2.1:free"},
|
|
{"provider": "custom", "model": "qwen3.5:4b",
|
|
"base_url": "http://127.0.0.1:11434/v1"},
|
|
],
|
|
)
|
|
assert agent.provider == "custom"
|
|
assert agent.model == "qwen3.5:4b"
|
|
assert agent._fallback_activated is True
|
|
|
|
|
|
def test_init_openrouter_exhausted_without_chain_keeps_generic_error():
|
|
"""openrouter exhausted + no usable fallback keeps the generic
|
|
'No LLM provider configured' error (not the named-provider one)."""
|
|
with patch("agent.auxiliary_client.resolve_provider_client", return_value=(None, None)), \
|
|
patch("model_tools.get_tool_definitions", return_value=_make_tool_defs()), \
|
|
patch("model_tools.check_toolset_requirements", return_value={}), \
|
|
patch("agent.process_bootstrap.OpenAI", return_value=MagicMock()):
|
|
|
|
with pytest.raises(RuntimeError, match="No LLM provider configured"):
|
|
AIAgent(
|
|
provider="openrouter",
|
|
model="z-ai/glm-5.2:free",
|
|
api_key=None,
|
|
base_url=None,
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
fallback_model=[{"provider": "openrouter",
|
|
"model": "poolside/laguna-s-2.1:free"}],
|
|
)
|