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.
86 lines
2.9 KiB
Python
86 lines
2.9 KiB
Python
"""Regression tests for #61099: switch_model must reapply provider-specific
|
|
default headers when it rebuilds _client_kwargs from scratch.
|
|
|
|
Without _apply_client_headers_for_base_url() in the rebuild path, a /model
|
|
switch drops OpenRouter attribution headers (HTTP-Referer / X-Title → logs
|
|
show "Unknown") and, worse, functional headers like Kimi's User-Agent
|
|
sentinel (403 without it).
|
|
"""
|
|
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
from run_agent import AIAgent
|
|
from agent.context_compressor import ContextCompressor
|
|
|
|
|
|
def _make_agent(provider="copilot", base_url="https://api.githubcopilot.com") -> AIAgent:
|
|
"""Minimal AIAgent with a context_compressor, skipping __init__."""
|
|
agent = AIAgent.__new__(AIAgent)
|
|
|
|
agent.model = "claude-opus-4.8"
|
|
agent.provider = provider
|
|
agent.base_url = base_url
|
|
agent.api_key = "sk-primary"
|
|
agent.api_mode = "chat_completions"
|
|
agent.client = MagicMock()
|
|
agent.quiet_mode = True
|
|
agent._config_context_length = None
|
|
agent._client_kwargs = {"api_key": "sk-primary", "base_url": base_url}
|
|
|
|
compressor = ContextCompressor(
|
|
model=agent.model,
|
|
threshold_percent=0.50,
|
|
base_url=base_url,
|
|
api_key="sk-primary",
|
|
provider=provider,
|
|
quiet_mode=True,
|
|
config_context_length=None,
|
|
)
|
|
agent.context_compressor = compressor
|
|
agent._primary_runtime = {}
|
|
|
|
return agent
|
|
|
|
|
|
@patch("agent.model_metadata.get_model_context_length", return_value=131_072)
|
|
def test_switch_to_openrouter_reapplies_attribution_headers(mock_ctx_len):
|
|
"""Switching to an openrouter.ai base_url must attach the OpenRouter
|
|
attribution headers (HTTP-Referer / X-Title) to the rebuilt client
|
|
kwargs — not ship a bare api_key+base_url client (#61099)."""
|
|
agent = _make_agent(provider="copilot", base_url="https://api.githubcopilot.com")
|
|
|
|
agent.switch_model(
|
|
"deepseek/deepseek-chat",
|
|
"openrouter",
|
|
api_key="sk-or-new",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
)
|
|
|
|
headers = agent._client_kwargs.get("default_headers") or {}
|
|
assert "HTTP-Referer" in headers
|
|
assert headers.get("X-Title")
|
|
|
|
|
|
|
|
|
|
@patch("agent.model_metadata.get_model_context_length", return_value=131_072)
|
|
def test_switch_away_from_headered_provider_clears_stale_headers(mock_ctx_len):
|
|
"""Switching FROM a headered provider TO one with no URL-specific headers
|
|
must not carry the old provider's headers along."""
|
|
agent = _make_agent(provider="openrouter", base_url="https://openrouter.ai/api/v1")
|
|
agent._client_kwargs["default_headers"] = {
|
|
"HTTP-Referer": "https://hermes-agent.nousresearch.com",
|
|
"X-Title": "Hermes Agent",
|
|
}
|
|
|
|
agent.switch_model(
|
|
"MiniMax-M3",
|
|
"custom:minimax",
|
|
api_key="sk-minimax",
|
|
base_url="https://api.minimax.io/v1",
|
|
)
|
|
|
|
headers = agent._client_kwargs.get("default_headers") or {}
|
|
assert "HTTP-Referer" not in headers
|
|
assert "X-Title" not in headers
|