mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-05-22 16:06:50 +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).
288 lines
9.5 KiB
TypeScript
288 lines
9.5 KiB
TypeScript
"use client";
|
|
|
|
import { useRouter } from "next/navigation";
|
|
import { useTheme } from "next-themes";
|
|
import { useEffect, useState } from "react";
|
|
|
|
import { Button } from "@/components/ui/button";
|
|
import { FlickeringGrid } from "@/components/ui/flickering-grid";
|
|
import { Input } from "@/components/ui/input";
|
|
import { getCsrfHeaders } from "@/core/api/fetcher";
|
|
import { useAuth } from "@/core/auth/AuthProvider";
|
|
import { parseAuthError } from "@/core/auth/types";
|
|
|
|
type SetupMode = "loading" | "init_admin" | "change_password";
|
|
|
|
export default function SetupPage() {
|
|
const router = useRouter();
|
|
const { user, isAuthenticated } = useAuth();
|
|
const { theme, resolvedTheme } = useTheme();
|
|
const [mode, setMode] = useState<SetupMode>("loading");
|
|
|
|
// --- Shared state ---
|
|
const [email, setEmail] = useState("");
|
|
const [newPassword, setNewPassword] = useState("");
|
|
const [confirmPassword, setConfirmPassword] = useState("");
|
|
const [error, setError] = useState("");
|
|
const [loading, setLoading] = useState(false);
|
|
|
|
// --- Change-password mode only ---
|
|
const [currentPassword, setCurrentPassword] = useState("");
|
|
|
|
useEffect(() => {
|
|
let cancelled = false;
|
|
|
|
if (isAuthenticated && user?.needs_setup) {
|
|
setMode("change_password");
|
|
} else if (!isAuthenticated) {
|
|
// Check if the system has no users yet
|
|
void fetch("/api/v1/auth/setup-status")
|
|
.then((r) => r.json())
|
|
.then((data: { needs_setup?: boolean }) => {
|
|
if (cancelled) return;
|
|
if (data.needs_setup) {
|
|
setMode("init_admin");
|
|
} else {
|
|
// System already set up and user is not logged in — go to login
|
|
router.push("/login");
|
|
}
|
|
})
|
|
.catch(() => {
|
|
if (!cancelled) router.push("/login");
|
|
});
|
|
} else {
|
|
// Authenticated but needs_setup is false — already set up
|
|
router.push("/workspace");
|
|
}
|
|
|
|
return () => {
|
|
cancelled = true;
|
|
};
|
|
}, [isAuthenticated, user, router]);
|
|
|
|
// ── Init-admin handler ─────────────────────────────────────────────
|
|
const handleInitAdmin = async (e: React.SubmitEvent) => {
|
|
e.preventDefault();
|
|
setError("");
|
|
|
|
if (newPassword !== confirmPassword) {
|
|
setError("Passwords do not match");
|
|
return;
|
|
}
|
|
|
|
setLoading(true);
|
|
try {
|
|
const res = await fetch("/api/v1/auth/initialize", {
|
|
method: "POST",
|
|
headers: { "Content-Type": "application/json" },
|
|
credentials: "include",
|
|
body: JSON.stringify({
|
|
email,
|
|
password: newPassword,
|
|
}),
|
|
});
|
|
|
|
if (!res.ok) {
|
|
const data = await res.json();
|
|
const authError = parseAuthError(data);
|
|
setError(authError.message);
|
|
return;
|
|
}
|
|
|
|
router.push("/workspace");
|
|
} catch {
|
|
setError("Network error. Please try again.");
|
|
} finally {
|
|
setLoading(false);
|
|
}
|
|
};
|
|
|
|
// ── Change-password handler ────────────────────────────────────────
|
|
const handleChangePassword = async (e: React.SubmitEvent) => {
|
|
e.preventDefault();
|
|
setError("");
|
|
|
|
if (newPassword !== confirmPassword) {
|
|
setError("Passwords do not match");
|
|
return;
|
|
}
|
|
if (newPassword.length < 8) {
|
|
setError("Password must be at least 8 characters");
|
|
return;
|
|
}
|
|
|
|
setLoading(true);
|
|
try {
|
|
const res = await fetch("/api/v1/auth/change-password", {
|
|
method: "POST",
|
|
headers: {
|
|
"Content-Type": "application/json",
|
|
...getCsrfHeaders(),
|
|
},
|
|
credentials: "include",
|
|
body: JSON.stringify({
|
|
current_password: currentPassword,
|
|
new_password: newPassword,
|
|
new_email: email || undefined,
|
|
}),
|
|
});
|
|
|
|
if (!res.ok) {
|
|
const data = await res.json();
|
|
const authError = parseAuthError(data);
|
|
setError(authError.message);
|
|
return;
|
|
}
|
|
|
|
router.push("/workspace");
|
|
} catch {
|
|
setError("Network error. Please try again.");
|
|
} finally {
|
|
setLoading(false);
|
|
}
|
|
};
|
|
|
|
const actualTheme = theme === "system" ? resolvedTheme : theme;
|
|
|
|
if (mode === "loading") {
|
|
return (
|
|
<div className="flex min-h-screen items-center justify-center">
|
|
<p className="text-muted-foreground text-sm">Loading…</p>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
// ── Admin initialization form ──────────────────────────────────────
|
|
if (mode === "init_admin") {
|
|
return (
|
|
<div className="bg-background flex min-h-screen items-center justify-center">
|
|
<FlickeringGrid
|
|
className="absolute inset-0 z-0 mask-[url(/images/deer.svg)] mask-size-[100vw] mask-center mask-no-repeat md:mask-size-[72vh]"
|
|
squareSize={4}
|
|
gridGap={4}
|
|
color={actualTheme === "dark" ? "white" : "black"}
|
|
maxOpacity={0.3}
|
|
flickerChance={0.25}
|
|
/>
|
|
<div className="border-border/20 bg-background/5 w-full max-w-md space-y-6 rounded-3xl border p-8 backdrop-blur-sm">
|
|
<div className="text-center">
|
|
<h1 className="font-serif text-3xl">DeerFlow</h1>
|
|
<p className="text-muted-foreground mt-2">Create admin account</p>
|
|
<p className="text-muted-foreground mt-1 text-xs">
|
|
Set up the administrator account to get started.
|
|
</p>
|
|
</div>
|
|
<form onSubmit={handleInitAdmin} className="space-y-2">
|
|
<div className="flex flex-col space-y-1">
|
|
<label htmlFor="email" className="text-sm font-medium">
|
|
Email
|
|
</label>
|
|
<Input
|
|
id="email"
|
|
type="email"
|
|
placeholder="you@example.com"
|
|
value={email}
|
|
onChange={(e) => setEmail(e.target.value)}
|
|
required
|
|
/>
|
|
</div>
|
|
<div className="flex flex-col space-y-1">
|
|
<label htmlFor="password" className="text-sm font-medium">
|
|
Password
|
|
</label>
|
|
<Input
|
|
id="password"
|
|
type="password"
|
|
placeholder="Password (min. 8 characters)"
|
|
value={newPassword}
|
|
onChange={(e) => setNewPassword(e.target.value)}
|
|
required
|
|
minLength={8}
|
|
/>
|
|
</div>
|
|
<div className="flex flex-col space-y-1">
|
|
<label htmlFor="confirmPassword" className="text-sm font-medium">
|
|
Confirm Password
|
|
</label>
|
|
<Input
|
|
id="confirmPassword"
|
|
type="password"
|
|
placeholder="Confirm password"
|
|
value={confirmPassword}
|
|
onChange={(e) => setConfirmPassword(e.target.value)}
|
|
required
|
|
minLength={8}
|
|
/>
|
|
</div>
|
|
{error && <p className="ms-1 text-sm text-red-500">{error}</p>}
|
|
<Button type="submit" className="w-full" disabled={loading}>
|
|
{loading ? "Creating account…" : "Create Admin Account"}
|
|
</Button>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
// ── Change-password form (needs_setup after login) ─────────────────
|
|
return (
|
|
<div className="bg-background flex min-h-screen items-center justify-center">
|
|
<FlickeringGrid
|
|
className="absolute inset-0 z-0 mask-[url(/images/deer.svg)] mask-size-[100vw] mask-center mask-no-repeat md:mask-size-[72vh]"
|
|
squareSize={4}
|
|
gridGap={4}
|
|
color={actualTheme === "dark" ? "white" : "black"}
|
|
maxOpacity={0.3}
|
|
flickerChance={0.25}
|
|
/>
|
|
<div className="border-border/20 bg-background/5 w-full max-w-md space-y-6 rounded-3xl border p-8 backdrop-blur-sm">
|
|
<div className="text-center">
|
|
<h1 className="font-serif text-3xl">DeerFlow</h1>
|
|
<p className="text-muted-foreground mt-2">
|
|
Complete admin account setup
|
|
</p>
|
|
<p className="text-muted-foreground mt-1 text-xs">
|
|
Set your real email and a new password.
|
|
</p>
|
|
</div>
|
|
<form onSubmit={handleChangePassword} className="space-y-4">
|
|
<Input
|
|
type="email"
|
|
placeholder="Your email"
|
|
value={email}
|
|
onChange={(e) => setEmail(e.target.value)}
|
|
required
|
|
/>
|
|
<Input
|
|
type="password"
|
|
placeholder="Current password"
|
|
value={currentPassword}
|
|
onChange={(e) => setCurrentPassword(e.target.value)}
|
|
required
|
|
/>
|
|
<Input
|
|
type="password"
|
|
placeholder="New password"
|
|
value={newPassword}
|
|
onChange={(e) => setNewPassword(e.target.value)}
|
|
required
|
|
minLength={8}
|
|
/>
|
|
<Input
|
|
type="password"
|
|
placeholder="Confirm new password"
|
|
value={confirmPassword}
|
|
onChange={(e) => setConfirmPassword(e.target.value)}
|
|
required
|
|
minLength={8}
|
|
/>
|
|
{error && <p className="text-sm text-red-500">{error}</p>}
|
|
<Button type="submit" className="w-full" disabled={loading}>
|
|
{loading ? "Setting up…" : "Complete Setup"}
|
|
</Button>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|