mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-05-19 23:23:40 +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).
56 lines
1.8 KiB
Python
56 lines
1.8 KiB
Python
"""Tests for the FastAPI get_config dependency.
|
|
|
|
Phase 2 step 1: introduces the new explicit-config primitive that
|
|
resolves ``AppConfig`` from ``request.app.state.config``. After migration,
|
|
it is the sole mechanism.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from fastapi import Depends, FastAPI
|
|
from fastapi.testclient import TestClient
|
|
|
|
from app.gateway.deps import get_config
|
|
from deerflow.config.app_config import AppConfig
|
|
from deerflow.config.sandbox_config import SandboxConfig
|
|
|
|
|
|
def test_get_config_returns_app_state_config():
|
|
"""get_config returns the AppConfig stored on app.state.config."""
|
|
app = FastAPI()
|
|
cfg = AppConfig(sandbox=SandboxConfig(use="test"))
|
|
app.state.config = cfg
|
|
|
|
@app.get("/probe")
|
|
def probe(c: AppConfig = Depends(get_config)):
|
|
# Identity check: FastAPI must hand us the exact object from app.state
|
|
return {"same_identity": c is cfg, "log_level": c.log_level}
|
|
|
|
client = TestClient(app)
|
|
response = client.get("/probe")
|
|
|
|
assert response.status_code == 200
|
|
body = response.json()
|
|
assert body["same_identity"] is True
|
|
assert body["log_level"] == "info"
|
|
|
|
|
|
def test_get_config_reads_updated_app_state():
|
|
"""When app.state.config is swapped (config reload), get_config sees the new value."""
|
|
app = FastAPI()
|
|
original = AppConfig(sandbox=SandboxConfig(use="test"), log_level="info")
|
|
replacement = original.model_copy(update={"log_level": "debug"})
|
|
|
|
app.state.config = original
|
|
|
|
@app.get("/log-level")
|
|
def log_level(c: AppConfig = Depends(get_config)):
|
|
return {"level": c.log_level}
|
|
|
|
client = TestClient(app)
|
|
assert client.get("/log-level").json() == {"level": "info"}
|
|
|
|
# Simulate config reload (PUT /mcp/config, etc.)
|
|
app.state.config = replacement
|
|
assert client.get("/log-level").json() == {"level": "debug"}
|