teknium1
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.
68 lines
2.3 KiB
Python
68 lines
2.3 KiB
Python
"""Test: _moa_prepared_request does not leak to native OpenAI clients (#78382).
|
|
|
|
After a client replacement (credential rotation / fallback / dead-connection
|
|
cleanup), agent.client may become a native OpenAI client while agent.provider
|
|
stays "moa". The dispatch must strip the MoA-internal key so the native SDK
|
|
does not reject it.
|
|
"""
|
|
import types
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
from agent.chat_completion_helpers import _dispatch_nonstreaming_api_request
|
|
|
|
|
|
class _FakeNativeClient:
|
|
"""Mimics a native OpenAI client whose create() rejects unknown kwargs."""
|
|
|
|
def __init__(self):
|
|
self.chat = types.SimpleNamespace()
|
|
self.chat.completions = types.SimpleNamespace()
|
|
self.chat.completions.create = MagicMock(return_value="native-response")
|
|
|
|
|
|
def _make_agent(provider="moa"):
|
|
agent = MagicMock()
|
|
agent.provider = provider
|
|
agent.client = _FakeNativeClient()
|
|
agent.api_mode = "chat_completions"
|
|
return agent
|
|
|
|
|
|
def test_moa_key_stripped_from_native_client():
|
|
"""_moa_prepared_request must not reach a native OpenAI client."""
|
|
agent = _make_agent(provider="moa")
|
|
api_kwargs = {
|
|
"model": "gpt-4",
|
|
"messages": [{"role": "user", "content": "hi"}],
|
|
"_moa_prepared_request": {"messages": [], "model": "x"},
|
|
}
|
|
|
|
# Patch make_client to return a factory that returns our fake client
|
|
def _make_client(label=None):
|
|
return agent.client
|
|
|
|
_dispatch_nonstreaming_api_request(agent, api_kwargs, make_client=_make_client)
|
|
|
|
# The native client should NOT have received the MoA-internal key.
|
|
call_kwargs = agent.client.chat.completions.create.call_args[1]
|
|
assert "_moa_prepared_request" not in call_kwargs, (
|
|
f"_moa_prepared_request leaked to native client: {call_kwargs.keys()}"
|
|
)
|
|
|
|
|
|
def test_no_moa_key_when_absent():
|
|
"""Normal non-MoA call should work without the key present."""
|
|
agent = _make_agent(provider="openai")
|
|
api_kwargs = {
|
|
"model": "gpt-4",
|
|
"messages": [{"role": "user", "content": "hi"}],
|
|
}
|
|
|
|
def _make_client(label=None):
|
|
return agent.client
|
|
|
|
_dispatch_nonstreaming_api_request(agent, api_kwargs, make_client=_make_client)
|
|
call_kwargs = agent.client.chat.completions.create.call_args[1]
|
|
assert "_moa_prepared_request" not in call_kwargs
|
|
assert call_kwargs["model"] == "gpt-4"
|