56ba144875
Moves chat_with_model, ask_teacher and list_models out of ai_interaction.py into src/agent_tools/model_interaction_tools.py (the do_ prefix dropped) and registers them in TOOL_HANDLERS, so dispatch flows through the registry instead of the dispatch_ai_tool elif in tool_execution.py. The implementations are relocated, not wrapped. ai_interaction.py keeps only the shared helpers they reuse (_resolve_model, AI_CHAT_TIMEOUT), still used by the not-yet-migrated session/pipeline tools. dispatch_ai_tool loses its three now-unused branches. Also removes the dead do_second_opinion: it was already off the live tool surface (no tag/schema/parsing/dispatch; tool_index.py notes it was removed), so the function and its stale frontend catalog entries (admin.js, assistant.js) are deleted. Tests: owner-scope test points at the new list_models location and drops the moved tools from the dispatch_ai_tool parametrize; a new test_model_interaction_registry covers registration, owner threading, and registry dispatch.
140 lines
5.3 KiB
Python
140 lines
5.3 KiB
Python
"""
|
|
agent_tools.py — Facade module.
|
|
|
|
Re-exports tool parsing, schemas, execution, and implementations
|
|
for backward compatibility. All importers continue to work unchanged.
|
|
|
|
Sub-modules:
|
|
- tool_parsing.py: regex patterns, parse/strip functions
|
|
- tool_schemas.py: FUNCTION_TOOL_SCHEMAS, function_call_to_tool_block
|
|
- tool_execution.py: execute_tool_block, format_tool_result, MCP helpers
|
|
- tool_implementations.py: all do_* tool functions
|
|
"""
|
|
|
|
import logging
|
|
from collections import namedtuple
|
|
|
|
from src.tool_utils import _truncate, get_mcp_manager, set_mcp_manager
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
from .subprocess_tools import BashTool, PythonTool
|
|
from .web_tools import WebSearchTool, WebFetchTool
|
|
from .filesystem_tools import ReadFileTool, WriteFileTool, EditFileTool, LsTool, GlobTool, GrepTool, GetWorkspaceTool
|
|
from .document_tools import CreateDocumentTool, UpdateDocumentTool, EditDocumentTool, SuggestDocumentTool, ManageDocumentTool
|
|
from .model_interaction_tools import ChatWithModelTool, AskTeacherTool, ListModelsTool
|
|
|
|
TOOL_HANDLERS = {
|
|
"bash": BashTool().execute,
|
|
"python": PythonTool().execute,
|
|
"web_search": WebSearchTool().execute,
|
|
"web_fetch": WebFetchTool().execute,
|
|
"read_file": ReadFileTool().execute,
|
|
"write_file": WriteFileTool().execute,
|
|
"edit_file": EditFileTool().execute,
|
|
"ls": LsTool().execute,
|
|
"glob": GlobTool().execute,
|
|
"grep": GrepTool().execute,
|
|
"create_document": CreateDocumentTool().execute,
|
|
"update_document": UpdateDocumentTool().execute,
|
|
"edit_document": EditDocumentTool().execute,
|
|
"suggest_document": SuggestDocumentTool().execute,
|
|
"manage_documents": ManageDocumentTool().execute,
|
|
"get_workspace": GetWorkspaceTool().execute,
|
|
"chat_with_model": ChatWithModelTool().execute,
|
|
"ask_teacher": AskTeacherTool().execute,
|
|
"list_models": ListModelsTool().execute,
|
|
}
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Constants (re-exported for backward compatibility — single source of truth
|
|
# is src.constants; always prefer importing from there for new code)
|
|
# ---------------------------------------------------------------------------
|
|
MAX_AGENT_ROUNDS = 50
|
|
SHELL_TIMEOUT = 60
|
|
PYTHON_TIMEOUT = 30
|
|
|
|
# Tool types that trigger execution
|
|
TOOL_TAGS = {"bash", "python", "web_search", "web_fetch", "read_file", "write_file", "edit_file",
|
|
"grep", "glob", "ls", "get_workspace",
|
|
"create_document", "update_document", "edit_document",
|
|
"search_chats",
|
|
"chat_with_model", "create_session", "list_sessions",
|
|
"send_to_session",
|
|
"pipeline",
|
|
"manage_session", "manage_memory", "list_models",
|
|
"ui_control", "generate_image", "ask_user", "update_plan",
|
|
"manage_tasks", "api_call", "ask_teacher", "manage_skills",
|
|
"suggest_document",
|
|
"manage_endpoints", "manage_mcp", "manage_webhooks",
|
|
"manage_tokens", "manage_documents", "manage_settings",
|
|
"manage_notes", "manage_calendar",
|
|
"resolve_contact", "manage_contact", "list_email_accounts", "send_email", "list_emails",
|
|
"read_email", "reply_to_email", "bulk_email", "archive_email",
|
|
"delete_email", "mark_email_read",
|
|
# Cookbook tools (LLM serving + downloads). Without these
|
|
# entries, native function calls to e.g. list_served_models
|
|
# are rejected as "Unknown function call" before reaching
|
|
# the dispatcher — silent failure for the whole cookbook
|
|
# surface.
|
|
"download_model", "serve_model",
|
|
"list_served_models", "stop_served_model",
|
|
"list_downloads", "cancel_download",
|
|
"search_hf_models", "list_cached_models",
|
|
"list_serve_presets", "serve_preset", "adopt_served_model",
|
|
"list_cookbook_servers",
|
|
# Other tools the agent reaches for that were also missing.
|
|
"edit_image", "trigger_research", "manage_research",
|
|
# Generic loopback to any UI-button endpoint (cookbook,
|
|
# gallery, email folders, etc.) — agent uses this when
|
|
# there's no named tool wrapper for the action.
|
|
"app_api"}
|
|
|
|
ToolBlock = namedtuple("ToolBlock", ["tool_type", "content"])
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Re-exports from sub-modules
|
|
# ---------------------------------------------------------------------------
|
|
|
|
# Parsing
|
|
from src.tool_parsing import ( # noqa: E402, F401
|
|
parse_tool_blocks,
|
|
strip_tool_blocks,
|
|
_TOOL_NAME_MAP,
|
|
_TOOL_BLOCK_RE,
|
|
_TOOL_CALL_RE,
|
|
_XML_TOOL_CALL_RE,
|
|
_XML_INVOKE_RE,
|
|
_XML_PARAM_RE,
|
|
)
|
|
|
|
# Schemas
|
|
from src.tool_schemas import ( # noqa: E402, F401
|
|
FUNCTION_TOOL_SCHEMAS,
|
|
function_call_to_tool_block,
|
|
)
|
|
|
|
# Execution
|
|
from src.tool_execution import ( # noqa: E402, F401
|
|
execute_tool_block,
|
|
format_tool_result,
|
|
)
|
|
|
|
# Document functions
|
|
from .document_tools import (
|
|
set_active_document,
|
|
set_active_model
|
|
)
|
|
|
|
# Implementations
|
|
from src.tool_implementations import ( # noqa: E402, F401
|
|
do_search_chats,
|
|
do_manage_skills,
|
|
do_manage_tasks,
|
|
do_manage_endpoints,
|
|
do_manage_mcp,
|
|
do_manage_webhooks,
|
|
do_manage_tokens,
|
|
do_manage_settings,
|
|
do_api_call,
|
|
)
|