mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-04-28 04:38:25 +00:00
3e6a34297d
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).
86 lines
3.1 KiB
Python
86 lines
3.1 KiB
Python
from types import SimpleNamespace
|
|
|
|
from deerflow.sandbox.security import is_host_bash_allowed
|
|
from deerflow.tools.tools import get_available_tools
|
|
|
|
|
|
def _make_config(*, allow_host_bash: bool, sandbox_use: str = "deerflow.sandbox.local:LocalSandboxProvider", extra_tools: list[SimpleNamespace] | None = None):
|
|
return SimpleNamespace(
|
|
tools=[
|
|
SimpleNamespace(name="bash", group="bash", use="deerflow.sandbox.tools:bash_tool"),
|
|
SimpleNamespace(name="ls", group="file:read", use="tests:ls_tool"),
|
|
*(extra_tools or []),
|
|
],
|
|
models=[],
|
|
sandbox=SimpleNamespace(
|
|
use=sandbox_use,
|
|
allow_host_bash=allow_host_bash,
|
|
),
|
|
tool_search=SimpleNamespace(enabled=False),
|
|
get_model_config=lambda name: None,
|
|
)
|
|
|
|
|
|
def test_get_available_tools_hides_bash_for_default_local_sandbox(monkeypatch):
|
|
app_config = _make_config(allow_host_bash=False)
|
|
monkeypatch.setattr(
|
|
"deerflow.tools.tools.resolve_variable",
|
|
lambda use, _: SimpleNamespace(name="bash" if "bash" in use else "ls"),
|
|
)
|
|
|
|
names = [tool.name for tool in get_available_tools(include_mcp=False, subagent_enabled=False, app_config=app_config)]
|
|
|
|
assert "bash" not in names
|
|
assert "ls" in names
|
|
|
|
|
|
def test_get_available_tools_keeps_bash_when_explicitly_enabled(monkeypatch):
|
|
app_config = _make_config(allow_host_bash=True)
|
|
monkeypatch.setattr(
|
|
"deerflow.tools.tools.resolve_variable",
|
|
lambda use, _: SimpleNamespace(name="bash" if "bash" in use else "ls"),
|
|
)
|
|
|
|
names = [tool.name for tool in get_available_tools(include_mcp=False, subagent_enabled=False, app_config=app_config)]
|
|
|
|
assert "bash" in names
|
|
assert "ls" in names
|
|
|
|
|
|
def test_get_available_tools_hides_renamed_host_bash_alias(monkeypatch):
|
|
config = _make_config(
|
|
allow_host_bash=False,
|
|
extra_tools=[SimpleNamespace(name="shell", group="bash", use="deerflow.sandbox.tools:bash_tool")],
|
|
)
|
|
monkeypatch.setattr(
|
|
"deerflow.tools.tools.resolve_variable",
|
|
lambda use, _: SimpleNamespace(name="bash" if "bash_tool" in use else "ls"),
|
|
)
|
|
|
|
names = [tool.name for tool in get_available_tools(include_mcp=False, subagent_enabled=False, app_config=config)]
|
|
|
|
assert "bash" not in names
|
|
assert "shell" not in names
|
|
assert "ls" in names
|
|
|
|
|
|
def test_get_available_tools_keeps_bash_for_aio_sandbox(monkeypatch):
|
|
config = _make_config(
|
|
allow_host_bash=False,
|
|
sandbox_use="deerflow.community.aio_sandbox:AioSandboxProvider",
|
|
)
|
|
monkeypatch.setattr(
|
|
"deerflow.tools.tools.resolve_variable",
|
|
lambda use, _: SimpleNamespace(name="bash" if "bash_tool" in use else "ls"),
|
|
)
|
|
|
|
names = [tool.name for tool in get_available_tools(include_mcp=False, subagent_enabled=False, app_config=config)]
|
|
|
|
assert "bash" in names
|
|
assert "ls" in names
|
|
|
|
|
|
def test_is_host_bash_allowed_defaults_false_when_sandbox_missing():
|
|
assert is_host_bash_allowed(SimpleNamespace()) is False
|
|
assert is_host_bash_allowed(SimpleNamespace(sandbox=None)) is False
|