Qwen

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 });
@@ -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,6 +61,9 @@ async function request(req: NextRequest) {
   );
 
   const fetchUrl = `${baseUrl}${path}`;
+
+  console.log("[Alibaba] fetchUrl", fetchUrl);
+
   const fetchOptions: RequestInit = {
     headers: {
       "Content-Type": "application/json",
@@ -83,28 +82,77 @@ async function request(req: NextRequest) {
   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);
     }

app/client/platforms/alibaba.ts

@@ -18,7 +18,6 @@ import {
   LLMModel,
   SpeechOptions,
   MultimodalContent,
-  MultimodalContentForAlibaba,
 } from "../api";
 import { getClientConfig } from "@/app/config/client";
 import {
@@ -156,86 +155,38 @@ export class QwenApi implements LLMApi {
       );
 
       if (shouldStream) {
+        // Lấy danh sách các công cụ (tools) và hàm (funcs) từ plugin hiện tại của phiên chat
         const [tools, funcs] = usePluginStore
           .getState()
           .getAsTools(
             useChatStore.getState().currentSession().mask?.plugin || [],
           );
+        // Gọi hàm streamWithThink để xử lý chat dạng stream (dòng sự kiện server-sent events)
         return streamWithThink(
           chatPath,
           requestPayload,
           headers,
           tools as any,
           funcs,
           controller,
-          // parseSSE
+          // SSE parse callback for OpenAI-style streaming
           (text: string, runTools: ChatMessageTool[]) => {
-            // console.log("parseSSE", text, runTools);
-            const json = JSON.parse(text);
-            const choices = json.output.choices as Array<{
-              message: {
-                content: string | null | MultimodalContentForAlibaba[];
-                tool_calls: ChatMessageTool[];
-                reasoning_content: string | null;
-              };
-            }>;
-
-            if (!choices?.length) return { isThinking: false, content: "" };
-
-            const tool_calls = choices[0]?.message?.tool_calls;
-            if (tool_calls?.length > 0) {
-              const index = tool_calls[0]?.index;
-              const id = tool_calls[0]?.id;
-              const args = tool_calls[0]?.function?.arguments;
-              if (id) {
-                runTools.push({
-                  id,
-                  type: tool_calls[0]?.type,
-                  function: {
-                    name: tool_calls[0]?.function?.name as string,
-                    arguments: args,
-                  },
-                });
-              } else {
-                // @ts-ignore
-                runTools[index]["function"]["arguments"] += args;
-              }
-            }
-
-            const reasoning = choices[0]?.message?.reasoning_content;
-            const content = choices[0]?.message?.content;
-
-            // Skip if both content and reasoning_content are empty or null
-            if (
-              (!reasoning || reasoning.length === 0) &&
-              (!content || content.length === 0)
-            ) {
-              return {
-                isThinking: false,
-                content: "",
-              };
-            }
-
-            if (reasoning && reasoning.length > 0) {
-              return {
-                isThinking: true,
-                content: reasoning,
-              };
-            } else if (content && content.length > 0) {
-              return {
-                isThinking: false,
-                content: Array.isArray(content)
-                  ? content.map((item) => item.text).join(",")
-                  : content,
-              };
+            // Each `text` is a line like: data: {...}
+            let json: any;
+            try {
+              json = JSON.parse(text);
+            } catch {
+              return { isThinking: false, content: "" };
             }
+            const delta = json.choices?.[0]?.delta;
+            const content = delta?.content ?? "";
 
+            // You can accumulate content outside if needed
             return {
               isThinking: false,
-              content: "",
+              content,
             };
           },
-          // processToolMessage, include tool_calls message and tool call results
           (
             requestPayload: RequestPayload,
             toolCallMessage: any,
@@ -248,7 +199,20 @@ export class QwenApi implements LLMApi {
               ...toolCallResult,
             );
           },
-          options,
+          {
+            ...options,
+            // Accumulate and render result as it streams
+            onUpdate: (() => {
+              let accumulated = "";
+              return (chunk: string) => {
+                accumulated += chunk;
+                options.onUpdate?.(accumulated, chunk);
+              };
+            })(),
+            onFinish: (final: string, res: any) => {
+              options.onFinish?.(final, res);
+            },
+          },
         );
       } else {
         const res = await fetch(chatPath, chatPayload);

app/client/platforms/deepseek.ts

@@ -151,7 +151,8 @@ export class DeepSeekApi implements LLMApi {
           controller,
           // parseSSE
           (text: string, runTools: ChatMessageTool[]) => {
-            // console.log("parseSSE", text, runTools);
+            console.log("parseSSE", text, runTools);
+
             const json = JSON.parse(text);
             const choices = json.choices as Array<{
               delta: {

app/client/platforms/siliconflow.ts

@@ -153,81 +153,35 @@ export class SiliconflowApi implements LLMApi {
           tools as any,
           funcs,
           controller,
-          // parseSSE
+          // parseSSE mới cho SiliconFlow response
           (text: string, runTools: ChatMessageTool[]) => {
-            // console.log("parseSSE", text, runTools);
+            // Parse chuỗi JSON trả về thành đối tượng
             const json = JSON.parse(text);
-            const choices = json.choices as Array<{
-              delta: {
-                content: string | null;
-                tool_calls: ChatMessageTool[];
-                reasoning_content: string | null;
-              };
-            }>;
-            const tool_calls = choices[0]?.delta?.tool_calls;
-            if (tool_calls?.length > 0) {
-              const index = tool_calls[0]?.index;
-              const id = tool_calls[0]?.id;
-              const args = tool_calls[0]?.function?.arguments;
-              if (id) {
-                runTools.push({
-                  id,
-                  type: tool_calls[0]?.type,
-                  function: {
-                    name: tool_calls[0]?.function?.name as string,
-                    arguments: args,
-                  },
-                });
-              } else {
-                // @ts-ignore
-                runTools[index]["function"]["arguments"] += args;
-              }
-            }
-            const reasoning = choices[0]?.delta?.reasoning_content;
-            const content = choices[0]?.delta?.content;
 
-            // Skip if both content and reasoning_content are empty or null
-            if (
-              (!reasoning || reasoning.length === 0) &&
-              (!content || content.length === 0)
-            ) {
-              return {
-                isThinking: false,
-                content: "",
-              };
-            }
+            // Lấy nội dung trả lời từ output.text
+            const content = json?.output?.text ?? "";
 
-            if (reasoning && reasoning.length > 0) {
-              return {
-                isThinking: true,
-                content: reasoning,
-              };
-            } else if (content && content.length > 0) {
+            // Nếu không có nội dung trả lời, trả về trạng thái không suy nghĩ và nội dung rỗng
+            if (!content || content.length === 0) {
               return {
                 isThinking: false,
-                content: content,
+                content: "",
               };
             }
 
+            // Trả về trạng thái không suy nghĩ và nội dung trả lời
             return {
               isThinking: false,
-              content: "",
+              content: content,
             };
           },
-          // processToolMessage, include tool_calls message and tool call results
+          // processToolMessage: SiliconFlow không có tool_call nên giữ nguyên hoặc để rỗng
           (
             requestPayload: RequestPayload,
             toolCallMessage: any,
             toolCallResult: any[],
           ) => {
-            // @ts-ignore
-            requestPayload?.messages?.splice(
-              // @ts-ignore
-              requestPayload?.messages?.length,
-              0,
-              toolCallMessage,
-              ...toolCallResult,
-            );
+            // Không cần xử lý tool_call, có thể để trống hoặc giữ nguyên nếu muốn tương thích
           },
           options,
         );