`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.
121 lines
5.0 KiB
Python
121 lines
5.0 KiB
Python
"""Tests for user-configured ``model.default_headers`` in the auxiliary client.
|
|
|
|
Companion to ``tests/agent/test_provider_attribution_headers.py`` (which
|
|
covers the main agent client). The main agent turn and the auxiliary client
|
|
(title generation, context compression, vision routing) build separate OpenAI
|
|
clients, so a ``custom`` endpoint behind a gateway/WAF that rejects the OpenAI
|
|
SDK's identifying headers needs the ``model.default_headers`` override applied
|
|
on BOTH paths — otherwise the main turn succeeds but auxiliary calls to the
|
|
same endpoint still fail with an opaque 4xx/502. (#40033)
|
|
"""
|
|
|
|
from unittest.mock import patch, MagicMock
|
|
|
|
import pytest
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _isolate(tmp_path, monkeypatch):
|
|
"""Redirect HERMES_HOME so load_config() reads our test config.yaml."""
|
|
hermes_home = tmp_path / ".hermes"
|
|
hermes_home.mkdir()
|
|
monkeypatch.setenv("HERMES_HOME", str(hermes_home))
|
|
(hermes_home / "config.yaml").write_text("model:\n default: test-model\n")
|
|
|
|
|
|
def _write_config(tmp_path, config_dict):
|
|
import yaml
|
|
(tmp_path / ".hermes" / "config.yaml").write_text(yaml.dump(config_dict))
|
|
|
|
|
|
class TestApplyUserDefaultHeadersHelper:
|
|
"""Direct unit tests for the merge helper."""
|
|
|
|
def test_user_headers_merged_and_win(self, tmp_path):
|
|
_write_config(tmp_path, {
|
|
"model": {"default": "m", "default_headers": {"User-Agent": "curl/8.7.1", "X-Extra": "1"}},
|
|
})
|
|
from agent.auxiliary_client import _apply_user_default_headers
|
|
merged = _apply_user_default_headers({"User-Agent": "OpenAI/Python 2.24.0"})
|
|
assert merged["User-Agent"] == "curl/8.7.1" # user wins
|
|
assert merged["X-Extra"] == "1"
|
|
|
|
|
|
|
|
|
|
def test_none_values_skipped(self, tmp_path):
|
|
_write_config(tmp_path, {
|
|
"model": {"default": "m", "default_headers": {"User-Agent": "curl/8.7.1", "X-Drop": None}},
|
|
})
|
|
from agent.auxiliary_client import _apply_user_default_headers
|
|
merged = _apply_user_default_headers({})
|
|
assert merged == {"User-Agent": "curl/8.7.1"}
|
|
assert "X-Drop" not in merged
|
|
|
|
|
|
class TestAuxClientHonorsUserDefaultHeaders:
|
|
"""Integration: resolve_provider_client must pass overridden headers to OpenAI."""
|
|
|
|
def test_custom_provider_overrides_sdk_user_agent(self, tmp_path):
|
|
"""The #40033 reproduction on the auxiliary path."""
|
|
_write_config(tmp_path, {
|
|
"model": {
|
|
"default": "my-custom-model",
|
|
"provider": "custom",
|
|
"base_url": "http://localhost:8080/v1",
|
|
"default_headers": {"User-Agent": "curl/8.7.1", "X-Extra": "1"},
|
|
},
|
|
})
|
|
with patch("agent.auxiliary_client.OpenAI") as mock_openai:
|
|
mock_openai.return_value = MagicMock()
|
|
from agent.auxiliary_client import resolve_provider_client
|
|
client, model = resolve_provider_client("main", "my-custom-model")
|
|
|
|
assert client is not None
|
|
assert mock_openai.called
|
|
headers = mock_openai.call_args.kwargs.get("default_headers", {})
|
|
assert headers.get("User-Agent") == "curl/8.7.1"
|
|
assert headers.get("X-Extra") == "1"
|
|
|
|
def test_custom_provider_no_override_sends_no_user_agent(self, tmp_path):
|
|
"""Without config, the aux client injects nothing — SDK defaults apply."""
|
|
_write_config(tmp_path, {
|
|
"model": {
|
|
"default": "my-custom-model",
|
|
"provider": "custom",
|
|
"base_url": "http://localhost:8080/v1",
|
|
},
|
|
})
|
|
with patch("agent.auxiliary_client.OpenAI") as mock_openai:
|
|
mock_openai.return_value = MagicMock()
|
|
from agent.auxiliary_client import resolve_provider_client
|
|
client, model = resolve_provider_client("main", "my-custom-model")
|
|
|
|
assert client is not None
|
|
headers = mock_openai.call_args.kwargs.get("default_headers", {}) or {}
|
|
assert "User-Agent" not in headers
|
|
|
|
def test_named_custom_provider_honors_override(self, tmp_path):
|
|
"""A `custom_providers:` entry's aux calls also honor model.default_headers.
|
|
|
|
This is a distinct construction path (_extra2) from the config-level
|
|
`model.provider: custom` path — both must apply the global override.
|
|
"""
|
|
_write_config(tmp_path, {
|
|
"model": {
|
|
"default": "test-model",
|
|
"default_headers": {"User-Agent": "curl/8.7.1"},
|
|
},
|
|
"custom_providers": [
|
|
{"name": "my-gw", "base_url": "http://my-gw.local/v1", "api_key": "k"},
|
|
],
|
|
})
|
|
with patch("agent.auxiliary_client.OpenAI") as mock_openai:
|
|
mock_openai.return_value = MagicMock()
|
|
from agent.auxiliary_client import resolve_provider_client
|
|
client, model = resolve_provider_client("my-gw", "test-model")
|
|
|
|
assert client is not None
|
|
headers = mock_openai.call_args.kwargs.get("default_headers", {}) or {}
|
|
assert headers.get("User-Agent") == "curl/8.7.1"
|