mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-05-06 16:58:24 +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).
83 lines
3.0 KiB
Python
83 lines
3.0 KiB
Python
"""Multi-client isolation regression test.
|
|
|
|
Phase 2 Task P2-3: ``DeerFlowClient`` now captures its ``AppConfig`` in the
|
|
constructor instead of going through a process-global config.
|
|
This test pins the resulting invariant: two clients with different configs
|
|
can coexist without contending over shared state.
|
|
|
|
Before P2-3, the shared ``AppConfig._global`` caused the second client's
|
|
``init()`` to clobber the first client's config.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from unittest.mock import MagicMock
|
|
|
|
import pytest
|
|
|
|
from deerflow.client import DeerFlowClient
|
|
from deerflow.config.app_config import AppConfig
|
|
from deerflow.config.memory_config import MemoryConfig
|
|
from deerflow.config.sandbox_config import SandboxConfig
|
|
|
|
|
|
@pytest.fixture
|
|
def disable_agent_creation(monkeypatch):
|
|
"""Prevent lazy agent creation — we only care about config access."""
|
|
monkeypatch.setattr(DeerFlowClient, "_get_or_create_agent", MagicMock(), raising=False)
|
|
|
|
|
|
def test_two_clients_do_not_clobber_each_other(disable_agent_creation):
|
|
"""Two clients with distinct configs keep their own AppConfig."""
|
|
cfg_a = AppConfig(
|
|
sandbox=SandboxConfig(use="test"),
|
|
memory=MemoryConfig(enabled=True),
|
|
)
|
|
cfg_b = AppConfig(
|
|
sandbox=SandboxConfig(use="test"),
|
|
memory=MemoryConfig(enabled=False),
|
|
)
|
|
|
|
client_a = DeerFlowClient(config=cfg_a)
|
|
client_b = DeerFlowClient(config=cfg_b)
|
|
|
|
# Identity: each client retains its own instance, not a shared ref
|
|
assert client_a._app_config is cfg_a
|
|
assert client_b._app_config is cfg_b
|
|
|
|
# Semantic: memory flag differs
|
|
assert client_a._app_config.memory.enabled is True
|
|
assert client_b._app_config.memory.enabled is False
|
|
|
|
|
|
def test_client_config_precedes_path(disable_agent_creation, tmp_path):
|
|
"""When both config= and config_path= are given, config= wins."""
|
|
cfg = AppConfig(sandbox=SandboxConfig(use="test"), log_level="debug")
|
|
|
|
# config_path points at a file that doesn't exist — proves it's unused
|
|
bogus_path = str(tmp_path / "nope.yaml")
|
|
client = DeerFlowClient(config_path=bogus_path, config=cfg)
|
|
|
|
assert client._app_config is cfg
|
|
assert client._app_config.log_level == "debug"
|
|
|
|
|
|
def test_multi_client_gateway_dict_returns_distinct(disable_agent_creation):
|
|
"""get_mcp_config() reads from self._app_config, not process-global."""
|
|
from deerflow.config.extensions_config import ExtensionsConfig, McpServerConfig
|
|
|
|
ext_a = ExtensionsConfig(mcp_servers={"server-a": McpServerConfig(enabled=True)})
|
|
ext_b = ExtensionsConfig(mcp_servers={"server-b": McpServerConfig(enabled=True)})
|
|
|
|
cfg_a = AppConfig(sandbox=SandboxConfig(use="test"), extensions=ext_a)
|
|
cfg_b = AppConfig(sandbox=SandboxConfig(use="test"), extensions=ext_b)
|
|
|
|
client_a = DeerFlowClient(config=cfg_a)
|
|
client_b = DeerFlowClient(config=cfg_b)
|
|
|
|
servers_a = client_a.get_mcp_config()["mcp_servers"]
|
|
servers_b = client_b.get_mcp_config()["mcp_servers"]
|
|
|
|
assert set(servers_a.keys()) == {"server-a"}
|
|
assert set(servers_b.keys()) == {"server-b"}
|