Update api/server.py

api/server.py

@@ -2,7 +2,7 @@
 import os
 import time
 import threading
-from typing import Dict, List, Optional, Any, Tuple
+from typing import Dict, List, Optional, Any
 
 from fastapi import FastAPI, UploadFile, File, Form, Request
 from fastapi.responses import FileResponse, JSONResponse
@@ -37,9 +37,29 @@ API_DIR = os.path.dirname(__file__)
 MODULE10_PATH = os.path.join(API_DIR, "module10_responsible_ai.pdf")
 MODULE10_DOC_TYPE = "Literature Review / Paper"
 
-WEB_DIST = os.path.abspath(os.path.join(API_DIR, "..", "web", "build"))
-WEB_INDEX = os.path.join(WEB_DIST, "index.html")
-WEB_ASSETS = os.path.join(WEB_DIST, "assets")
+# ----------------------------
+# Static hosting (SPA build)
+# Prefer CRA web/build then Vite web/dist
+# ----------------------------
+WEB_BUILD = os.path.abspath(os.path.join(API_DIR, "..", "web", "build"))
+WEB_DIST2 = os.path.abspath(os.path.join(API_DIR, "..", "web", "dist"))
+
+def _pick_web_root() -> str:
+    build_index = os.path.join(WEB_BUILD, "index.html")
+    dist_index = os.path.join(WEB_DIST2, "index.html")
+    if os.path.exists(build_index):
+        return WEB_BUILD
+    if os.path.exists(dist_index):
+        return WEB_DIST2
+    # fallback: prefer build path, but may not exist yet
+    return WEB_BUILD
+
+WEB_ROOT = _pick_web_root()
+WEB_INDEX = os.path.join(WEB_ROOT, "index.html")
+
+WEB_ASSETS_DIR = os.path.join(WEB_ROOT, "assets")  # Vite
+WEB_STATIC_DIR = os.path.join(WEB_ROOT, "static")  # CRA
+# Some builds also place misc files at root (favicon, manifest, etc.)
 
 LS_DATASET_NAME = os.getenv("LS_DATASET_NAME", "clare_user_events").strip()
 LS_PROJECT = os.getenv("LANGSMITH_PROJECT", os.getenv("LANGCHAIN_PROJECT", "")).strip()
@@ -75,25 +95,58 @@ app.add_middleware(
 )
 
 # ----------------------------
-# Static hosting (Vite build)
+# Static hosting mounts
 # ----------------------------
-if os.path.isdir(WEB_ASSETS):
-    app.mount("/assets", StaticFiles(directory=WEB_ASSETS), name="assets")
+# If Vite build: /assets exists
+if os.path.isdir(WEB_ASSETS_DIR):
+    app.mount("/assets", StaticFiles(directory=WEB_ASSETS_DIR), name="assets")
+
+# If CRA build: /static exists
+if os.path.isdir(WEB_STATIC_DIR):
+    app.mount("/static", StaticFiles(directory=WEB_STATIC_DIR), name="static")
 
-if os.path.isdir(WEB_DIST):
-    app.mount("/static", StaticFiles(directory=WEB_DIST), name="static")
+# Mount the full root to serve favicon/manifest/robots.txt, etc.
+if os.path.isdir(WEB_ROOT):
+    app.mount("/_app", StaticFiles(directory=WEB_ROOT), name="app_root")
 
 
 @app.get("/")
 def index():
+    # Re-pick on each request in case build output changed after container start
+    global WEB_ROOT, WEB_INDEX, WEB_ASSETS_DIR, WEB_STATIC_DIR
+    WEB_ROOT = _pick_web_root()
+    WEB_INDEX = os.path.join(WEB_ROOT, "index.html")
+    WEB_ASSETS_DIR = os.path.join(WEB_ROOT, "assets")
+    WEB_STATIC_DIR = os.path.join(WEB_ROOT, "static")
+
     if os.path.exists(WEB_INDEX):
         return FileResponse(WEB_INDEX)
     return JSONResponse(
-        {"detail": "web/build not found. Build frontend first (web/build/index.html)."},
+        {"detail": "web build not found. Expected web/build/index.html or web/dist/index.html."},
         status_code=500,
     )
 
 
+# ----------------------------
+# Debug endpoint (verify deployment / static root)
+# ----------------------------
+@app.get("/__debug__")
+def __debug__():
+    root = _pick_web_root()
+    return {
+        "ok": True,
+        "ts": int(time.time()),
+        "web_build": WEB_BUILD,
+        "web_dist": WEB_DIST2,
+        "web_root_selected": root,
+        "index_path": os.path.join(root, "index.html"),
+        "has_index": os.path.exists(os.path.join(root, "index.html")),
+        "has_assets_dir": os.path.isdir(os.path.join(root, "assets")),
+        "has_static_dir": os.path.isdir(os.path.join(root, "static")),
+        "uptime_s": round(time.time() - APP_START_TS, 3),
+    }
+
+
 # ----------------------------
 # In-memory session store (MVP)
 # ----------------------------
@@ -373,10 +426,7 @@ def chat(req: ChatReq):
 
     sess["history"] = new_history
 
-    refs = [
-        {"source_file": c.get("source_file"), "section": c.get("section")}
-        for c in (rag_used_chunks or [])
-    ]
+    refs = [{"source_file": c.get("source_file"), "section": c.get("section")} for c in (rag_used_chunks or [])]
 
     rag_context_chars = len(rag_context_text or "")
     rag_used_chunks_count = len(rag_used_chunks or [])
@@ -487,7 +537,6 @@ def api_feedback(req: FeedbackReq):
     if rating not in ("helpful", "not_helpful"):
         return JSONResponse({"ok": False, "error": "Invalid rating"}, status_code=400)
 
-    # normalize fields
     assistant_text = (req.assistant_text or "").strip()
     user_text = (req.user_text or "").strip()
     comment = (req.comment or "").strip()
@@ -505,12 +554,8 @@ def api_feedback(req: FeedbackReq):
             "timestamp_ms": timestamp_ms,
             "rating": rating,
             "assistant_message_id": req.assistant_message_id,
-
-            # Keep the Example readable:
-            "question": user_text,            # what user asked (optional)
-            "answer": assistant_text,         # the assistant response being rated
-
-            # metadata
+            "question": user_text,
+            "answer": assistant_text,
             "comment": comment,
             "tags": tags,
             "refs": refs,
@@ -568,17 +613,23 @@ def memoryline(user_id: str):
 # ----------------------------
 @app.get("/{full_path:path}")
 def spa_fallback(full_path: str, request: Request):
+    # allow API and static mounts to 404 normally
     if (
         full_path.startswith("api/")
         or full_path.startswith("assets/")
         or full_path.startswith("static/")
+        or full_path.startswith("_app/")
+        or full_path in ("__debug__", "health", "ready")
     ):
         return JSONResponse({"detail": "Not Found"}, status_code=404)
 
-    if os.path.exists(WEB_INDEX):
-        return FileResponse(WEB_INDEX)
+    root = _pick_web_root()
+    idx = os.path.join(root, "index.html")
+
+    if os.path.exists(idx):
+        return FileResponse(idx)
 
     return JSONResponse(
-        {"detail": "web/build not found. Build frontend first (web/build/index.html)."},
+        {"detail": "web build not found. Expected web/build/index.html or web/dist/index.html."},
         status_code=500,
-    )
+    )