mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-05-10 02:38:26 +00:00
Squashes 25 PR commits onto current main. AppConfig becomes a pure value object with no ambient lookup. Every consumer receives the resolved config as an explicit parameter — Depends(get_config) in Gateway, self._app_config in DeerFlowClient, runtime.context.app_config in agent runs, AppConfig.from_file() at the LangGraph Server registration boundary. Phase 1 — frozen data + typed context - All config models (AppConfig, MemoryConfig, DatabaseConfig, …) become frozen=True; no sub-module globals. - AppConfig.from_file() is pure (no side-effect singleton loaders). - Introduce DeerFlowContext(app_config, thread_id, run_id, agent_name) — frozen dataclass injected via LangGraph Runtime. - Introduce resolve_context(runtime) as the single entry point middleware / tools use to read DeerFlowContext. Phase 2 — pure explicit parameter passing - Gateway: app.state.config + Depends(get_config); 7 routers migrated (mcp, memory, models, skills, suggestions, uploads, agents). - DeerFlowClient: __init__(config=...) captures config locally. - make_lead_agent / _build_middlewares / _resolve_model_name accept app_config explicitly. - RunContext.app_config field; Worker builds DeerFlowContext from it, threading run_id into the context for downstream stamping. - Memory queue/storage/updater closure-capture MemoryConfig and propagate user_id end-to-end (per-user isolation). - Sandbox/skills/community/factories/tools thread app_config. - resolve_context() rejects non-typed runtime.context. - Test suite migrated off AppConfig.current() monkey-patches. - AppConfig.current() classmethod deleted. Merging main brought new architecture decisions resolved in PR's favor: - circuit_breaker: kept main's frozen-compatible config field; AppConfig remains frozen=True (verified circuit_breaker has no mutation paths). - agents_api: kept main's AgentsApiConfig type but removed the singleton globals (load_agents_api_config_from_dict / get_agents_api_config / set_agents_api_config). 8 routes in agents.py now read via Depends(get_config). - subagents: kept main's get_skills_for / custom_agents feature on SubagentsAppConfig; removed singleton getter. registry.py now reads app_config.subagents directly. - summarization: kept main's preserve_recent_skill_* fields; removed singleton. - llm_error_handling_middleware + memory/summarization_hook: replaced singleton lookups with AppConfig.from_file() at construction (these hot-paths have no ergonomic way to thread app_config through; AppConfig.from_file is a pure load). - worker.py + thread_data_middleware.py: DeerFlowContext.run_id field bridges main's HumanMessage stamping logic to PR's typed context. Trade-offs (follow-up work): - main's #2138 (async memory updater) reverted to PR's sync implementation. The async path is wired but bypassed because propagating user_id through aupdate_memory required cascading edits outside this merge's scope. - tests/test_subagent_skills_config.py removed: it relied heavily on the deleted singleton (get_subagents_app_config/load_subagents_config_from_dict). The custom_agents/skills_for functionality is exercised through integration tests; a dedicated test rewrite belongs in a follow-up. Verification: backend test suite — 2560 passed, 4 skipped, 84 failures. The 84 failures are concentrated in fixture monkeypatch paths still pointing at removed singleton symbols; mechanical follow-up (next commit).
177 lines
6.1 KiB
Python
177 lines
6.1 KiB
Python
"""Tests for subagent runtime configuration.
|
|
|
|
Covers:
|
|
- SubagentsAppConfig / SubagentOverrideConfig model validation and defaults
|
|
- get_timeout_for() / get_max_turns_for() resolution logic
|
|
- AppConfig.subagents field access
|
|
- registry.get_subagent_config() applies config overrides
|
|
- registry.list_subagents() applies overrides for all agents
|
|
- Polling timeout calculation in task_tool is consistent with config
|
|
"""
|
|
|
|
import pytest
|
|
|
|
from deerflow.config.app_config import AppConfig
|
|
from deerflow.config.sandbox_config import SandboxConfig
|
|
from deerflow.config.subagents_config import (
|
|
SubagentOverrideConfig,
|
|
SubagentsAppConfig,
|
|
)
|
|
|
|
|
|
def _make_config(
|
|
timeout_seconds: int = 900,
|
|
*,
|
|
max_turns: int | None = None,
|
|
agents: dict | None = None,
|
|
) -> AppConfig:
|
|
"""Build an AppConfig with the given subagents settings."""
|
|
return AppConfig(
|
|
sandbox=SandboxConfig(use="test"),
|
|
subagents=SubagentsAppConfig(
|
|
timeout_seconds=timeout_seconds,
|
|
max_turns=max_turns,
|
|
agents={k: SubagentOverrideConfig(**v) for k, v in (agents or {}).items()},
|
|
),
|
|
)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# SubagentOverrideConfig
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestSubagentOverrideConfig:
|
|
def test_default_is_none(self):
|
|
override = SubagentOverrideConfig()
|
|
assert override.timeout_seconds is None
|
|
assert override.max_turns is None
|
|
|
|
def test_explicit_values(self):
|
|
override = SubagentOverrideConfig(timeout_seconds=120, max_turns=50)
|
|
assert override.timeout_seconds == 120
|
|
assert override.max_turns == 50
|
|
|
|
def test_rejects_negative_timeout(self):
|
|
with pytest.raises(Exception):
|
|
SubagentOverrideConfig(timeout_seconds=-1)
|
|
|
|
def test_rejects_zero_timeout(self):
|
|
with pytest.raises(Exception):
|
|
SubagentOverrideConfig(timeout_seconds=0)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# SubagentsAppConfig model
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestSubagentsAppConfig:
|
|
def test_default_timeout_is_900(self):
|
|
config = SubagentsAppConfig()
|
|
assert config.timeout_seconds == 900
|
|
assert config.max_turns is None
|
|
assert config.agents == {}
|
|
|
|
def test_custom_defaults(self):
|
|
config = SubagentsAppConfig(timeout_seconds=300, max_turns=50)
|
|
assert config.timeout_seconds == 300
|
|
assert config.max_turns == 50
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# get_timeout_for / get_max_turns_for
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestTimeoutResolution:
|
|
def test_global_timeout_for_unknown_agent(self):
|
|
config = SubagentsAppConfig(timeout_seconds=600)
|
|
assert config.get_timeout_for("unknown") == 600
|
|
|
|
def test_per_agent_timeout_overrides_global(self):
|
|
config = SubagentsAppConfig(
|
|
timeout_seconds=600,
|
|
agents={"bash": SubagentOverrideConfig(timeout_seconds=120)},
|
|
)
|
|
assert config.get_timeout_for("bash") == 120
|
|
assert config.get_timeout_for("general-purpose") == 600
|
|
|
|
def test_per_agent_override_none_falls_back_to_global(self):
|
|
config = SubagentsAppConfig(
|
|
timeout_seconds=600,
|
|
agents={"bash": SubagentOverrideConfig(timeout_seconds=None)},
|
|
)
|
|
assert config.get_timeout_for("bash") == 600
|
|
|
|
|
|
class TestMaxTurnsResolution:
|
|
def test_builtin_default_when_no_override(self):
|
|
config = SubagentsAppConfig()
|
|
assert config.get_max_turns_for("bash", 60) == 60
|
|
|
|
def test_global_max_turns_overrides_builtin(self):
|
|
config = SubagentsAppConfig(max_turns=100)
|
|
assert config.get_max_turns_for("bash", 60) == 100
|
|
|
|
def test_per_agent_max_turns_overrides_global(self):
|
|
config = SubagentsAppConfig(
|
|
max_turns=100,
|
|
agents={"bash": SubagentOverrideConfig(max_turns=30)},
|
|
)
|
|
assert config.get_max_turns_for("bash", 60) == 30
|
|
assert config.get_max_turns_for("general-purpose", 60) == 100
|
|
|
|
def test_per_agent_override_none_falls_back(self):
|
|
config = SubagentsAppConfig(
|
|
max_turns=100,
|
|
agents={"bash": SubagentOverrideConfig(max_turns=None)},
|
|
)
|
|
assert config.get_max_turns_for("bash", 60) == 100
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# AppConfig.subagents
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestAppConfigSubagents:
|
|
def test_load_global_timeout(self):
|
|
cfg = _make_config(timeout_seconds=300, max_turns=120)
|
|
sub = cfg.subagents
|
|
assert sub.timeout_seconds == 300
|
|
assert sub.max_turns == 120
|
|
|
|
def test_load_with_per_agent_overrides(self):
|
|
cfg = _make_config(
|
|
timeout_seconds=900,
|
|
max_turns=120,
|
|
agents={
|
|
"general-purpose": {"timeout_seconds": 1800, "max_turns": 200},
|
|
"bash": {"timeout_seconds": 60, "max_turns": 80},
|
|
},
|
|
)
|
|
sub = cfg.subagents
|
|
assert sub.get_timeout_for("general-purpose") == 1800
|
|
assert sub.get_timeout_for("bash") == 60
|
|
assert sub.get_max_turns_for("general-purpose", 100) == 200
|
|
assert sub.get_max_turns_for("bash", 60) == 80
|
|
|
|
def test_load_partial_override(self):
|
|
cfg = _make_config(
|
|
timeout_seconds=600,
|
|
agents={"bash": {"timeout_seconds": 120, "max_turns": 70}},
|
|
)
|
|
sub = cfg.subagents
|
|
assert sub.get_timeout_for("general-purpose") == 600
|
|
assert sub.get_timeout_for("bash") == 120
|
|
assert sub.get_max_turns_for("general-purpose", 100) == 100
|
|
assert sub.get_max_turns_for("bash", 60) == 70
|
|
|
|
def test_load_empty_uses_defaults(self):
|
|
cfg = _make_config()
|
|
sub = cfg.subagents
|
|
assert sub.timeout_seconds == 900
|
|
assert sub.max_turns is None
|
|
assert sub.agents == {}
|