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.
67 lines
1.9 KiB
Python
67 lines
1.9 KiB
Python
import pytest
|
|
from langchain_core.tools import tool as as_tool
|
|
|
|
from deerflow.tools.builtins.tool_search import DeferredToolCatalog
|
|
|
|
|
|
@as_tool
|
|
def alpha_search(query: str) -> str:
|
|
"Search alpha records by query."
|
|
return query
|
|
|
|
|
|
@as_tool
|
|
def beta_translate(text: str) -> str:
|
|
"Translate beta text."
|
|
return text
|
|
|
|
|
|
@pytest.fixture
|
|
def catalog() -> DeferredToolCatalog:
|
|
return DeferredToolCatalog((alpha_search, beta_translate))
|
|
|
|
|
|
def test_names(catalog):
|
|
assert catalog.names == frozenset({"alpha_search", "beta_translate"})
|
|
|
|
|
|
def test_search_select(catalog):
|
|
got = catalog.search("select:alpha_search")
|
|
assert [t.name for t in got] == ["alpha_search"]
|
|
|
|
|
|
def test_search_plus_keyword(catalog):
|
|
got = catalog.search("+beta translate")
|
|
assert [t.name for t in got] == ["beta_translate"]
|
|
|
|
|
|
def test_search_regex_on_description(catalog):
|
|
got = catalog.search("translate")
|
|
assert "beta_translate" in [t.name for t in got]
|
|
|
|
|
|
def test_search_invalid_regex_falls_back_to_literal():
|
|
@as_tool
|
|
def calc(expr: str) -> str:
|
|
"Compute sum(a, b) style expressions."
|
|
return expr
|
|
|
|
cat = DeferredToolCatalog((calc, alpha_search))
|
|
# "sum(" is an invalid regex (unbalanced paren). search() must not raise; it
|
|
# falls back to a literal match, which finds calc's "sum(" in its description.
|
|
assert [t.name for t in cat.search("sum(")] == ["calc"]
|
|
# A literal with no match is deterministically empty (and still must not raise).
|
|
assert cat.search("zzz(") == []
|
|
|
|
|
|
def test_hash_stable_across_instances():
|
|
c1 = DeferredToolCatalog((alpha_search, beta_translate))
|
|
c2 = DeferredToolCatalog((beta_translate, alpha_search))
|
|
assert c1.hash == c2.hash
|
|
|
|
|
|
def test_hash_changes_with_membership():
|
|
c1 = DeferredToolCatalog((alpha_search, beta_translate))
|
|
c2 = DeferredToolCatalog((alpha_search,))
|
|
assert c1.hash != c2.hash
|