Qwen

Chebichat.md

@@ -0,0 +1,4 @@
+<!-- comment detail in vietnamese -->
+app/store/config.ts
+
+comment detail in vietnamese

NextChat.code-workspace

@@ -0,0 +1,7 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	]
+}

app/SyncOnFirstLoad.tsx

@@ -0,0 +1,54 @@
+"use client";
+import { useEffect } from "react";
+import { useSyncStore } from "./store/sync";
+import { showToast } from "./components/ui-lib";
+export default function SyncOnFirstLoad() {
+  const syncStore = useSyncStore();
+
+  useEffect(() => {
+    // Parse cookies using the cookie library
+    // const cookies = cookie.parse(document.cookie || "");
+    // const authToken = cookies["sb-zzgkylsbdgwoohcbompi-auth-token"] || null;
+
+    console.log("[Auth Check] Checking user authentication status");
+
+    fetch("/api/auth/check")
+      .then((res) => {
+        if (res.status === 401) {
+          console.log("[Auth Check] User is not authenticated");
+          // Handle unauthenticated user - redirect or show login modal
+
+          showToast("Please login first");
+
+          //   setTimeout(() => {
+          //     window.location.href = AUTHEN_PAGE;
+          //   }, 500);
+
+          return;
+        }
+
+        return res.json();
+      })
+      .then((data) => {
+        if (data) {
+          console.log("[Auth Check] User is authenticated:", data.user);
+
+          // Assuming data.user contains the user information(user email)
+          const email = data.user.email || "";
+
+          // Only update upstash.username, keep other params
+          syncStore.update((config) => (config.upstash.username = email));
+
+          // You can now use the user data as needed
+          //   syncStore.sync();
+          // console.log("[Sync] User data synced successfully");
+        }
+      })
+      .catch((e) => {
+        console.error("[Auth Check] Error checking authentication:", e);
+        // Handle error appropriately
+      });
+  }, []);
+
+  return null;
+}

app/api/[provider]/[...path]/route.ts

