Merge pull request #1300 from FalkorDB/staging

Anchel123 · web-flow · commit a35abab6a9bc · 2025-12-23T13:09:07.000+02:00
Staging
diff --git a/app/api/auth/DBVersion/route.ts b/app/api/auth/DBVersion/route.ts
@@ -13,13 +13,15 @@ export async function GET() {
     const { client } = session;
 
     try {
+      // result: [module name, module version]
       const result = await (await client.connection).moduleList();
-      return NextResponse.json({ result: [result[1][1], result[1][3]] }, { status: 200 });
+
+      return NextResponse.json({ result: [result[0][1], result[0][3]] }, { status: 200 });
     } catch (error) {
       console.error(error);
       return NextResponse.json(
         { message: (error as Error).message },
-        { status: (error as Error).message.includes("NOPERM") ? 200 : 400 }
+        { status: 400 }
       );
     }
   } catch (err) {
diff --git a/app/api/auth/[...nextauth]/options.ts b/app/api/auth/[...nextauth]/options.ts
@@ -251,7 +251,7 @@ async function tryJWTAuthentication(): Promise<{ client: FalkorDB; user: Authent
         try {
           const connection = await client.connection;
           await connection.ping();
-          
+
           // Connection is healthy, reuse it
           const user = createUserFromJWTPayload(payload);
           return { client, user };
@@ -260,13 +260,13 @@ async function tryJWTAuthentication(): Promise<{ client: FalkorDB; user: Authent
           // eslint-disable-next-line no-console
           console.warn("Connection health check failed, recreating:", pingError);
           connections.delete(payload.sub);
-          
+
           try {
             await client.close();
           } catch (closeError) {
             // Ignore close errors on dead connections
           }
-          
+
           client = undefined; // Will be recreated below
         }
       }
@@ -277,7 +277,7 @@ async function tryJWTAuthentication(): Promise<{ client: FalkorDB; user: Authent
           // Fetch password from Token DB (6380) - NOT from JWT
           const { getPasswordFromTokenDB } = await import('../tokenUtils');
           const password = await getPasswordFromTokenDB(payload.jti);
-          
+
           // Create new connection with retrieved password
           const { client: reconnectedClient } = await newClient(
             {
@@ -290,7 +290,7 @@ async function tryJWTAuthentication(): Promise<{ client: FalkorDB; user: Authent
             },
             payload.sub
           );
-          
+
           client = reconnectedClient;
           // Connection is already cached in connections Map by newClient()
         } catch (connectionError) {
@@ -370,6 +370,7 @@ const authOptions: AuthOptions = {
           tls: user.tls,
           ca: user.ca,
           role: user.role,
+          url: user.url,
         };
       }
 
@@ -392,6 +393,7 @@ const authOptions: AuthOptions = {
             tls: token.tls as boolean,
             ca: token.ca,
             role: token.role as Role,
+            url: token.url as string | undefined,
           },
         };
       }
@@ -463,6 +465,7 @@ export async function getClient() {
         password: user.password,
         tls: String(user.tls),
         ca: user.ca,
+        url: user.url,
       },
       user.id
     );
