mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-06-09 17:12:01 +00:00
d9f4724950
* feat(tool-search): add hash-scoped promoted state to ThreadState * feat(tool-search): add immutable DeferredToolCatalog with stable hash * feat(tool-search): add build_deferred_tool_setup + Command-writing tool_search * refactor(tool-search): replace deferred-tool ContextVar with closures + graph state (#3272) Build the deferred catalog + tool_search tool per agent from the policy-filtered tool list (after skill allowed-tools), pass deferred_names + catalog_hash explicitly to DeferredToolFilterMiddleware and the prompt, and record promotions in ThreadState.promoted (scoped by catalog_hash) via a Command-returning tool_search. Removes DeferredToolRegistry and the _registry_var ContextVar so deferral no longer depends on build/execute sharing an async context. MCP tools are tagged with metadata[deerflow_mcp]; client.py assembles deferral the same way. Catalog is built AFTER tool-policy filtering (no policy-excluded tool can leak via tool_search) and assembly is fail-closed. Migrate tests off the deleted registry APIs; delete the obsolete ContextVar-based #2884 regression (re-covered by state-based tests in a follow-up). * test(tool-search): lock tool_search promotion into next model turn via graph state * test(tool-search): cross-context, policy-leak, fail-closed, #2884 isolation regressions * test(tool-search): align real-LLM e2e with closure-based deferred setup * docs: update DeferredToolFilterMiddleware description for closure+state design * style(tests): drop unused import in test_deferred_setup (ruff) * test(tool-search): harden merge_promoted + replace tautological catalog test From independent code review: - merge_promoted: use existing.get("catalog_hash") so a forward-incompatible or externally-injected persisted promoted dict triggers a replace instead of a KeyError crash; add regression test for the malformed-existing case. - test_deferred_catalog: replace the `== [] or True` tautology (a test that could never fail) with a deterministic invalid-regex->literal-fallback check (positive match on calc + negative empty match). - DeferredToolCatalog: comment why frozen-without-slots is required for the cached_property hash/names fields (adding slots=True would break them). * fix(tool-search): read tool_search.enabled from self._app_config in client DeerFlowClient._ensure_agent called get_app_config() directly to read tool_search.enabled, but the client already resolves and stores its config as self._app_config at construction (and uses it everywhere else). The bare call re-resolves config from disk at agent-build time, which raises FileNotFoundError in environments without a config.yaml (CI) — test_client.py's fixture only patches get_app_config during __init__, so the later call hit the real loader. Use self._app_config, matching the rest of the client. * test(tool-search): lock tool_search post-policy append ordering tool_search is appended after skill-allowlist filtering, so the allowlist can no longer deny it by name. Lock the intended contract: it only appears when allowed MCP tools survive the filter, and its catalog (derived from the already policy-filtered list) can never expose a denied tool. Addresses the ordering observation from the Copilot review on #3342.
39 lines
1.4 KiB
Python
39 lines
1.4 KiB
Python
"""Tests for the tool_search (deferred tool loading) config + prompt section.
|
|
|
|
Catalog search, setup assembly, the Command-writing tool_search tool, and the
|
|
filter middleware are covered by:
|
|
- tests/test_deferred_catalog.py
|
|
- tests/test_deferred_setup.py
|
|
- tests/test_deferred_filter_middleware.py
|
|
- tests/test_thread_state_promoted.py
|
|
"""
|
|
|
|
from deerflow.agents.lead_agent.prompt import get_deferred_tools_prompt_section
|
|
from deerflow.config.tool_search_config import ToolSearchConfig, load_tool_search_config_from_dict
|
|
|
|
|
|
class TestToolSearchConfig:
|
|
def test_default_disabled(self):
|
|
assert ToolSearchConfig().enabled is False
|
|
|
|
def test_enabled(self):
|
|
assert ToolSearchConfig(enabled=True).enabled is True
|
|
|
|
def test_load_from_dict(self):
|
|
assert load_tool_search_config_from_dict({"enabled": True}).enabled is True
|
|
|
|
def test_load_from_empty_dict(self):
|
|
assert load_tool_search_config_from_dict({}).enabled is False
|
|
|
|
|
|
class TestDeferredToolsPromptSection:
|
|
def test_empty_without_names(self):
|
|
assert get_deferred_tools_prompt_section() == ""
|
|
|
|
def test_empty_with_empty_frozenset(self):
|
|
assert get_deferred_tools_prompt_section(deferred_names=frozenset()) == ""
|
|
|
|
def test_lists_sorted_names(self):
|
|
out = get_deferred_tools_prompt_section(deferred_names=frozenset({"b_tool", "a_tool"}))
|
|
assert out == "<available-deferred-tools>\na_tool\nb_tool\n</available-deferred-tools>"
|