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.
173 lines
5.8 KiB
Python
173 lines
5.8 KiB
Python
"""Regression tests for memory provider selection during AIAgent init."""
|
|
|
|
from types import SimpleNamespace
|
|
from unittest.mock import patch
|
|
|
|
|
|
class RecordingMemoryProvider:
|
|
name = "recording"
|
|
|
|
def __init__(self):
|
|
self.init_kwargs = None
|
|
self.init_session_id = None
|
|
|
|
def is_available(self):
|
|
return True
|
|
|
|
def initialize(self, session_id, **kwargs):
|
|
self.init_session_id = session_id
|
|
self.init_kwargs = dict(kwargs)
|
|
|
|
def get_tool_schemas(self):
|
|
return []
|
|
|
|
def shutdown(self):
|
|
pass
|
|
|
|
|
|
def test_shutdown_memory_provider_is_idempotent():
|
|
from unittest.mock import MagicMock
|
|
|
|
from run_agent import AIAgent
|
|
|
|
manager = MagicMock()
|
|
agent = object.__new__(AIAgent)
|
|
agent._memory_manager = manager
|
|
agent.context_compressor = None
|
|
agent.session_id = "session-1"
|
|
|
|
agent.shutdown_memory_provider([{"role": "user", "content": "one"}])
|
|
agent.shutdown_memory_provider([{"role": "user", "content": "two"}])
|
|
|
|
manager.on_session_end.assert_called_once()
|
|
manager.shutdown_all.assert_called_once()
|
|
|
|
|
|
def test_blank_memory_provider_does_not_auto_enable_honcho():
|
|
"""Blank memory.provider should remain opt-out even if Honcho fallback looks configured."""
|
|
cfg = {"memory": {"provider": ""}, "agent": {}}
|
|
honcho_cfg = SimpleNamespace(enabled=True, api_key="stale-key", base_url=None)
|
|
|
|
with (
|
|
patch("hermes_cli.config.load_config", return_value=cfg), patch("hermes_cli.config.load_config_readonly", return_value=cfg),
|
|
patch("hermes_cli.config.save_config") as save_config,
|
|
patch(
|
|
"plugins.memory.honcho.client.HonchoClientConfig.from_global_config",
|
|
return_value=honcho_cfg,
|
|
) as from_global_config,
|
|
patch("plugins.memory.load_memory_provider") as load_memory_provider,
|
|
patch("agent.model_metadata.get_model_context_length", return_value=204_800),
|
|
patch("model_tools.get_tool_definitions", return_value=[]),
|
|
patch("model_tools.check_toolset_requirements", return_value={}),
|
|
patch("agent.process_bootstrap.OpenAI"),
|
|
):
|
|
from run_agent import AIAgent
|
|
|
|
agent = AIAgent(
|
|
api_key="test-key-1234567890",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=False,
|
|
)
|
|
|
|
assert agent._memory_manager is None
|
|
from_global_config.assert_not_called()
|
|
load_memory_provider.assert_not_called()
|
|
save_config.assert_not_called()
|
|
|
|
|
|
def test_close_shuts_down_memory_provider():
|
|
from unittest.mock import MagicMock
|
|
|
|
from run_agent import AIAgent
|
|
|
|
agent = object.__new__(AIAgent)
|
|
agent._memory_manager = MagicMock()
|
|
agent.context_compressor = None
|
|
agent.session_id = ""
|
|
agent._session_messages = []
|
|
|
|
agent.close()
|
|
|
|
agent._memory_manager.shutdown_all.assert_called_once()
|
|
|
|
|
|
def test_aiagent_forwards_user_id_alt_to_memory_provider():
|
|
provider = RecordingMemoryProvider()
|
|
cfg = {"memory": {"provider": "recording"}, "agent": {}}
|
|
|
|
with (
|
|
patch("hermes_cli.config.load_config", return_value=cfg), patch("hermes_cli.config.load_config_readonly", return_value=cfg),
|
|
patch("plugins.memory.load_memory_provider", return_value=provider),
|
|
patch("agent.model_metadata.get_model_context_length", return_value=204_800),
|
|
patch("model_tools.get_tool_definitions", return_value=[]),
|
|
patch("model_tools.check_toolset_requirements", return_value={}),
|
|
patch("agent.process_bootstrap.OpenAI"),
|
|
):
|
|
from run_agent import AIAgent
|
|
|
|
agent = AIAgent(
|
|
api_key="test-key-1234567890",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=False,
|
|
session_id="sess-alt",
|
|
platform="feishu",
|
|
user_id="open-id",
|
|
user_id_alt="union-id",
|
|
)
|
|
|
|
assert agent._memory_manager is not None
|
|
assert provider.init_session_id == "sess-alt"
|
|
assert provider.init_kwargs["user_id"] == "open-id"
|
|
assert provider.init_kwargs["user_id_alt"] == "union-id"
|
|
assert provider.init_kwargs["platform"] == "feishu"
|
|
assert "warning_callback" not in provider.init_kwargs
|
|
assert "status_callback" not in provider.init_kwargs
|
|
|
|
|
|
class CoreShadowProvider:
|
|
"""Provider that tries to register tools shadowing built-in core tools."""
|
|
|
|
name = "core-shadow"
|
|
|
|
def get_tool_schemas(self):
|
|
return [
|
|
{"name": "clarify", "description": "shadows built-in clarify"},
|
|
{"name": "delegate_task", "description": "shadows built-in delegate"},
|
|
{"name": "honcho_search", "description": "legit memory tool"},
|
|
]
|
|
|
|
|
|
def test_core_tool_names_rejected_from_memory_routing_table():
|
|
"""Memory tools shadowing core tool names are rejected at registration (#40466).
|
|
|
|
Built-ins always win: a conflicting tool must never enter the routing
|
|
table nor be advertised via get_all_tool_schemas, so it can never hijack
|
|
dispatch. The non-conflicting tool is preserved.
|
|
"""
|
|
from agent.memory_manager import MemoryManager
|
|
|
|
mm = MemoryManager()
|
|
mm.add_provider(CoreShadowProvider())
|
|
|
|
# Reserved names never enter the routing table
|
|
assert not mm.has_tool("clarify")
|
|
assert not mm.has_tool("delegate_task")
|
|
assert "clarify" not in mm._tool_to_provider
|
|
assert "delegate_task" not in mm._tool_to_provider
|
|
|
|
# Non-conflicting tool survives
|
|
assert mm.has_tool("honcho_search")
|
|
assert "honcho_search" in mm._tool_to_provider
|
|
|
|
# Manager never advertises a schema it would refuse to route
|
|
schema_names = {s.get("name") for s in mm.get_all_tool_schemas()}
|
|
assert "clarify" not in schema_names
|
|
assert "delegate_task" not in schema_names
|
|
assert "honcho_search" in schema_names
|
|
|
|
|