Update web/src/lib/api.ts

web/src/lib/api.ts

@@ -1,4 +1,8 @@
 // web/src/lib/api.ts
+// Aligns with api/server.py routes (supports both variants where relevant):
+// POST /api/login, /api/chat, /api/upload, /api/export, /api/summary, /api/feedback
+// POST /api/quiz_start OR /api/quiz/start   (both supported via fallback)
+// GET  /api/memoryline
 
 export type LearningMode =
   | "general"
@@ -11,39 +15,19 @@ export type LearningMode =
 
 export type LanguagePref = "Auto" | "English" | "中文";
 
-export type ChatRequest = {
-  user_id: string;
-  message: string;
-  learning_mode: string;
-  language_preference: string;
-  doc_type: string;      // ✅ "All" recommended default
-  course_id?: string;    // ✅ NEW
-};
-
-export type ChatResponse = {
-  reply: string;
-  session_status_md?: string;
-  refs?: any[];
-  latency_ms?: number;
-  run_id?: string;
-};
-
-export type QuizStartRequest = {
-  user_id: string;
-  language_preference: string;
-  doc_type: string;
-  learning_mode: "quiz";
-  course_id?: string;    // ✅ NEW
-};
-
 const DEFAULT_TIMEOUT_MS = 20000;
 
 function getBaseUrl() {
+  // Vite env: VITE_API_BASE can be "", "http://localhost:8000", etc.
   const v = (import.meta as any)?.env?.VITE_API_BASE as string | undefined;
   return v && v.trim() ? v.trim() : "";
 }
 
