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.
92 lines
3.0 KiB
Python
92 lines
3.0 KiB
Python
"""Two core decisions must key on the ``acp://`` scheme, not on one vendor.
|
|
|
|
An ACP client talks to a CLI over subprocess stdio: it returns a plain
|
|
completion object rather than an iterable stream, and it does not implement the
|
|
Responses API surface. Both exclusions used to spell out ``acp://copilot``,
|
|
which meant the next ACP client silently inherited the wrong defaults — a
|
|
Responses upgrade its shim cannot serve, and a streaming call that tries to
|
|
iterate a ``SimpleNamespace``.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import sys
|
|
from types import SimpleNamespace
|
|
|
|
_REPO_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
|
if _REPO_ROOT not in sys.path:
|
|
sys.path.insert(0, _REPO_ROOT)
|
|
|
|
|
|
class _FakeCompletions:
|
|
"""Returns a whole completion — exactly what an ACP shim does.
|
|
|
|
``stream=True`` is not honoured (an ACP turn is one-shot), so if the loop
|
|
ever tries to stream this, iterating the result raises.
|
|
"""
|
|
|
|
def __init__(self):
|
|
self.calls: list[dict] = []
|
|
|
|
def create(self, **kwargs):
|
|
self.calls.append(kwargs)
|
|
return SimpleNamespace(
|
|
choices=[
|
|
SimpleNamespace(
|
|
message=SimpleNamespace(content="ok", reasoning=None, tool_calls=[]),
|
|
finish_reason="stop",
|
|
)
|
|
],
|
|
usage=None,
|
|
)
|
|
|
|
|
|
class _FakeClient:
|
|
def __init__(self):
|
|
self.chat = SimpleNamespace(completions=_FakeCompletions())
|
|
|
|
|
|
def _agent(monkeypatch, base_url: str, **kwargs):
|
|
from run_agent import AIAgent
|
|
|
|
client = _FakeClient()
|
|
monkeypatch.setattr("agent.process_bootstrap.OpenAI", lambda **_kw: client)
|
|
monkeypatch.setattr("model_tools.get_tool_definitions", lambda *a, **k: [])
|
|
agent = AIAgent(
|
|
model="gpt-5", # a model that would normally trigger the Responses upgrade
|
|
api_key="test-key",
|
|
base_url=base_url,
|
|
platform="cli",
|
|
max_iterations=2,
|
|
quiet_mode=True,
|
|
skip_memory=True,
|
|
**kwargs,
|
|
)
|
|
return agent, client
|
|
|
|
|
|
def test_an_acp_base_url_is_not_upgraded_to_the_responses_api(monkeypatch):
|
|
agent, _ = _agent(monkeypatch, "acp://somevendor")
|
|
assert agent.api_mode == "chat_completions"
|
|
|
|
|
|
def test_a_non_acp_url_still_upgrades(monkeypatch):
|
|
"""Guard against the exclusion being widened into a blanket opt-out."""
|
|
agent, _ = _agent(monkeypatch, "https://api.openai.com/v1")
|
|
assert agent.api_mode == "codex_responses"
|
|
|
|
|
|
def test_an_acp_provider_turn_never_asks_for_a_stream(monkeypatch):
|
|
"""A display consumer is present, so streaming would otherwise be chosen."""
|
|
agent, client = _agent(
|
|
monkeypatch, "acp://somevendor", stream_delta_callback=lambda *_a, **_k: None
|
|
)
|
|
assert agent._has_stream_consumers()
|
|
|
|
result = agent.run_conversation("hi")
|
|
|
|
assert result["final_response"].startswith("ok")
|
|
assert client.chat.completions.calls, "the client was never called"
|
|
assert not any(c.get("stream") for c in client.chat.completions.calls)
|