diff --git a/app/api/chat/route.tsx b/app/api/chat/route.tsx
@@ -29,11 +29,13 @@ export async function GET() {
             return NextResponse.json(data)
         } catch (error) {
             const { message } = (error as Error)
-            
-            if (message.includes("fetch failed")) {
-                return NextResponse.json({ message: "Server is not available" }, { status: 200 })
+
+            // Gracefully handle missing endpoint or server unavailability
+            // Return empty object to allow chat to be displayed
+            if (message.includes("fetch failed") || message.includes("Not Found") || message.includes("NOT_FOUND") || message.includes("could not be found")) {
+                return NextResponse.json({ message }, { status: 200 })
             }
-            
+
             console.error(error)
             return NextResponse.json({ error: message }, { status: 400 })
         }
@@ -52,6 +54,7 @@ export async function POST(request: NextRequest) {
     const writer = writable.getWriter()
 
     try {
+        // Verify authentication via getClient
         const session = await getClient()
 
         if (session instanceof NextResponse) {
@@ -62,10 +65,11 @@ export async function POST(request: NextRequest) {
 
         // Validate request body
         const validation = validateBody(chatRequest, body);
-        
+
         if (!validation.success) {
             writer.write(encoder.encode(`event: error status: ${400} data: ${JSON.stringify(validation.error)}\n\n`))
             writer.close()
+
             return new Response(readable, {
                 headers: {
                     "Content-Type": "text/event-stream",
@@ -78,14 +82,15 @@ export async function POST(request: NextRequest) {
         const { messages, graphName, key, model } = validation.data
 
         try {
-
-            const requestBody = {
-                "chat_request": {
-                    messages,
-                },
+            const requestBody: Record<string, unknown> = {
+                chat_request: { messages },
                 "graph_name": graphName,
-                key,
-                model,
+                "model": model || "gpt-4o-mini",
+            }
+
+            // Only add key if provided
+            if (key) {
+                requestBody.key = key
             }
 
             const response = await fetch(`${CHAT_URL}text_to_cypher`, {
@@ -100,38 +105,47 @@ export async function POST(request: NextRequest) {
                 throw new Error(`Error: ${await response.text()}`);
             }
 
+            // Handle streaming SSE response from text-to-cypher
             const reader = response.body?.getReader();
             const decoder = new TextDecoder();
 
             const processStream = async () => {
                 if (!reader) return;
 
                 const { done, value } = await reader.read();
-                if (done) return;
+                if (done) {
+                    writer.close();
+                    return;
+                }
 
                 const chunk = decoder.decode(value, { stream: true });
-
                 const lines = chunk.split('\n').filter(line => line);
-                let isResult = false
-
+                let isResult = false;
 
                 lines.forEach(line => {
-                    const data = JSON.parse(line.split("data:")[1])
-                    const type: EventType = Object.keys(data)[0] as EventType
+                    if (line.startsWith('data: ')) {
+                        try {
+                            const data = JSON.parse(line.slice(6)); // Remove 'data: ' prefix
+                            const type: EventType = Object.keys(data)[0] as EventType
 
-                    isResult = type === "Result" || type === "Error"
+                            isResult = type === "Result" || type === "Error"
 
-                    writer.write(encoder.encode(`event: ${type} data: ${data[type]}\n\n`))
-                })
+                            writer.write(encoder.encode(`event: ${type} data: ${data[type]}\n\n`))
+                        } catch (parseError) {
+                            console.error("Failed to parse SSE data:", line, parseError)
+                        }
+                    }
+                });
 
+                // Continue processing the stream unless we received Result or Error
                 if (!isResult) {
-                    processStream();
+                    await processStream();
                 } else {
                     writer.close();
                 }
             };
 
-            processStream()
+            await processStream();
         } catch (error) {
             console.error(error)
             writer.write(encoder.encode(`event: error status: ${400} data: ${JSON.stringify((error as Error).message)}\n\n`))
diff --git a/app/api/graph/[graph]/memory/route.ts b/app/api/graph/[graph]/memory/route.ts
@@ -27,32 +27,37 @@ export async function GET(
       return session;
     }
 
-    const res = await getDBVersion();
+    try {
+      const res = await getDBVersion();
 
-    if (!res.ok) {
-      return NextResponse.json(
-        {
-          message: `Failed to retrieve database version: ${await res.text()}`,
-        },
-        { status: 400 }
-      );
-    }
+      if (!res.ok) {
+        const err = await res.text();
 
-    const [name, version] = (await res.json()).result || ["", 0];
+        let message;
 
-    if (name !== "graph" || version < MEMORY_USAGE_VERSION_THRESHOLD) {
-      return NextResponse.json(
-        {
-          message: `Memory usage feature requires graph module version ${MEMORY_USAGE_VERSION_THRESHOLD} or higher. Current version: ${version}`,
-        },
-        { status: 400 }
-      );
-    }
+        try {
+          message = JSON.parse(err).message;
+        } catch {
+          message = err;
+        }
 
-    const { client } = session;
-    const { graph } = await params;
+        return NextResponse.json(
+          { message: `Failed to retrieve database version: ${message}` },
+          { status: 400 }
+        );
+      }
 
-    try {
+      const [name, version] = (await res.json()).result;
+
+      if (name !== "graph" || version < MEMORY_USAGE_VERSION_THRESHOLD) {
+        return NextResponse.json(
+          { message: `Memory usage feature requires graph module version ${MEMORY_USAGE_VERSION_THRESHOLD} or higher. Current version: ${version}` },
+          { status: 400 }
+        );
+      }
+
+      const { client } = session;
+      const { graph } = await params;
       const result = await client.selectGraph(graph).memoryUsage();
 
       return NextResponse.json({ result }, { status: 200 });
diff --git a/app/graph/Chat.tsx b/app/graph/Chat.tsx
@@ -178,7 +178,6 @@ export default function Chat({ onClose }: Props) {
 
                         case "Result":
                             isResult = true
-
                             break;
 
                         case "Error":
diff --git a/app/providers.tsx b/app/providers.tsx
@@ -457,7 +457,10 @@ function ProvidersWithSession({ children }: { children: React.ReactNode }) {
       if (result.ok) {
         const json = await result.json()
 
-        if (!json.message) setDisplayChat(true)
+        if (json.message) return
+
+        setDisplayChat(true)
+        
         if (!json.model && json.error) {
           setNavigateToSettings(true)
         }
@@ -470,7 +473,7 @@ function ProvidersWithSession({ children }: { children: React.ReactNode }) {
     securedFetch("/api/status", {
       method: "GET",
     }, toast, setIndicator)
-  }, [])
+  }, [toast])
 
   useEffect(() => {
     let interval: NodeJS.Timeout | undefined
diff --git a/app/settings/browserSettings.tsx b/app/settings/browserSettings.tsx
@@ -13,7 +13,7 @@ import Button from "../components/ui/Button";
 import Input from "../components/ui/Input";
 import Combobox from "../components/ui/combobox";
 
-const MODELS = ["gpt-5", "gpt-5-mini", "gpt-5-nano", "gpt-4.1"]
+const MODELS = ["gpt-4o-mini", "gpt-4o", "gpt-4-turbo", "gpt-3.5-turbo"]
 
 export default function BrowserSettings() {
     const {
diff --git a/lib/utils.ts b/lib/utils.ts
@@ -64,13 +64,13 @@ export type Message = {
   role: "user" | "assistant";
   content: string;
   type:
-    | "Text"
-    | "Result"
-    | "Error"
-    | "Status"
-    | "CypherQuery"
-    | "CypherResult"
-    | "Schema";
+  | "Text"
+  | "Result"
+  | "Error"
+  | "Status"
+  | "CypherQuery"
+  | "CypherResult"
+  | "Schema";
 };
 
 export type Cell = SelectCell | TextCell | ObjectCell | ReadOnlyCell | LazyCell;
@@ -145,12 +145,20 @@ export async function securedFetch(
   const response = await fetch(input, init);
   const { status } = response;
   if (status >= 300) {
-    const err = await response.text();
+    let message = await response.text();
+
+    try {
+      message = JSON.parse(message).message;
+    } catch {
+      // message is already text
+    }
+
     toast({
       title: "Error",
-      description: err,
+      description: message,
       variant: "destructive",
     });
+    
     if (status === 401 || status >= 500) {
       setIndicator("offline");
     }
@@ -334,30 +342,30 @@ export const getNodeDisplayText = (node: Node, displayTextPriority: TextPriority
   const { data: nodeData } = node;
 
   const displayText = displayTextPriority.find(({ name, ignore }) => {
-      const key = ignore
-          ? Object.keys(nodeData).find(
-              (k) => k.toLowerCase() === name.toLowerCase()
-          )
-          : name;
-
-      return (
-          key &&
-          nodeData[key] &&
-          typeof nodeData[key] === "string" &&
-          nodeData[key].trim().length > 0
-      );
+    const key = ignore
+      ? Object.keys(nodeData).find(
+        (k) => k.toLowerCase() === name.toLowerCase()
+      )
+      : name;
+
+    return (
+      key &&
+      nodeData[key] &&
+      typeof nodeData[key] === "string" &&
+      nodeData[key].trim().length > 0
+    );
   });
 
   if (displayText) {
-      const key = displayText.ignore
-          ? Object.keys(nodeData).find(
-              (k) => k.toLowerCase() === displayText.name.toLowerCase()
-          )
-          : displayText.name;
-
-      if (key) {
-          return String(nodeData[key]);
-      }
+    const key = displayText.ignore
+      ? Object.keys(nodeData).find(
+        (k) => k.toLowerCase() === displayText.name.toLowerCase()
+      )
+      : displayText.name;
+
+    if (key) {
+      return String(nodeData[key]);
+    }
   }
 
   return String(node.id);
diff --git a/next.config.js b/next.config.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/tsconfig.json b/tsconfig.json