-async function fetchWithTimeout(input: RequestInfo, init?: RequestInit, timeoutMs = DEFAULT_TIMEOUT_MS) {
+async function fetchWithTimeout(
+  input: RequestInfo,
+  init?: RequestInit,
+  timeoutMs = DEFAULT_TIMEOUT_MS
+) {
   const controller = new AbortController();
   const id = setTimeout(() => controller.abort(), timeoutMs);
   try {
@@ -53,45 +37,6 @@ async function fetchWithTimeout(input: RequestInfo, init?: RequestInit, timeoutM
   }
 }
 
-export async function apiChat(payload: ChatRequest): Promise<ChatResponse> {
-  const base = getBaseUrl();
-  const res = await fetchWithTimeout(`${base}/api/chat`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(payload),
-  });
-
-  if (!res.ok) {
-    const txt = await res.text().catch(() => "");
-    throw new Error(txt || `apiChat failed: ${res.status}`);
-  }
-
-  return (await res.json()) as ChatResponse;
-}
-
-export async function apiQuizStart(payload: QuizStartRequest): Promise<ChatResponse> {
-  const base = getBaseUrl();
-  const res = await fetchWithTimeout(`${base}/api/quiz_start`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(payload),
-  });
-
-  if (!res.ok) {
-    const txt = await res.text().catch(() => "");
-    throw new Error(txt || `apiQuizStart failed: ${res.status}`);
-  }
-
-  return (await res.json()) as ChatResponse;
-}
-
-/**
- * 你原来的 apiUpload / apiMemoryline / apiFeedback ... 保持不动
- * 如果你希望我也给“你当前项目里的 api.ts 完整版”，把你现在 api.ts 全文贴出来即可。
- */
-
-
-
 async function parseJsonSafe(res: Response) {
   const text = await res.text();
   try {
@@ -140,7 +85,7 @@ export type ApiChatReq = {
   message: string;
   learning_mode: string; // backend expects string (not strict union)
   language_preference?: string; // "Auto" | "English" | "中文"
-  doc_type?: string; // "Syllabus" | "Lecture Slides / PPT" | ...
+  doc_type?: string; // "All" | "Syllabus" | "Lecture Slides / PPT" | ...
   course_id?: string; // e.g. "course_ist345"
 };
 
@@ -148,15 +93,16 @@ export type ApiChatReq = {
 export type ApiChatRefObj = { source_file?: string; section?: string };
 export type ApiChatRefRaw = ApiChatRefObj | string;
 
-// ✅ normalize ANY ref format into {source_file, section} so App can map reliably
+// ✅ normalize ANY ref format into {source_file, section}
 function normalizeRefs(raw: any): ApiChatRefObj[] {
   const arr: any[] = Array.isArray(raw) ? raw : [];
   return arr
     .map((x) => {
       // Case A: already object
       if (x && typeof x === "object" && !Array.isArray(x)) {
-        const a = x.source_file != null ? String(x.source_file) : "";
-        const b = x.section != null ? String(x.section) : "";
+        const a = x.source_file != null ? String(x.source_file).trim() : "";
+        const b = x.section != null ? String(x.section).trim() : "";
+        if (!a && !b) return null;
         return { source_file: a || undefined, section: b || undefined };
       }
 
@@ -164,7 +110,10 @@ function normalizeRefs(raw: any): ApiChatRefObj[] {
       if (typeof x === "string") {
         const s = x.trim();
         if (!s) return null;
-        const parts = s.split("—").map((p) => p.trim()).filter(Boolean);
+        const parts = s
+          .split("—")
+          .map((p) => p.trim())
+          .filter(Boolean);
         if (parts.length >= 2) {
           return { source_file: parts[0], section: parts.slice(1).join(" — ") };
         }
@@ -179,18 +128,14 @@ function normalizeRefs(raw: any): ApiChatRefObj[] {
 export type ApiChatResp = {
   reply: string;
   session_status_md: string;
-
-  // ✅ after normalization, always object array
   refs: ApiChatRefObj[];
-
   latency_ms: number;
-
-  // optional tracing run id returned by backend
   run_id?: string | null;
 };
 
 export async function apiChat(payload: ApiChatReq): Promise<ApiChatResp> {
   const base = getBaseUrl();
+
   const res = await fetchWithTimeout(
     `${base}/api/chat`,
     {
@@ -198,7 +143,7 @@ export async function apiChat(payload: ApiChatReq): Promise<ApiChatResp> {
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
         language_preference: "Auto",
-        doc_type: "Syllabus",
+        doc_type: "All",
         course_id: "course_ist345", // ✅ default
         ...payload,
       }),
@@ -209,8 +154,6 @@ export async function apiChat(payload: ApiChatReq): Promise<ApiChatResp> {
   const data = await parseJsonSafe(res);
   if (!res.ok) throw new Error(errMsg(data, `apiChat failed (${res.status})`));
 
-  // backend returns { reply, session_status_md, refs, latency_ms, run_id? }
-  // but refs may be ApiChatRefObj[] OR string[]
   const out = data as any;
 
   return {
@@ -223,12 +166,12 @@ export async function apiChat(payload: ApiChatReq): Promise<ApiChatResp> {
 }
 
 // --------------------
-// /api/quiz/start
+// /api/quiz_start  (OR /api/quiz/start) - support both
 // --------------------
 export type ApiQuizStartReq = {
   user_id: string;
   language_preference?: string; // "Auto" | "English" | "中文"
-  doc_type?: string; // default: "Literature Review / Paper" (backend default ok)
+  doc_type?: string; // recommended "All"
   learning_mode?: string; // default: "quiz"
   course_id?: string;
 };
@@ -241,28 +184,44 @@ export type ApiQuizStartResp = {
   run_id?: string | null;
 };
 
-export async function apiQuizStart(
-  payload: ApiQuizStartReq
-): Promise<ApiQuizStartResp> {
-  const base = getBaseUrl();
-  const res = await fetchWithTimeout(
-    `${base}/api/quiz/start`,
+async function postQuizStart(base: string, path: string, body: any) {
+  return await fetchWithTimeout(
+    `${base}${path}`,
     {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        language_preference: "Auto",
-        doc_type: "Literature Review / Paper",
-        learning_mode: "quiz",
-        course_id: "course_ist345", // ✅ default
-        ...payload,
-      }),
+      body: JSON.stringify(body),
     },
     60000
   );
+}
 
-  const data = await parseJsonSafe(res);
-  if (!res.ok) throw new Error(errMsg(data, `apiQuizStart failed (${res.status})`));
+export async function apiQuizStart(
+  payload: ApiQuizStartReq
+): Promise<ApiQuizStartResp> {
+  const base = getBaseUrl();
+
+  const reqBody = {
+    language_preference: "Auto",
+    doc_type: "All",
+    learning_mode: "quiz",
+    course_id: "course_ist345",
+    ...payload,
+  };
+
+  // Try /api/quiz_start first (your earlier backend pattern)
+  let res = await postQuizStart(base, "/api/quiz_start", reqBody);
+  let data = await parseJsonSafe(res);
+
+  // If 404, fallback to /api/quiz/start (your later frontend pattern)
+  if (!res.ok && res.status === 404) {
+    res = await postQuizStart(base, "/api/quiz/start", reqBody);
+    data = await parseJsonSafe(res);
+  }
+
+  if (!res.ok) {
+    throw new Error(errMsg(data, `apiQuizStart failed (${res.status})`));
+  }
 
   const out = data as any;
 
@@ -290,19 +249,21 @@ export async function apiUpload(args: {
   user_id: string;
   doc_type: string;
   file: File;
+  course_id?: string;
 }): Promise<ApiUploadResp> {
   const base = getBaseUrl();
   const fd = new FormData();
   fd.append("user_id", args.user_id);
   fd.append("doc_type", args.doc_type);
   fd.append("file", args.file);
-  fd.append("course_id", args.course_id || "course_ist345"); 
+  fd.append("course_id", args.course_id || "course_ist345");
 
   const res = await fetchWithTimeout(
     `${base}/api/upload`,
     { method: "POST", body: fd },
     120000
   );
+
   const data = await parseJsonSafe(res);
   if (!res.ok) throw new Error(errMsg(data, `apiUpload failed (${res.status})`));
   return data as ApiUploadResp;
@@ -397,7 +358,10 @@ export async function apiMemoryline(
     `${base}/api/memoryline?user_id=${encodeURIComponent(user_id)}`,
     { method: "GET" }
   );
+
   const data = await parseJsonSafe(res);
-  if (!res.ok) throw new Error(errMsg(data, `apiMemoryline failed (${res.status})`));
+  if (!res.ok) {
+    throw new Error(errMsg(data, `apiMemoryline failed (${res.status})`));
+  }
   return data as { next_review_label: string; progress_pct: number };
-}
+}