mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-05-10 02:38:26 +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>
73 lines
2.6 KiB
Python
73 lines
2.6 KiB
Python
"""Tests for loop detection configuration."""
|
|
|
|
import pytest
|
|
|
|
from deerflow.config.loop_detection_config import LoopDetectionConfig
|
|
|
|
|
|
class TestLoopDetectionConfig:
|
|
def test_defaults_match_middleware_defaults(self):
|
|
config = LoopDetectionConfig()
|
|
|
|
assert config.enabled is True
|
|
assert config.warn_threshold == 3
|
|
assert config.hard_limit == 5
|
|
assert config.window_size == 20
|
|
assert config.max_tracked_threads == 100
|
|
assert config.tool_freq_warn == 30
|
|
assert config.tool_freq_hard_limit == 50
|
|
|
|
def test_accepts_custom_values(self):
|
|
config = LoopDetectionConfig(
|
|
enabled=False,
|
|
warn_threshold=10,
|
|
hard_limit=20,
|
|
window_size=50,
|
|
max_tracked_threads=200,
|
|
tool_freq_warn=60,
|
|
tool_freq_hard_limit=80,
|
|
)
|
|
|
|
assert config.enabled is False
|
|
assert config.warn_threshold == 10
|
|
assert config.hard_limit == 20
|
|
assert config.window_size == 50
|
|
assert config.max_tracked_threads == 200
|
|
assert config.tool_freq_warn == 60
|
|
assert config.tool_freq_hard_limit == 80
|
|
|
|
def test_rejects_zero_thresholds(self):
|
|
with pytest.raises(ValueError):
|
|
LoopDetectionConfig(warn_threshold=0)
|
|
|
|
with pytest.raises(ValueError):
|
|
LoopDetectionConfig(hard_limit=0)
|
|
|
|
with pytest.raises(ValueError):
|
|
LoopDetectionConfig(tool_freq_warn=0)
|
|
|
|
with pytest.raises(ValueError):
|
|
LoopDetectionConfig(tool_freq_hard_limit=0)
|
|
|
|
def test_rejects_hard_limit_below_warn_threshold(self):
|
|
with pytest.raises(ValueError, match="hard_limit"):
|
|
LoopDetectionConfig(warn_threshold=5, hard_limit=4)
|
|
|
|
def test_rejects_tool_freq_hard_limit_below_warn_threshold(self):
|
|
with pytest.raises(ValueError, match="tool_freq_hard_limit"):
|
|
LoopDetectionConfig(tool_freq_warn=5, tool_freq_hard_limit=4)
|
|
|
|
def test_tool_freq_override_valid(self):
|
|
config = LoopDetectionConfig(tool_freq_overrides={"bash": {"warn": 150, "hard_limit": 300}})
|
|
override = config.tool_freq_overrides["bash"]
|
|
assert override.warn == 150
|
|
assert override.hard_limit == 300
|
|
|
|
def test_tool_freq_override_rejects_zero_warn(self):
|
|
with pytest.raises(ValueError):
|
|
LoopDetectionConfig(tool_freq_overrides={"bash": {"warn": 0, "hard_limit": 10}})
|
|
|
|
def test_tool_freq_override_rejects_hard_limit_below_warn(self):
|
|
with pytest.raises(ValueError, match="hard_limit"):
|
|
LoopDetectionConfig(tool_freq_overrides={"bash": {"warn": 100, "hard_limit": 50}})
|