mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-05-14 20:53:41 +00:00
* Make loop detection configurable Expose LoopDetectionMiddleware thresholds through config.yaml while preserving existing defaults and allowing the middleware to be disabled. Refs bytedance/deer-flow#2517 * feat(loop-detection): add per-tool tool_freq_overrides to Phase 1 Adds ToolFreqOverride model and tool_freq_overrides field to LoopDetectionConfig, wires it through LoopDetectionMiddleware, and documents the option in config.example.yaml. Resolves the gap flagged in the #2586 review: without per-tool overrides, users hit by #2510/#2511 (RNA-seq workflows exceeding the bash hard limit) had no way to raise thresholds for one tool without loosening the global limit for every tool. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * docs(loop-detection): document tool_freq_overrides in LoopDetectionMiddleware docstring Add the missing Args entry for tool_freq_overrides, explaining the (warn, hard_limit) tuple structure and how per-tool thresholds supersede the global tool_freq_warn / tool_freq_hard_limit for named tools. Also run ruff format on the three files flagged by the lint check. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(loop-detection): validate LoopDetectionMiddleware __init__ params eagerly Raise clear ValueError at construction time instead of crashing at unpack-time inside _track_and_check when bad values are passed: - tool_freq_overrides: must be 2-tuples of positive ints with hard_limit >= warn - scalar thresholds: warn_threshold, hard_limit, tool_freq_warn, tool_freq_hard_limit must be >= 1 and hard limits must >= their warn pairs - window_size, max_tracked_threads must be >= 1 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(test): isolate credential loader directory-path test from real ~/.claude The test didn't monkeypatch HOME, so on any machine with real Claude Code credentials at ~/.claude/.credentials.json the function fell through to those credentials and the assertion failed. Adding HOME redirect ensures the default credential path doesn't exist during the test. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * style(test): add blank lines after import pytest in TestInitValidation Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * refactor(loop-detection): collapse dual validation to LoopDetectionConfig Modifications - LoopDetectionMiddleware.__init__: stripped of all ValueError raises; becomes a plain field-assignment constructor. - LoopDetectionMiddleware.from_config: classmethod that builds the middleware from a Pydantic-validated LoopDetectionConfig and handles the ToolFreqOverride -> tuple[int, int] conversion. - agents/factory.py: SDK construction routed through LoopDetectionMiddleware.from_config(LoopDetectionConfig()) so the defaults path is Pydantic-validated too. - agents/lead_agent/agent.py: uses from_config instead of unpacking config fields by hand. - tests/test_loop_detection_middleware.py: deleted TestInitValidation (16 methods exercising the removed __init__ checks); added TestFromConfig (4 tests: scalar field mapping, override tuple conversion, empty overrides, behavioral smoke test). Result: one validation layer (Pydantic), zero duplication, no __new__ hacks. Both production construction sites flow through LoopDetectionConfig. Test results make test -> 2977 passed, 18 skipped, 0 failed (137s) make format -> All checks passed; 411 files left unchanged * feat(agents): make loop_detection configurable in create_deerflow_agent Adds a `loop_detection: bool | AgentMiddleware = True` field to RuntimeFeatures, mirroring the existing pattern used by `sandbox`, `memory`, and `vision`. SDK users can now disable LoopDetectionMiddleware or replace it with a custom instance built from their own LoopDetectionConfig — e.g. `LoopDetectionMiddleware.from_config(my_cfg)` — instead of being stuck with the hardcoded defaults previously installed by the SDK factory. The lead-agent path (which already reads AppConfig.loop_detection) is unchanged, and the default `True` preserves prior always-on behavior for all existing callers. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> --------- Co-authored-by: knight0940 <631532668@qq.com> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com> Co-authored-by: Amorend <142649913+knight0940@users.noreply.github.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: Willem Jiang <willem.jiang@gmail.com>
380 lines
16 KiB
Python
380 lines
16 KiB
Python
"""Pure-argument factory for DeerFlow agents.
|
|
|
|
``create_deerflow_agent`` accepts plain Python arguments — no YAML files, no
|
|
global singletons. It is the SDK-level entry point sitting between the raw
|
|
``langchain.agents.create_agent`` primitive and the config-driven
|
|
``make_lead_agent`` application factory.
|
|
|
|
Note: the factory assembly itself is config-free, but some injected runtime
|
|
components (e.g. ``task_tool`` for subagent) may still read global config at
|
|
invocation time. Full config-free runtime is a Phase 2 goal.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from typing import TYPE_CHECKING
|
|
|
|
from langchain.agents import create_agent
|
|
from langchain.agents.middleware import AgentMiddleware
|
|
|
|
from deerflow.agents.features import RuntimeFeatures
|
|
from deerflow.agents.middlewares.clarification_middleware import ClarificationMiddleware
|
|
from deerflow.agents.middlewares.dangling_tool_call_middleware import DanglingToolCallMiddleware
|
|
from deerflow.agents.middlewares.tool_error_handling_middleware import ToolErrorHandlingMiddleware
|
|
from deerflow.agents.thread_state import ThreadState
|
|
from deerflow.tools.builtins import ask_clarification_tool
|
|
|
|
if TYPE_CHECKING:
|
|
from langchain_core.language_models import BaseChatModel
|
|
from langchain_core.tools import BaseTool
|
|
from langgraph.checkpoint.base import BaseCheckpointSaver
|
|
from langgraph.graph.state import CompiledStateGraph
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# TodoMiddleware prompts (minimal SDK version)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
_TODO_SYSTEM_PROMPT = """
|
|
<todo_list_system>
|
|
You have access to the `write_todos` tool to help you manage and track complex multi-step objectives.
|
|
|
|
**CRITICAL RULES:**
|
|
- Mark todos as completed IMMEDIATELY after finishing each step - do NOT batch completions
|
|
- Keep EXACTLY ONE task as `in_progress` at any time (unless tasks can run in parallel)
|
|
- Update the todo list in REAL-TIME as you work - this gives users visibility into your progress
|
|
- DO NOT use this tool for simple tasks (< 3 steps) - just complete them directly
|
|
</todo_list_system>
|
|
"""
|
|
|
|
_TODO_TOOL_DESCRIPTION = "Use this tool to create and manage a structured task list for complex work sessions. Only use for complex tasks (3+ steps)."
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Public API
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def create_deerflow_agent(
|
|
model: BaseChatModel,
|
|
tools: list[BaseTool] | None = None,
|
|
*,
|
|
system_prompt: str | None = None,
|
|
middleware: list[AgentMiddleware] | None = None,
|
|
features: RuntimeFeatures | None = None,
|
|
extra_middleware: list[AgentMiddleware] | None = None,
|
|
plan_mode: bool = False,
|
|
state_schema: type | None = None,
|
|
checkpointer: BaseCheckpointSaver | None = None,
|
|
name: str = "default",
|
|
) -> CompiledStateGraph:
|
|
"""Create a DeerFlow agent from plain Python arguments.
|
|
|
|
The factory assembly itself reads no config files. Some injected runtime
|
|
components (e.g. ``task_tool``) may still depend on global config at
|
|
invocation time — see Phase 2 roadmap for full config-free runtime.
|
|
|
|
Parameters
|
|
----------
|
|
model:
|
|
Chat model instance.
|
|
tools:
|
|
User-provided tools. Feature-injected tools are appended automatically.
|
|
system_prompt:
|
|
System message. ``None`` uses a minimal default.
|
|
middleware:
|
|
**Full takeover** — if provided, this exact list is used.
|
|
Cannot be combined with *features* or *extra_middleware*.
|
|
features:
|
|
Declarative feature flags. Cannot be combined with *middleware*.
|
|
extra_middleware:
|
|
Additional middlewares inserted into the auto-assembled chain via
|
|
``@Next``/``@Prev`` positioning. Cannot be used with *middleware*.
|
|
plan_mode:
|
|
Enable TodoMiddleware for task tracking.
|
|
state_schema:
|
|
LangGraph state type. Defaults to ``ThreadState``.
|
|
checkpointer:
|
|
Optional persistence backend.
|
|
name:
|
|
Agent name (passed to middleware that cares, e.g. ``MemoryMiddleware``).
|
|
|
|
Raises
|
|
------
|
|
ValueError
|
|
If both *middleware* and *features*/*extra_middleware* are provided.
|
|
"""
|
|
if middleware is not None and features is not None:
|
|
raise ValueError("Cannot specify both 'middleware' and 'features'. Use one or the other.")
|
|
if middleware is not None and extra_middleware:
|
|
raise ValueError("Cannot use 'extra_middleware' with 'middleware' (full takeover).")
|
|
if extra_middleware:
|
|
for mw in extra_middleware:
|
|
if not isinstance(mw, AgentMiddleware):
|
|
raise TypeError(f"extra_middleware items must be AgentMiddleware instances, got {type(mw).__name__}")
|
|
|
|
effective_tools: list[BaseTool] = list(tools or [])
|
|
effective_state = state_schema or ThreadState
|
|
|
|
if middleware is not None:
|
|
effective_middleware = list(middleware)
|
|
else:
|
|
feat = features or RuntimeFeatures()
|
|
effective_middleware, extra_tools = _assemble_from_features(
|
|
feat,
|
|
name=name,
|
|
plan_mode=plan_mode,
|
|
extra_middleware=extra_middleware or [],
|
|
)
|
|
# Deduplicate by tool name — user-provided tools take priority.
|
|
existing_names = {t.name for t in effective_tools}
|
|
for t in extra_tools:
|
|
if t.name not in existing_names:
|
|
effective_tools.append(t)
|
|
existing_names.add(t.name)
|
|
|
|
return create_agent(
|
|
model=model,
|
|
tools=effective_tools or None,
|
|
middleware=effective_middleware,
|
|
system_prompt=system_prompt,
|
|
state_schema=effective_state,
|
|
checkpointer=checkpointer,
|
|
name=name,
|
|
)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Internal: feature-driven middleware assembly
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _assemble_from_features(
|
|
feat: RuntimeFeatures,
|
|
*,
|
|
name: str = "default",
|
|
plan_mode: bool = False,
|
|
extra_middleware: list[AgentMiddleware] | None = None,
|
|
) -> tuple[list[AgentMiddleware], list[BaseTool]]:
|
|
"""Build an ordered middleware chain + extra tools from *feat*.
|
|
|
|
Middleware order matches ``make_lead_agent`` (14 middlewares):
|
|
|
|
0-2. Sandbox infrastructure (ThreadData → Uploads → Sandbox)
|
|
3. DanglingToolCallMiddleware (always)
|
|
4. GuardrailMiddleware (guardrail feature)
|
|
5. ToolErrorHandlingMiddleware (always)
|
|
6. SummarizationMiddleware (summarization feature)
|
|
7. TodoMiddleware (plan_mode parameter)
|
|
8. TitleMiddleware (auto_title feature)
|
|
9. MemoryMiddleware (memory feature)
|
|
10. ViewImageMiddleware (vision feature)
|
|
11. SubagentLimitMiddleware (subagent feature)
|
|
12. LoopDetectionMiddleware (loop_detection feature)
|
|
13. ClarificationMiddleware (always last)
|
|
|
|
Two-phase ordering:
|
|
1. Built-in chain — fixed sequential append.
|
|
2. Extra middleware — inserted via @Next/@Prev.
|
|
|
|
Each feature value is handled as:
|
|
- ``False``: skip
|
|
- ``True``: create the built-in default middleware (not available for
|
|
``summarization`` and ``guardrail`` — these require a custom instance)
|
|
- ``AgentMiddleware`` instance: use directly (custom replacement)
|
|
"""
|
|
chain: list[AgentMiddleware] = []
|
|
extra_tools: list[BaseTool] = []
|
|
|
|
# --- [0-2] Sandbox infrastructure ---
|
|
if feat.sandbox is not False:
|
|
if isinstance(feat.sandbox, AgentMiddleware):
|
|
chain.append(feat.sandbox)
|
|
else:
|
|
from deerflow.agents.middlewares.thread_data_middleware import ThreadDataMiddleware
|
|
from deerflow.agents.middlewares.uploads_middleware import UploadsMiddleware
|
|
from deerflow.sandbox.middleware import SandboxMiddleware
|
|
|
|
chain.append(ThreadDataMiddleware(lazy_init=True))
|
|
chain.append(UploadsMiddleware())
|
|
chain.append(SandboxMiddleware(lazy_init=True))
|
|
|
|
# --- [3] DanglingToolCall (always) ---
|
|
chain.append(DanglingToolCallMiddleware())
|
|
|
|
# --- [4] Guardrail ---
|
|
if feat.guardrail is not False:
|
|
if isinstance(feat.guardrail, AgentMiddleware):
|
|
chain.append(feat.guardrail)
|
|
else:
|
|
raise ValueError("guardrail=True requires a custom AgentMiddleware instance (no built-in GuardrailMiddleware yet)")
|
|
|
|
# --- [5] ToolErrorHandling (always) ---
|
|
chain.append(ToolErrorHandlingMiddleware())
|
|
|
|
# --- [6] Summarization ---
|
|
if feat.summarization is not False:
|
|
if isinstance(feat.summarization, AgentMiddleware):
|
|
chain.append(feat.summarization)
|
|
else:
|
|
raise ValueError("summarization=True requires a custom AgentMiddleware instance (SummarizationMiddleware needs a model argument)")
|
|
|
|
# --- [7] TodoMiddleware (plan_mode) ---
|
|
if plan_mode:
|
|
from deerflow.agents.middlewares.todo_middleware import TodoMiddleware
|
|
|
|
chain.append(TodoMiddleware(system_prompt=_TODO_SYSTEM_PROMPT, tool_description=_TODO_TOOL_DESCRIPTION))
|
|
|
|
# --- [8] Auto Title ---
|
|
if feat.auto_title is not False:
|
|
if isinstance(feat.auto_title, AgentMiddleware):
|
|
chain.append(feat.auto_title)
|
|
else:
|
|
from deerflow.agents.middlewares.title_middleware import TitleMiddleware
|
|
|
|
chain.append(TitleMiddleware())
|
|
|
|
# --- [9] Memory ---
|
|
if feat.memory is not False:
|
|
if isinstance(feat.memory, AgentMiddleware):
|
|
chain.append(feat.memory)
|
|
else:
|
|
from deerflow.agents.middlewares.memory_middleware import MemoryMiddleware
|
|
|
|
chain.append(MemoryMiddleware(agent_name=name))
|
|
|
|
# --- [10] Vision ---
|
|
if feat.vision is not False:
|
|
if isinstance(feat.vision, AgentMiddleware):
|
|
chain.append(feat.vision)
|
|
else:
|
|
from deerflow.agents.middlewares.view_image_middleware import ViewImageMiddleware
|
|
|
|
chain.append(ViewImageMiddleware())
|
|
|
|
if feat.sandbox is not False:
|
|
from deerflow.tools.builtins import view_image_tool
|
|
|
|
extra_tools.append(view_image_tool)
|
|
|
|
# --- [11] Subagent ---
|
|
if feat.subagent is not False:
|
|
if isinstance(feat.subagent, AgentMiddleware):
|
|
chain.append(feat.subagent)
|
|
else:
|
|
from deerflow.agents.middlewares.subagent_limit_middleware import SubagentLimitMiddleware
|
|
|
|
chain.append(SubagentLimitMiddleware())
|
|
from deerflow.tools.builtins import task_tool
|
|
|
|
extra_tools.append(task_tool)
|
|
|
|
# --- [12] LoopDetection ---
|
|
if feat.loop_detection is not False:
|
|
if isinstance(feat.loop_detection, AgentMiddleware):
|
|
chain.append(feat.loop_detection)
|
|
else:
|
|
from deerflow.agents.middlewares.loop_detection_middleware import LoopDetectionMiddleware
|
|
from deerflow.config.loop_detection_config import LoopDetectionConfig
|
|
|
|
chain.append(LoopDetectionMiddleware.from_config(LoopDetectionConfig()))
|
|
|
|
# --- [13] Clarification (always last among built-ins) ---
|
|
chain.append(ClarificationMiddleware())
|
|
extra_tools.append(ask_clarification_tool)
|
|
|
|
# --- Insert extra_middleware via @Next/@Prev ---
|
|
if extra_middleware:
|
|
_insert_extra(chain, extra_middleware)
|
|
# Invariant: ClarificationMiddleware must always be last.
|
|
# @Next(ClarificationMiddleware) could push it off the tail.
|
|
clar_idx = next(i for i, m in enumerate(chain) if isinstance(m, ClarificationMiddleware))
|
|
if clar_idx != len(chain) - 1:
|
|
chain.append(chain.pop(clar_idx))
|
|
|
|
return chain, extra_tools
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Internal: extra middleware insertion with @Next/@Prev
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _insert_extra(chain: list[AgentMiddleware], extras: list[AgentMiddleware]) -> None:
|
|
"""Insert extra middlewares into *chain* using ``@Next``/``@Prev`` anchors.
|
|
|
|
Algorithm:
|
|
1. Validate: no middleware has both @Next and @Prev.
|
|
2. Conflict detection: two extras targeting same anchor (same or opposite direction) → error.
|
|
3. Insert unanchored extras before ClarificationMiddleware.
|
|
4. Insert anchored extras iteratively (supports cross-external anchoring).
|
|
5. If an anchor cannot be resolved after all rounds → error.
|
|
"""
|
|
next_targets: dict[type, type] = {}
|
|
prev_targets: dict[type, type] = {}
|
|
|
|
anchored: list[tuple[AgentMiddleware, str, type]] = []
|
|
unanchored: list[AgentMiddleware] = []
|
|
|
|
for mw in extras:
|
|
next_anchor = getattr(type(mw), "_next_anchor", None)
|
|
prev_anchor = getattr(type(mw), "_prev_anchor", None)
|
|
|
|
if next_anchor and prev_anchor:
|
|
raise ValueError(f"{type(mw).__name__} cannot have both @Next and @Prev")
|
|
|
|
if next_anchor:
|
|
if next_anchor in next_targets:
|
|
raise ValueError(f"Conflict: {type(mw).__name__} and {next_targets[next_anchor].__name__} both @Next({next_anchor.__name__})")
|
|
if next_anchor in prev_targets:
|
|
raise ValueError(f"Conflict: {type(mw).__name__} @Next({next_anchor.__name__}) and {prev_targets[next_anchor].__name__} @Prev({next_anchor.__name__}) — use cross-anchoring between extras instead")
|
|
next_targets[next_anchor] = type(mw)
|
|
anchored.append((mw, "next", next_anchor))
|
|
elif prev_anchor:
|
|
if prev_anchor in prev_targets:
|
|
raise ValueError(f"Conflict: {type(mw).__name__} and {prev_targets[prev_anchor].__name__} both @Prev({prev_anchor.__name__})")
|
|
if prev_anchor in next_targets:
|
|
raise ValueError(f"Conflict: {type(mw).__name__} @Prev({prev_anchor.__name__}) and {next_targets[prev_anchor].__name__} @Next({prev_anchor.__name__}) — use cross-anchoring between extras instead")
|
|
prev_targets[prev_anchor] = type(mw)
|
|
anchored.append((mw, "prev", prev_anchor))
|
|
else:
|
|
unanchored.append(mw)
|
|
|
|
# Unanchored → before ClarificationMiddleware
|
|
clarification_idx = next(i for i, m in enumerate(chain) if isinstance(m, ClarificationMiddleware))
|
|
for mw in unanchored:
|
|
chain.insert(clarification_idx, mw)
|
|
clarification_idx += 1
|
|
|
|
# Anchored → iterative insertion (supports external-to-external anchoring)
|
|
pending = list(anchored)
|
|
max_rounds = len(pending) + 1
|
|
for _ in range(max_rounds):
|
|
if not pending:
|
|
break
|
|
remaining = []
|
|
for mw, direction, anchor in pending:
|
|
idx = next(
|
|
(i for i, m in enumerate(chain) if isinstance(m, anchor)),
|
|
None,
|
|
)
|
|
if idx is None:
|
|
remaining.append((mw, direction, anchor))
|
|
continue
|
|
if direction == "next":
|
|
chain.insert(idx + 1, mw)
|
|
else:
|
|
chain.insert(idx, mw)
|
|
if len(remaining) == len(pending):
|
|
names = [type(m).__name__ for m, _, _ in remaining]
|
|
anchor_types = {a for _, _, a in remaining}
|
|
remaining_types = {type(m) for m, _, _ in remaining}
|
|
circular = anchor_types & remaining_types
|
|
if circular:
|
|
raise ValueError(f"Circular dependency among extra middlewares: {', '.join(t.__name__ for t in circular)}")
|
|
raise ValueError(f"Cannot resolve positions for {', '.join(names)} — anchors {', '.join(a.__name__ for _, _, a in remaining)} not found in chain")
|
|
pending = remaining
|