Teknium
2a95791992
run_agent.py: delete the `# noqa: F401` re-export block (agent.process_bootstrap
OpenAI/_SafeWriter/_get_proxy_*, model_tools get_tool_definitions/
handle_function_call/check_toolset_requirements, FailoverReason,
_qwen_portal_headers/_routermint_headers, session_persistence names,
estimate_request_tokens_rough, ContextCompressor + friends, jittered_backoff,
prompt_builder names, message_sanitization names, tool_dispatch_helpers
names) — 41 names run_agent never used itself — and the `_STREAM_DIAG_HEADERS`
back-compat class alias (no in-tree reader). run_agent now imports only what
it uses (get_toolset_for_tool, is_local_endpoint, coalesce/uniquify tool-call
ids, cleanup_vm/get_active_env from terminal_tool_lifecycle).
agent/*: `_ra().X` late-binds that only reached a re-export now import the
defining module directly (agent_runtime_helpers -> process_bootstrap.OpenAI,
model_tools.handle_function_call, session_persistence._safe_session_filename_component;
agent_init -> model_tools.get_tool_definitions/check_toolset_requirements,
_lazy_headers("agent.client_lifecycle", ...) for qwen/routermint;
system_prompt -> agent.prompt_builder / model_tools directly, dropping its
own _ra() shim and the `_r` parameter threading). `_ra()` stays for
run_agent-resident names (logger, AIAgent, _hermes_home, _set_interrupt, ...).
toolsets.py: remove resolve_multiple_toolsets (shim-only, restored by
34abf954bd); tests/test_toolsets.py pins the same union behavior via
resolve_toolset over each name.
providers/__init__.py: drop the OMIT_TEMPERATURE re-export (no callers via the
package); ProviderProfile stays because __init__ uses it for annotations —
2 tests repointed to providers.base.
agent/iteration_budget.py: drop the "run_agent re-exports the class"
docstring pointer; 4 tests import IterationBudget from its home.
model_tools.py (arg_coercion names), agent/tool_executor.py, and
hermes_cli/cli_session_mixin.py repoints landed via a sibling commit on this
shared worktree.
Callers repointed: gateway/run.py, hermes_cli/cli_chat_turn_mixin.py,
hermes_cli/cli_tui_mixin.py, tui_gateway/session_workdir.py,
agent/transports/codex.py (one-line imports) + comment pointers in
tools/file_state.py, tools/schema_sanitizer.py, scripts/tool_search_livetest.py.
Tests: patch("run_agent.X") / monkeypatch.setattr(run_agent, "X") /
`from run_agent import X` -> defining module across 99 test files.
52 lines
1.5 KiB
Python
52 lines
1.5 KiB
Python
"""Per-provider ``extra_headers`` applied to the OpenAI client (#3526 salvage).
|
|
|
|
Custom providers (``providers`` / ``custom_providers`` in config.yaml) can
|
|
declare an ``extra_headers`` dict that must land on the OpenAI client's
|
|
``default_headers`` at construction and survive header re-application on
|
|
credential swaps / rebuilds. Values may carry credentials — the plumbing must
|
|
never log them.
|
|
"""
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
from run_agent import AIAgent
|
|
|
|
_PROXY_URL = "https://llm.internal.example.com/v1"
|
|
_PROXY_CONFIG = {
|
|
"custom_providers": [
|
|
{
|
|
"name": "my-proxy",
|
|
"base_url": _PROXY_URL,
|
|
"api_key": "proxy-key",
|
|
"extra_headers": {
|
|
"CF-Access-Client-Id": "xxxx.access",
|
|
"X-Client-Name": "hermes-agent",
|
|
},
|
|
}
|
|
]
|
|
}
|
|
|
|
|
|
@patch("agent.process_bootstrap.OpenAI")
|
|
def test_custom_provider_extra_headers_applied_at_construction(mock_openai):
|
|
mock_openai.return_value = MagicMock()
|
|
with patch("hermes_cli.config.load_config", return_value=_PROXY_CONFIG):
|
|
agent = AIAgent(
|
|
api_key="proxy-key",
|
|
base_url=_PROXY_URL,
|
|
model="my-model",
|
|
provider="custom",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
)
|
|
|
|
headers = agent._client_kwargs["default_headers"]
|
|
assert headers["CF-Access-Client-Id"] == "xxxx.access"
|
|
assert headers["X-Client-Name"] == "hermes-agent"
|
|
|
|
|
|
|
|
|
|
|
|
|