Compare commits

..

12 Commits

Author SHA1 Message Date
dependabot[bot]
f9d3c93633 Bump prettier from 3.0.2 to 3.6.2
---
updated-dependencies:
- dependency-name: prettier
  dependency-version: 3.6.2
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-06-30 13:19:33 +00:00
RiverRay
673f907ea4 Update README.md
Some checks failed
Run Tests / test (push) Has been cancelled
2025-06-19 20:18:28 +08:00
RiverRay
fb3af2a08f Merge pull request #6515 from dupl/main
Some checks failed
Run Tests / test (push) Has been cancelled
Removed deprecated Gemini models
2025-06-14 13:35:32 +08:00
dupl
eb193ac0ff Removed deprecated Gemini models 2025-06-12 15:34:03 +08:00
RiverRay
c30ddfbb07 Merge pull request #6425 from yunlingz/o_model_md_response
Some checks failed
Run Tests / test (push) Has been cancelled
Fix: Encourage markdown inclusion in model responses for o1/o3
2025-06-12 11:19:24 +08:00
RiverRay
a2f0149786 Merge pull request #6460 from dreamsafari/main
加入Grok3模型列表
2025-06-12 11:13:31 +08:00
GH Action - Upstream Sync
03d36f96ed Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2025-06-12 01:53:30 +00:00
RiverRay
705dffc664 Merge pull request #6514 from KevinShiCN/patch-1
Some checks failed
Run Tests / test (push) Has been cancelled
Add gemini-2.5-pro-preview-06-05 into constant.ts
2025-06-11 16:14:09 +08:00
KevinShiCN
02f7e6de98 Add gemini-2.5-pro-preview-06-05 into constant.ts 2025-06-08 23:59:49 +08:00
dreamsafari
843dc52efa 加入Grok3模型列表 2025-04-22 13:06:54 +08:00
Yunling Zhu
c261ebc82c use unshift to improve perf 2025-04-06 16:56:54 +08:00
Yunling Zhu
f7c747c65f encourage markdown inclusion for o1/o3 2025-04-03 22:11:59 +08:00
19 changed files with 36 additions and 622 deletions

View File

@@ -81,9 +81,3 @@ SILICONFLOW_API_KEY=
### siliconflow Api url (optional) ### siliconflow Api url (optional)
SILICONFLOW_URL= SILICONFLOW_URL=
### openrouter Api key (optional)
OPENROUTER_API_KEY=
### openrouter Api url (optional)
OPENROUTER_URL=

View File

