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.
130 lines
4.0 KiB
Python
130 lines
4.0 KiB
Python
from types import ModuleType, SimpleNamespace
|
|
from unittest.mock import MagicMock, patch
|
|
import json
|
|
import sys
|
|
|
|
from run_agent import AIAgent
|
|
|
|
|
|
def _mock_response(*, usage: dict, content: str = "done"):
|
|
msg = SimpleNamespace(content=content, tool_calls=None)
|
|
choice = SimpleNamespace(message=msg, finish_reason="stop")
|
|
return SimpleNamespace(
|
|
choices=[choice],
|
|
model="test/model",
|
|
usage=SimpleNamespace(**usage),
|
|
)
|
|
|
|
|
|
def _make_agent(session_db, *, platform: str):
|
|
with (
|
|
patch("model_tools.get_tool_definitions", return_value=[]),
|
|
patch("model_tools.check_toolset_requirements", return_value={}),
|
|
patch("agent.process_bootstrap.OpenAI"),
|
|
):
|
|
agent = AIAgent(
|
|
api_key="test-key",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
session_db=session_db,
|
|
session_id=f"{platform}-session",
|
|
platform=platform,
|
|
)
|
|
agent.client = MagicMock()
|
|
agent.client.chat.completions.create.return_value = _mock_response(
|
|
usage={
|
|
"prompt_tokens": 11,
|
|
"completion_tokens": 7,
|
|
"total_tokens": 18,
|
|
}
|
|
)
|
|
return agent
|
|
|
|
|
|
def test_run_conversation_persists_tokens_for_telegram_sessions():
|
|
session_db = MagicMock()
|
|
agent = _make_agent(session_db, platform="telegram")
|
|
|
|
result = agent.run_conversation("hello")
|
|
|
|
assert result["final_response"] == "done"
|
|
# Per-call deltas are enqueued for the SessionDB background writer
|
|
# (queue_token_counts) rather than written inline on the turn thread.
|
|
session_db.queue_token_counts.assert_called_once()
|
|
assert session_db.queue_token_counts.call_args.args[0] == "telegram-session"
|
|
|
|
|
|
|
|
|
|
def test_session_search_lazily_opens_db_when_entrypoint_did_not_pass_one(monkeypatch):
|
|
sentinel_db = object()
|
|
captured = {}
|
|
|
|
class FakeSessionDB:
|
|
def __new__(cls):
|
|
return sentinel_db
|
|
|
|
hermes_state = ModuleType("hermes_state")
|
|
hermes_state.SessionDB = FakeSessionDB
|
|
hermes_state.get_shared_session_db = lambda db_path=None: sentinel_db
|
|
monkeypatch.setitem(sys.modules, "hermes_state", hermes_state)
|
|
|
|
session_search_mod = ModuleType("tools.session_search_tool")
|
|
|
|
def fake_session_search(**kwargs):
|
|
captured.update(kwargs)
|
|
return json.dumps({"success": True, "results": []})
|
|
|
|
session_search_mod.session_search = fake_session_search
|
|
monkeypatch.setitem(sys.modules, "tools.session_search_tool", session_search_mod)
|
|
|
|
agent = _make_agent(None, platform="acp")
|
|
result = json.loads(agent._invoke_tool(
|
|
"session_search",
|
|
{"query": "Hermes", "detail": "full"},
|
|
"task-id",
|
|
))
|
|
|
|
assert result["success"] is True
|
|
assert captured["db"] is sentinel_db
|
|
assert captured["query"] == "Hermes"
|
|
assert captured["detail"] == "full"
|
|
assert agent._session_db is sentinel_db
|
|
|
|
|
|
def test_sequential_session_search_forwards_detail(monkeypatch):
|
|
session_db = MagicMock()
|
|
captured = {}
|
|
|
|
session_search_mod = ModuleType("tools.session_search_tool")
|
|
|
|
def fake_session_search(**kwargs):
|
|
captured.update(kwargs)
|
|
return json.dumps({"success": True, "results": []})
|
|
|
|
session_search_mod.session_search = fake_session_search
|
|
monkeypatch.setitem(sys.modules, "tools.session_search_tool", session_search_mod)
|
|
|
|
agent = _make_agent(session_db, platform="acp")
|
|
tool_call = SimpleNamespace(
|
|
id="search-1",
|
|
function=SimpleNamespace(
|
|
name="session_search",
|
|
arguments=json.dumps({"query": "Hermes", "detail": "full"}),
|
|
),
|
|
)
|
|
assistant_message = SimpleNamespace(tool_calls=[tool_call])
|
|
messages = []
|
|
|
|
agent._execute_tool_calls_sequential(
|
|
assistant_message,
|
|
messages,
|
|
"task-id",
|
|
)
|
|
|
|
assert captured["db"] is session_db
|
|
assert captured["query"] == "Hermes"
|
|
assert captured["detail"] == "full"
|