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.
79 lines
2.4 KiB
Python
79 lines
2.4 KiB
Python
import json
|
|
from types import SimpleNamespace
|
|
|
|
|
|
def _tool_call(name: str, arguments):
|
|
return SimpleNamespace(
|
|
id="call_1",
|
|
type="function",
|
|
function=SimpleNamespace(name=name, arguments=arguments),
|
|
)
|
|
|
|
|
|
def _response_with_tool_call(arguments):
|
|
assistant = SimpleNamespace(
|
|
content=None,
|
|
reasoning=None,
|
|
tool_calls=[_tool_call("read_file", arguments)],
|
|
)
|
|
choice = SimpleNamespace(message=assistant, finish_reason="tool_calls")
|
|
return SimpleNamespace(choices=[choice], usage=None)
|
|
|
|
|
|
class _FakeChatCompletions:
|
|
def __init__(self):
|
|
self.calls = 0
|
|
|
|
def create(self, **kwargs):
|
|
self.calls += 1
|
|
if self.calls == 1:
|
|
return _response_with_tool_call({"path": "README.md"})
|
|
return SimpleNamespace(
|
|
choices=[
|
|
SimpleNamespace(
|
|
message=SimpleNamespace(content="done", reasoning=None, tool_calls=[]),
|
|
finish_reason="stop",
|
|
)
|
|
],
|
|
usage=None,
|
|
)
|
|
|
|
|
|
class _FakeClient:
|
|
def __init__(self):
|
|
self.chat = SimpleNamespace(completions=_FakeChatCompletions())
|
|
|
|
|
|
def test_tool_call_validation_accepts_dict_arguments(monkeypatch):
|
|
from run_agent import AIAgent
|
|
|
|
monkeypatch.setattr("agent.process_bootstrap.OpenAI", lambda **kwargs: _FakeClient())
|
|
monkeypatch.setattr(
|
|
"model_tools.get_tool_definitions",
|
|
lambda *args, **kwargs: [{"function": {"name": "read_file"}}],
|
|
)
|
|
monkeypatch.setattr(
|
|
"model_tools.handle_function_call",
|
|
lambda name, args, task_id=None, **kwargs: json.dumps({"ok": True, "args": args}),
|
|
)
|
|
|
|
agent = AIAgent(
|
|
model="test-model",
|
|
api_key="test-key",
|
|
base_url="http://localhost:8080/v1",
|
|
platform="cli",
|
|
max_iterations=3,
|
|
quiet_mode=True,
|
|
skip_memory=True,
|
|
)
|
|
agent._disable_streaming = True
|
|
|
|
result = agent.run_conversation("read the file")
|
|
|
|
# The conversation hits max_iterations=3 (3 tool turns then forced summary).
|
|
# PR #34470 adds an explainer suffix to abnormal turn endings so users
|
|
# understand why the response is short instead of seeing a blank reply.
|
|
# The exact suffix wording is owned by conversation_loop; this test only
|
|
# cares that the model's actual text ('done') survives at the start.
|
|
assert result["final_response"].startswith("done")
|