mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-05-21 15:36:48 +00:00
ac04f2704f
* feat(subagents): allow model override per subagent in config.yaml Wire the existing SubagentConfig.model field to config.yaml so users can assign different models to different subagent types. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * test(subagents): cover model override in SubagentsAppConfig + registry Addresses review feedback on #2064: - registry.py: update stale inline comment — the block now applies timeout, max_turns AND model overrides, not just timeout. - test_subagent_timeout_config.py: add coverage for model override resolution across SubagentOverrideConfig, SubagentsAppConfig (get_model_for + load), and registry.get_subagent_config: - per-agent model override is applied to registry-returned config - omitted `model` keeps the builtin value - explicit `model: null` in config.yaml is equivalent to omission - model override on one agent does not affect other agents - model override preserves all other fields (name, description, timeout_seconds, max_turns) - model override does not mutate BUILTIN_SUBAGENTS Copilot's suggestion (3) "setting model to 'inherit' forces inheritance" is skipped intentionally: there is no 'inherit' sentinel in the current implementation — model is `str | None`, and None already means "inherit from parent". Adding a sentinel would be a new feature, not test coverage for this PR. Tests run locally: 51 passed (37 existing + 14 new / expanded). * test(subagents): reject empty-string model at config load time Addresses WillemJiang's review comment on #2064 (empty-string edge case): - subagents_config.py: add `min_length=1` to the `model` field on SubagentOverrideConfig. `model: ""` in config.yaml would otherwise bypass the `is not None` check and reach create_chat_model(name="") as a confusing runtime error. This is symmetric with the existing `ge=1` guards on timeout_seconds / max_turns, so the validation style stays consistent across all three override fields. - test_subagent_timeout_config.py: add test_rejects_empty_model mirroring the existing test_rejects_zero / test_rejects_negative cases; update the docstring on test_model_accepts_any_string (now test_model_accepts_any_non_empty_string) to reflect the new guard. Not addressing the first comment (validating `model` against the `models:` section at load time) in this PR. `SubagentsAppConfig` is scoped to the `subagents:` block and cannot see the sibling `models:` section, so proper cross-section validation needs a second pass or a structural change that is out of scope here — and the current behavior is consistent with how timeout_seconds / max_turns work today. Happy to track this as a follow-up issue covering cross-section validation uniformly for all three fields. Tests run locally: 52 passed in this file; 1847 passed, 18 skipped across the full backend suite. Ruff check + format clean. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
124 lines
4.1 KiB
Python
124 lines
4.1 KiB
Python
"""Configuration for the subagent system loaded from config.yaml."""
|
|
|
|
import logging
|
|
|
|
from pydantic import BaseModel, Field
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class SubagentOverrideConfig(BaseModel):
|
|
"""Per-agent configuration overrides."""
|
|
|
|
timeout_seconds: int | None = Field(
|
|
default=None,
|
|
ge=1,
|
|
description="Timeout in seconds for this subagent (None = use global default)",
|
|
)
|
|
max_turns: int | None = Field(
|
|
default=None,
|
|
ge=1,
|
|
description="Maximum turns for this subagent (None = use global or builtin default)",
|
|
)
|
|
model: str | None = Field(
|
|
default=None,
|
|
min_length=1,
|
|
description="Model name for this subagent (None = inherit from parent agent)",
|
|
)
|
|
|
|
|
|
class SubagentsAppConfig(BaseModel):
|
|
"""Configuration for the subagent system."""
|
|
|
|
timeout_seconds: int = Field(
|
|
default=900,
|
|
ge=1,
|
|
description="Default timeout in seconds for all subagents (default: 900 = 15 minutes)",
|
|
)
|
|
max_turns: int | None = Field(
|
|
default=None,
|
|
ge=1,
|
|
description="Optional default max-turn override for all subagents (None = keep builtin defaults)",
|
|
)
|
|
agents: dict[str, SubagentOverrideConfig] = Field(
|
|
default_factory=dict,
|
|
description="Per-agent configuration overrides keyed by agent name",
|
|
)
|
|
|
|
def get_timeout_for(self, agent_name: str) -> int:
|
|
"""Get the effective timeout for a specific agent.
|
|
|
|
Args:
|
|
agent_name: The name of the subagent.
|
|
|
|
Returns:
|
|
The timeout in seconds, using per-agent override if set, otherwise global default.
|
|
"""
|
|
override = self.agents.get(agent_name)
|
|
if override is not None and override.timeout_seconds is not None:
|
|
return override.timeout_seconds
|
|
return self.timeout_seconds
|
|
|
|
def get_model_for(self, agent_name: str) -> str | None:
|
|
"""Get the model override for a specific agent.
|
|
|
|
Args:
|
|
agent_name: The name of the subagent.
|
|
|
|
Returns:
|
|
Model name if overridden, None otherwise (subagent will inherit parent model).
|
|
"""
|
|
override = self.agents.get(agent_name)
|
|
if override is not None and override.model is not None:
|
|
return override.model
|
|
return None
|
|
|
|
def get_max_turns_for(self, agent_name: str, builtin_default: int) -> int:
|
|
"""Get the effective max_turns for a specific agent."""
|
|
override = self.agents.get(agent_name)
|
|
if override is not None and override.max_turns is not None:
|
|
return override.max_turns
|
|
if self.max_turns is not None:
|
|
return self.max_turns
|
|
return builtin_default
|
|
|
|
|
|
_subagents_config: SubagentsAppConfig = SubagentsAppConfig()
|
|
|
|
|
|
def get_subagents_app_config() -> SubagentsAppConfig:
|
|
"""Get the current subagents configuration."""
|
|
return _subagents_config
|
|
|
|
|
|
def load_subagents_config_from_dict(config_dict: dict) -> None:
|
|
"""Load subagents configuration from a dictionary."""
|
|
global _subagents_config
|
|
_subagents_config = SubagentsAppConfig(**config_dict)
|
|
|
|
overrides_summary = {}
|
|
for name, override in _subagents_config.agents.items():
|
|
parts = []
|
|
if override.timeout_seconds is not None:
|
|
parts.append(f"timeout={override.timeout_seconds}s")
|
|
if override.max_turns is not None:
|
|
parts.append(f"max_turns={override.max_turns}")
|
|
if override.model is not None:
|
|
parts.append(f"model={override.model}")
|
|
if parts:
|
|
overrides_summary[name] = ", ".join(parts)
|
|
|
|
if overrides_summary:
|
|
logger.info(
|
|
"Subagents config loaded: default timeout=%ss, default max_turns=%s, per-agent overrides=%s",
|
|
_subagents_config.timeout_seconds,
|
|
_subagents_config.max_turns,
|
|
overrides_summary,
|
|
)
|
|
else:
|
|
logger.info(
|
|
"Subagents config loaded: default timeout=%ss, default max_turns=%s, no per-agent overrides",
|
|
_subagents_config.timeout_seconds,
|
|
_subagents_config.max_turns,
|
|
)
|