@@ -22,12 +22,12 @@ English / [简体中文](./README_CN.md)
[![MacOS][MacOS-image]][download-url] [![MacOS][MacOS-image]][download-url]
[![Linux][Linux-image]][download-url] [![Linux][Linux-image]][download-url]
[NextChatAI](https://nextchat.club?utm_source=readme) / [iOS APP](https://apps.apple.com/us/app/nextchat-ai/id6743085599) / [Web App Demo](https://app.nextchat.dev) / [Desktop App](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [Enterprise Edition](#enterprise-edition) [NextChatAI](https://nextchat.club?utm_source=readme) / [iOS APP](https://apps.apple.com/us/app/nextchat-ai/id6743085599) / [Web App Demo](https://app.nextchat.club) / [Desktop App](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [Enterprise Edition](#enterprise-edition)
[saas-url]: https://nextchat.club?utm_source=readme [saas-url]: https://nextchat.club?utm_source=readme
[saas-image]: https://img.shields.io/badge/NextChat-Saas-green?logo=microsoftedge [saas-image]: https://img.shields.io/badge/NextChat-Saas-green?logo=microsoftedge
[web-url]: https://app.nextchat.dev/ [web-url]: https://app.nextchat.club/
[download-url]: https://github.com/Yidadaa/ChatGPT-Next-Web/releases [download-url]: https://github.com/Yidadaa/ChatGPT-Next-Web/releases
[Web-image]: https://img.shields.io/badge/Web-PWA-orange?logo=microsoftedge [Web-image]: https://img.shields.io/badge/Web-PWA-orange?logo=microsoftedge
[Windows-image]: https://img.shields.io/badge/-Windows-blue?logo=windows [Windows-image]: https://img.shields.io/badge/-Windows-blue?logo=windows
@@ -311,9 +311,6 @@ To control custom models, use `+` to add a custom model, use `-` to hide a model
User `-all` to disable all default models, `+all` to enable all default models. User `-all` to disable all default models, `+all` to enable all default models.
Models from OpenRouter (except `openrouter/auto`) need to be configured manually, use `+provider/model@OpenRouter`.
> Example: `+qwen/qwen3-32b:free@OpenRouter` will show `qwen/qwen3-32b:free(OpenRouter)` in model list.
For Azure: use `modelName@Azure=deploymentName` to customize model name and deployment name. For Azure: use `modelName@Azure=deploymentName` to customize model name and deployment name.
> Example: `+gpt-3.5-turbo@Azure=gpt35` will show option `gpt35(Azure)` in model list. > Example: `+gpt-3.5-turbo@Azure=gpt35` will show option `gpt35(Azure)` in model list.
> If you only can use Azure model, `-all,+gpt-3.5-turbo@Azure=gpt35` will `gpt35(Azure)` the only option in model list. > If you only can use Azure model, `-all,+gpt-3.5-turbo@Azure=gpt35` will `gpt35(Azure)` the only option in model list.
@@ -364,14 +361,6 @@ SiliconFlow API Key.
SiliconFlow API URL. SiliconFlow API URL.
### `OPENROUTER_API_KEY` (optional)
OpenRouter API Key.
### `OPENROUTER_URL` (optional)
OpenRouter API URL.
## Requirements ## Requirements
NodeJS >= 18, Docker >= 20 NodeJS >= 18, Docker >= 20

View File

@@ -232,9 +232,6 @@ DeepSeek Api Url.
用来控制模型列表,使用 `+` 增加一个模型,使用 `-` 来隐藏一个模型,使用 `模型名=展示名` 来自定义模型的展示名,用英文逗号隔开。 用来控制模型列表,使用 `+` 增加一个模型,使用 `-` 来隐藏一个模型,使用 `模型名=展示名` 来自定义模型的展示名,用英文逗号隔开。
OpenRouter 提供的模型(除 `openrouter/auto` 外)需要手动配置,使用 `+provider/model@OpenRouter`
> 示例:`+qwen/qwen3-32b:free@OpenRouter` 这个配置会在模型列表显示一个 `qwen/qwen3-32b:free(OpenRouter)` 的选项。
在Azure的模式下支持使用`modelName@Azure=deploymentName`的方式配置模型名称和部署名称(deploy-name) 在Azure的模式下支持使用`modelName@Azure=deploymentName`的方式配置模型名称和部署名称(deploy-name)
> 示例:`+gpt-3.5-turbo@Azure=gpt35`这个配置会在模型列表显示一个`gpt35(Azure)`的选项。 > 示例:`+gpt-3.5-turbo@Azure=gpt35`这个配置会在模型列表显示一个`gpt35(Azure)`的选项。
> 如果你只能使用Azure模式那么设置 `-all,+gpt-3.5-turbo@Azure=gpt35` 则可以让对话的默认使用 `gpt35(Azure)` > 如果你只能使用Azure模式那么设置 `-all,+gpt-3.5-turbo@Azure=gpt35` 则可以让对话的默认使用 `gpt35(Azure)`
@@ -278,14 +275,6 @@ SiliconFlow API Key.
SiliconFlow API URL. SiliconFlow API URL.
### `OPENROUTER_API_KEY` (optional)
OpenRouter API Key.
### `OPENROUTER_URL` (optional)
OpenRouter API URL.
## 开发 ## 开发
点击下方按钮,开始二次开发: 点击下方按钮,开始二次开发:

View File

@@ -15,7 +15,6 @@ import { handle as siliconflowHandler } from "../../siliconflow";
import { handle as xaiHandler } from "../../xai"; import { handle as xaiHandler } from "../../xai";
import { handle as chatglmHandler } from "../../glm"; import { handle as chatglmHandler } from "../../glm";
import { handle as proxyHandler } from "../../proxy"; import { handle as proxyHandler } from "../../proxy";
import { handle as openrouterHandler } from "../../openrouter";
async function handle( async function handle(
req: NextRequest, req: NextRequest,
@@ -51,8 +50,6 @@ async function handle(
return chatglmHandler(req, { params }); return chatglmHandler(req, { params });
case ApiPath.SiliconFlow: case ApiPath.SiliconFlow:
return siliconflowHandler(req, { params }); return siliconflowHandler(req, { params });
case ApiPath.OpenRouter:
return openrouterHandler(req, { params });
case ApiPath.OpenAI: case ApiPath.OpenAI:
return openaiHandler(req, { params }); return openaiHandler(req, { params });
default: default:

View File

@@ -104,9 +104,6 @@ export function auth(req: NextRequest, modelProvider: ModelProvider) {
case ModelProvider.SiliconFlow: case ModelProvider.SiliconFlow:
systemApiKey = serverConfig.siliconFlowApiKey; systemApiKey = serverConfig.siliconFlowApiKey;
break; break;
case ModelProvider.OpenRouter:
systemApiKey = serverConfig.openrouterApiKey;
break;
case ModelProvider.GPT: case ModelProvider.GPT:
default: default:
if (req.nextUrl.pathname.includes("azure/deployments")) { if (req.nextUrl.pathname.includes("azure/deployments")) {

View File

@@ -1,128 +0,0 @@
import { getServerSideConfig } from "@/app/config/server";
import {
OPENROUTER_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("[OpenRouter Route] params ", params);
if (req.method === "OPTIONS") {
return NextResponse.json({ body: "OK" }, { status: 200 });
}
const authResult = auth(req, ModelProvider.OpenRouter);
if (authResult.error) {
return NextResponse.json(authResult, {
status: 401,
});
}
try {
const response = await request(req);
return response;
} catch (e) {
console.error("[OpenRouter] ", 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.OpenRouter, "");
let baseUrl = serverConfig.openrouterUrl || OPENROUTER_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.OpenRouter as string,
)
) {
return NextResponse.json(
{
error: true,
message: `you are not allowed to use ${jsonBody?.model} model`,
},
{
status: 403,
},
);
}
} catch (e) {
console.error(`[OpenRouter] 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);
}
}

View File

@@ -24,7 +24,6 @@ import { DeepSeekApi } from "./platforms/deepseek";
import { XAIApi } from "./platforms/xai"; import { XAIApi } from "./platforms/xai";
import { ChatGLMApi } from "./platforms/glm"; import { ChatGLMApi } from "./platforms/glm";
import { SiliconflowApi } from "./platforms/siliconflow"; import { SiliconflowApi } from "./platforms/siliconflow";
import { OpenRouterApi } from "./platforms/openrouter";
export const ROLES = ["system", "user", "assistant"] as const; export const ROLES = ["system", "user", "assistant"] as const;
export type MessageRole = (typeof ROLES)[number]; export type MessageRole = (typeof ROLES)[number];
@@ -174,9 +173,6 @@ export class ClientApi {
case ModelProvider.SiliconFlow: case ModelProvider.SiliconFlow:
this.llm = new SiliconflowApi(); this.llm = new SiliconflowApi();
break; break;
case ModelProvider.OpenRouter:
this.llm = new OpenRouterApi();
break;
default: default:
this.llm = new ChatGPTApi(); this.llm = new ChatGPTApi();
} }
@@ -269,8 +265,6 @@ export function getHeaders(ignoreHeaders: boolean = false) {
const isChatGLM = modelConfig.providerName === ServiceProvider.ChatGLM; const isChatGLM = modelConfig.providerName === ServiceProvider.ChatGLM;
const isSiliconFlow = const isSiliconFlow =
modelConfig.providerName === ServiceProvider.SiliconFlow; modelConfig.providerName === ServiceProvider.SiliconFlow;
const isOpenRouter =
modelConfig.providerName === ServiceProvider.OpenRouter;
const isEnabledAccessControl = accessStore.enabledAccessControl(); const isEnabledAccessControl = accessStore.enabledAccessControl();
const apiKey = isGoogle const apiKey = isGoogle
? accessStore.googleApiKey ? accessStore.googleApiKey
@@ -292,8 +286,6 @@ export function getHeaders(ignoreHeaders: boolean = false) {
? accessStore.chatglmApiKey ? accessStore.chatglmApiKey
: isSiliconFlow : isSiliconFlow
? accessStore.siliconflowApiKey ? accessStore.siliconflowApiKey
: isOpenRouter
? accessStore.openrouterApiKey
: isIflytek : isIflytek
? accessStore.iflytekApiKey && accessStore.iflytekApiSecret ? accessStore.iflytekApiKey && accessStore.iflytekApiSecret
? accessStore.iflytekApiKey + ":" + accessStore.iflytekApiSecret ? accessStore.iflytekApiKey + ":" + accessStore.iflytekApiSecret
@@ -312,7 +304,6 @@ export function getHeaders(ignoreHeaders: boolean = false) {
isXAI, isXAI,
isChatGLM, isChatGLM,
isSiliconFlow, isSiliconFlow,
isOpenRouter,
apiKey, apiKey,
isEnabledAccessControl, isEnabledAccessControl,
}; };
@@ -341,7 +332,6 @@ export function getHeaders(ignoreHeaders: boolean = false) {
isXAI, isXAI,
isChatGLM, isChatGLM,
isSiliconFlow, isSiliconFlow,
isOpenRouter,
apiKey, apiKey,
isEnabledAccessControl, isEnabledAccessControl,
} = getConfig(); } = getConfig();
@@ -392,8 +382,6 @@ export function getClientApi(provider: ServiceProvider): ClientApi {
return new ClientApi(ModelProvider.ChatGLM); return new ClientApi(ModelProvider.ChatGLM);
case ServiceProvider.SiliconFlow: case ServiceProvider.SiliconFlow:
return new ClientApi(ModelProvider.SiliconFlow); return new ClientApi(ModelProvider.SiliconFlow);
case ServiceProvider.OpenRouter:
return new ClientApi(ModelProvider.OpenRouter);
default: default:
return new ClientApi(ModelProvider.GPT); return new ClientApi(ModelProvider.GPT);
} }

View File

@@ -56,7 +56,7 @@ export interface OpenAIListModelResponse {
export interface RequestPayload { export interface RequestPayload {
messages: { messages: {
role: "system" | "user" | "assistant"; role: "developer" | "system" | "user" | "assistant";
content: string | MultimodalContent[]; content: string | MultimodalContent[];
}[]; }[];
stream?: boolean; stream?: boolean;
@@ -238,8 +238,16 @@ export class ChatGPTApi implements LLMApi {
// Please do not ask me why not send max_tokens, no reason, this param is just shit, I dont want to explain anymore. // 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 (isO1OrO3) { if (isO1OrO3) {
// by default the o1/o3 models will not attempt to produce output that includes markdown formatting
// manually add "Formatting re-enabled" developer message to encourage markdown inclusion in model responses
// (https://learn.microsoft.com/en-us/azure/ai-services/openai/how-to/reasoning?tabs=python-secure#markdown-output)
requestPayload["messages"].unshift({
role: "developer",
content: "Formatting re-enabled",
});
// o1/o3 uses max_completion_tokens to control the number of tokens (https://platform.openai.com/docs/guides/reasoning#controlling-costs)
requestPayload["max_completion_tokens"] = modelConfig.max_tokens; requestPayload["max_completion_tokens"] = modelConfig.max_tokens;
} }

View File

@@ -1,287 +0,0 @@
"use client";
// azure and openai, using same models. so using same LLMApi.
import {
ApiPath,
OPENROUTER_BASE_URL,
OpenRouter,
DEFAULT_MODELS,
} from "@/app/constant";
import {
useAccessStore,
useAppConfig,
useChatStore,
ChatMessageTool,
usePluginStore,
} from "@/app/store";
import { preProcessImageContent, streamWithThink } from "@/app/utils/chat";
import {
ChatOptions,
getHeaders,
LLMApi,
LLMModel,
SpeechOptions,
} from "../api";
import { getClientConfig } from "@/app/config/client";
import {
getMessageTextContent,
getMessageTextContentWithoutThinking,
isVisionModel,
getTimeoutMSByModel,
} from "@/app/utils";
import { RequestPayload } from "./openai";
import { fetch } from "@/app/utils/stream";
export interface OpenRouterListModelResponse {
object: string;
data: Array<{
id: string;
object: string;
root: string;
}>;
}
export class OpenRouterApi implements LLMApi {
private disableListModels = false;
path(path: string): string {
const accessStore = useAccessStore.getState();
let baseUrl = "";
if (accessStore.useCustomConfig) {
baseUrl = accessStore.openrouterUrl;
}
if (baseUrl.length === 0) {
const isApp = !!getClientConfig()?.isApp;
const apiPath = ApiPath.OpenRouter;
baseUrl = isApp ? OPENROUTER_BASE_URL : apiPath;
}
if (baseUrl.endsWith("/")) {
baseUrl = baseUrl.slice(0, baseUrl.length - 1);
}
if (
!baseUrl.startsWith("http") &&
!baseUrl.startsWith(ApiPath.OpenRouter)
) {
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<ArrayBuffer> {
throw new Error("Method not implemented.");
}
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 = visionModel
? await preProcessImageContent(v.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(OpenRouter.ChatPath);
const chatPayload = {
method: "POST",
body: JSON.stringify(requestPayload),
signal: controller.signal,
headers: getHeaders(),
};
// console.log(chatPayload);
// Use extended timeout for thinking models as they typically require more processing time
const requestTimeoutId = setTimeout(
() => controller.abort(),
getTimeoutMSByModel(options.config.model),
);
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: 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;
const content = choices[0]?.delta?.content;
// Skip if both content and reasoning_content are empty or null
if (
(!reasoning || reasoning.length === 0) &&
(!content || content.length === 0)
) {
return {
isThinking: false,
content: "",
};
}
if (reasoning && reasoning.length > 0) {
return {
isThinking: true,
content: reasoning,
};
} else if (content && content.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<LLMModel[]> {
if (this.disableListModels) {
return DEFAULT_MODELS.slice();
}
const res = await fetch(this.path(OpenRouter.ListModelPath), {
method: "GET",
headers: {
...getHeaders(),
},
});
const resJson = (await res.json()) as OpenRouterListModelResponse;
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: "openrouter",
providerName: "OpenRouter",
providerType: "openrouter",
sorted: 15,
},
}));
}
}

View File

@@ -57,32 +57,18 @@ export function Avatar(props: { model?: ModelType; avatar?: string }) {
modelName.startsWith("dall-e") || modelName.startsWith("dall-e") ||
modelName.startsWith("dalle") || modelName.startsWith("dalle") ||
modelName.startsWith("o1") || modelName.startsWith("o1") ||
modelName.startsWith("o3") || modelName.startsWith("o3")
modelName.startsWith("openai/")
) { ) {
LlmIcon = BotIconOpenAI; LlmIcon = BotIconOpenAI;
} else if ( } else if (modelName.startsWith("gemini")) {
modelName.startsWith("gemini") ||
modelName.startsWith("google/gemini")
) {
LlmIcon = BotIconGemini; LlmIcon = BotIconGemini;
} else if ( } else if (modelName.startsWith("gemma")) {
modelName.startsWith("gemma") ||
modelName.startsWith("google/gemma")
) {
LlmIcon = BotIconGemma; LlmIcon = BotIconGemma;
} else if ( } else if (modelName.startsWith("claude")) {
modelName.startsWith("claude") ||
modelName.startsWith("anthropic/claude")
) {
LlmIcon = BotIconClaude; LlmIcon = BotIconClaude;
} else if (modelName.includes("llama")) { } else if (modelName.includes("llama")) {
LlmIcon = BotIconMeta; LlmIcon = BotIconMeta;
} else if ( } else if (modelName.startsWith("mixtral") || modelName.startsWith("codestral")) {
modelName.startsWith("mixtral") ||
modelName.startsWith("codestral") ||
modelName.startsWith("mistralai/")
) {
LlmIcon = BotIconMistral; LlmIcon = BotIconMistral;
} else if (modelName.includes("deepseek")) { } else if (modelName.includes("deepseek")) {
LlmIcon = BotIconDeepseek; LlmIcon = BotIconDeepseek;
@@ -92,10 +78,7 @@ export function Avatar(props: { model?: ModelType; avatar?: string }) {
LlmIcon = BotIconQwen; LlmIcon = BotIconQwen;
} else if (modelName.startsWith("ernie")) { } else if (modelName.startsWith("ernie")) {
LlmIcon = BotIconWenxin; LlmIcon = BotIconWenxin;
} else if ( } else if (modelName.startsWith("grok")) {
modelName.startsWith("grok") ||
modelName.startsWith("x-ai/grok")
) {
LlmIcon = BotIconGrok; LlmIcon = BotIconGrok;
} else if (modelName.startsWith("hunyuan")) { } else if (modelName.startsWith("hunyuan")) {
LlmIcon = BotIconHunyuan; LlmIcon = BotIconHunyuan;

View File

@@ -75,7 +75,6 @@ import {
ChatGLM, ChatGLM,
DeepSeek, DeepSeek,
SiliconFlow, SiliconFlow,
OpenRouter,
} from "../constant"; } from "../constant";
import { Prompt, SearchService, usePromptStore } from "../store/prompt"; import { Prompt, SearchService, usePromptStore } from "../store/prompt";
import { ErrorBoundary } from "./error"; import { ErrorBoundary } from "./error";
@@ -1360,46 +1359,6 @@ export function Settings() {
</ListItem> </ListItem>
</> </>
); );
const openrouterConfigComponent = accessStore.provider ===
ServiceProvider.OpenRouter && (
<>
<ListItem
title={Locale.Settings.Access.OpenRouter.Endpoint.Title}
subTitle={
Locale.Settings.Access.OpenRouter.Endpoint.SubTitle +
OpenRouter.ExampleEndpoint
}
>
<input
aria-label={Locale.Settings.Access.OpenRouter.Endpoint.Title}
type="text"
value={accessStore.openrouterUrl}
placeholder={OpenRouter.ExampleEndpoint}
onChange={(e) =>
accessStore.update(
(access) => (access.openrouterUrl = e.currentTarget.value),
)
}
></input>
</ListItem>
<ListItem
title={Locale.Settings.Access.OpenRouter.ApiKey.Title}
subTitle={Locale.Settings.Access.OpenRouter.ApiKey.SubTitle}
>
<PasswordInput
aria-label={Locale.Settings.Access.OpenRouter.ApiKey.Title}
value={accessStore.openrouterApiKey}
type="text"
placeholder={Locale.Settings.Access.OpenRouter.ApiKey.Placeholder}
onChange={(e) => {
accessStore.update(
(access) => (access.openrouterApiKey = e.currentTarget.value),
);
}}
/>
</ListItem>
</>
);
const stabilityConfigComponent = accessStore.provider === const stabilityConfigComponent = accessStore.provider ===
ServiceProvider.Stability && ( ServiceProvider.Stability && (
@@ -1863,7 +1822,6 @@ export function Settings() {
{XAIConfigComponent} {XAIConfigComponent}
{chatglmConfigComponent} {chatglmConfigComponent}
{siliconflowConfigComponent} {siliconflowConfigComponent}
{openrouterConfigComponent}
</> </>
)} )}
</> </>

View File

@@ -88,10 +88,6 @@ declare global {
SILICONFLOW_URL?: string; SILICONFLOW_URL?: string;
SILICONFLOW_API_KEY?: string; SILICONFLOW_API_KEY?: string;
// openrouter only
OPENROUTER_URL?: string;
OPENROUTER_API_KEY?: string;
// custom template for preprocessing user input // custom template for preprocessing user input
DEFAULT_INPUT_TEMPLATE?: string; DEFAULT_INPUT_TEMPLATE?: string;
@@ -167,7 +163,6 @@ export const getServerSideConfig = () => {
const isXAI = !!process.env.XAI_API_KEY; const isXAI = !!process.env.XAI_API_KEY;
const isChatGLM = !!process.env.CHATGLM_API_KEY; const isChatGLM = !!process.env.CHATGLM_API_KEY;
const isSiliconFlow = !!process.env.SILICONFLOW_API_KEY; const isSiliconFlow = !!process.env.SILICONFLOW_API_KEY;
const isOpenRouter = !!process.env.OPENROUTER_API_KEY;
// const apiKeyEnvVar = process.env.OPENAI_API_KEY ?? ""; // const apiKeyEnvVar = process.env.OPENAI_API_KEY ?? "";
// const apiKeys = apiKeyEnvVar.split(",").map((v) => v.trim()); // const apiKeys = apiKeyEnvVar.split(",").map((v) => v.trim());
// const randomIndex = Math.floor(Math.random() * apiKeys.length); // const randomIndex = Math.floor(Math.random() * apiKeys.length);
@@ -251,10 +246,6 @@ export const getServerSideConfig = () => {
siliconFlowUrl: process.env.SILICONFLOW_URL, siliconFlowUrl: process.env.SILICONFLOW_URL,
siliconFlowApiKey: getApiKey(process.env.SILICONFLOW_API_KEY), siliconFlowApiKey: getApiKey(process.env.SILICONFLOW_API_KEY),
isOpenRouter,
openrouterUrl: process.env.OPENROUTER_URL,
openrouterApiKey: getApiKey(process.env.OPENROUTER_API_KEY),
gtmId: process.env.GTM_ID, gtmId: process.env.GTM_ID,
gaId: process.env.GA_ID || DEFAULT_GA_ID, gaId: process.env.GA_ID || DEFAULT_GA_ID,

View File

@@ -36,8 +36,6 @@ export const CHATGLM_BASE_URL = "https://open.bigmodel.cn";
export const SILICONFLOW_BASE_URL = "https://api.siliconflow.cn"; export const SILICONFLOW_BASE_URL = "https://api.siliconflow.cn";
export const OPENROUTER_BASE_URL = "https://openrouter.ai/api";
export const CACHE_URL_PREFIX = "/api/cache"; export const CACHE_URL_PREFIX = "/api/cache";
export const UPLOAD_URL = `${CACHE_URL_PREFIX}/upload`; export const UPLOAD_URL = `${CACHE_URL_PREFIX}/upload`;
@@ -74,7 +72,6 @@ export enum ApiPath {
ChatGLM = "/api/chatglm", ChatGLM = "/api/chatglm",
DeepSeek = "/api/deepseek", DeepSeek = "/api/deepseek",
SiliconFlow = "/api/siliconflow", SiliconFlow = "/api/siliconflow",
OpenRouter = "/api/openrouter",
} }
export enum SlotID { export enum SlotID {
@@ -133,7 +130,6 @@ export enum ServiceProvider {
ChatGLM = "ChatGLM", ChatGLM = "ChatGLM",
DeepSeek = "DeepSeek", DeepSeek = "DeepSeek",
SiliconFlow = "SiliconFlow", SiliconFlow = "SiliconFlow",
OpenRouter = "OpenRouter",
} }
// Google API safety settings, see https://ai.google.dev/gemini-api/docs/safety-settings // Google API safety settings, see https://ai.google.dev/gemini-api/docs/safety-settings
@@ -160,7 +156,6 @@ export enum ModelProvider {
ChatGLM = "ChatGLM", ChatGLM = "ChatGLM",
DeepSeek = "DeepSeek", DeepSeek = "DeepSeek",
SiliconFlow = "SiliconFlow", SiliconFlow = "SiliconFlow",
OpenRouter = "OpenRouter",
} }
export const Stability = { export const Stability = {
@@ -271,12 +266,6 @@ export const SiliconFlow = {
ListModelPath: "v1/models?&sub_type=chat", ListModelPath: "v1/models?&sub_type=chat",
}; };
export const OpenRouter = {
ExampleEndpoint: OPENROUTER_BASE_URL,
ChatPath: "v1/chat/completions",
ListModelPath: "v1/models",
};
export const DEFAULT_INPUT_TEMPLATE = `{{input}}`; // input / time / model / lang export const DEFAULT_INPUT_TEMPLATE = `{{input}}`; // input / time / model / lang
// export const DEFAULT_SYSTEM_TEMPLATE = ` // export const DEFAULT_SYSTEM_TEMPLATE = `
// You are ChatGPT, a large language model trained by {{ServiceProvider}}. // You are ChatGPT, a large language model trained by {{ServiceProvider}}.
@@ -534,20 +523,15 @@ const openaiModels = [
]; ];
const googleModels = [ const googleModels = [
"gemini-1.0-pro", // Deprecated on 2/15/2025
"gemini-1.5-pro-latest", "gemini-1.5-pro-latest",
"gemini-1.5-pro", "gemini-1.5-pro",
"gemini-1.5-pro-002", "gemini-1.5-pro-002",
"gemini-1.5-pro-exp-0827",
"gemini-1.5-flash-latest", "gemini-1.5-flash-latest",
"gemini-1.5-flash-8b-latest", "gemini-1.5-flash-8b-latest",
"gemini-1.5-flash", "gemini-1.5-flash",
"gemini-1.5-flash-8b", "gemini-1.5-flash-8b",
"gemini-1.5-flash-002", "gemini-1.5-flash-002",
"gemini-1.5-flash-exp-0827",
"learnlm-1.5-pro-experimental", "learnlm-1.5-pro-experimental",
"gemini-exp-1114",
"gemini-exp-1121",
"gemini-exp-1206", "gemini-exp-1206",
"gemini-2.0-flash", "gemini-2.0-flash",
"gemini-2.0-flash-exp", "gemini-2.0-flash-exp",
@@ -557,6 +541,7 @@ const googleModels = [
"gemini-2.0-flash-thinking-exp-01-21", "gemini-2.0-flash-thinking-exp-01-21",
"gemini-2.0-pro-exp", "gemini-2.0-pro-exp",
"gemini-2.0-pro-exp-02-05", "gemini-2.0-pro-exp-02-05",
"gemini-2.5-pro-preview-06-05",
]; ];
const anthropicModels = [ const anthropicModels = [
@@ -643,6 +628,18 @@ const xAIModes = [
"grok-2-vision-1212", "grok-2-vision-1212",
"grok-2-vision", "grok-2-vision",
"grok-2-vision-latest", "grok-2-vision-latest",
"grok-3-mini-fast-beta",
"grok-3-mini-fast",
"grok-3-mini-fast-latest",
"grok-3-mini-beta",
"grok-3-mini",
"grok-3-mini-latest",
"grok-3-fast-beta",
"grok-3-fast",
"grok-3-fast-latest",
"grok-3-beta",
"grok-3",
"grok-3-latest",
]; ];
const chatglmModels = [ const chatglmModels = [
@@ -682,12 +679,6 @@ const siliconflowModels = [
"Pro/deepseek-ai/DeepSeek-V3", "Pro/deepseek-ai/DeepSeek-V3",
]; ];
// Use this to generate a full model list -> https://gist.github.com/hyc1230/d4b271d161ffcda485f1fa1a27e08096
const openrouterModels = [
// Requires user to customize models
"openrouter/auto",
];
let seq = 1000; // 内置的模型序号生成器从1000开始 let seq = 1000; // 内置的模型序号生成器从1000开始
export const DEFAULT_MODELS = [ export const DEFAULT_MODELS = [
...openaiModels.map((name) => ({ ...openaiModels.map((name) => ({
@@ -844,17 +835,6 @@ export const DEFAULT_MODELS = [
sorted: 14, sorted: 14,
}, },
})), })),
...openrouterModels.map((name) => ({
name,
available: true,
sorted: seq++,
provider: {
id: "openrouter",
providerName: "OpenRouter",
providerType: "openrouter",
sorted: 15,
},
})),
] as const; ] as const;
export const CHAT_PAGE_SIZE = 15; export const CHAT_PAGE_SIZE = 15;

View File

@@ -507,17 +507,6 @@ const cn = {
SubTitle: "样例:", SubTitle: "样例:",
}, },
}, },
OpenRouter: {
ApiKey: {
Title: "接口密钥",
SubTitle: "使用自定义 OpenRouter API Key",
Placeholder: "OpenRouter API Key",
},
Endpoint: {
Title: "接口地址",
SubTitle: "样例:",
},
},
Stability: { Stability: {
ApiKey: { ApiKey: {
Title: "接口密钥", Title: "接口密钥",

View File

@@ -467,17 +467,6 @@ const da: PartialLocaleType = {
SubTitle: "F.eks.: ", SubTitle: "F.eks.: ",
}, },
}, },
OpenRouter: {
ApiKey: {
Title: "OpenRouter-nøgle",
SubTitle: "Din egen OpenRouter-nøgle",
Placeholder: "OpenRouter API Key",
},
Endpoint: {
Title: "Adresse",
SubTitle: "F.eks.: ",
},
},
Stability: { Stability: {
ApiKey: { ApiKey: {
Title: "Stability-nøgle", Title: "Stability-nøgle",

View File

@@ -491,17 +491,6 @@ const en: LocaleType = {
SubTitle: "Example: ", SubTitle: "Example: ",
}, },
}, },
OpenRouter: {
ApiKey: {
Title: "OpenRouter API Key",
SubTitle: "Use a custom OpenRouter API Key",
Placeholder: "OpenRouter API Key",
},
Endpoint: {
Title: "Endpoint Address",
SubTitle: "Example: ",
},
},
Stability: { Stability: {
ApiKey: { ApiKey: {
Title: "Stability API Key", Title: "Stability API Key",

View File

@@ -17,7 +17,6 @@ import {
XAI_BASE_URL, XAI_BASE_URL,
CHATGLM_BASE_URL, CHATGLM_BASE_URL,
SILICONFLOW_BASE_URL, SILICONFLOW_BASE_URL,
OPENROUTER_BASE_URL,
} from "../constant"; } from "../constant";
import { getHeaders } from "../client/api"; import { getHeaders } from "../client/api";
import { getClientConfig } from "../config/client"; import { getClientConfig } from "../config/client";
@@ -60,8 +59,6 @@ const DEFAULT_SILICONFLOW_URL = isApp
? SILICONFLOW_BASE_URL ? SILICONFLOW_BASE_URL
: ApiPath.SiliconFlow; : ApiPath.SiliconFlow;
const DEFAULT_OPENROUTER_URL = isApp ? OPENROUTER_BASE_URL : ApiPath.OpenRouter;
const DEFAULT_ACCESS_STATE = { const DEFAULT_ACCESS_STATE = {
accessCode: "", accessCode: "",
useCustomConfig: false, useCustomConfig: false,
@@ -135,10 +132,6 @@ const DEFAULT_ACCESS_STATE = {
siliconflowUrl: DEFAULT_SILICONFLOW_URL, siliconflowUrl: DEFAULT_SILICONFLOW_URL,
siliconflowApiKey: "", siliconflowApiKey: "",
// openrouter
openrouterUrl: DEFAULT_OPENROUTER_URL,
openrouterApiKey: "",
// server config // server config
needCode: true, needCode: true,
hideUserApiKey: false, hideUserApiKey: false,
@@ -226,10 +219,6 @@ export const useAccessStore = createPersistStore(
return ensure(get(), ["siliconflowApiKey"]); return ensure(get(), ["siliconflowApiKey"]);
}, },
isValidOpenRouter() {
return ensure(get(), ["openrouterApiKey"]);
},
isAuthorized() { isAuthorized() {
this.fetch(); this.fetch();
@@ -249,7 +238,6 @@ export const useAccessStore = createPersistStore(
this.isValidXAI() || this.isValidXAI() ||
this.isValidChatGLM() || this.isValidChatGLM() ||
this.isValidSiliconFlow() || this.isValidSiliconFlow() ||
this.isValidOpenRouter() ||
!this.enabledAccessControl() || !this.enabledAccessControl() ||
(this.enabledAccessControl() && ensure(get(), ["accessCode"])) (this.enabledAccessControl() && ensure(get(), ["accessCode"]))
); );

View File

@@ -83,7 +83,7 @@
"jest": "^29.7.0", "jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0", "jest-environment-jsdom": "^29.7.0",
"lint-staged": "^13.2.2", "lint-staged": "^13.2.2",
"prettier": "^3.0.2", "prettier": "^3.6.2",
"ts-node": "^10.9.2", "ts-node": "^10.9.2",
"tsx": "^4.16.0", "tsx": "^4.16.0",
"typescript": "5.2.2", "typescript": "5.2.2",

View File

@@ -7076,10 +7076,10 @@ prettier-linter-helpers@^1.0.0:
dependencies: dependencies:
fast-diff "^1.1.2" fast-diff "^1.1.2"
prettier@^3.0.2: prettier@^3.6.2:
version "3.0.2" version "3.6.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.2.tgz#78fcecd6d870551aa5547437cdae39d4701dca5b" resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.6.2.tgz#ccda02a1003ebbb2bfda6f83a074978f608b9393"
integrity sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ== integrity sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==
pretty-format@^27.0.2: pretty-format@^27.0.2:
version "27.5.1" version "27.5.1"