mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-06-10 09:25:57 +00:00
AochenShen99
2bbc7879fa
Follow-up to #3342 (deferred MCP tool loading). Maintainability cleanup plus hardening of malformed/empty tool_search queries; no change to the deferral mechanism or search ranking. - Add deerflow/tools/mcp_metadata.py as the single source of truth for the "deerflow_mcp" tag (MCP_TOOL_METADATA_KEY + tag_mcp_tool + public is_mcp_tool). Removes the duplicated magic string and the private, cross-module _is_mcp_tool import. - tool_search.search: never raise on model-generated input. Extract _compile_catalog_regex (shared compile-with-literal-fallback); return empty for empty/whitespace queries and a bare "+" instead of matching everything or raising IndexError. - DeferredToolSetup: document the empty-vs-populated invariant. - build_deferred_tool_setup: comment the two distinct empty-return branches. - _assemble_deferred: add return type, rename local to deferred_setup, build the final list with an explicit append. - Tests: use tag_mcp_tool instead of per-file tag helpers; cover empty and bare-"+" queries.
30 lines
1.2 KiB
Python
30 lines
1.2 KiB
Python
"""Single source of truth for the MCP-tool metadata tag.
|
|
|
|
A tool is "MCP-sourced" when it carries the ``deerflow_mcp`` metadata flag.
|
|
The tag is *written* where MCP tools are loaded (``tools.py``) and *read* by
|
|
deferred-tool assembly (``tool_search.py``) and the agent build site
|
|
(``agent.py``). Keeping the key, the tagger, and the predicate here means the
|
|
magic string lives in exactly one place, and readers import a public predicate
|
|
instead of a private cross-module helper.
|
|
|
|
This is a leaf module by design: it depends only on ``BaseTool`` so that any
|
|
module (including the tool loader) can import it without an import cycle.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from langchain.tools import BaseTool
|
|
|
|
MCP_TOOL_METADATA_KEY = "deerflow_mcp"
|
|
|
|
|
|
def tag_mcp_tool(tool: BaseTool) -> BaseTool:
|
|
"""Mark ``tool`` as MCP-sourced. Mutates in place and returns it for chaining."""
|
|
tool.metadata = {**(tool.metadata or {}), MCP_TOOL_METADATA_KEY: True}
|
|
return tool
|
|
|
|
|
|
def is_mcp_tool(tool: BaseTool) -> bool:
|
|
"""True when ``tool`` carries the MCP-source tag written by :func:`tag_mcp_tool`."""
|
|
return (getattr(tool, "metadata", None) or {}).get(MCP_TOOL_METADATA_KEY) is True
|