mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-05-23 08:25:57 +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).
85 lines
2.7 KiB
TypeScript
85 lines
2.7 KiB
TypeScript
import { cookies } from "next/headers";
|
|
|
|
import { getGatewayConfig } from "./gateway-config";
|
|
import { type AuthResult, userSchema } from "./types";
|
|
|
|
const SSR_AUTH_TIMEOUT_MS = 5_000;
|
|
|
|
/**
|
|
* Fetch the authenticated user from the gateway using the request's cookies.
|
|
* Returns a tagged AuthResult — callers use exhaustive switch, no try/catch.
|
|
*/
|
|
export async function getServerSideUser(): Promise<AuthResult> {
|
|
const cookieStore = await cookies();
|
|
const sessionCookie = cookieStore.get("access_token");
|
|
|
|
let internalGatewayUrl: string;
|
|
try {
|
|
internalGatewayUrl = getGatewayConfig().internalGatewayUrl;
|
|
} catch (err) {
|
|
return { tag: "config_error", message: String(err) };
|
|
}
|
|
|
|
if (!sessionCookie) {
|
|
// No session — check whether the system has been initialised yet.
|
|
const setupController = new AbortController();
|
|
const setupTimeout = setTimeout(
|
|
() => setupController.abort(),
|
|
SSR_AUTH_TIMEOUT_MS,
|
|
);
|
|
try {
|
|
const setupRes = await fetch(
|
|
`${internalGatewayUrl}/api/v1/auth/setup-status`,
|
|
{
|
|
cache: "no-store",
|
|
signal: setupController.signal,
|
|
},
|
|
);
|
|
clearTimeout(setupTimeout);
|
|
if (setupRes.ok) {
|
|
const setupData = (await setupRes.json()) as { needs_setup?: boolean };
|
|
if (setupData.needs_setup) {
|
|
return { tag: "system_setup_required" };
|
|
}
|
|
}
|
|
} catch {
|
|
clearTimeout(setupTimeout);
|
|
// If setup-status is unreachable/times out, fall through to unauthenticated.
|
|
}
|
|
return { tag: "unauthenticated" };
|
|
}
|
|
|
|
const controller = new AbortController();
|
|
const timeout = setTimeout(() => controller.abort(), SSR_AUTH_TIMEOUT_MS);
|
|
|
|
try {
|
|
const res = await fetch(`${internalGatewayUrl}/api/v1/auth/me`, {
|
|
headers: { Cookie: `access_token=${sessionCookie.value}` },
|
|
cache: "no-store",
|
|
signal: controller.signal,
|
|
});
|
|
clearTimeout(timeout); // Clear immediately — covers all response branches
|
|
|
|
if (res.ok) {
|
|
const parsed = userSchema.safeParse(await res.json());
|
|
if (!parsed.success) {
|
|
console.error("[SSR auth] Malformed /auth/me response:", parsed.error);
|
|
return { tag: "gateway_unavailable" };
|
|
}
|
|
if (parsed.data.needs_setup) {
|
|
return { tag: "needs_setup", user: parsed.data };
|
|
}
|
|
return { tag: "authenticated", user: parsed.data };
|
|
}
|
|
if (res.status === 401 || res.status === 403) {
|
|
return { tag: "unauthenticated" };
|
|
}
|
|
console.error(`[SSR auth] /api/v1/auth/me responded ${res.status}`);
|
|
return { tag: "gateway_unavailable" };
|
|
} catch (err) {
|
|
clearTimeout(timeout);
|
|
console.error("[SSR auth] Failed to reach gateway:", err);
|
|
return { tag: "gateway_unavailable" };
|
|
}
|
|
}
|