From 4f28fca506980306c7d5810d4b6c9365503dce7f Mon Sep 17 00:00:00 2001 From: Kadxy <2230318258@qq.com> Date: Sat, 1 Feb 2025 15:02:06 +0800 Subject: [PATCH 01/33] feat: Support OpenAI o3-mini --- app/constant.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/constant.ts b/app/constant.ts index 14c8c78e5f3..a7567f1d726 100644 --- a/app/constant.ts +++ b/app/constant.ts @@ -450,6 +450,8 @@ export const VISION_MODEL_REGEXES = [ export const EXCLUDE_VISION_MODEL_REGEXES = [/claude-3-5-haiku-20241022/]; const openaiModels = [ + // As of July 2024, gpt-4o-mini should be used in place of gpt-3.5-turbo, + // as it is cheaper, more capable, multimodal, and just as fast. gpt-3.5-turbo is still available for use in the API. "gpt-3.5-turbo", "gpt-3.5-turbo-1106", "gpt-3.5-turbo-0125", @@ -472,6 +474,7 @@ const openaiModels = [ "dall-e-3", "o1-mini", "o1-preview", + "o3-mini", ]; const googleModels = [ From 034b7d4655c55ecd5a8e6abd5a130356e4f6b38a Mon Sep 17 00:00:00 2001 From: dupl <67990457+dupl@users.noreply.github.com> Date: Sun, 2 Feb 2025 23:11:07 +0800 Subject: [PATCH 02/33] add gemini-2.0-flash-thinking-exp, gemini-2.0-flash-thinking-exp-01-21 --- app/constant.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/constant.ts b/app/constant.ts index a7567f1d726..141e8f3520d 100644 --- a/app/constant.ts +++ b/app/constant.ts @@ -494,7 +494,9 @@ const googleModels = [ "gemini-exp-1121", "gemini-exp-1206", "gemini-2.0-flash-exp", + "gemini-2.0-flash-thinking-exp", "gemini-2.0-flash-thinking-exp-1219", + "gemini-2.0-flash-thinking-exp-01-21", ]; const anthropicModels = [ From 60fa358010125894dc85f19618081040eccce15c Mon Sep 17 00:00:00 2001 From: dupl <67990457+dupl@users.noreply.github.com> Date: Sun, 2 Feb 2025 23:27:45 +0800 Subject: [PATCH 03/33] typo: OpanAI -> OpenAI --- README_CN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_CN.md b/README_CN.md index 9348176e5b5..b23ea790dae 100644 --- a/README_CN.md +++ b/README_CN.md @@ -89,7 +89,7 @@ code1,code2,code3 ### `OPENAI_API_KEY` （必填项） -OpanAI 密钥，你在 openai 账户页面申请的 api key，使用英文逗号隔开多个 key，这样可以随机轮询这些 key。 +OpenAI 密钥，你在 openai 账户页面申请的 api key，使用英文逗号隔开多个 key，这样可以随机轮询这些 key。 ### `CODE` （可选） From 2e7cac32185e52f648d30a76a61474951295c0be Mon Sep 17 00:00:00 2001 From: AndrewS Date: Sun, 2 Feb 2025 19:44:53 +0100 Subject: [PATCH 04/33] chore: add knowledge cut off dates for o1 and o3 --- app/constant.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/constant.ts b/app/constant.ts index a7567f1d726..6ffabfaffe0 100644 --- a/app/constant.ts +++ b/app/constant.ts @@ -408,8 +408,14 @@ export const KnowledgeCutOffDate: Record = { "gpt-4o-mini": "2023-10", "gpt-4o-mini-2024-07-18": "2023-10", "gpt-4-vision-preview": "2023-04", + "o1-mini-2024-09-12": "2023-10", "o1-mini": "2023-10", + "o1-preview-2024-09-12": "2023-10", "o1-preview": "2023-10", + "o1-2024-12-17": "2023-10", + "o1": "2023-10", + "o3-mini-2025-01-31": "2023-10", + "o3-mini": "2023-10", // After improvements, // it's now easier to add "KnowledgeCutOffDate" instead of stupid hardcoding it, as was done previously. "gemini-pro": "2023-12", From 8f12beb8f0b65d9b3de009348b0a8b2397e5574c Mon Sep 17 00:00:00 2001 From: Sky Date: Sun, 2 Feb 2025 21:43:30 +0000 Subject: [PATCH 05/33] support o3-mini --- app/api/openai.ts | 2 +- app/client/platforms/openai.ts | 16 ++++++++-------- app/components/emoji.tsx | 3 ++- app/constant.ts | 1 + 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/api/openai.ts b/app/api/openai.ts index 2b5deca8be3..dd820073f85 100644 --- a/app/api/openai.ts +++ b/app/api/openai.ts @@ -14,7 +14,7 @@ function getModels(remoteModelRes: OpenAIListModelResponse) { if (config.disableGPT4) { remoteModelRes.data = remoteModelRes.data.filter( (m) => - !(m.id.startsWith("gpt-4") || m.id.startsWith("chatgpt-4o") || m.id.startsWith("o1")) || + !(m.id.startsWith("gpt-4") || m.id.startsWith("chatgpt-4o") || m.id.startsWith("o1")) || m.id.startsWith("o3")) || m.id.startsWith("gpt-4o-mini"), ); } diff --git a/app/client/platforms/openai.ts b/app/client/platforms/openai.ts index 5a110b84bea..467bb82e0ac 100644 --- a/app/client/platforms/openai.ts +++ b/app/client/platforms/openai.ts @@ -195,7 +195,7 @@ export class ChatGPTApi implements LLMApi { let requestPayload: RequestPayload | DalleRequestPayload; const isDalle3 = _isDalle3(options.config.model); - const isO1 = options.config.model.startsWith("o1"); + const isO1OrO3 = options.config.model.startsWith("o1") || options.config.model.startsWith("o3"); if (isDalle3) { const prompt = getMessageTextContent( options.messages.slice(-1)?.pop() as any, @@ -217,7 +217,7 @@ export class ChatGPTApi implements LLMApi { const content = visionModel ? await preProcessImageContent(v.content) : getMessageTextContent(v); - if (!(isO1 && v.role === "system")) + if (!(isO1OrO3 && v.role === "system")) messages.push({ role: v.role, content }); } @@ -226,16 +226,16 @@ export class ChatGPTApi implements LLMApi { messages, stream: options.config.stream, model: modelConfig.model, - temperature: !isO1 ? modelConfig.temperature : 1, - presence_penalty: !isO1 ? modelConfig.presence_penalty : 0, - frequency_penalty: !isO1 ? modelConfig.frequency_penalty : 0, - top_p: !isO1 ? modelConfig.top_p : 1, + temperature: !isO1OrO3 ? modelConfig.temperature : 1, + presence_penalty: !isO1OrO3 ? modelConfig.presence_penalty : 0, + frequency_penalty: !isO1OrO3 ? modelConfig.frequency_penalty : 0, + top_p: !isO1OrO3 ? modelConfig.top_p : 1, // max_tokens: Math.max(modelConfig.max_tokens, 1024), // Please do not ask me why not send max_tokens, no reason, this param is just shit, I dont want to explain anymore. }; // O1 使用 max_completion_tokens 控制token数 (https://platform.openai.com/docs/guides/reasoning#controlling-costs) - if (isO1) { + if (isO1OrO3) { requestPayload["max_completion_tokens"] = modelConfig.max_tokens; } @@ -359,7 +359,7 @@ export class ChatGPTApi implements LLMApi { // make a fetch request const requestTimeoutId = setTimeout( () => controller.abort(), - isDalle3 || isO1 ? REQUEST_TIMEOUT_MS * 4 : REQUEST_TIMEOUT_MS, // dalle3 using b64_json is slow. + isDalle3 || isO1OrO3 ? REQUEST_TIMEOUT_MS * 4 : REQUEST_TIMEOUT_MS, // dalle3 using b64_json is slow. ); const res = await fetch(chatPath, chatPayload); diff --git a/app/components/emoji.tsx b/app/components/emoji.tsx index d75cdda9268..54d1c1c9980 100644 --- a/app/components/emoji.tsx +++ b/app/components/emoji.tsx @@ -38,7 +38,8 @@ export function Avatar(props: { model?: ModelType; avatar?: string }) {
{props.model?.startsWith("gpt-4") || props.model?.startsWith("chatgpt-4o") || - props.model?.startsWith("o1") ? ( + props.model?.startsWith("o1") || + props.model?.startsWith("o3") ? ( ) : ( diff --git a/app/constant.ts b/app/constant.ts index a7567f1d726..d98b84828b1 100644 --- a/app/constant.ts +++ b/app/constant.ts @@ -410,6 +410,7 @@ export const KnowledgeCutOffDate: Record = { "gpt-4-vision-preview": "2023-04", "o1-mini": "2023-10", "o1-preview": "2023-10", + "o3-mini": "2023-10", // After improvements, // it's now easier to add "KnowledgeCutOffDate" instead of stupid hardcoding it, as was done previously. "gemini-pro": "2023-12", From 4c4d44e2f831ec3296bbfd9f3c9e8b201e6bf18d Mon Sep 17 00:00:00 2001 From: Sky Date: Sun, 2 Feb 2025 21:45:30 +0000 Subject: [PATCH 06/33] fix --- app/api/openai.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/openai.ts b/app/api/openai.ts index dd820073f85..e97dfbfe789 100644 --- a/app/api/openai.ts +++ b/app/api/openai.ts @@ -14,7 +14,7 @@ function getModels(remoteModelRes: OpenAIListModelResponse) { if (config.disableGPT4) { remoteModelRes.data = remoteModelRes.data.filter( (m) => - !(m.id.startsWith("gpt-4") || m.id.startsWith("chatgpt-4o") || m.id.startsWith("o1")) || m.id.startsWith("o3")) || + !(m.id.startsWith("gpt-4") || m.id.startsWith("chatgpt-4o") || m.id.startsWith("o1") || m.id.startsWith("o3")) || m.id.startsWith("gpt-4o-mini"), ); } From 92f57fb18fe40e73a425842747d4b5654493f275 Mon Sep 17 00:00:00 2001 From: zcong1993 Date: Mon, 3 Feb 2025 16:58:42 +0800 Subject: [PATCH 07/33] fix: fix isModelNotavailableInServer logic for bytedance models --- app/utils/model.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/utils/model.ts b/app/utils/model.ts index a1a38a2f81c..f460babcd25 100644 --- a/app/utils/model.ts +++ b/app/utils/model.ts @@ -1,4 +1,4 @@ -import { DEFAULT_MODELS } from "../constant"; +import { DEFAULT_MODELS, ServiceProvider } from "../constant"; import { LLMModel } from "../client/api"; const CustomSeq = { @@ -246,6 +246,11 @@ export function isModelNotavailableInServer( ? providerNames : [providerNames]; for (const providerName of providerNamesArray) { + // if model provider is bytedance, use model config name to check if not avaliable + if (providerName === ServiceProvider.ByteDance) { + return !Object.values(modelTable).filter((v) => v.name === modelName)?.[0] + ?.available; + } const fullName = `${modelName}@${providerName.toLowerCase()}`; if (modelTable?.[fullName]?.available === true) return false; } From 1db4d25370d5754576c2bddc29ee75c6869b2696 Mon Sep 17 00:00:00 2001 From: RiverRay Date: Tue, 4 Feb 2025 09:29:56 +0800 Subject: [PATCH 08/33] Update README.md --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3c23f4993c8..6df709d9656 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,12 @@
- icon + icon +

NextChat (ChatGPT Next Web)

English / [简体中文](./README_CN.md) @@ -13,8 +14,7 @@ English / [简体中文](./README_CN.md) ChatGPTNextWeb%2FChatGPT-Next-Web | Trendshift - -One-Click to get a well-designed cross-platform ChatGPT web UI, with Claude, GPT4 & Gemini Pro support. +✨ Light and Fast AI Assistant,with Claude, DeepSeek, GPT4 & Gemini Pro support. [![Saas][Saas-image]][saas-url] [![Web][Web-image]][web-url] @@ -22,7 +22,7 @@ One-Click to get a well-designed cross-platform ChatGPT web UI, with Claude, GPT [![MacOS][MacOS-image]][download-url] [![Linux][Linux-image]][download-url] -[NextChatAI](https://nextchat.dev/chat?utm_source=readme) / [Web App Demo](https://app.nextchat.dev) / [Desktop App](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [Discord](https://discord.gg/YCkeafCafC) / [Enterprise Edition](#enterprise-edition) / [Twitter](https://twitter.com/NextChatDev) +[NextChatAI](https://nextchat.dev/chat?utm_source=readme) / [Web App Demo](https://app.nextchat.dev) / [Desktop App](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) [saas-url]: https://nextchat.dev/chat?utm_source=readme @@ -34,9 +34,9 @@ One-Click to get a well-designed cross-platform ChatGPT web UI, with Claude, GPT [MacOS-image]: https://img.shields.io/badge/-MacOS-black?logo=apple [Linux-image]: https://img.shields.io/badge/-Linux-333?logo=ubuntu -[Deploy on Vercel](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FChatGPTNextWeb%2FChatGPT-Next-Web&env=OPENAI_API_KEY&env=CODE&project-name=nextchat&repository-name=NextChat) [Deploy on Zeabur](https://zeabur.com/templates/ZBUEFA) [Open in Gitpod](https://gitpod.io/#https://github.com/Yidadaa/ChatGPT-Next-Web) [BT Deply Install](https://www.bt.cn/new/download.html) +[Deploy on Zeabur](https://zeabur.com/templates/ZBUEFA) [Deploy on Vercel](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FChatGPTNextWeb%2FChatGPT-Next-Web&env=OPENAI_API_KEY&env=CODE&project-name=nextchat&repository-name=NextChat) [Open in Gitpod](https://gitpod.io/#https://github.com/ChatGPTNextWeb/NextChat) -[](https://monica.im/?utm=nxcrp) +[](https://monica.im/?utm=nxcrp)
From 9943a52295e36b0c296110f31643090f5fe0bb35 Mon Sep 17 00:00:00 2001 From: RiverRay Date: Tue, 4 Feb 2025 09:31:16 +0800 Subject: [PATCH 09/33] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6df709d9656..d6e99fca9c8 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@
- icon + icon From ad9ab9d45afa384718a59bce23d9b70e3e8ed08a Mon Sep 17 00:00:00 2001 From: Shenghang Tsai Date: Tue, 4 Feb 2025 15:02:18 +0800 Subject: [PATCH 10/33] New provider SiliconFlow and Its Latest DeekSeek Models Update README.md Update constant.ts Update README_CN.md --- README.md | 7 + README_CN.md | 7 + app/api/[provider]/[...path]/route.ts | 3 + app/api/auth.ts | 3 + app/api/siliconflow.ts | 128 ++++++++++++++ app/client/api.ts | 12 ++ app/client/platforms/siliconflow.ts | 243 ++++++++++++++++++++++++++ app/components/settings.tsx | 42 +++++ app/config/server.ts | 9 + app/constant.ts | 38 +++- app/locales/cn.ts | 11 ++ app/locales/en.ts | 11 ++ app/store/access.ts | 14 ++ 13 files changed, 527 insertions(+), 1 deletion(-) create mode 100644 app/api/siliconflow.ts create mode 100644 app/client/platforms/siliconflow.ts diff --git a/README.md b/README.md index d6e99fca9c8..d391bdbff8c 100644 --- a/README.md +++ b/README.md @@ -352,6 +352,13 @@ Customize Stability API url. Enable MCP（Model Context Protocol）Feature +### `SILICONFLOW_API_KEY` (optional) + +SiliconFlow API Key. + +### `SILICONFLOW_URL` (optional) + +SiliconFlow API URL. ## Requirements diff --git a/README_CN.md b/README_CN.md index b23ea790dae..f6f4c0be5a7 100644 --- a/README_CN.md +++ b/README_CN.md @@ -267,6 +267,13 @@ Stability API密钥 启用MCP（Model Context Protocol）功能 +### `SILICONFLOW_API_KEY` (optional) + +SiliconFlow API Key. + +### `SILICONFLOW_URL` (optional) + +SiliconFlow API URL. ## 开发 diff --git a/app/api/[provider]/[...path]/route.ts b/app/api/[provider]/[...path]/route.ts index 3b5833d7e99..8975bf971e2 100644 --- a/app/api/[provider]/[...path]/route.ts +++ b/app/api/[provider]/[...path]/route.ts @@ -11,6 +11,7 @@ import { handle as moonshotHandler } from "../../moonshot"; import { handle as stabilityHandler } from "../../stability"; import { handle as iflytekHandler } from "../../iflytek"; import { handle as deepseekHandler } from "../../deepseek"; +import { handle as siliconflowHandler } from "../../siliconflow"; import { handle as xaiHandler } from "../../xai"; import { handle as chatglmHandler } from "../../glm"; import { handle as proxyHandler } from "../../proxy"; @@ -47,6 +48,8 @@ async function handle( return xaiHandler(req, { params }); case ApiPath.ChatGLM: return chatglmHandler(req, { params }); + case ApiPath.SiliconFlow: + return siliconflowHandler(req, { params }); case ApiPath.OpenAI: return openaiHandler(req, { params }); default: diff --git a/app/api/auth.ts b/app/api/auth.ts index 1760c249cc4..8c78c70c865 100644 --- a/app/api/auth.ts +++ b/app/api/auth.ts @@ -101,6 +101,9 @@ export function auth(req: NextRequest, modelProvider: ModelProvider) { case ModelProvider.ChatGLM: systemApiKey = serverConfig.chatglmApiKey; break; + case ModelProvider.SiliconFlow: + systemApiKey = serverConfig.siliconFlowApiKey; + break; case ModelProvider.GPT: default: if (req.nextUrl.pathname.includes("azure/deployments")) { diff --git a/app/api/siliconflow.ts b/app/api/siliconflow.ts new file mode 100644 index 00000000000..e298a21d43c --- /dev/null +++ b/app/api/siliconflow.ts @@ -0,0 +1,128 @@ +import { getServerSideConfig } from "@/app/config/server"; +import { + SILICONFLOW_BASE_URL, + ApiPath, + ModelProvider, + ServiceProvider, +} 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("[SiliconFlow Route] params ", params); + + if (req.method === "OPTIONS") { + return NextResponse.json({ body: "OK" }, { status: 200 }); + } + + const authResult = auth(req, ModelProvider.SiliconFlow); + if (authResult.error) { + return NextResponse.json(authResult, { + status: 401, + }); + } + + try { + const response = await request(req); + return response; + } catch (e) { + console.error("[SiliconFlow] ", e); + return NextResponse.json(prettyObject(e)); + } +} + +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.SiliconFlow, ""); + + let baseUrl = serverConfig.siliconFlowUrl || SILICONFLOW_BASE_URL; + + if (!baseUrl.startsWith("http")) { + baseUrl = `https://${baseUrl}`; + } + + if (baseUrl.endsWith("/")) { + baseUrl = baseUrl.slice(0, -1); + } + + console.log("[Proxy] ", path); + console.log("[Base Url]", baseUrl); + + const timeoutId = setTimeout( + () => { + controller.abort(); + }, + 10 * 60 * 1000, + ); + + const fetchUrl = `${baseUrl}${path}`; + const fetchOptions: RequestInit = { + headers: { + "Content-Type": "application/json", + Authorization: req.headers.get("Authorization") ?? "", + }, + method: req.method, + body: req.body, + redirect: "manual", + // @ts-ignore + duplex: "half", + signal: controller.signal, + }; + + // #1815 try to refuse some request to some models + if (serverConfig.customModels && req.body) { + try { + const clonedBody = await req.text(); + fetchOptions.body = clonedBody; + + const jsonBody = JSON.parse(clonedBody) as { model?: string }; + + // not undefined and is false + if ( + isModelNotavailableInServer( + serverConfig.customModels, + jsonBody?.model as string, + ServiceProvider.SiliconFlow as string, + ) + ) { + return NextResponse.json( + { + error: true, + message: `you are not allowed to use ${jsonBody?.model} model`, + }, + { + status: 403, + }, + ); + } + } catch (e) { + console.error(`[SiliconFlow] filter`, e); + } + } + try { + const res = await fetch(fetchUrl, fetchOptions); + + // to prevent browser prompt for credentials + const newHeaders = new Headers(res.headers); + newHeaders.delete("www-authenticate"); + // to disable nginx buffering + newHeaders.set("X-Accel-Buffering", "no"); + + return new Response(res.body, { + status: res.status, + statusText: res.statusText, + headers: newHeaders, + }); + } finally { + clearTimeout(timeoutId); + } +} diff --git a/app/client/api.ts b/app/client/api.ts index 8f263763ba6..64ac82b2a61 100644 --- a/app/client/api.ts +++ b/app/client/api.ts @@ -23,6 +23,7 @@ import { SparkApi } from "./platforms/iflytek"; import { DeepSeekApi } from "./platforms/deepseek"; import { XAIApi } from "./platforms/xai"; import { ChatGLMApi } from "./platforms/glm"; +import { SiliconflowApi } from "./platforms/siliconflow"; export const ROLES = ["system", "user", "assistant"] as const; export type MessageRole = (typeof ROLES)[number]; @@ -164,6 +165,9 @@ export class ClientApi { case ModelProvider.ChatGLM: this.llm = new ChatGLMApi(); break; + case ModelProvider.SiliconFlow: + this.llm = new SiliconflowApi(); + break; default: this.llm = new ChatGPTApi(); } @@ -254,6 +258,8 @@ export function getHeaders(ignoreHeaders: boolean = false) { const isDeepSeek = modelConfig.providerName === ServiceProvider.DeepSeek; const isXAI = modelConfig.providerName === ServiceProvider.XAI; const isChatGLM = modelConfig.providerName === ServiceProvider.ChatGLM; + const isSiliconFlow = + modelConfig.providerName === ServiceProvider.SiliconFlow; const isEnabledAccessControl = accessStore.enabledAccessControl(); const apiKey = isGoogle ? accessStore.googleApiKey @@ -273,6 +279,8 @@ export function getHeaders(ignoreHeaders: boolean = false) { ? accessStore.deepseekApiKey : isChatGLM ? accessStore.chatglmApiKey + : isSiliconFlow + ? accessStore.siliconflowApiKey : isIflytek ? accessStore.iflytekApiKey && accessStore.iflytekApiSecret ? accessStore.iflytekApiKey + ":" + accessStore.iflytekApiSecret @@ -290,6 +298,7 @@ export function getHeaders(ignoreHeaders: boolean = false) { isDeepSeek, isXAI, isChatGLM, + isSiliconFlow, apiKey, isEnabledAccessControl, }; @@ -317,6 +326,7 @@ export function getHeaders(ignoreHeaders: boolean = false) { isDeepSeek, isXAI, isChatGLM, + isSiliconFlow, apiKey, isEnabledAccessControl, } = getConfig(); @@ -365,6 +375,8 @@ export function getClientApi(provider: ServiceProvider): ClientApi { return new ClientApi(ModelProvider.XAI); case ServiceProvider.ChatGLM: return new ClientApi(ModelProvider.ChatGLM); + case ServiceProvider.SiliconFlow: + return new ClientApi(ModelProvider.SiliconFlow); default: return new ClientApi(ModelProvider.GPT); } diff --git a/app/client/platforms/siliconflow.ts b/app/client/platforms/siliconflow.ts new file mode 100644 index 00000000000..fe2f9862b27 --- /dev/null +++ b/app/client/platforms/siliconflow.ts @@ -0,0 +1,243 @@ +"use client"; +// azure and openai, using same models. so using same LLMApi. +import { + ApiPath, + SILICONFLOW_BASE_URL, + SiliconFlow, + REQUEST_TIMEOUT_MS, +} from "@/app/constant"; +import { + useAccessStore, + useAppConfig, + useChatStore, + ChatMessageTool, + usePluginStore, +} from "@/app/store"; +import { streamWithThink } from "@/app/utils/chat"; +import { + ChatOptions, + getHeaders, + LLMApi, + LLMModel, + SpeechOptions, +} from "../api"; +import { getClientConfig } from "@/app/config/client"; +import { + getMessageTextContent, + getMessageTextContentWithoutThinking, +} from "@/app/utils"; +import { RequestPayload } from "./openai"; +import { fetch } from "@/app/utils/stream"; + +export class SiliconflowApi implements LLMApi { + private disableListModels = true; + + path(path: string): string { + const accessStore = useAccessStore.getState(); + + let baseUrl = ""; + + if (accessStore.useCustomConfig) { + baseUrl = accessStore.siliconflowUrl; + } + + if (baseUrl.length === 0) { + const isApp = !!getClientConfig()?.isApp; + const apiPath = ApiPath.SiliconFlow; + baseUrl = isApp ? SILICONFLOW_BASE_URL : apiPath; + } + + if (baseUrl.endsWith("/")) { + baseUrl = baseUrl.slice(0, baseUrl.length - 1); + } + if ( + !baseUrl.startsWith("http") && + !baseUrl.startsWith(ApiPath.SiliconFlow) + ) { + baseUrl = "https://" + baseUrl; + } + + console.log("[Proxy Endpoint] ", baseUrl, path); + + return [baseUrl, path].join("/"); + } + + extractMessage(res: any) { + return res.choices?.at(0)?.message?.content ?? ""; + } + + speech(options: SpeechOptions): Promise { + throw new Error("Method not implemented."); + } + + async chat(options: ChatOptions) { + const messages: ChatOptions["messages"] = []; + for (const v of options.messages) { + if (v.role === "assistant") { + const content = getMessageTextContentWithoutThinking(v); + messages.push({ role: v.role, content }); + } else { + const content = getMessageTextContent(v); + messages.push({ role: v.role, content }); + } + } + + const modelConfig = { + ...useAppConfig.getState().modelConfig, + ...useChatStore.getState().currentSession().mask.modelConfig, + ...{ + model: options.config.model, + providerName: options.config.providerName, + }, + }; + + const requestPayload: RequestPayload = { + messages, + stream: options.config.stream, + model: modelConfig.model, + temperature: modelConfig.temperature, + presence_penalty: modelConfig.presence_penalty, + frequency_penalty: modelConfig.frequency_penalty, + top_p: modelConfig.top_p, + // max_tokens: Math.max(modelConfig.max_tokens, 1024), + // Please do not ask me why not send max_tokens, no reason, this param is just shit, I dont want to explain anymore. + }; + + console.log("[Request] openai payload: ", requestPayload); + + const shouldStream = !!options.config.stream; + const controller = new AbortController(); + options.onController?.(controller); + + try { + const chatPath = this.path(SiliconFlow.ChatPath); + const chatPayload = { + method: "POST", + body: JSON.stringify(requestPayload), + signal: controller.signal, + headers: getHeaders(), + }; + + // console.log(chatPayload); + + // make a fetch request + const requestTimeoutId = setTimeout( + () => controller.abort(), + REQUEST_TIMEOUT_MS, + ); + + if (shouldStream) { + const [tools, funcs] = usePluginStore + .getState() + .getAsTools( + useChatStore.getState().currentSession().mask?.plugin || [], + ); + return streamWithThink( + chatPath, + requestPayload, + getHeaders(), + tools as any, + funcs, + controller, + // parseSSE + (text: string, runTools: ChatMessageTool[]) => { + // console.log("parseSSE", text, runTools); + 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.trim().length === 0) && + (!content || content.trim().length === 0) + ) { + return { + isThinking: false, + content: "", + }; + } + + if (reasoning && reasoning.trim().length > 0) { + return { + isThinking: true, + content: reasoning, + }; + } else if (content && content.trim().length > 0) { + return { + isThinking: false, + content: content, + }; + } + + return { + isThinking: false, + content: "", + }; + }, + // processToolMessage, include tool_calls message and tool call results + ( + requestPayload: RequestPayload, + toolCallMessage: any, + toolCallResult: any[], + ) => { + // @ts-ignore + requestPayload?.messages?.splice( + // @ts-ignore + requestPayload?.messages?.length, + 0, + toolCallMessage, + ...toolCallResult, + ); + }, + options, + ); + } else { + const res = await fetch(chatPath, chatPayload); + clearTimeout(requestTimeoutId); + + const resJson = await res.json(); + const message = this.extractMessage(resJson); + options.onFinish(message, res); + } + } catch (e) { + console.log("[Request] failed to make a chat request", e); + options.onError?.(e as Error); + } + } + async usage() { + return { + used: 0, + total: 0, + }; + } + + async models(): Promise { + return []; + } +} diff --git a/app/components/settings.tsx b/app/components/settings.tsx index 3b990ed2c74..68ebcf084c1 100644 --- a/app/components/settings.tsx +++ b/app/components/settings.tsx @@ -74,6 +74,7 @@ import { SAAS_CHAT_URL, ChatGLM, DeepSeek, + SiliconFlow, } from "../constant"; import { Prompt, SearchService, usePromptStore } from "../store/prompt"; import { ErrorBoundary } from "./error"; @@ -1318,6 +1319,46 @@ export function Settings() { ); + const siliconflowConfigComponent = accessStore.provider === + ServiceProvider.SiliconFlow && ( + <> + + + accessStore.update( + (access) => (access.siliconflowUrl = e.currentTarget.value), + ) + } + > + + + { + accessStore.update( + (access) => (access.siliconflowApiKey = e.currentTarget.value), + ); + }} + /> + + + ); const stabilityConfigComponent = accessStore.provider === ServiceProvider.Stability && ( @@ -1780,6 +1821,7 @@ export function Settings() { {lflytekConfigComponent} {XAIConfigComponent} {chatglmConfigComponent} + {siliconflowConfigComponent} )} diff --git a/app/config/server.ts b/app/config/server.ts index 1166805b57c..43d4ff833ce 100644 --- a/app/config/server.ts +++ b/app/config/server.ts @@ -84,6 +84,10 @@ declare global { CHATGLM_URL?: string; CHATGLM_API_KEY?: string; + // siliconflow only + SILICONFLOW_URL?: string; + SILICONFLOW_API_KEY?: string; + // custom template for preprocessing user input DEFAULT_INPUT_TEMPLATE?: string; @@ -158,6 +162,7 @@ export const getServerSideConfig = () => { const isDeepSeek = !!process.env.DEEPSEEK_API_KEY; const isXAI = !!process.env.XAI_API_KEY; const isChatGLM = !!process.env.CHATGLM_API_KEY; + const isSiliconFlow = !!process.env.SILICONFLOW_API_KEY; // const apiKeyEnvVar = process.env.OPENAI_API_KEY ?? ""; // const apiKeys = apiKeyEnvVar.split(",").map((v) => v.trim()); // const randomIndex = Math.floor(Math.random() * apiKeys.length); @@ -237,6 +242,10 @@ export const getServerSideConfig = () => { cloudflareKVApiKey: getApiKey(process.env.CLOUDFLARE_KV_API_KEY), cloudflareKVTTL: process.env.CLOUDFLARE_KV_TTL, + isSiliconFlow, + siliconFlowUrl: process.env.SILICONFLOW_URL, + siliconFlowApiKey: getApiKey(process.env.SILICONFLOW_API_KEY), + gtmId: process.env.GTM_ID, gaId: process.env.GA_ID || DEFAULT_GA_ID, diff --git a/app/constant.ts b/app/constant.ts index 60200af41f1..32e5a22632a 100644 --- a/app/constant.ts +++ b/app/constant.ts @@ -34,6 +34,8 @@ export const XAI_BASE_URL = "https://api.x.ai"; export const CHATGLM_BASE_URL = "https://open.bigmodel.cn"; +export const SILICONFLOW_BASE_URL = "https://api.siliconflow.cn"; + export const CACHE_URL_PREFIX = "/api/cache"; export const UPLOAD_URL = `${CACHE_URL_PREFIX}/upload`; @@ -69,6 +71,7 @@ export enum ApiPath { XAI = "/api/xai", ChatGLM = "/api/chatglm", DeepSeek = "/api/deepseek", + SiliconFlow = "/api/siliconflow", } export enum SlotID { @@ -125,6 +128,7 @@ export enum ServiceProvider { XAI = "XAI", ChatGLM = "ChatGLM", DeepSeek = "DeepSeek", + SiliconFlow = "SiliconFlow", } // Google API safety settings, see https://ai.google.dev/gemini-api/docs/safety-settings @@ -150,6 +154,7 @@ export enum ModelProvider { XAI = "XAI", ChatGLM = "ChatGLM", DeepSeek = "DeepSeek", + SiliconFlow = "SiliconFlow", } export const Stability = { @@ -249,6 +254,11 @@ export const ChatGLM = { VideoPath: "api/paas/v4/videos/generations", }; +export const SiliconFlow = { + ExampleEndpoint: SILICONFLOW_BASE_URL, + ChatPath: "v1/chat/completions", +}; + export const DEFAULT_INPUT_TEMPLATE = `{{input}}`; // input / time / model / lang // export const DEFAULT_SYSTEM_TEMPLATE = ` // You are ChatGPT, a large language model trained by {{ServiceProvider}}. @@ -413,7 +423,7 @@ export const KnowledgeCutOffDate: Record = { "o1-preview-2024-09-12": "2023-10", "o1-preview": "2023-10", "o1-2024-12-17": "2023-10", - "o1": "2023-10", + o1: "2023-10", "o3-mini-2025-01-31": "2023-10", "o3-mini": "2023-10", // After improvements, @@ -597,6 +607,21 @@ const chatglmModels = [ // "cogvideox-flash", // free ]; +const siliconflowModels = [ + "Qwen/Qwen2.5-7B-Instruct", + "Qwen/Qwen2.5-72B-Instruct", + "deepseek-ai/DeepSeek-R1", + "deepseek-ai/DeepSeek-R1-Distill-Llama-70B", + "deepseek-ai/DeepSeek-R1-Distill-Llama-8B", + "deepseek-ai/DeepSeek-R1-Distill-Qwen-1.5B", + "deepseek-ai/DeepSeek-R1-Distill-Qwen-14B", + "deepseek-ai/DeepSeek-R1-Distill-Qwen-32B", + "deepseek-ai/DeepSeek-R1-Distill-Qwen-7B", + "deepseek-ai/DeepSeek-V3", + "meta-llama/Llama-3.3-70B-Instruct", + "THUDM/glm-4-9b-chat", +]; + let seq = 1000; // 内置的模型序号生成器从1000开始 export const DEFAULT_MODELS = [ ...openaiModels.map((name) => ({ @@ -742,6 +767,17 @@ export const DEFAULT_MODELS = [ sorted: 13, }, })), + ...siliconflowModels.map((name) => ({ + name, + available: true, + sorted: seq++, + provider: { + id: "siliconflow", + providerName: "SiliconFlow", + providerType: "siliconflow", + sorted: 14, + }, + })), ] as const; export const CHAT_PAGE_SIZE = 15; diff --git a/app/locales/cn.ts b/app/locales/cn.ts index 39498f66269..81b609cde17 100644 --- a/app/locales/cn.ts +++ b/app/locales/cn.ts @@ -496,6 +496,17 @@ const cn = { SubTitle: "样例：", }, }, + SiliconFlow: { + ApiKey: { + Title: "接口密钥", + SubTitle: "使用自定义硅基流动 API Key", + Placeholder: "硅基流动 API Key", + }, + Endpoint: { + Title: "接口地址", + SubTitle: "样例：", + }, + }, Stability: { ApiKey: { Title: "接口密钥", diff --git a/app/locales/en.ts b/app/locales/en.ts index 8c2c19f186d..8fecf8bf78e 100644 --- a/app/locales/en.ts +++ b/app/locales/en.ts @@ -480,6 +480,17 @@ const en: LocaleType = { SubTitle: "Example: ", }, }, + SiliconFlow: { + ApiKey: { + Title: "SiliconFlow API Key", + SubTitle: "Use a custom SiliconFlow API Key", + Placeholder: "SiliconFlow API Key", + }, + Endpoint: { + Title: "Endpoint Address", + SubTitle: "Example: ", + }, + }, Stability: { ApiKey: { Title: "Stability API Key", diff --git a/app/store/access.ts b/app/store/access.ts index 1fed5dfeda7..7025a181418 100644 --- a/app/store/access.ts +++ b/app/store/access.ts @@ -16,6 +16,7 @@ import { DEEPSEEK_BASE_URL, XAI_BASE_URL, CHATGLM_BASE_URL, + SILICONFLOW_BASE_URL, } from "../constant"; import { getHeaders } from "../client/api"; import { getClientConfig } from "../config/client"; @@ -54,6 +55,10 @@ const DEFAULT_XAI_URL = isApp ? XAI_BASE_URL : ApiPath.XAI; const DEFAULT_CHATGLM_URL = isApp ? CHATGLM_BASE_URL : ApiPath.ChatGLM; +const DEFAULT_SILICONFLOW_URL = isApp + ? SILICONFLOW_BASE_URL + : ApiPath.SiliconFlow; + const DEFAULT_ACCESS_STATE = { accessCode: "", useCustomConfig: false, @@ -123,6 +128,10 @@ const DEFAULT_ACCESS_STATE = { chatglmUrl: DEFAULT_CHATGLM_URL, chatglmApiKey: "", + // siliconflow + siliconflowUrl: DEFAULT_SILICONFLOW_URL, + siliconflowApiKey: "", + // server config needCode: true, hideUserApiKey: false, @@ -206,6 +215,10 @@ export const useAccessStore = createPersistStore( return ensure(get(), ["chatglmApiKey"]); }, + isValidSiliconFlow() { + return ensure(get(), ["siliconflowApiKey"]); + }, + isAuthorized() { this.fetch(); @@ -224,6 +237,7 @@ export const useAccessStore = createPersistStore( this.isValidDeepSeek() || this.isValidXAI() || this.isValidChatGLM() || + this.isValidSiliconFlow() || !this.enabledAccessControl() || (this.enabledAccessControl() && ensure(get(), ["accessCode"])) ); From 5225a6e1921d170803ab11aa8ba09957cf0b678b Mon Sep 17 00:00:00 2001 From: Eric-2369 Date: Wed, 5 Feb 2025 12:34:00 +0800 Subject: [PATCH 11/33] feat: add more llm icons --- app/components/emoji.tsx | 65 ++++++++++++++++++---- app/components/ui-lib.tsx | 2 + app/icons/llm-icons/chatglm.svg | 14 +++++ app/icons/llm-icons/claude.svg | 8 +++ app/icons/llm-icons/deepseek.svg | 8 +++ app/icons/llm-icons/default.svg | 27 ++++++++++ app/icons/llm-icons/doubao.svg | 14 +++++ app/icons/llm-icons/gemini.svg | 15 ++++++ app/icons/llm-icons/gemma.svg | 15 ++++++ app/icons/llm-icons/grok.svg | 8 +++ app/icons/llm-icons/hunyuan.svg | 17 ++++++ app/icons/llm-icons/meta.svg | 93 ++++++++++++++++++++++++++++++++ app/icons/llm-icons/mistral.svg | 15 ++++++ app/icons/llm-icons/moonshot.svg | 8 +++ app/icons/llm-icons/openai.svg | 8 +++ app/icons/llm-icons/qwen.svg | 14 +++++ app/icons/llm-icons/wenxin.svg | 18 +++++++ 17 files changed, 339 insertions(+), 10 deletions(-) create mode 100644 app/icons/llm-icons/chatglm.svg create mode 100644 app/icons/llm-icons/claude.svg create mode 100644 app/icons/llm-icons/deepseek.svg create mode 100644 app/icons/llm-icons/default.svg create mode 100644 app/icons/llm-icons/doubao.svg create mode 100644 app/icons/llm-icons/gemini.svg create mode 100644 app/icons/llm-icons/gemma.svg create mode 100644 app/icons/llm-icons/grok.svg create mode 100644 app/icons/llm-icons/hunyuan.svg create mode 100644 app/icons/llm-icons/meta.svg create mode 100644 app/icons/llm-icons/mistral.svg create mode 100644 app/icons/llm-icons/moonshot.svg create mode 100644 app/icons/llm-icons/openai.svg create mode 100644 app/icons/llm-icons/qwen.svg create mode 100644 app/icons/llm-icons/wenxin.svg diff --git a/app/components/emoji.tsx b/app/components/emoji.tsx index 54d1c1c9980..6686d87310d 100644 --- a/app/components/emoji.tsx +++ b/app/components/emoji.tsx @@ -6,8 +6,21 @@ import EmojiPicker, { import { ModelType } from "../store"; -import BotIcon from "../icons/bot.svg"; -import BlackBotIcon from "../icons/black-bot.svg"; +import BotIconDefault from "../icons/llm-icons/default.svg"; +import BotIconOpenAI from "../icons/llm-icons/openai.svg"; +import BotIconGemini from "../icons/llm-icons/gemini.svg"; +import BotIconGemma from "../icons/llm-icons/gemma.svg"; +import BotIconClaude from "../icons/llm-icons/claude.svg"; +import BotIconMeta from "../icons/llm-icons/meta.svg"; +import BotIconMistral from "../icons/llm-icons/mistral.svg"; +import BotIconDeepseek from "../icons/llm-icons/deepseek.svg"; +import BotIconMoonshot from "../icons/llm-icons/moonshot.svg"; +import BotIconQwen from "../icons/llm-icons/qwen.svg"; +import BotIconWenxin from "../icons/llm-icons/wenxin.svg"; +import BotIconGrok from "../icons/llm-icons/grok.svg"; +import BotIconHunyuan from "../icons/llm-icons/hunyuan.svg"; +import BotIconDoubao from "../icons/llm-icons/doubao.svg"; +import BotIconChatglm from "../icons/llm-icons/chatglm.svg"; export function getEmojiUrl(unified: string, style: EmojiStyle) { // Whoever owns this Content Delivery Network (CDN), I am using your CDN to serve emojis @@ -33,17 +46,49 @@ export function AvatarPicker(props: { } export function Avatar(props: { model?: ModelType; avatar?: string }) { + let LlmIcon = BotIconDefault; + if (props.model) { + const modelName = props.model.toLowerCase(); + + if ( + modelName.startsWith("gpt") || + modelName.startsWith("chatgpt") || + modelName.startsWith("o1") || + modelName.startsWith("o3") + ) { + LlmIcon = BotIconOpenAI; + } else if (modelName.startsWith("gemini")) { + LlmIcon = BotIconGemini; + } else if (modelName.startsWith("gemma")) { + LlmIcon = BotIconGemma; + } else if (modelName.startsWith("claude")) { + LlmIcon = BotIconClaude; + } else if (modelName.startsWith("llama")) { + LlmIcon = BotIconMeta; + } else if (modelName.startsWith("mixtral")) { + LlmIcon = BotIconMistral; + } else if (modelName.startsWith("deepseek")) { + LlmIcon = BotIconDeepseek; + } else if (modelName.startsWith("moonshot")) { + LlmIcon = BotIconMoonshot; + } else if (modelName.startsWith("qwen")) { + LlmIcon = BotIconQwen; + } else if (modelName.startsWith("ernie")) { + LlmIcon = BotIconWenxin; + } else if (modelName.startsWith("grok")) { + LlmIcon = BotIconGrok; + } else if (modelName.startsWith("hunyuan")) { + LlmIcon = BotIconHunyuan; + } else if (modelName.startsWith("doubao")) { + LlmIcon = BotIconDoubao; + } else if (modelName.startsWith("glm")) { + LlmIcon = BotIconChatglm; + } + return (
- {props.model?.startsWith("gpt-4") || - props.model?.startsWith("chatgpt-4o") || - props.model?.startsWith("o1") || - props.model?.startsWith("o3") ? ( - - ) : ( - - )} +
); } diff --git a/app/components/ui-lib.tsx b/app/components/ui-lib.tsx index a642652358f..7b9f5ace028 100644 --- a/app/components/ui-lib.tsx +++ b/app/components/ui-lib.tsx @@ -23,6 +23,7 @@ import React, { useRef, } from "react"; import { IconButton } from "./button"; +import { Avatar } from "./emoji"; import clsx from "clsx"; export function Popover(props: { @@ -522,6 +523,7 @@ export function Selector(props: { key={i} title={item.title} subTitle={item.subTitle} + icon={} onClick={(e) => { if (item.disable) { e.stopPropagation(); diff --git a/app/icons/llm-icons/chatglm.svg b/app/icons/llm-icons/chatglm.svg new file mode 100644 index 00000000000..642750f3ece --- /dev/null +++ b/app/icons/llm-icons/chatglm.svg @@ -0,0 +1,14 @@ + + ChatGLM + + + + + + + + + + + \ No newline at end of file diff --git a/app/icons/llm-icons/claude.svg b/app/icons/llm-icons/claude.svg new file mode 100644 index 00000000000..ca8e447bb28 --- /dev/null +++ b/app/icons/llm-icons/claude.svg @@ -0,0 +1,8 @@ + + Claude + + + + + \ No newline at end of file diff --git a/app/icons/llm-icons/deepseek.svg b/app/icons/llm-icons/deepseek.svg new file mode 100644 index 00000000000..30440e3166c --- /dev/null +++ b/app/icons/llm-icons/deepseek.svg @@ -0,0 +1,8 @@ + + DeepSeek + + + + + \ No newline at end of file diff --git a/app/icons/llm-icons/default.svg b/app/icons/llm-icons/default.svg new file mode 100644 index 00000000000..2ebff6b3f71 --- /dev/null +++ b/app/icons/llm-icons/default.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/icons/llm-icons/doubao.svg b/app/icons/llm-icons/doubao.svg new file mode 100644 index 00000000000..79b1b822ad6 --- /dev/null +++ b/app/icons/llm-icons/doubao.svg @@ -0,0 +1,14 @@ + + Doubao + + + + + + + + \ No newline at end of file diff --git a/app/icons/llm-icons/gemini.svg b/app/icons/llm-icons/gemini.svg new file mode 100644 index 00000000000..5876691353e --- /dev/null +++ b/app/icons/llm-icons/gemini.svg @@ -0,0 +1,15 @@ + + Gemini + + + + + + + + + + + + \ No newline at end of file diff --git a/app/icons/llm-icons/gemma.svg b/app/icons/llm-icons/gemma.svg new file mode 100644 index 00000000000..daf1a035c9e --- /dev/null +++ b/app/icons/llm-icons/gemma.svg @@ -0,0 +1,15 @@ + + Gemma + + + + + + + + + + + + \ No newline at end of file diff --git a/app/icons/llm-icons/grok.svg b/app/icons/llm-icons/grok.svg new file mode 100644 index 00000000000..335786777b5 --- /dev/null +++ b/app/icons/llm-icons/grok.svg @@ -0,0 +1,8 @@ + + Grok + + + + + \ No newline at end of file diff --git a/app/icons/llm-icons/hunyuan.svg b/app/icons/llm-icons/hunyuan.svg new file mode 100644 index 00000000000..f67930c9831 --- /dev/null +++ b/app/icons/llm-icons/hunyuan.svg @@ -0,0 +1,17 @@ + + Hunyuan + + + + + + + + + + + \ No newline at end of file diff --git a/app/icons/llm-icons/meta.svg b/app/icons/llm-icons/meta.svg new file mode 100644 index 00000000000..75dc40df79d --- /dev/null +++ b/app/icons/llm-icons/meta.svg @@ -0,0 +1,93 @@ + + Meta + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/icons/llm-icons/mistral.svg b/app/icons/llm-icons/mistral.svg new file mode 100644 index 00000000000..e577faca501 --- /dev/null +++ b/app/icons/llm-icons/mistral.svg @@ -0,0 +1,15 @@ + + Mistral + + + + + + + + + + + + \ No newline at end of file diff --git a/app/icons/llm-icons/moonshot.svg b/app/icons/llm-icons/moonshot.svg new file mode 100644 index 00000000000..8ab682d3735 --- /dev/null +++ b/app/icons/llm-icons/moonshot.svg @@ -0,0 +1,8 @@ + + MoonshotAI + + + + + \ No newline at end of file diff --git a/app/icons/llm-icons/openai.svg b/app/icons/llm-icons/openai.svg new file mode 100644 index 00000000000..ac4567f877c --- /dev/null +++ b/app/icons/llm-icons/openai.svg @@ -0,0 +1,8 @@ + + OpenAI + + + + + \ No newline at end of file diff --git a/app/icons/llm-icons/qwen.svg b/app/icons/llm-icons/qwen.svg new file mode 100644 index 00000000000..857ce218639 --- /dev/null +++ b/app/icons/llm-icons/qwen.svg @@ -0,0 +1,14 @@ + + Qwen + + + + + + + + + + + \ No newline at end of file diff --git a/app/icons/llm-icons/wenxin.svg b/app/icons/llm-icons/wenxin.svg new file mode 100644 index 00000000000..0030b0e01e4 --- /dev/null +++ b/app/icons/llm-icons/wenxin.svg @@ -0,0 +1,18 @@ + + Wenxin + + + + + + + + + + + + + + \ No newline at end of file From e5e5fde924a7598a6c447c079cce7337294b9d81 Mon Sep 17 00:00:00 2001 From: dupl <67990457+dupl@users.noreply.github.com> Date: Fri, 7 Feb 2025 06:50:31 +0800 Subject: [PATCH 12/33] update the lastest Gemini models --- app/constant.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/constant.ts b/app/constant.ts index 32e5a22632a..226cd404680 100644 --- a/app/constant.ts +++ b/app/constant.ts @@ -509,10 +509,14 @@ const googleModels = [ "gemini-exp-1114", "gemini-exp-1121", "gemini-exp-1206", + "gemini-2.0-flash", "gemini-2.0-flash-exp", + "gemini-2.0-flash-lite-preview-02-05", "gemini-2.0-flash-thinking-exp", "gemini-2.0-flash-thinking-exp-1219", "gemini-2.0-flash-thinking-exp-01-21", + "gemini-2.0-pro-exp", + "gemini-2.0-pro-exp-02-05", ]; const anthropicModels = [ From 51384ddc5feff6ca31028c77cf6b17b751a0ab24 Mon Sep 17 00:00:00 2001 From: ZhangYichi Date: Fri, 7 Feb 2025 11:13:22 +0800 Subject: [PATCH 13/33] Fix: Set consistent fill color for OpenAI/MoonShot/Grok SVG to prevent color inversion in dark mode --- app/icons/llm-icons/grok.svg | 2 +- app/icons/llm-icons/moonshot.svg | 2 +- app/icons/llm-icons/openai.svg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/icons/llm-icons/grok.svg b/app/icons/llm-icons/grok.svg index 335786777b5..8125cd610a7 100644 --- a/app/icons/llm-icons/grok.svg +++ b/app/icons/llm-icons/grok.svg @@ -1,4 +1,4 @@ - Grok diff --git a/app/icons/llm-icons/moonshot.svg b/app/icons/llm-icons/moonshot.svg index 8ab682d3735..5206e0f12a5 100644 --- a/app/icons/llm-icons/moonshot.svg +++ b/app/icons/llm-icons/moonshot.svg @@ -1,4 +1,4 @@ - MoonshotAI diff --git a/app/icons/llm-icons/openai.svg b/app/icons/llm-icons/openai.svg index ac4567f877c..564cd5e87b7 100644 --- a/app/icons/llm-icons/openai.svg +++ b/app/icons/llm-icons/openai.svg @@ -1,4 +1,4 @@ - OpenAI From 1010db834ce52f6a832bf50d3645527f3b42697e Mon Sep 17 00:00:00 2001 From: xiexin12138 Date: Fri, 7 Feb 2025 15:41:40 +0800 Subject: [PATCH 14/33] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=E7=A1=85?= =?UTF-8?q?=E5=9F=BA=E6=B5=81=E5=8A=A8=E7=9A=84=20env=20=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.env.template b/.env.template index 907ec9dfe8d..4efaa2ff8c6 100644 --- a/.env.template +++ b/.env.template @@ -73,6 +73,11 @@ ANTHROPIC_API_VERSION= ### anthropic claude Api url (optional) ANTHROPIC_URL= - ### (optional) WHITE_WEBDAV_ENDPOINTS= + +### siliconflow Api key (optional) +SILICONFLOW_API_KEY= + +### siliconflow Api url (optional) +SILICONFLOW_URL= From a780b39c17a271eb44421ac2f027fcf91c3b77cf Mon Sep 17 00:00:00 2001 From: xiexin12138 Date: Fri, 7 Feb 2025 15:43:50 +0800 Subject: [PATCH 15/33] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=E7=A1=85?= =?UTF-8?q?=E5=9F=BA=E6=B5=81=E5=8A=A8=E5=AF=B9=20DeepSeek=20=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=9A=84=E4=BB=98=E8=B4=B9=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/constant.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/constant.ts b/app/constant.ts index 32e5a22632a..dd478c5e71e 100644 --- a/app/constant.ts +++ b/app/constant.ts @@ -620,6 +620,8 @@ const siliconflowModels = [ "deepseek-ai/DeepSeek-V3", "meta-llama/Llama-3.3-70B-Instruct", "THUDM/glm-4-9b-chat", + "Pro/deepseek-ai/DeepSeek-R1", + "Pro/deepseek-ai/DeepSeek-V3", ]; let seq = 1000; // 内置的模型序号生成器从1000开始 From f30c6a4348fb25fead1d1ba4f4ff6717a45496fb Mon Sep 17 00:00:00 2001 From: suruiqiang Date: Fri, 7 Feb 2025 16:14:19 +0800 Subject: [PATCH 16/33] fix doubao and grok not upload image --- app/client/platforms/bytedance.ts | 11 ++++++----- app/client/platforms/xai.ts | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/client/platforms/bytedance.ts b/app/client/platforms/bytedance.ts index a2f0660d828..c2f128128fe 100644 --- a/app/client/platforms/bytedance.ts +++ b/app/client/platforms/bytedance.ts @@ -22,7 +22,7 @@ import { } from "@fortaine/fetch-event-source"; import { prettyObject } from "@/app/utils/format"; import { getClientConfig } from "@/app/config/client"; -import { getMessageTextContent } from "@/app/utils"; +import { preProcessImageContent } from "@/app/utils/chat"; import { fetch } from "@/app/utils/stream"; export interface OpenAIListModelResponse { @@ -84,10 +84,11 @@ export class DoubaoApi implements LLMApi { } async chat(options: ChatOptions) { - const messages = options.messages.map((v) => ({ - role: v.role, - content: getMessageTextContent(v), - })); + const messages: ChatOptions["messages"] = []; + for (const v of options.messages) { + const content = await preProcessImageContent(v.content); + messages.push({ role: v.role, content }); + } const modelConfig = { ...useAppConfig.getState().modelConfig, diff --git a/app/client/platforms/xai.ts b/app/client/platforms/xai.ts index 06dbaaa29ff..8c41c2d988f 100644 --- a/app/client/platforms/xai.ts +++ b/app/client/platforms/xai.ts @@ -17,7 +17,7 @@ import { SpeechOptions, } from "../api"; import { getClientConfig } from "@/app/config/client"; -import { getMessageTextContent } from "@/app/utils"; +import { preProcessImageContent } from "@/app/utils/chat"; import { RequestPayload } from "./openai"; import { fetch } from "@/app/utils/stream"; @@ -62,7 +62,7 @@ export class XAIApi implements LLMApi { async chat(options: ChatOptions) { const messages: ChatOptions["messages"] = []; for (const v of options.messages) { - const content = getMessageTextContent(v); + const content = await preProcessImageContent(v.content); messages.push({ role: v.role, content }); } From f156430cc5f9451618b13e6432148d1d0dd35c5c Mon Sep 17 00:00:00 2001 From: suruiqiang Date: Fri, 7 Feb 2025 16:18:15 +0800 Subject: [PATCH 17/33] fix emoji issue for doubao and glm's congview & congvideox --- app/components/emoji.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/components/emoji.tsx b/app/components/emoji.tsx index 6686d87310d..6cefe349757 100644 --- a/app/components/emoji.tsx +++ b/app/components/emoji.tsx @@ -80,9 +80,13 @@ export function Avatar(props: { model?: ModelType; avatar?: string }) { LlmIcon = BotIconGrok; } else if (modelName.startsWith("hunyuan")) { LlmIcon = BotIconHunyuan; - } else if (modelName.startsWith("doubao")) { + } else if (modelName.startsWith("doubao") || modelName.startsWith("ep-")) { LlmIcon = BotIconDoubao; - } else if (modelName.startsWith("glm")) { + } else if ( + modelName.startsWith("glm") || + modelName.startsWith("cogview-") || + modelName.startsWith("cogvideox-") + ) { LlmIcon = BotIconChatglm; } From 3fe55b4f7ff1791cf6e8c5d9da02b69a240e98a8 Mon Sep 17 00:00:00 2001 From: suruiqiang Date: Fri, 7 Feb 2025 16:20:07 +0800 Subject: [PATCH 18/33] fix bug that gemini has multiple candidates part --- app/client/platforms/google.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/client/platforms/google.ts b/app/client/platforms/google.ts index 5ca8e1071a7..22c89b13f33 100644 --- a/app/client/platforms/google.ts +++ b/app/client/platforms/google.ts @@ -69,9 +69,16 @@ export class GeminiProApi implements LLMApi { .join("\n\n"); }; + let content = ""; + if (Array.isArray(res)) { + res.map((item) => { + content += getTextFromParts(item?.candidates?.at(0)?.content?.parts); + }); + } + return ( getTextFromParts(res?.candidates?.at(0)?.content?.parts) || - getTextFromParts(res?.at(0)?.candidates?.at(0)?.content?.parts) || + content || //getTextFromParts(res?.at(0)?.candidates?.at(0)?.content?.parts) || res?.error?.message || "" ); From a5a976824591a7e2c228dbb257616b98fd7a53ed Mon Sep 17 00:00:00 2001 From: suruiqiang Date: Fri, 7 Feb 2025 16:34:14 +0800 Subject: [PATCH 19/33] change request timeout for thinking mode --- app/client/platforms/deepseek.ts | 7 ++++++- app/client/platforms/google.ts | 10 ++++++++-- app/client/platforms/openai.ts | 9 +++++++-- app/constant.ts | 1 + 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/app/client/platforms/deepseek.ts b/app/client/platforms/deepseek.ts index 2bf3b2338ea..c436ae61d01 100644 --- a/app/client/platforms/deepseek.ts +++ b/app/client/platforms/deepseek.ts @@ -5,6 +5,7 @@ import { DEEPSEEK_BASE_URL, DeepSeek, REQUEST_TIMEOUT_MS, + REQUEST_TIMEOUT_MS_FOR_THINKING, } from "@/app/constant"; import { useAccessStore, @@ -117,10 +118,14 @@ export class DeepSeekApi implements LLMApi { // console.log(chatPayload); + const isR1 = + options.config.model.endsWith("-reasoner") || + options.config.model.endsWith("-r1"); + // make a fetch request const requestTimeoutId = setTimeout( () => controller.abort(), - REQUEST_TIMEOUT_MS, + isR1 ? REQUEST_TIMEOUT_MS_FOR_THINKING : REQUEST_TIMEOUT_MS, ); if (shouldStream) { diff --git a/app/client/platforms/google.ts b/app/client/platforms/google.ts index 22c89b13f33..1e593dd4257 100644 --- a/app/client/platforms/google.ts +++ b/app/client/platforms/google.ts @@ -1,4 +1,9 @@ -import { ApiPath, Google, REQUEST_TIMEOUT_MS } from "@/app/constant"; +import { + ApiPath, + Google, + REQUEST_TIMEOUT_MS, + REQUEST_TIMEOUT_MS_FOR_THINKING, +} from "@/app/constant"; import { ChatOptions, getHeaders, @@ -197,10 +202,11 @@ export class GeminiProApi implements LLMApi { headers: getHeaders(), }; + const isThinking = options.config.model.includes("-thinking"); // make a fetch request const requestTimeoutId = setTimeout( () => controller.abort(), - REQUEST_TIMEOUT_MS, + isThinking ? REQUEST_TIMEOUT_MS_FOR_THINKING : REQUEST_TIMEOUT_MS, ); if (shouldStream) { diff --git a/app/client/platforms/openai.ts b/app/client/platforms/openai.ts index 467bb82e0ac..fbe533cadab 100644 --- a/app/client/platforms/openai.ts +++ b/app/client/platforms/openai.ts @@ -8,6 +8,7 @@ import { Azure, REQUEST_TIMEOUT_MS, ServiceProvider, + REQUEST_TIMEOUT_MS_FOR_THINKING, } from "@/app/constant"; import { ChatMessageTool, @@ -195,7 +196,9 @@ export class ChatGPTApi implements LLMApi { let requestPayload: RequestPayload | DalleRequestPayload; const isDalle3 = _isDalle3(options.config.model); - const isO1OrO3 = options.config.model.startsWith("o1") || options.config.model.startsWith("o3"); + const isO1OrO3 = + options.config.model.startsWith("o1") || + options.config.model.startsWith("o3"); if (isDalle3) { const prompt = getMessageTextContent( options.messages.slice(-1)?.pop() as any, @@ -359,7 +362,9 @@ export class ChatGPTApi implements LLMApi { // make a fetch request const requestTimeoutId = setTimeout( () => controller.abort(), - isDalle3 || isO1OrO3 ? REQUEST_TIMEOUT_MS * 4 : REQUEST_TIMEOUT_MS, // dalle3 using b64_json is slow. + isDalle3 || isO1OrO3 + ? REQUEST_TIMEOUT_MS_FOR_THINKING + : REQUEST_TIMEOUT_MS, // dalle3 using b64_json is slow. ); const res = await fetch(chatPath, chatPayload); diff --git a/app/constant.ts b/app/constant.ts index 32e5a22632a..64aa734f4d4 100644 --- a/app/constant.ts +++ b/app/constant.ts @@ -110,6 +110,7 @@ export const UNFINISHED_INPUT = (id: string) => "unfinished-input-" + id; export const STORAGE_KEY = "chatgpt-next-web"; export const REQUEST_TIMEOUT_MS = 60000; +export const REQUEST_TIMEOUT_MS_FOR_THINKING = REQUEST_TIMEOUT_MS * 5; export const EXPORT_MESSAGE_CLASS_NAME = "export-markdown"; From c4e9cb03a92751b37ec0b9615ef5ec056fa20bde Mon Sep 17 00:00:00 2001 From: itsevin <2720269770@qq.com> Date: Fri, 7 Feb 2025 20:29:21 +0800 Subject: [PATCH 20/33] Add Xai model --- app/constant.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/constant.ts b/app/constant.ts index 32e5a22632a..e04152d0f85 100644 --- a/app/constant.ts +++ b/app/constant.ts @@ -585,7 +585,16 @@ const iflytekModels = [ const deepseekModels = ["deepseek-chat", "deepseek-coder", "deepseek-reasoner"]; -const xAIModes = ["grok-beta"]; +const xAIModes = [ + "grok-beta", + "grok-2", + "grok-2-1212", + "grok-2-latest", + "grok-vision-beta", + "grok-2-vision-1212", + "grok-2-vision", + "grok-2-vision-latest", +]; const chatglmModels = [ "glm-4-plus", From 2a3996e0d66e41a99bfd4373c2bd9dec4d78652a Mon Sep 17 00:00:00 2001 From: Shenghang Tsai Date: Sat, 8 Feb 2025 14:38:12 +0800 Subject: [PATCH 21/33] Update siliconflow.ts --- app/client/platforms/siliconflow.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/client/platforms/siliconflow.ts b/app/client/platforms/siliconflow.ts index fe2f9862b27..1bdf587e6c8 100644 --- a/app/client/platforms/siliconflow.ts +++ b/app/client/platforms/siliconflow.ts @@ -121,10 +121,10 @@ export class SiliconflowApi implements LLMApi { // console.log(chatPayload); // make a fetch request - const requestTimeoutId = setTimeout( - () => controller.abort(), - REQUEST_TIMEOUT_MS, - ); + const requestTimeoutId = setTimeout(() => { + console.error("[Request] SiliconFlow API timeout"); + controller.abort(); + }, 10 * REQUEST_TIMEOUT_MS); if (shouldStream) { const [tools, funcs] = usePluginStore From 1ae5fdbf013349a2c32e6083b41500cbf2c4000d Mon Sep 17 00:00:00 2001 From: suruiqiang Date: Sat, 8 Feb 2025 16:15:10 +0800 Subject: [PATCH 22/33] mini optimizations --- app/client/platforms/siliconflow.ts | 4 ++-- app/components/emoji.tsx | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/client/platforms/siliconflow.ts b/app/client/platforms/siliconflow.ts index fe2f9862b27..d6d51fe9395 100644 --- a/app/client/platforms/siliconflow.ts +++ b/app/client/platforms/siliconflow.ts @@ -4,7 +4,7 @@ import { ApiPath, SILICONFLOW_BASE_URL, SiliconFlow, - REQUEST_TIMEOUT_MS, + REQUEST_TIMEOUT_MS_FOR_THINKING, } from "@/app/constant"; import { useAccessStore, @@ -123,7 +123,7 @@ export class SiliconflowApi implements LLMApi { // make a fetch request const requestTimeoutId = setTimeout( () => controller.abort(), - REQUEST_TIMEOUT_MS, + REQUEST_TIMEOUT_MS_FOR_THINKING, ); if (shouldStream) { diff --git a/app/components/emoji.tsx b/app/components/emoji.tsx index 6cefe349757..ecb1c65819e 100644 --- a/app/components/emoji.tsx +++ b/app/components/emoji.tsx @@ -54,6 +54,8 @@ export function Avatar(props: { model?: ModelType; avatar?: string }) { if ( modelName.startsWith("gpt") || modelName.startsWith("chatgpt") || + modelName.startsWith("dall-e") || + modelName.startsWith("dalle") || modelName.startsWith("o1") || modelName.startsWith("o3") ) { From acf75ce68f7152972fe5924b4880b3ae06c0ca65 Mon Sep 17 00:00:00 2001 From: Shenghang Tsai Date: Sat, 8 Feb 2025 16:34:17 +0800 Subject: [PATCH 23/33] Remove unnecessary trimming --- app/client/platforms/siliconflow.ts | 8 ++++---- app/utils/chat.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/client/platforms/siliconflow.ts b/app/client/platforms/siliconflow.ts index fe2f9862b27..90dc135110e 100644 --- a/app/client/platforms/siliconflow.ts +++ b/app/client/platforms/siliconflow.ts @@ -174,8 +174,8 @@ export class SiliconflowApi implements LLMApi { // Skip if both content and reasoning_content are empty or null if ( - (!reasoning || reasoning.trim().length === 0) && - (!content || content.trim().length === 0) + (!reasoning || reasoning.length === 0) && + (!content || content.length === 0) ) { return { isThinking: false, @@ -183,12 +183,12 @@ export class SiliconflowApi implements LLMApi { }; } - if (reasoning && reasoning.trim().length > 0) { + if (reasoning && reasoning.length > 0) { return { isThinking: true, content: reasoning, }; - } else if (content && content.trim().length > 0) { + } else if (content && content.length > 0) { return { isThinking: false, content: content, diff --git a/app/utils/chat.ts b/app/utils/chat.ts index c04d33cbfbf..b77955e6ecf 100644 --- a/app/utils/chat.ts +++ b/app/utils/chat.ts @@ -576,7 +576,7 @@ export function streamWithThink( try { const chunk = parseSSE(text, runTools); // Skip if content is empty - if (!chunk?.content || chunk.content.trim().length === 0) { + if (!chunk?.content || chunk.content.length === 0) { return; } // Check if thinking mode changed From 2842b264e06b08de9cfdcb84982ee6571fa45881 Mon Sep 17 00:00:00 2001 From: RiverRay Date: Sun, 9 Feb 2025 11:05:32 +0800 Subject: [PATCH 24/33] Update LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 047f9431e7d..4864ab00d2c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023-2024 Zhang Yifei +Copyright (c) 2023-2025 NextChat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 9f91c2d05c21c7fea604a88a0974679a07293c81 Mon Sep 17 00:00:00 2001 From: suruiqiang Date: Sun, 9 Feb 2025 16:52:46 +0800 Subject: [PATCH 25/33] fix avatar for export message preview and saved image --- app/components/exporter.tsx | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/app/components/exporter.tsx b/app/components/exporter.tsx index 79ae87be2d2..69a73062ace 100644 --- a/app/components/exporter.tsx +++ b/app/components/exporter.tsx @@ -23,7 +23,6 @@ import CopyIcon from "../icons/copy.svg"; import LoadingIcon from "../icons/three-dots.svg"; import ChatGptIcon from "../icons/chatgpt.png"; import ShareIcon from "../icons/share.svg"; -import BotIcon from "../icons/bot.png"; import DownloadIcon from "../icons/download.svg"; import { useEffect, useMemo, useRef, useState } from "react"; @@ -33,13 +32,13 @@ import dynamic from "next/dynamic"; import NextImage from "next/image"; import { toBlob, toPng } from "html-to-image"; -import { DEFAULT_MASK_AVATAR } from "../store/mask"; import { prettyObject } from "../utils/format"; import { EXPORT_MESSAGE_CLASS_NAME } from "../constant"; import { getClientConfig } from "../config/client"; import { type ClientApi, getClientApi } from "../client/api"; import { getMessageTextContent } from "../utils"; +import { MaskAvatar } from "./mask"; import clsx from "clsx"; const Markdown = dynamic(async () => (await import("./markdown")).Markdown, { @@ -407,22 +406,6 @@ export function PreviewActions(props: { ); } -function ExportAvatar(props: { avatar: string }) { - if (props.avatar === DEFAULT_MASK_AVATAR) { - return ( - bot - ); - } - - return ; -} - export function ImagePreviewer(props: { messages: ChatMessage[]; topic: string; @@ -546,9 +529,12 @@ export function ImagePreviewer(props: { github.com/ChatGPTNextWeb/ChatGPT-Next-Web
- + & - +
@@ -576,9 +562,14 @@ export function ImagePreviewer(props: { key={i} >
- + {m.role === "user" ? ( + + ) : ( + + )}
From 0bfc6480855640032ec3593960b434fc5e1c1de5 Mon Sep 17 00:00:00 2001 From: Shenghang Tsai Date: Sun, 9 Feb 2025 18:47:57 +0800 Subject: [PATCH 26/33] fix model icon on siliconflow --- app/components/emoji.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/components/emoji.tsx b/app/components/emoji.tsx index ecb1c65819e..19fb1400eaa 100644 --- a/app/components/emoji.tsx +++ b/app/components/emoji.tsx @@ -66,11 +66,11 @@ export function Avatar(props: { model?: ModelType; avatar?: string }) { LlmIcon = BotIconGemma; } else if (modelName.startsWith("claude")) { LlmIcon = BotIconClaude; - } else if (modelName.startsWith("llama")) { + } else if (modelName.includes("llama")) { LlmIcon = BotIconMeta; } else if (modelName.startsWith("mixtral")) { LlmIcon = BotIconMistral; - } else if (modelName.startsWith("deepseek")) { + } else if (modelName.includes("deepseek")) { LlmIcon = BotIconDeepseek; } else if (modelName.startsWith("moonshot")) { LlmIcon = BotIconMoonshot; @@ -85,7 +85,7 @@ export function Avatar(props: { model?: ModelType; avatar?: string }) { } else if (modelName.startsWith("doubao") || modelName.startsWith("ep-")) { LlmIcon = BotIconDoubao; } else if ( - modelName.startsWith("glm") || + modelName.includes("glm") || modelName.startsWith("cogview-") || modelName.startsWith("cogvideox-") ) { From 18fa2cc30d96fbb452efd9226db7ca6021cacb3e Mon Sep 17 00:00:00 2001 From: Shenghang Tsai Date: Sun, 9 Feb 2025 18:49:26 +0800 Subject: [PATCH 27/33] fix model icon on siliconflow --- app/components/emoji.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/components/emoji.tsx b/app/components/emoji.tsx index 19fb1400eaa..1bf39ac1d77 100644 --- a/app/components/emoji.tsx +++ b/app/components/emoji.tsx @@ -66,11 +66,11 @@ export function Avatar(props: { model?: ModelType; avatar?: string }) { LlmIcon = BotIconGemma; } else if (modelName.startsWith("claude")) { LlmIcon = BotIconClaude; - } else if (modelName.includes("llama")) { + } else if (modelName.toLowerCase().includes("llama")) { LlmIcon = BotIconMeta; } else if (modelName.startsWith("mixtral")) { LlmIcon = BotIconMistral; - } else if (modelName.includes("deepseek")) { + } else if (modelName.toLowerCase().includes("deepseek")) { LlmIcon = BotIconDeepseek; } else if (modelName.startsWith("moonshot")) { LlmIcon = BotIconMoonshot; @@ -85,7 +85,7 @@ export function Avatar(props: { model?: ModelType; avatar?: string }) { } else if (modelName.startsWith("doubao") || modelName.startsWith("ep-")) { LlmIcon = BotIconDoubao; } else if ( - modelName.includes("glm") || + modelName.toLowerCase().includes("glm") || modelName.startsWith("cogview-") || modelName.startsWith("cogvideox-") ) { From 2137aa65bfaeda33bdbfad7f1ae36bfdde8c9edf Mon Sep 17 00:00:00 2001 From: Shenghang Tsai Date: Mon, 10 Feb 2025 11:03:49 +0800 Subject: [PATCH 28/33] Model listing of SiliconFlow --- app/client/platforms/siliconflow.ts | 44 +++++++++++++++++++++++++++-- app/constant.ts | 1 + 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/app/client/platforms/siliconflow.ts b/app/client/platforms/siliconflow.ts index 1ad316a6143..8cf9ad3b1c2 100644 --- a/app/client/platforms/siliconflow.ts +++ b/app/client/platforms/siliconflow.ts @@ -5,6 +5,7 @@ import { SILICONFLOW_BASE_URL, SiliconFlow, REQUEST_TIMEOUT_MS_FOR_THINKING, + DEFAULT_MODELS, } from "@/app/constant"; import { useAccessStore, @@ -27,10 +28,19 @@ import { getMessageTextContentWithoutThinking, } from "@/app/utils"; import { RequestPayload } from "./openai"; + import { fetch } from "@/app/utils/stream"; +export interface SiliconFlowListModelResponse { + object: string; + data: Array<{ + id: string; + object: string; + root: string; + }>; +} export class SiliconflowApi implements LLMApi { - private disableListModels = true; + private disableListModels = false; path(path: string): string { const accessStore = useAccessStore.getState(); @@ -238,6 +248,36 @@ export class SiliconflowApi implements LLMApi { } async models(): Promise { - return []; + if (this.disableListModels) { + return DEFAULT_MODELS.slice(); + } + + const res = await fetch(this.path(SiliconFlow.ListModelPath), { + method: "GET", + headers: { + ...getHeaders(), + }, + }); + + const resJson = (await res.json()) as SiliconFlowListModelResponse; + const chatModels = resJson.data; + console.log("[Models]", chatModels); + + if (!chatModels) { + return []; + } + + let seq = 1000; //同 Constant.ts 中的排序保持一致 + return chatModels.map((m) => ({ + name: m.id, + available: true, + sorted: seq++, + provider: { + id: "siliconflow", + providerName: "SiliconFlow", + providerType: "siliconflow", + sorted: 14, + }, + })); } } diff --git a/app/constant.ts b/app/constant.ts index 09eec44b68d..5d0640d1cdd 100644 --- a/app/constant.ts +++ b/app/constant.ts @@ -258,6 +258,7 @@ export const ChatGLM = { export const SiliconFlow = { ExampleEndpoint: SILICONFLOW_BASE_URL, ChatPath: "v1/chat/completions", + ListModelPath: "v1/models?&sub_type=chat", }; export const DEFAULT_INPUT_TEMPLATE = `{{input}}`; // input / time / model / lang From 86f86962fb0725b888cee6ebd9eb9f818a0c9cee Mon Sep 17 00:00:00 2001 From: Shenghang Tsai Date: Mon, 10 Feb 2025 13:37:48 +0800 Subject: [PATCH 29/33] Support VLM on SiliconFlow --- app/client/platforms/siliconflow.ts | 8 ++++++-- app/constant.ts | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/client/platforms/siliconflow.ts b/app/client/platforms/siliconflow.ts index 1ad316a6143..17650a9c69b 100644 --- a/app/client/platforms/siliconflow.ts +++ b/app/client/platforms/siliconflow.ts @@ -13,7 +13,7 @@ import { ChatMessageTool, usePluginStore, } from "@/app/store"; -import { streamWithThink } from "@/app/utils/chat"; +import { preProcessImageContent, streamWithThink } from "@/app/utils/chat"; import { ChatOptions, getHeaders, @@ -25,6 +25,7 @@ import { getClientConfig } from "@/app/config/client"; import { getMessageTextContent, getMessageTextContentWithoutThinking, + isVisionModel, } from "@/app/utils"; import { RequestPayload } from "./openai"; import { fetch } from "@/app/utils/stream"; @@ -71,13 +72,16 @@ export class SiliconflowApi implements LLMApi { } async chat(options: ChatOptions) { + const visionModel = isVisionModel(options.config.model); const messages: ChatOptions["messages"] = []; for (const v of options.messages) { if (v.role === "assistant") { const content = getMessageTextContentWithoutThinking(v); messages.push({ role: v.role, content }); } else { - const content = getMessageTextContent(v); + const content = visionModel + ? await preProcessImageContent(v.content) + : getMessageTextContent(v); messages.push({ role: v.role, content }); } } diff --git a/app/constant.ts b/app/constant.ts index 09eec44b68d..d9cb62bf934 100644 --- a/app/constant.ts +++ b/app/constant.ts @@ -462,6 +462,7 @@ export const VISION_MODEL_REGEXES = [ /gpt-4-turbo(?!.*preview)/, // Matches "gpt-4-turbo" but not "gpt-4-turbo-preview" /^dall-e-3$/, // Matches exactly "dall-e-3" /glm-4v/, + /vl/i, ]; export const EXCLUDE_VISION_MODEL_REGEXES = [/claude-3-5-haiku-20241022/]; From 98a11e56d2c55d7d89dfc4c8905045781863bf98 Mon Sep 17 00:00:00 2001 From: suruiqiang Date: Tue, 11 Feb 2025 12:46:46 +0800 Subject: [PATCH 30/33] support alibaba and bytedance's reasoning_content --- app/client/platforms/alibaba.ts | 220 ++++++++++++++---------------- app/client/platforms/bytedance.ts | 205 +++++++++++++--------------- 2 files changed, 200 insertions(+), 225 deletions(-) diff --git a/app/client/platforms/alibaba.ts b/app/client/platforms/alibaba.ts index 6fe69e87ae2..13cb558f9ac 100644 --- a/app/client/platforms/alibaba.ts +++ b/app/client/platforms/alibaba.ts @@ -5,8 +5,14 @@ import { ALIBABA_BASE_URL, REQUEST_TIMEOUT_MS, } from "@/app/constant"; -import { useAccessStore, useAppConfig, useChatStore } from "@/app/store"; - +import { + useAccessStore, + useAppConfig, + useChatStore, + ChatMessageTool, + usePluginStore, +} from "@/app/store"; +import { streamWithThink } from "@/app/utils/chat"; import { ChatOptions, getHeaders, @@ -15,14 +21,11 @@ import { SpeechOptions, MultimodalContent, } from "../api"; -import Locale from "../../locales"; -import { - EventStreamContentType, - fetchEventSource, -} from "@fortaine/fetch-event-source"; -import { prettyObject } from "@/app/utils/format"; import { getClientConfig } from "@/app/config/client"; -import { getMessageTextContent } from "@/app/utils"; +import { + getMessageTextContent, + getMessageTextContentWithoutThinking, +} from "@/app/utils"; import { fetch } from "@/app/utils/stream"; export interface OpenAIListModelResponse { @@ -92,7 +95,10 @@ export class QwenApi implements LLMApi { async chat(options: ChatOptions) { const messages = options.messages.map((v) => ({ role: v.role, - content: getMessageTextContent(v), + content: + v.role === "assistant" + ? getMessageTextContentWithoutThinking(v) + : getMessageTextContent(v), })); const modelConfig = { @@ -122,15 +128,17 @@ export class QwenApi implements LLMApi { options.onController?.(controller); try { + const headers = { + ...getHeaders(), + "X-DashScope-SSE": shouldStream ? "enable" : "disable", + }; + const chatPath = this.path(Alibaba.ChatPath); const chatPayload = { method: "POST", body: JSON.stringify(requestPayload), signal: controller.signal, - headers: { - ...getHeaders(), - "X-DashScope-SSE": shouldStream ? "enable" : "disable", - }, + headers: headers, }; // make a fetch request @@ -140,116 +148,96 @@ export class QwenApi implements LLMApi { ); if (shouldStream) { - let responseText = ""; - let remainText = ""; - let finished = false; - let responseRes: Response; - - // animate response to make it looks smooth - function animateResponseText() { - if (finished || controller.signal.aborted) { - responseText += remainText; - console.log("[Response Animation] finished"); - if (responseText?.length === 0) { - options.onError?.(new Error("empty response from server")); - } - return; - } - - if (remainText.length > 0) { - const fetchCount = Math.max(1, Math.round(remainText.length / 60)); - const fetchText = remainText.slice(0, fetchCount); - responseText += fetchText; - remainText = remainText.slice(fetchCount); - options.onUpdate?.(responseText, fetchText); - } - - requestAnimationFrame(animateResponseText); - } - - // start animaion - animateResponseText(); - - const finish = () => { - if (!finished) { - finished = true; - options.onFinish(responseText + remainText, responseRes); - } - }; - - controller.signal.onabort = finish; - - fetchEventSource(chatPath, { - fetch: fetch as any, - ...chatPayload, - async onopen(res) { - clearTimeout(requestTimeoutId); - const contentType = res.headers.get("content-type"); - console.log( - "[Alibaba] request response content type: ", - contentType, - ); - responseRes = res; - - if (contentType?.startsWith("text/plain")) { - responseText = await res.clone().text(); - return finish(); + const [tools, funcs] = usePluginStore + .getState() + .getAsTools( + useChatStore.getState().currentSession().mask?.plugin || [], + ); + return streamWithThink( + chatPath, + requestPayload, + headers, + tools as any, + funcs, + controller, + // parseSSE + (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; + tool_calls: ChatMessageTool[]; + reasoning_content: string | null; + }; + }>; + 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 ( - !res.ok || - !res.headers - .get("content-type") - ?.startsWith(EventStreamContentType) || - res.status !== 200 + (!reasoning || reasoning.trim().length === 0) && + (!content || content.trim().length === 0) ) { - const responseTexts = [responseText]; - let extraInfo = await res.clone().text(); - try { - const resJson = await res.clone().json(); - extraInfo = prettyObject(resJson); - } catch {} - - if (res.status === 401) { - responseTexts.push(Locale.Error.Unauthorized); - } - - if (extraInfo) { - responseTexts.push(extraInfo); - } - - responseText = responseTexts.join("\n\n"); - - return finish(); + return { + isThinking: false, + content: "", + }; } - }, - onmessage(msg) { - if (msg.data === "[DONE]" || finished) { - return finish(); - } - const text = msg.data; - try { - const json = JSON.parse(text); - const choices = json.output.choices as Array<{ - message: { content: string }; - }>; - const delta = choices[0]?.message?.content; - if (delta) { - remainText += delta; - } - } catch (e) { - console.error("[Request] parse error", text, msg); + + if (reasoning && reasoning.trim().length > 0) { + return { + isThinking: true, + content: reasoning, + }; + } else if (content && content.trim().length > 0) { + return { + isThinking: false, + content: content, + }; } + + return { + isThinking: false, + content: "", + }; }, - onclose() { - finish(); - }, - onerror(e) { - options.onError?.(e); - throw e; + // processToolMessage, include tool_calls message and tool call results + ( + requestPayload: RequestPayload, + toolCallMessage: any, + toolCallResult: any[], + ) => { + // @ts-ignore + requestPayload?.messages?.splice( + // @ts-ignore + requestPayload?.messages?.length, + 0, + toolCallMessage, + ...toolCallResult, + ); }, - openWhenHidden: true, - }); + options, + ); } else { const res = await fetch(chatPath, chatPayload); clearTimeout(requestTimeoutId); diff --git a/app/client/platforms/bytedance.ts b/app/client/platforms/bytedance.ts index c2f128128fe..5d7ddebeb88 100644 --- a/app/client/platforms/bytedance.ts +++ b/app/client/platforms/bytedance.ts @@ -5,7 +5,13 @@ import { BYTEDANCE_BASE_URL, REQUEST_TIMEOUT_MS, } from "@/app/constant"; -import { useAccessStore, useAppConfig, useChatStore } from "@/app/store"; +import { + useAccessStore, + useAppConfig, + useChatStore, + ChatMessageTool, + usePluginStore, +} from "@/app/store"; import { ChatOptions, @@ -15,14 +21,11 @@ import { MultimodalContent, SpeechOptions, } from "../api"; -import Locale from "../../locales"; -import { - EventStreamContentType, - fetchEventSource, -} from "@fortaine/fetch-event-source"; -import { prettyObject } from "@/app/utils/format"; + +import { streamWithThink } from "@/app/utils/chat"; import { getClientConfig } from "@/app/config/client"; import { preProcessImageContent } from "@/app/utils/chat"; +import { getMessageTextContentWithoutThinking } from "@/app/utils"; import { fetch } from "@/app/utils/stream"; export interface OpenAIListModelResponse { @@ -86,7 +89,10 @@ export class DoubaoApi implements LLMApi { async chat(options: ChatOptions) { const messages: ChatOptions["messages"] = []; for (const v of options.messages) { - const content = await preProcessImageContent(v.content); + const content = + v.role === "assistant" + ? getMessageTextContentWithoutThinking(v) + : await preProcessImageContent(v.content); messages.push({ role: v.role, content }); } @@ -128,115 +134,96 @@ export class DoubaoApi implements LLMApi { ); if (shouldStream) { - let responseText = ""; - let remainText = ""; - let finished = false; - let responseRes: Response; - - // animate response to make it looks smooth - function animateResponseText() { - if (finished || controller.signal.aborted) { - responseText += remainText; - console.log("[Response Animation] finished"); - if (responseText?.length === 0) { - options.onError?.(new Error("empty response from server")); - } - return; - } - - if (remainText.length > 0) { - const fetchCount = Math.max(1, Math.round(remainText.length / 60)); - const fetchText = remainText.slice(0, fetchCount); - responseText += fetchText; - remainText = remainText.slice(fetchCount); - options.onUpdate?.(responseText, fetchText); - } - - requestAnimationFrame(animateResponseText); - } - - // start animaion - animateResponseText(); - - const finish = () => { - if (!finished) { - finished = true; - options.onFinish(responseText + remainText, responseRes); - } - }; - - controller.signal.onabort = finish; - - fetchEventSource(chatPath, { - fetch: fetch as any, - ...chatPayload, - async onopen(res) { - clearTimeout(requestTimeoutId); - const contentType = res.headers.get("content-type"); - console.log( - "[ByteDance] request response content type: ", - contentType, - ); - responseRes = res; - if (contentType?.startsWith("text/plain")) { - responseText = await res.clone().text(); - return finish(); + const [tools, funcs] = usePluginStore + .getState() + .getAsTools( + useChatStore.getState().currentSession().mask?.plugin || [], + ); + return streamWithThink( + chatPath, + requestPayload, + getHeaders(), + tools as any, + funcs, + controller, + // parseSSE + (text: string, runTools: ChatMessageTool[]) => { + // console.log("parseSSE", text, runTools); + 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 ( - !res.ok || - !res.headers - .get("content-type") - ?.startsWith(EventStreamContentType) || - res.status !== 200 + (!reasoning || reasoning.trim().length === 0) && + (!content || content.trim().length === 0) ) { - const responseTexts = [responseText]; - let extraInfo = await res.clone().text(); - try { - const resJson = await res.clone().json(); - extraInfo = prettyObject(resJson); - } catch {} - - if (res.status === 401) { - responseTexts.push(Locale.Error.Unauthorized); - } - - if (extraInfo) { - responseTexts.push(extraInfo); - } - - responseText = responseTexts.join("\n\n"); - - return finish(); + return { + isThinking: false, + content: "", + }; } - }, - onmessage(msg) { - if (msg.data === "[DONE]" || finished) { - return finish(); - } - const text = msg.data; - try { - const json = JSON.parse(text); - const choices = json.choices as Array<{ - delta: { content: string }; - }>; - const delta = choices[0]?.delta?.content; - if (delta) { - remainText += delta; - } - } catch (e) { - console.error("[Request] parse error", text, msg); + + if (reasoning && reasoning.trim().length > 0) { + return { + isThinking: true, + content: reasoning, + }; + } else if (content && content.trim().length > 0) { + return { + isThinking: false, + content: content, + }; } + + return { + isThinking: false, + content: "", + }; }, - onclose() { - finish(); - }, - onerror(e) { - options.onError?.(e); - throw e; + // processToolMessage, include tool_calls message and tool call results + ( + requestPayload: RequestPayload, + toolCallMessage: any, + toolCallResult: any[], + ) => { + // @ts-ignore + requestPayload?.messages?.splice( + // @ts-ignore + requestPayload?.messages?.length, + 0, + toolCallMessage, + ...toolCallResult, + ); }, - openWhenHidden: true, - }); + options, + ); } else { const res = await fetch(chatPath, chatPayload); clearTimeout(requestTimeoutId); From b0758cccde8709af7fa31aed8c019029c97be82b Mon Sep 17 00:00:00 2001 From: suruiqiang Date: Tue, 11 Feb 2025 16:08:30 +0800 Subject: [PATCH 31/33] optimization --- app/client/platforms/alibaba.ts | 10 ++++++---- app/client/platforms/bytedance.ts | 11 ++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/client/platforms/alibaba.ts b/app/client/platforms/alibaba.ts index 13cb558f9ac..44dbd847aa6 100644 --- a/app/client/platforms/alibaba.ts +++ b/app/client/platforms/alibaba.ts @@ -171,6 +171,9 @@ export class QwenApi implements LLMApi { 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; @@ -190,6 +193,7 @@ export class QwenApi implements LLMApi { runTools[index]["function"]["arguments"] += args; } } + const reasoning = choices[0]?.message?.reasoning_content; const content = choices[0]?.message?.content; @@ -227,10 +231,8 @@ export class QwenApi implements LLMApi { toolCallMessage: any, toolCallResult: any[], ) => { - // @ts-ignore - requestPayload?.messages?.splice( - // @ts-ignore - requestPayload?.messages?.length, + requestPayload?.input?.messages?.splice( + requestPayload?.input?.messages?.length, 0, toolCallMessage, ...toolCallResult, diff --git a/app/client/platforms/bytedance.ts b/app/client/platforms/bytedance.ts index 5d7ddebeb88..5e2e63f589d 100644 --- a/app/client/platforms/bytedance.ts +++ b/app/client/platforms/bytedance.ts @@ -37,7 +37,7 @@ export interface OpenAIListModelResponse { }>; } -interface RequestPayload { +interface RequestPayloadForByteDance { messages: { role: "system" | "user" | "assistant"; content: string | MultimodalContent[]; @@ -105,7 +105,7 @@ export class DoubaoApi implements LLMApi { }; const shouldStream = !!options.config.stream; - const requestPayload: RequestPayload = { + const requestPayload: RequestPayloadForByteDance = { messages, stream: shouldStream, model: modelConfig.model, @@ -157,6 +157,9 @@ export class DoubaoApi implements LLMApi { reasoning_content: string | null; }; }>; + + if (!choices?.length) return { isThinking: false, content: "" }; + const tool_calls = choices[0]?.delta?.tool_calls; if (tool_calls?.length > 0) { const index = tool_calls[0]?.index; @@ -209,13 +212,11 @@ export class DoubaoApi implements LLMApi { }, // processToolMessage, include tool_calls message and tool call results ( - requestPayload: RequestPayload, + requestPayload: RequestPayloadForByteDance, toolCallMessage: any, toolCallResult: any[], ) => { - // @ts-ignore requestPayload?.messages?.splice( - // @ts-ignore requestPayload?.messages?.length, 0, toolCallMessage, From 97142583224faa28e7cdd43eba75b77828f280af Mon Sep 17 00:00:00 2001 From: suruiqiang Date: Tue, 11 Feb 2025 18:57:16 +0800 Subject: [PATCH 32/33] support deepseek-r1@OpenAI's reasoning_content, parse from stream --- app/client/platforms/openai.ts | 40 +++++++++++++++++++++++++++++++--- app/utils/chat.ts | 18 +++++++++++++++ 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/app/client/platforms/openai.ts b/app/client/platforms/openai.ts index fbe533cadab..9d43c816101 100644 --- a/app/client/platforms/openai.ts +++ b/app/client/platforms/openai.ts @@ -22,7 +22,7 @@ import { preProcessImageContent, uploadImage, base64Image2Blob, - stream, + streamWithThink, } from "@/app/utils/chat"; import { cloudflareAIGatewayUrl } from "@/app/utils/cloudflare"; import { ModelSize, DalleQuality, DalleStyle } from "@/app/typing"; @@ -294,7 +294,7 @@ export class ChatGPTApi implements LLMApi { useChatStore.getState().currentSession().mask?.plugin || [], ); // console.log("getAsTools", tools, funcs); - stream( + streamWithThink( chatPath, requestPayload, getHeaders(), @@ -309,8 +309,12 @@ export class ChatGPTApi implements LLMApi { delta: { content: string; tool_calls: ChatMessageTool[]; + reasoning_content: string | null; }; }>; + + if (!choices?.length) return { isThinking: false, content: "" }; + const tool_calls = choices[0]?.delta?.tool_calls; if (tool_calls?.length > 0) { const id = tool_calls[0]?.id; @@ -330,7 +334,37 @@ export class ChatGPTApi implements LLMApi { runTools[index]["function"]["arguments"] += args; } } - return choices[0]?.delta?.content; + + 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.trim().length === 0) && + (!content || content.trim().length === 0) + ) { + return { + isThinking: false, + content: "", + }; + } + + if (reasoning && reasoning.trim().length > 0) { + return { + isThinking: true, + content: reasoning, + }; + } else if (content && content.trim().length > 0) { + return { + isThinking: false, + content: content, + }; + } + + return { + isThinking: false, + content: "", + }; }, // processToolMessage, include tool_calls message and tool call results ( diff --git a/app/utils/chat.ts b/app/utils/chat.ts index b77955e6ecf..efc496f2c32 100644 --- a/app/utils/chat.ts +++ b/app/utils/chat.ts @@ -400,6 +400,7 @@ export function streamWithThink( let responseRes: Response; let isInThinkingMode = false; let lastIsThinking = false; + let lastIsThinkingTagged = false; //between and tags // animate response to make it looks smooth function animateResponseText() { @@ -579,6 +580,23 @@ export function streamWithThink( if (!chunk?.content || chunk.content.length === 0) { return; } + + // deal with and tags start + if (!chunk.isThinking) { + if (chunk.content.startsWith("")) { + chunk.isThinking = true; + chunk.content = chunk.content.slice(7).trim(); + lastIsThinkingTagged = true; + } else if (chunk.content.endsWith("")) { + chunk.isThinking = false; + chunk.content = chunk.content.slice(0, -8).trim(); + lastIsThinkingTagged = false; + } else if (lastIsThinkingTagged) { + chunk.isThinking = true; + } + } + // deal with and tags start + // Check if thinking mode changed const isThinkingChanged = lastIsThinking !== chunk.isThinking; lastIsThinking = chunk.isThinking; From 476d946f961a551ffedc7734dcce28faa7dc30fe Mon Sep 17 00:00:00 2001 From: suruiqiang Date: Wed, 12 Feb 2025 17:49:54 +0800 Subject: [PATCH 33/33] fix bug (trim eats space or \n mistakenly), optimize timeout by model --- app/client/platforms/alibaba.ts | 18 +++++++----------- app/client/platforms/baidu.ts | 11 +++-------- app/client/platforms/bytedance.ts | 22 ++++++++++------------ app/client/platforms/deepseek.ts | 25 +++++++------------------ app/client/platforms/glm.ts | 15 +++++++-------- app/client/platforms/google.ts | 10 +++------- app/client/platforms/openai.ts | 14 ++++++-------- app/client/platforms/siliconflow.ts | 10 +++------- app/client/platforms/tencent.ts | 10 +++++++--- app/client/platforms/xai.ts | 5 +++-- app/utils.ts | 20 +++++++++++++++++++- 11 files changed, 75 insertions(+), 85 deletions(-) diff --git a/app/client/platforms/alibaba.ts b/app/client/platforms/alibaba.ts index 44dbd847aa6..88511768cd3 100644 --- a/app/client/platforms/alibaba.ts +++ b/app/client/platforms/alibaba.ts @@ -1,10 +1,5 @@ "use client"; -import { - ApiPath, - Alibaba, - ALIBABA_BASE_URL, - REQUEST_TIMEOUT_MS, -} from "@/app/constant"; +import { ApiPath, Alibaba, ALIBABA_BASE_URL } from "@/app/constant"; import { useAccessStore, useAppConfig, @@ -25,6 +20,7 @@ import { getClientConfig } from "@/app/config/client"; import { getMessageTextContent, getMessageTextContentWithoutThinking, + getTimeoutMSByModel, } from "@/app/utils"; import { fetch } from "@/app/utils/stream"; @@ -144,7 +140,7 @@ export class QwenApi implements LLMApi { // make a fetch request const requestTimeoutId = setTimeout( () => controller.abort(), - REQUEST_TIMEOUT_MS, + getTimeoutMSByModel(options.config.model), ); if (shouldStream) { @@ -199,8 +195,8 @@ export class QwenApi implements LLMApi { // Skip if both content and reasoning_content are empty or null if ( - (!reasoning || reasoning.trim().length === 0) && - (!content || content.trim().length === 0) + (!reasoning || reasoning.length === 0) && + (!content || content.length === 0) ) { return { isThinking: false, @@ -208,12 +204,12 @@ export class QwenApi implements LLMApi { }; } - if (reasoning && reasoning.trim().length > 0) { + if (reasoning && reasoning.length > 0) { return { isThinking: true, content: reasoning, }; - } else if (content && content.trim().length > 0) { + } else if (content && content.length > 0) { return { isThinking: false, content: content, diff --git a/app/client/platforms/baidu.ts b/app/client/platforms/baidu.ts index 9e8c2f139b6..dc990db4103 100644 --- a/app/client/platforms/baidu.ts +++ b/app/client/platforms/baidu.ts @@ -1,10 +1,5 @@ "use client"; -import { - ApiPath, - Baidu, - BAIDU_BASE_URL, - REQUEST_TIMEOUT_MS, -} from "@/app/constant"; +import { ApiPath, Baidu, BAIDU_BASE_URL } from "@/app/constant"; import { useAccessStore, useAppConfig, useChatStore } from "@/app/store"; import { getAccessToken } from "@/app/utils/baidu"; @@ -23,7 +18,7 @@ import { } from "@fortaine/fetch-event-source"; import { prettyObject } from "@/app/utils/format"; import { getClientConfig } from "@/app/config/client"; -import { getMessageTextContent } from "@/app/utils"; +import { getMessageTextContent, getTimeoutMSByModel } from "@/app/utils"; import { fetch } from "@/app/utils/stream"; export interface OpenAIListModelResponse { @@ -155,7 +150,7 @@ export class ErnieApi implements LLMApi { // make a fetch request const requestTimeoutId = setTimeout( () => controller.abort(), - REQUEST_TIMEOUT_MS, + getTimeoutMSByModel(options.config.model), ); if (shouldStream) { diff --git a/app/client/platforms/bytedance.ts b/app/client/platforms/bytedance.ts index 5e2e63f589d..f9524cba28d 100644 --- a/app/client/platforms/bytedance.ts +++ b/app/client/platforms/bytedance.ts @@ -1,10 +1,5 @@ "use client"; -import { - ApiPath, - ByteDance, - BYTEDANCE_BASE_URL, - REQUEST_TIMEOUT_MS, -} from "@/app/constant"; +import { ApiPath, ByteDance, BYTEDANCE_BASE_URL } from "@/app/constant"; import { useAccessStore, useAppConfig, @@ -25,7 +20,10 @@ import { import { streamWithThink } from "@/app/utils/chat"; import { getClientConfig } from "@/app/config/client"; import { preProcessImageContent } from "@/app/utils/chat"; -import { getMessageTextContentWithoutThinking } from "@/app/utils"; +import { + getMessageTextContentWithoutThinking, + getTimeoutMSByModel, +} from "@/app/utils"; import { fetch } from "@/app/utils/stream"; export interface OpenAIListModelResponse { @@ -130,7 +128,7 @@ export class DoubaoApi implements LLMApi { // make a fetch request const requestTimeoutId = setTimeout( () => controller.abort(), - REQUEST_TIMEOUT_MS, + getTimeoutMSByModel(options.config.model), ); if (shouldStream) { @@ -184,8 +182,8 @@ export class DoubaoApi implements LLMApi { // Skip if both content and reasoning_content are empty or null if ( - (!reasoning || reasoning.trim().length === 0) && - (!content || content.trim().length === 0) + (!reasoning || reasoning.length === 0) && + (!content || content.length === 0) ) { return { isThinking: false, @@ -193,12 +191,12 @@ export class DoubaoApi implements LLMApi { }; } - if (reasoning && reasoning.trim().length > 0) { + if (reasoning && reasoning.length > 0) { return { isThinking: true, content: reasoning, }; - } else if (content && content.trim().length > 0) { + } else if (content && content.length > 0) { return { isThinking: false, content: content, diff --git a/app/client/platforms/deepseek.ts b/app/client/platforms/deepseek.ts index c436ae61d01..b21d24cefc4 100644 --- a/app/client/platforms/deepseek.ts +++ b/app/client/platforms/deepseek.ts @@ -1,12 +1,6 @@ "use client"; // azure and openai, using same models. so using same LLMApi. -import { - ApiPath, - DEEPSEEK_BASE_URL, - DeepSeek, - REQUEST_TIMEOUT_MS, - REQUEST_TIMEOUT_MS_FOR_THINKING, -} from "@/app/constant"; +import { ApiPath, DEEPSEEK_BASE_URL, DeepSeek } from "@/app/constant"; import { useAccessStore, useAppConfig, @@ -26,6 +20,7 @@ import { getClientConfig } from "@/app/config/client"; import { getMessageTextContent, getMessageTextContentWithoutThinking, + getTimeoutMSByModel, } from "@/app/utils"; import { RequestPayload } from "./openai"; import { fetch } from "@/app/utils/stream"; @@ -116,16 +111,10 @@ export class DeepSeekApi implements LLMApi { headers: getHeaders(), }; - // console.log(chatPayload); - - const isR1 = - options.config.model.endsWith("-reasoner") || - options.config.model.endsWith("-r1"); - // make a fetch request const requestTimeoutId = setTimeout( () => controller.abort(), - isR1 ? REQUEST_TIMEOUT_MS_FOR_THINKING : REQUEST_TIMEOUT_MS, + getTimeoutMSByModel(options.config.model), ); if (shouldStream) { @@ -176,8 +165,8 @@ export class DeepSeekApi implements LLMApi { // Skip if both content and reasoning_content are empty or null if ( - (!reasoning || reasoning.trim().length === 0) && - (!content || content.trim().length === 0) + (!reasoning || reasoning.length === 0) && + (!content || content.length === 0) ) { return { isThinking: false, @@ -185,12 +174,12 @@ export class DeepSeekApi implements LLMApi { }; } - if (reasoning && reasoning.trim().length > 0) { + if (reasoning && reasoning.length > 0) { return { isThinking: true, content: reasoning, }; - } else if (content && content.trim().length > 0) { + } else if (content && content.length > 0) { return { isThinking: false, content: content, diff --git a/app/client/platforms/glm.ts b/app/client/platforms/glm.ts index a8d1869e30e..98b10277de9 100644 --- a/app/client/platforms/glm.ts +++ b/app/client/platforms/glm.ts @@ -1,10 +1,5 @@ "use client"; -import { - ApiPath, - CHATGLM_BASE_URL, - ChatGLM, - REQUEST_TIMEOUT_MS, -} from "@/app/constant"; +import { ApiPath, CHATGLM_BASE_URL, ChatGLM } from "@/app/constant"; import { useAccessStore, useAppConfig, @@ -21,7 +16,11 @@ import { SpeechOptions, } from "../api"; import { getClientConfig } from "@/app/config/client"; -import { getMessageTextContent, isVisionModel } from "@/app/utils"; +import { + getMessageTextContent, + isVisionModel, + getTimeoutMSByModel, +} from "@/app/utils"; import { RequestPayload } from "./openai"; import { fetch } from "@/app/utils/stream"; import { preProcessImageContent } from "@/app/utils/chat"; @@ -191,7 +190,7 @@ export class ChatGLMApi implements LLMApi { const requestTimeoutId = setTimeout( () => controller.abort(), - REQUEST_TIMEOUT_MS, + getTimeoutMSByModel(options.config.model), ); if (modelType === "image" || modelType === "video") { diff --git a/app/client/platforms/google.ts b/app/client/platforms/google.ts index 1e593dd4257..654f0e3e4c7 100644 --- a/app/client/platforms/google.ts +++ b/app/client/platforms/google.ts @@ -1,9 +1,4 @@ -import { - ApiPath, - Google, - REQUEST_TIMEOUT_MS, - REQUEST_TIMEOUT_MS_FOR_THINKING, -} from "@/app/constant"; +import { ApiPath, Google } from "@/app/constant"; import { ChatOptions, getHeaders, @@ -27,6 +22,7 @@ import { getMessageTextContent, getMessageImages, isVisionModel, + getTimeoutMSByModel, } from "@/app/utils"; import { preProcessImageContent } from "@/app/utils/chat"; import { nanoid } from "nanoid"; @@ -206,7 +202,7 @@ export class GeminiProApi implements LLMApi { // make a fetch request const requestTimeoutId = setTimeout( () => controller.abort(), - isThinking ? REQUEST_TIMEOUT_MS_FOR_THINKING : REQUEST_TIMEOUT_MS, + getTimeoutMSByModel(options.config.model), ); if (shouldStream) { diff --git a/app/client/platforms/openai.ts b/app/client/platforms/openai.ts index 9d43c816101..c6f3fc4253f 100644 --- a/app/client/platforms/openai.ts +++ b/app/client/platforms/openai.ts @@ -8,7 +8,6 @@ import { Azure, REQUEST_TIMEOUT_MS, ServiceProvider, - REQUEST_TIMEOUT_MS_FOR_THINKING, } from "@/app/constant"; import { ChatMessageTool, @@ -42,6 +41,7 @@ import { getMessageTextContent, isVisionModel, isDalle3 as _isDalle3, + getTimeoutMSByModel, } from "@/app/utils"; import { fetch } from "@/app/utils/stream"; @@ -340,8 +340,8 @@ export class ChatGPTApi implements LLMApi { // Skip if both content and reasoning_content are empty or null if ( - (!reasoning || reasoning.trim().length === 0) && - (!content || content.trim().length === 0) + (!reasoning || reasoning.length === 0) && + (!content || content.length === 0) ) { return { isThinking: false, @@ -349,12 +349,12 @@ export class ChatGPTApi implements LLMApi { }; } - if (reasoning && reasoning.trim().length > 0) { + if (reasoning && reasoning.length > 0) { return { isThinking: true, content: reasoning, }; - } else if (content && content.trim().length > 0) { + } else if (content && content.length > 0) { return { isThinking: false, content: content, @@ -396,9 +396,7 @@ export class ChatGPTApi implements LLMApi { // make a fetch request const requestTimeoutId = setTimeout( () => controller.abort(), - isDalle3 || isO1OrO3 - ? REQUEST_TIMEOUT_MS_FOR_THINKING - : REQUEST_TIMEOUT_MS, // dalle3 using b64_json is slow. + getTimeoutMSByModel(options.config.model), ); const res = await fetch(chatPath, chatPayload); diff --git a/app/client/platforms/siliconflow.ts b/app/client/platforms/siliconflow.ts index 1ad316a6143..92c0261c429 100644 --- a/app/client/platforms/siliconflow.ts +++ b/app/client/platforms/siliconflow.ts @@ -1,11 +1,6 @@ "use client"; // azure and openai, using same models. so using same LLMApi. -import { - ApiPath, - SILICONFLOW_BASE_URL, - SiliconFlow, - REQUEST_TIMEOUT_MS_FOR_THINKING, -} from "@/app/constant"; +import { ApiPath, SILICONFLOW_BASE_URL, SiliconFlow } from "@/app/constant"; import { useAccessStore, useAppConfig, @@ -25,6 +20,7 @@ import { getClientConfig } from "@/app/config/client"; import { getMessageTextContent, getMessageTextContentWithoutThinking, + getTimeoutMSByModel, } from "@/app/utils"; import { RequestPayload } from "./openai"; import { fetch } from "@/app/utils/stream"; @@ -123,7 +119,7 @@ export class SiliconflowApi implements LLMApi { // Use extended timeout for thinking models as they typically require more processing time const requestTimeoutId = setTimeout( () => controller.abort(), - REQUEST_TIMEOUT_MS_FOR_THINKING, + getTimeoutMSByModel(options.config.model), ); if (shouldStream) { diff --git a/app/client/platforms/tencent.ts b/app/client/platforms/tencent.ts index 580844a5b31..8adeb1b3ea7 100644 --- a/app/client/platforms/tencent.ts +++ b/app/client/platforms/tencent.ts @@ -1,5 +1,5 @@ "use client"; -import { ApiPath, TENCENT_BASE_URL, REQUEST_TIMEOUT_MS } from "@/app/constant"; +import { ApiPath, TENCENT_BASE_URL } from "@/app/constant"; import { useAccessStore, useAppConfig, useChatStore } from "@/app/store"; import { @@ -17,7 +17,11 @@ import { } from "@fortaine/fetch-event-source"; import { prettyObject } from "@/app/utils/format"; import { getClientConfig } from "@/app/config/client"; -import { getMessageTextContent, isVisionModel } from "@/app/utils"; +import { + getMessageTextContent, + isVisionModel, + getTimeoutMSByModel, +} from "@/app/utils"; import mapKeys from "lodash-es/mapKeys"; import mapValues from "lodash-es/mapValues"; import isArray from "lodash-es/isArray"; @@ -135,7 +139,7 @@ export class HunyuanApi implements LLMApi { // make a fetch request const requestTimeoutId = setTimeout( () => controller.abort(), - REQUEST_TIMEOUT_MS, + getTimeoutMSByModel(options.config.model), ); if (shouldStream) { diff --git a/app/client/platforms/xai.ts b/app/client/platforms/xai.ts index 8c41c2d988f..830ad4778ac 100644 --- a/app/client/platforms/xai.ts +++ b/app/client/platforms/xai.ts @@ -1,6 +1,6 @@ "use client"; // azure and openai, using same models. so using same LLMApi. -import { ApiPath, XAI_BASE_URL, XAI, REQUEST_TIMEOUT_MS } from "@/app/constant"; +import { ApiPath, XAI_BASE_URL, XAI } from "@/app/constant"; import { useAccessStore, useAppConfig, @@ -17,6 +17,7 @@ import { SpeechOptions, } from "../api"; import { getClientConfig } from "@/app/config/client"; +import { getTimeoutMSByModel } from "@/app/utils"; import { preProcessImageContent } from "@/app/utils/chat"; import { RequestPayload } from "./openai"; import { fetch } from "@/app/utils/stream"; @@ -103,7 +104,7 @@ export class XAIApi implements LLMApi { // make a fetch request const requestTimeoutId = setTimeout( () => controller.abort(), - REQUEST_TIMEOUT_MS, + getTimeoutMSByModel(options.config.model), ); if (shouldStream) { diff --git a/app/utils.ts b/app/utils.ts index f2337801976..6183e03b057 100644 --- a/app/utils.ts +++ b/app/utils.ts @@ -2,7 +2,11 @@ import { useEffect, useState } from "react"; import { showToast } from "./components/ui-lib"; import Locale from "./locales"; import { RequestMessage } from "./client/api"; -import { ServiceProvider } from "./constant"; +import { + REQUEST_TIMEOUT_MS, + REQUEST_TIMEOUT_MS_FOR_THINKING, + ServiceProvider, +} from "./constant"; // import { fetch as tauriFetch, ResponseType } from "@tauri-apps/api/http"; import { fetch as tauriStreamFetch } from "./utils/stream"; import { VISION_MODEL_REGEXES, EXCLUDE_VISION_MODEL_REGEXES } from "./constant"; @@ -292,6 +296,20 @@ export function isDalle3(model: string) { return "dall-e-3" === model; } +export function getTimeoutMSByModel(model: string) { + model = model.toLowerCase(); + if ( + model.startsWith("dall-e") || + model.startsWith("dalle") || + model.startsWith("o1") || + model.startsWith("o3") || + model.includes("deepseek-r") || + model.includes("-thinking") + ) + return REQUEST_TIMEOUT_MS_FOR_THINKING; + return REQUEST_TIMEOUT_MS; +} + export function getModelSizes(model: string): ModelSize[] { if (isDalle3(model)) { return ["1024x1024", "1792x1024", "1024x1792"];