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.
62 lines
1.4 KiB
Python
62 lines
1.4 KiB
Python
"""Tests for _repair_tool_call_arguments — malformed JSON repair pipeline."""
|
|
|
|
import json
|
|
|
|
from agent.message_sanitization import _repair_tool_call_arguments
|
|
class TestRepairToolCallArguments:
|
|
"""Verify each repair stage in the pipeline."""
|
|
|
|
# -- Stage 1: empty / whitespace-only --
|
|
|
|
def test_empty_string_returns_empty_object(self):
|
|
assert _repair_tool_call_arguments("", "t") == "{}"
|
|
|
|
|
|
|
|
# -- Stage 2: Python None literal --
|
|
|
|
|
|
|
|
# -- Stage 3: trailing comma repair --
|
|
|
|
|
|
def test_trailing_comma_in_array(self):
|
|
result = _repair_tool_call_arguments('{"a": [1, 2,]}', "t")
|
|
parsed = json.loads(result)
|
|
assert parsed == {"a": [1, 2]}
|
|
|
|
|
|
# -- Stage 4: unclosed brackets --
|
|
|
|
|
|
|
|
# -- Stage 5: excess closing delimiters --
|
|
|
|
|
|
|
|
# -- Stage 6: last resort --
|
|
|
|
|
|
def test_unrepairable_partial_returns_empty_object(self):
|
|
# Truncated in the middle of a string key — bracket closing won't help
|
|
assert _repair_tool_call_arguments('{"truncated": "val', "t") == "{}"
|
|
|
|
# -- Valid JSON passthrough (this path is via except, but still works) --
|
|
|
|
|
|
# -- Combined repairs --
|
|
|
|
|
|
|
|
# -- Stage 0: strict=False (literal control chars in strings) --
|
|
# llama.cpp backends sometimes emit literal tabs/newlines inside JSON
|
|
# string values. strict=False accepts these; we re-serialise to the
|
|
# canonical wire form (#12068).
|
|
|
|
|
|
|
|
|
|
# -- Stage 4: control-char escape fallback --
|
|
|
|
|