@@ -20,7 +20,11 @@ async function handle(
   req: NextRequest,
   { params }: { params: { provider: string; path: string[] } },
 ) {
+  // Handle OPTIONS request for CORS preflight
+  // params.provider = MODEL_PROVIDER;
+
   const apiPath = `/api/${params.provider}`;
+
   console.log(`[${params.provider} Route] params `, params);
   switch (apiPath) {
     case ApiPath.Azure:

app/api/alibaba.ts

@@ -1,22 +1,16 @@
 import { getServerSideConfig } from "@/app/config/server";
-import {
-  ALIBABA_BASE_URL,
-  ApiPath,
-  ModelProvider,
-  ServiceProvider,
-} from "@/app/constant";
+import { ALIBABA_BASE_URL, ApiPath, ModelProvider } from "@/app/constant";
 import { prettyObject } from "@/app/utils/format";
 import { NextRequest, NextResponse } from "next/server";
 import { auth } from "@/app/api/auth";
-import { isModelNotavailableInServer } from "@/app/utils/model";
 
 const serverConfig = getServerSideConfig();
 
 export async function handle(
   req: NextRequest,
   { params }: { params: { path: string[] } },
 ) {
-  console.log("[Alibaba Route] params ", params);
+  // console.log("[Alibaba Route] params ", params);
 
   if (req.method === "OPTIONS") {
     return NextResponse.json({ body: "OK" }, { status: 200 });
@@ -33,7 +27,7 @@ export async function handle(
     const response = await request(req);
     return response;
   } catch (e) {
-    console.error("[Alibaba] ", e);
+    // console.error("[Alibaba] ", e);
     return NextResponse.json(prettyObject(e));
   }
 }
@@ -42,7 +36,9 @@ async function request(req: NextRequest) {
   const controller = new AbortController();
 
   // alibaba use base url or just remove the path
-  let path = `${req.nextUrl.pathname}`.replaceAll(ApiPath.Alibaba, "");
+  let path = `${req.nextUrl.pathname}`
+    .replaceAll(ApiPath.Alibaba, "")
+    .replace("/api", "");
 
   let baseUrl = serverConfig.alibabaUrl || ALIBABA_BASE_URL;
 
@@ -65,11 +61,14 @@ async function request(req: NextRequest) {
   );
 
   const fetchUrl = `${baseUrl}${path}`;
+
+  // console.log("[Alibaba] fetchUrl", fetchUrl);
+
   const fetchOptions: RequestInit = {
     headers: {
       "Content-Type": "application/json",
       Authorization: req.headers.get("Authorization") ?? "",
-      "X-DashScope-SSE": req.headers.get("X-DashScope-SSE") ?? "disable",
+      "X-DashScope-SSE": req.headers.get("X-DashScope-SSE") ?? "enable",
     },
     method: req.method,
     body: req.body,
@@ -79,34 +78,85 @@ async function request(req: NextRequest) {
     signal: controller.signal,
   };
 
+  // console.log("[Proxy] Alibaba options: ", fetchOptions);
+
   // #1815 try to refuse some request to some models
   if (serverConfig.customModels && req.body) {
     try {
       const clonedBody = await req.text();
-      fetchOptions.body = clonedBody;
+      let jsonBody: any = {};
+
+      try {
+        jsonBody = JSON.parse(clonedBody);
+
+        // Move input.messages to messages at the root level if present
+        if (jsonBody.input && Array.isArray(jsonBody.input.messages)) {
+          jsonBody.messages = jsonBody.input.messages;
+
+          // Remove input.messages to avoid duplication
+          delete jsonBody.input;
+
+          jsonBody.stream = true;
+        }
+
+        const current_model = jsonBody?.model;
+        // console.log("[Alibaba] custom models", current_model);
+
+        //kiem tra xem model co phai la qwen-vl hay khong (vision model)
+        if (current_model && current_model.startsWith("qwen-vl")) {
+          console.log("[Alibaba] current model is qwen-vl");
+          console.log("xu ly hinh anh trong message");
+
+          // Reformat image objects in messages
+          if (Array.isArray(jsonBody.messages)) {
+            jsonBody.messages = jsonBody.messages.map((msg: any) => {
+              if (Array.isArray(msg.content)) {
+                msg.content = msg.content.map((item: any) => {
+                  if (item && typeof item === "object" && "image" in item) {
+                    return {
+                      type: "image_url",
+                      image_url: {
+                        url: item.image,
+                      },
+                    };
+                  }
+                  return item;
+                });
+              }
+              return msg;
+            });
+          }
+        }
+
+        // console.log("[Alibaba] request body json", jsonBody);
+
+        fetchOptions.body = JSON.stringify(jsonBody);
+      } catch (e) {
+        fetchOptions.body = clonedBody; // fallback if not JSON
+      }
 
-      const jsonBody = JSON.parse(clonedBody) as { model?: string };
+      // console.log("[Alibaba] request body", fetchOptions.body);
 
       // not undefined and is false
-      if (
-        isModelNotavailableInServer(
-          serverConfig.customModels,
-          jsonBody?.model as string,
-          ServiceProvider.Alibaba as string,
-        )
-      ) {
-        return NextResponse.json(
-          {
-            error: true,
-            message: `you are not allowed to use ${jsonBody?.model} model`,
-          },
-          {
-            status: 403,
-          },
-        );
-      }
+      // if (
+      //   isModelNotavailableInServer(
+      //     serverConfig.customModels,
+      //     jsonBody?.model as string,
+      //     ServiceProvider.Alibaba as string,
+      //   )
+      // ) {
+      //   return NextResponse.json(
+      //     {
+      //       error: true,
+      //       message: `you are not allowed to use ${jsonBody?.model} model`,
+      //     },
+      //     {
+      //       status: 403,
+      //     },
+      //   );
+      // }
     } catch (e) {
-      console.error(`[Alibaba] filter`, e);
+      // console.error(`[Alibaba] filter`, e);
     }
   }
   try {

app/api/auth/check/route.ts

@@ -0,0 +1,21 @@
+// /app/api/auth/check/route.ts
+import { NextRequest } from "next/server";
+import { checkAuth } from "../../supabase";
+
+export async function GET(req: NextRequest) {
+  const user = await checkAuth(req);
+
+  console.log("[Auth] user ", user);
+
+  if (!user) {
+    return new Response(JSON.stringify({ authenticated: false }), {
+      status: 401,
+      headers: { "Content-Type": "application/json" },
+    });
+  }
+
+  return new Response(JSON.stringify({ authenticated: true, user }), {
+    status: 200,
+    headers: { "Content-Type": "application/json" },
+  });
+}