mirror of
https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git
synced 2025-10-29 05:13:42 +08:00
Compare commits
22 Commits
6305-bugth
...
9f969903ed
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9f969903ed | ||
|
|
18bebf58e9 | ||
|
|
3809375694 | ||
|
|
1b0de25986 | ||
|
|
865c45dd29 | ||
|
|
1f5d8e6d9c | ||
|
|
c9ef6d58ed | ||
|
|
2d7229d2b8 | ||
|
|
11b37c15bd | ||
|
|
1d0038f17d | ||
|
|
619fa519c0 | ||
|
|
48469bd8ca | ||
|
|
5a5e887f2b | ||
|
|
b6f5d75656 | ||
|
|
0d41a17ef6 | ||
|
|
f7cde17919 | ||
|
|
570cbb34b6 | ||
|
|
7aa9ae0a3e | ||
|
|
ad6666eeaf | ||
|
|
a2c4e468a0 | ||
|
|
0a25a1a8cb | ||
|
|
b709ee3983 |
30
README.md
30
README.md
@@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
<h1 align="center">NextChat (ChatGPT Next Web)</h1>
|
<h1 align="center">NextChat</h1>
|
||||||
|
|
||||||
English / [简体中文](./README_CN.md)
|
English / [简体中文](./README_CN.md)
|
||||||
|
|
||||||
@@ -22,8 +22,7 @@ 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.dev/chat?utm_source=readme) / [Web App Demo](https://app.nextchat.dev) / [Desktop App](https://github.com/Yidadaa/ChatGPT-Next-Web/releases)
|
[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) / [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)
|
|
||||||
|
|
||||||
|
|
||||||
[saas-url]: https://nextchat.club?utm_source=readme
|
[saas-url]: https://nextchat.club?utm_source=readme
|
||||||
@@ -41,31 +40,14 @@ English / [简体中文](./README_CN.md)
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
## 👋 Hey, NextChat is going to develop a native app!
|
## 🥳 Cheer for NextChat iOS Version Online!
|
||||||
|
> [👉 Click Here to Install Now](https://apps.apple.com/us/app/nextchat-ai/id6743085599)
|
||||||
|
|
||||||
> This week we are going to start working on iOS and Android APP, and we want to find some reliable friends to do it together!
|
> [❤️ Source Code Coming Soon](https://github.com/ChatGPTNextWeb/NextChat-iOS)
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
✨ Several key points:
|
|
||||||
|
|
||||||
- Starting from 0, you are a veteran
|
|
||||||
- Completely open source, not hidden
|
|
||||||
- Native development, pursuing the ultimate experience
|
|
||||||
|
|
||||||
Will you come and do something together? 😎
|
|
||||||
|
|
||||||
https://github.com/ChatGPTNextWeb/NextChat/issues/6269
|
|
||||||
|
|
||||||
#Seeking for talents is thirsty #lack of people
|
|
||||||
|
|
||||||
|
|
||||||
## 🥳 Cheer for DeepSeek, China's AI star!
|
|
||||||
> Purpose-Built UI for DeepSeek Reasoner Model
|
|
||||||
|
|
||||||
<img src="https://github.com/user-attachments/assets/f3952210-3af1-4dc0-9b81-40eaa4847d9a"/>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## 🫣 NextChat Support MCP !
|
## 🫣 NextChat Support MCP !
|
||||||
> Before build, please set env ENABLE_MCP=true
|
> Before build, please set env ENABLE_MCP=true
|
||||||
|
|
||||||
|
|||||||
@@ -40,6 +40,11 @@ export interface MultimodalContent {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface MultimodalContentForAlibaba {
|
||||||
|
text?: string;
|
||||||
|
image?: string;
|
||||||
|
}
|
||||||
|
|
||||||
export interface RequestMessage {
|
export interface RequestMessage {
|
||||||
role: MessageRole;
|
role: MessageRole;
|
||||||
content: string | MultimodalContent[];
|
content: string | MultimodalContent[];
|
||||||
|
|||||||
@@ -7,7 +7,10 @@ import {
|
|||||||
ChatMessageTool,
|
ChatMessageTool,
|
||||||
usePluginStore,
|
usePluginStore,
|
||||||
} from "@/app/store";
|
} from "@/app/store";
|
||||||
import { streamWithThink } from "@/app/utils/chat";
|
import {
|
||||||
|
preProcessImageContentForAlibabaDashScope,
|
||||||
|
streamWithThink,
|
||||||
|
} from "@/app/utils/chat";
|
||||||
import {
|
import {
|
||||||
ChatOptions,
|
ChatOptions,
|
||||||
getHeaders,
|
getHeaders,
|
||||||
@@ -15,12 +18,14 @@ import {
|
|||||||
LLMModel,
|
LLMModel,
|
||||||
SpeechOptions,
|
SpeechOptions,
|
||||||
MultimodalContent,
|
MultimodalContent,
|
||||||
|
MultimodalContentForAlibaba,
|
||||||
} from "../api";
|
} from "../api";
|
||||||
import { getClientConfig } from "@/app/config/client";
|
import { getClientConfig } from "@/app/config/client";
|
||||||
import {
|
import {
|
||||||
getMessageTextContent,
|
getMessageTextContent,
|
||||||
getMessageTextContentWithoutThinking,
|
getMessageTextContentWithoutThinking,
|
||||||
getTimeoutMSByModel,
|
getTimeoutMSByModel,
|
||||||
|
isVisionModel,
|
||||||
} from "@/app/utils";
|
} from "@/app/utils";
|
||||||
import { fetch } from "@/app/utils/stream";
|
import { fetch } from "@/app/utils/stream";
|
||||||
|
|
||||||
@@ -89,14 +94,6 @@ export class QwenApi implements LLMApi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async chat(options: ChatOptions) {
|
async chat(options: ChatOptions) {
|
||||||
const messages = options.messages.map((v) => ({
|
|
||||||
role: v.role,
|
|
||||||
content:
|
|
||||||
v.role === "assistant"
|
|
||||||
? getMessageTextContentWithoutThinking(v)
|
|
||||||
: getMessageTextContent(v),
|
|
||||||
}));
|
|
||||||
|
|
||||||
const modelConfig = {
|
const modelConfig = {
|
||||||
...useAppConfig.getState().modelConfig,
|
...useAppConfig.getState().modelConfig,
|
||||||
...useChatStore.getState().currentSession().mask.modelConfig,
|
...useChatStore.getState().currentSession().mask.modelConfig,
|
||||||
@@ -105,6 +102,21 @@ export class QwenApi implements LLMApi {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const visionModel = isVisionModel(options.config.model);
|
||||||
|
|
||||||
|
const messages: ChatOptions["messages"] = [];
|
||||||
|
for (const v of options.messages) {
|
||||||
|
const content = (
|
||||||
|
visionModel
|
||||||
|
? await preProcessImageContentForAlibabaDashScope(v.content)
|
||||||
|
: v.role === "assistant"
|
||||||
|
? getMessageTextContentWithoutThinking(v)
|
||||||
|
: getMessageTextContent(v)
|
||||||
|
) as any;
|
||||||
|
|
||||||
|
messages.push({ role: v.role, content });
|
||||||
|
}
|
||||||
|
|
||||||
const shouldStream = !!options.config.stream;
|
const shouldStream = !!options.config.stream;
|
||||||
const requestPayload: RequestPayload = {
|
const requestPayload: RequestPayload = {
|
||||||
model: modelConfig.model,
|
model: modelConfig.model,
|
||||||
@@ -129,7 +141,7 @@ export class QwenApi implements LLMApi {
|
|||||||
"X-DashScope-SSE": shouldStream ? "enable" : "disable",
|
"X-DashScope-SSE": shouldStream ? "enable" : "disable",
|
||||||
};
|
};
|
||||||
|
|
||||||
const chatPath = this.path(Alibaba.ChatPath);
|
const chatPath = this.path(Alibaba.ChatPath(modelConfig.model));
|
||||||
const chatPayload = {
|
const chatPayload = {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
body: JSON.stringify(requestPayload),
|
body: JSON.stringify(requestPayload),
|
||||||
@@ -162,7 +174,7 @@ export class QwenApi implements LLMApi {
|
|||||||
const json = JSON.parse(text);
|
const json = JSON.parse(text);
|
||||||
const choices = json.output.choices as Array<{
|
const choices = json.output.choices as Array<{
|
||||||
message: {
|
message: {
|
||||||
content: string | null;
|
content: string | null | MultimodalContentForAlibaba[];
|
||||||
tool_calls: ChatMessageTool[];
|
tool_calls: ChatMessageTool[];
|
||||||
reasoning_content: string | null;
|
reasoning_content: string | null;
|
||||||
};
|
};
|
||||||
@@ -212,7 +224,9 @@ export class QwenApi implements LLMApi {
|
|||||||
} else if (content && content.length > 0) {
|
} else if (content && content.length > 0) {
|
||||||
return {
|
return {
|
||||||
isThinking: false,
|
isThinking: false,
|
||||||
content: content,
|
content: Array.isArray(content)
|
||||||
|
? content.map((item) => item.text).join(",")
|
||||||
|
: content,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -198,7 +198,8 @@ export class ChatGPTApi implements LLMApi {
|
|||||||
const isDalle3 = _isDalle3(options.config.model);
|
const isDalle3 = _isDalle3(options.config.model);
|
||||||
const isO1OrO3 =
|
const isO1OrO3 =
|
||||||
options.config.model.startsWith("o1") ||
|
options.config.model.startsWith("o1") ||
|
||||||
options.config.model.startsWith("o3");
|
options.config.model.startsWith("o3") ||
|
||||||
|
options.config.model.startsWith("o4-mini");
|
||||||
if (isDalle3) {
|
if (isDalle3) {
|
||||||
const prompt = getMessageTextContent(
|
const prompt = getMessageTextContent(
|
||||||
options.messages.slice(-1)?.pop() as any,
|
options.messages.slice(-1)?.pop() as any,
|
||||||
@@ -243,7 +244,7 @@ export class ChatGPTApi implements LLMApi {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// add max_tokens to vision model
|
// add max_tokens to vision model
|
||||||
if (visionModel) {
|
if (visionModel && !isO1OrO3) {
|
||||||
requestPayload["max_tokens"] = Math.max(modelConfig.max_tokens, 4000);
|
requestPayload["max_tokens"] = Math.max(modelConfig.max_tokens, 4000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,10 +23,12 @@ import {
|
|||||||
} from "../mcp/actions";
|
} from "../mcp/actions";
|
||||||
import {
|
import {
|
||||||
ListToolsResponse,
|
ListToolsResponse,
|
||||||
|
ToolSchema,
|
||||||
McpConfigData,
|
McpConfigData,
|
||||||
PresetServer,
|
PresetServer,
|
||||||
ServerConfig,
|
ServerConfig,
|
||||||
ServerStatusResponse,
|
ServerStatusResponse,
|
||||||
|
isServerStdioConfig,
|
||||||
} from "../mcp/types";
|
} from "../mcp/types";
|
||||||
import clsx from "clsx";
|
import clsx from "clsx";
|
||||||
import PlayIcon from "../icons/play.svg";
|
import PlayIcon from "../icons/play.svg";
|
||||||
@@ -46,7 +48,7 @@ export function McpMarketPage() {
|
|||||||
const [searchText, setSearchText] = useState("");
|
const [searchText, setSearchText] = useState("");
|
||||||
const [userConfig, setUserConfig] = useState<Record<string, any>>({});
|
const [userConfig, setUserConfig] = useState<Record<string, any>>({});
|
||||||
const [editingServerId, setEditingServerId] = useState<string | undefined>();
|
const [editingServerId, setEditingServerId] = useState<string | undefined>();
|
||||||
const [tools, setTools] = useState<ListToolsResponse["tools"] | null>(null);
|
const [tools, setTools] = useState<ListToolsResponse | null>(null);
|
||||||
const [viewingServerId, setViewingServerId] = useState<string | undefined>();
|
const [viewingServerId, setViewingServerId] = useState<string | undefined>();
|
||||||
const [isLoading, setIsLoading] = useState(false);
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
const [config, setConfig] = useState<McpConfigData>();
|
const [config, setConfig] = useState<McpConfigData>();
|
||||||
@@ -136,7 +138,7 @@ export function McpMarketPage() {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!editingServerId || !config) return;
|
if (!editingServerId || !config) return;
|
||||||
const currentConfig = config.mcpServers[editingServerId];
|
const currentConfig = config.mcpServers[editingServerId];
|
||||||
if (currentConfig) {
|
if (isServerStdioConfig(currentConfig)) {
|
||||||
// 从当前配置中提取用户配置
|
// 从当前配置中提取用户配置
|
||||||
const preset = presetServers.find((s) => s.id === editingServerId);
|
const preset = presetServers.find((s) => s.id === editingServerId);
|
||||||
if (preset?.configSchema) {
|
if (preset?.configSchema) {
|
||||||
@@ -732,16 +734,14 @@ export function McpMarketPage() {
|
|||||||
{isLoading ? (
|
{isLoading ? (
|
||||||
<div>Loading...</div>
|
<div>Loading...</div>
|
||||||
) : tools?.tools ? (
|
) : tools?.tools ? (
|
||||||
tools.tools.map(
|
tools.tools.map((tool: ToolSchema, index: number) => (
|
||||||
(tool: ListToolsResponse["tools"], index: number) => (
|
<div key={index} className={styles["tool-item"]}>
|
||||||
<div key={index} className={styles["tool-item"]}>
|
<div className={styles["tool-name"]}>{tool.name}</div>
|
||||||
<div className={styles["tool-name"]}>{tool.name}</div>
|
<div className={styles["tool-description"]}>
|
||||||
<div className={styles["tool-description"]}>
|
{tool.description}
|
||||||
{tool.description}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
),
|
</div>
|
||||||
)
|
))
|
||||||
) : (
|
) : (
|
||||||
<div>No tools available</div>
|
<div>No tools available</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -40,6 +40,17 @@ export const getBuildConfig = () => {
|
|||||||
buildMode,
|
buildMode,
|
||||||
isApp,
|
isApp,
|
||||||
template: process.env.DEFAULT_INPUT_TEMPLATE ?? DEFAULT_INPUT_TEMPLATE,
|
template: process.env.DEFAULT_INPUT_TEMPLATE ?? DEFAULT_INPUT_TEMPLATE,
|
||||||
|
|
||||||
|
needCode: !!process.env.CODE,
|
||||||
|
hideUserApiKey: !!process.env.HIDE_USER_API_KEY,
|
||||||
|
baseUrl: process.env.BASE_URL,
|
||||||
|
openaiUrl: process.env.OPENAI_BASE_URL ?? process.env.BASE_URL,
|
||||||
|
disableGPT4: !!process.env.DISABLE_GPT4,
|
||||||
|
useCustomConfig: !!process.env.USE_CUSTOM_CONFIG,
|
||||||
|
hideBalanceQuery: !process.env.ENABLE_BALANCE_QUERY,
|
||||||
|
disableFastLink: !!process.env.DISABLE_FAST_LINK,
|
||||||
|
defaultModel: process.env.DEFAULT_MODEL ?? "",
|
||||||
|
enableMcp: process.env.ENABLE_MCP === "true",
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -221,7 +221,12 @@ export const ByteDance = {
|
|||||||
|
|
||||||
export const Alibaba = {
|
export const Alibaba = {
|
||||||
ExampleEndpoint: ALIBABA_BASE_URL,
|
ExampleEndpoint: ALIBABA_BASE_URL,
|
||||||
ChatPath: "v1/services/aigc/text-generation/generation",
|
ChatPath: (modelName: string) => {
|
||||||
|
if (modelName.includes("vl") || modelName.includes("omni")) {
|
||||||
|
return "v1/services/aigc/multimodal-generation/generation";
|
||||||
|
}
|
||||||
|
return `v1/services/aigc/text-generation/generation`;
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
export const Tencent = {
|
export const Tencent = {
|
||||||
@@ -412,6 +417,14 @@ export const KnowledgeCutOffDate: Record<string, string> = {
|
|||||||
"gpt-4-turbo": "2023-12",
|
"gpt-4-turbo": "2023-12",
|
||||||
"gpt-4-turbo-2024-04-09": "2023-12",
|
"gpt-4-turbo-2024-04-09": "2023-12",
|
||||||
"gpt-4-turbo-preview": "2023-12",
|
"gpt-4-turbo-preview": "2023-12",
|
||||||
|
"gpt-4.1": "2024-06",
|
||||||
|
"gpt-4.1-2025-04-14": "2024-06",
|
||||||
|
"gpt-4.1-mini": "2024-06",
|
||||||
|
"gpt-4.1-mini-2025-04-14": "2024-06",
|
||||||
|
"gpt-4.1-nano": "2024-06",
|
||||||
|
"gpt-4.1-nano-2025-04-14": "2024-06",
|
||||||
|
"gpt-4.5-preview": "2023-10",
|
||||||
|
"gpt-4.5-preview-2025-02-27": "2023-10",
|
||||||
"gpt-4o": "2023-10",
|
"gpt-4o": "2023-10",
|
||||||
"gpt-4o-2024-05-13": "2023-10",
|
"gpt-4o-2024-05-13": "2023-10",
|
||||||
"gpt-4o-2024-08-06": "2023-10",
|
"gpt-4o-2024-08-06": "2023-10",
|
||||||
@@ -453,6 +466,7 @@ export const DEFAULT_TTS_VOICES = [
|
|||||||
export const VISION_MODEL_REGEXES = [
|
export const VISION_MODEL_REGEXES = [
|
||||||
/vision/,
|
/vision/,
|
||||||
/gpt-4o/,
|
/gpt-4o/,
|
||||||
|
/gpt-4\.1/,
|
||||||
/claude-3/,
|
/claude-3/,
|
||||||
/gemini-1\.5/,
|
/gemini-1\.5/,
|
||||||
/gemini-exp/,
|
/gemini-exp/,
|
||||||
@@ -464,6 +478,8 @@ export const VISION_MODEL_REGEXES = [
|
|||||||
/^dall-e-3$/, // Matches exactly "dall-e-3"
|
/^dall-e-3$/, // Matches exactly "dall-e-3"
|
||||||
/glm-4v/,
|
/glm-4v/,
|
||||||
/vl/i,
|
/vl/i,
|
||||||
|
/o3/,
|
||||||
|
/o4-mini/,
|
||||||
];
|
];
|
||||||
|
|
||||||
export const EXCLUDE_VISION_MODEL_REGEXES = [/claude-3-5-haiku-20241022/];
|
export const EXCLUDE_VISION_MODEL_REGEXES = [/claude-3-5-haiku-20241022/];
|
||||||
@@ -480,6 +496,14 @@ const openaiModels = [
|
|||||||
"gpt-4-32k-0613",
|
"gpt-4-32k-0613",
|
||||||
"gpt-4-turbo",
|
"gpt-4-turbo",
|
||||||
"gpt-4-turbo-preview",
|
"gpt-4-turbo-preview",
|
||||||
|
"gpt-4.1",
|
||||||
|
"gpt-4.1-2025-04-14",
|
||||||
|
"gpt-4.1-mini",
|
||||||
|
"gpt-4.1-mini-2025-04-14",
|
||||||
|
"gpt-4.1-nano",
|
||||||
|
"gpt-4.1-nano-2025-04-14",
|
||||||
|
"gpt-4.5-preview",
|
||||||
|
"gpt-4.5-preview-2025-02-27",
|
||||||
"gpt-4o",
|
"gpt-4o",
|
||||||
"gpt-4o-2024-05-13",
|
"gpt-4o-2024-05-13",
|
||||||
"gpt-4o-2024-08-06",
|
"gpt-4o-2024-08-06",
|
||||||
@@ -494,6 +518,8 @@ const openaiModels = [
|
|||||||
"o1-mini",
|
"o1-mini",
|
||||||
"o1-preview",
|
"o1-preview",
|
||||||
"o3-mini",
|
"o3-mini",
|
||||||
|
"o3",
|
||||||
|
"o4-mini",
|
||||||
];
|
];
|
||||||
|
|
||||||
const googleModels = [
|
const googleModels = [
|
||||||
@@ -570,6 +596,9 @@ const alibabaModes = [
|
|||||||
"qwen-max-0403",
|
"qwen-max-0403",
|
||||||
"qwen-max-0107",
|
"qwen-max-0107",
|
||||||
"qwen-max-longcontext",
|
"qwen-max-longcontext",
|
||||||
|
"qwen-omni-turbo",
|
||||||
|
"qwen-vl-plus",
|
||||||
|
"qwen-vl-max",
|
||||||
];
|
];
|
||||||
|
|
||||||
const tencentModels = [
|
const tencentModels = [
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
"use server";
|
if (!EXPORT_MODE) {
|
||||||
|
("use server");
|
||||||
|
}
|
||||||
import {
|
import {
|
||||||
createClient,
|
createClient,
|
||||||
executeRequest,
|
executeRequest,
|
||||||
@@ -14,12 +16,17 @@ import {
|
|||||||
ServerConfig,
|
ServerConfig,
|
||||||
ServerStatusResponse,
|
ServerStatusResponse,
|
||||||
} from "./types";
|
} from "./types";
|
||||||
import fs from "fs/promises";
|
|
||||||
import path from "path";
|
|
||||||
import { getServerSideConfig } from "../config/server";
|
|
||||||
|
|
||||||
const logger = new MCPClientLogger("MCP Actions");
|
const logger = new MCPClientLogger("MCP Actions");
|
||||||
const CONFIG_PATH = path.join(process.cwd(), "app/mcp/mcp_config.json");
|
|
||||||
|
const getConfigPath = async () => {
|
||||||
|
if (EXPORT_MODE) {
|
||||||
|
return "/mcp/config.json";
|
||||||
|
} else {
|
||||||
|
const path = await import("path");
|
||||||
|
return path.join(process.cwd(), "app/mcp/mcp_config.json");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const clientsMap = new Map<string, McpClientData>();
|
const clientsMap = new Map<string, McpClientData>();
|
||||||
|
|
||||||
@@ -339,7 +346,14 @@ export async function executeMcpAction(
|
|||||||
request: McpRequestMessage,
|
request: McpRequestMessage,
|
||||||
) {
|
) {
|
||||||
try {
|
try {
|
||||||
const client = clientsMap.get(clientId);
|
let client = clientsMap.get(clientId);
|
||||||
|
if (!client) {
|
||||||
|
client = [...clientsMap.values()].find(
|
||||||
|
(c) =>
|
||||||
|
c.tools?.tools &&
|
||||||
|
c.tools.tools.find((t) => t.name == request.params?.name),
|
||||||
|
);
|
||||||
|
}
|
||||||
if (!client?.client) {
|
if (!client?.client) {
|
||||||
throw new Error(`Client ${clientId} not found`);
|
throw new Error(`Client ${clientId} not found`);
|
||||||
}
|
}
|
||||||
@@ -354,8 +368,28 @@ export async function executeMcpAction(
|
|||||||
// 获取 MCP 配置文件
|
// 获取 MCP 配置文件
|
||||||
export async function getMcpConfigFromFile(): Promise<McpConfigData> {
|
export async function getMcpConfigFromFile(): Promise<McpConfigData> {
|
||||||
try {
|
try {
|
||||||
const configStr = await fs.readFile(CONFIG_PATH, "utf-8");
|
if (EXPORT_MODE) {
|
||||||
return JSON.parse(configStr);
|
const res = await fetch(await getConfigPath());
|
||||||
|
const config: McpConfigData = await res.json();
|
||||||
|
const storage = localStorage;
|
||||||
|
const storedConfig_str = storage.getItem("McpConfig");
|
||||||
|
if (storedConfig_str) {
|
||||||
|
const storedConfig: McpConfigData = JSON.parse(storedConfig_str);
|
||||||
|
const merged = { ...config.mcpServers };
|
||||||
|
if (storedConfig.mcpServers) {
|
||||||
|
for (const id in storedConfig.mcpServers) {
|
||||||
|
merged[id] = { ...merged[id], ...storedConfig.mcpServers[id] };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
config.mcpServers = merged;
|
||||||
|
}
|
||||||
|
return config;
|
||||||
|
} else {
|
||||||
|
const fs = await import("fs/promises");
|
||||||
|
const configStr = await fs.readFile(await getConfigPath(), "utf-8");
|
||||||
|
return JSON.parse(configStr);
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error(`Failed to load MCP config, using default config: ${error}`);
|
logger.error(`Failed to load MCP config, using default config: ${error}`);
|
||||||
return DEFAULT_MCP_CONFIG;
|
return DEFAULT_MCP_CONFIG;
|
||||||
@@ -366,8 +400,25 @@ export async function getMcpConfigFromFile(): Promise<McpConfigData> {
|
|||||||
async function updateMcpConfig(config: McpConfigData): Promise<void> {
|
async function updateMcpConfig(config: McpConfigData): Promise<void> {
|
||||||
try {
|
try {
|
||||||
// 确保目录存在
|
// 确保目录存在
|
||||||
await fs.mkdir(path.dirname(CONFIG_PATH), { recursive: true });
|
if (EXPORT_MODE) {
|
||||||
await fs.writeFile(CONFIG_PATH, JSON.stringify(config, null, 2));
|
try {
|
||||||
|
const storage = localStorage;
|
||||||
|
storage.setItem("McpConfig", JSON.stringify(config));
|
||||||
|
} catch (storageError) {
|
||||||
|
logger.warn(
|
||||||
|
`Failed to save MCP config to localStorage: ${storageError}`,
|
||||||
|
);
|
||||||
|
// Continue execution without storage
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
const fs = await import("fs/promises");
|
||||||
|
const path = await import("path");
|
||||||
|
await fs.mkdir(path.dirname(await getConfigPath()), { recursive: true });
|
||||||
|
await fs.writeFile(
|
||||||
|
await getConfigPath(),
|
||||||
|
JSON.stringify(config, null, 2),
|
||||||
|
);
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
@@ -376,8 +427,19 @@ async function updateMcpConfig(config: McpConfigData): Promise<void> {
|
|||||||
// 检查 MCP 是否启用
|
// 检查 MCP 是否启用
|
||||||
export async function isMcpEnabled() {
|
export async function isMcpEnabled() {
|
||||||
try {
|
try {
|
||||||
const serverConfig = getServerSideConfig();
|
const config = await getMcpConfigFromFile();
|
||||||
return serverConfig.enableMcp;
|
if (typeof config.enableMcp === "boolean") {
|
||||||
|
return config.enableMcp;
|
||||||
|
}
|
||||||
|
if (EXPORT_MODE) {
|
||||||
|
const { getClientConfig } = await import("../config/client");
|
||||||
|
const clientConfig = getClientConfig();
|
||||||
|
return clientConfig?.enableMcp === true;
|
||||||
|
} else {
|
||||||
|
const { getServerSideConfig } = await import("../config/server");
|
||||||
|
const serverConfig = getServerSideConfig();
|
||||||
|
return serverConfig.enableMcp;
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error(`Failed to check MCP status: ${error}`);
|
logger.error(`Failed to check MCP status: ${error}`);
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -1,7 +1,11 @@
|
|||||||
import { Client } from "@modelcontextprotocol/sdk/client/index.js";
|
import { Client } from "@modelcontextprotocol/sdk/client/index.js";
|
||||||
import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
|
|
||||||
import { MCPClientLogger } from "./logger";
|
import { MCPClientLogger } from "./logger";
|
||||||
import { ListToolsResponse, McpRequestMessage, ServerConfig } from "./types";
|
import {
|
||||||
|
ListToolsResponse,
|
||||||
|
McpRequestMessage,
|
||||||
|
ServerConfig,
|
||||||
|
isServerSseConfig,
|
||||||
|
} from "./types";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
|
||||||
const logger = new MCPClientLogger();
|
const logger = new MCPClientLogger();
|
||||||
@@ -12,18 +16,34 @@ export async function createClient(
|
|||||||
): Promise<Client> {
|
): Promise<Client> {
|
||||||
logger.info(`Creating client for ${id}...`);
|
logger.info(`Creating client for ${id}...`);
|
||||||
|
|
||||||
const transport = new StdioClientTransport({
|
let transport;
|
||||||
command: config.command,
|
|
||||||
args: config.args,
|
if (isServerSseConfig(config)) {
|
||||||
env: {
|
const { SSEClientTransport } = await import(
|
||||||
...Object.fromEntries(
|
"@modelcontextprotocol/sdk/client/sse.js"
|
||||||
Object.entries(process.env)
|
);
|
||||||
.filter(([_, v]) => v !== undefined)
|
transport = new SSEClientTransport(new URL(config.url));
|
||||||
.map(([k, v]) => [k, v as string]),
|
} else {
|
||||||
),
|
if (EXPORT_MODE) {
|
||||||
...(config.env || {}),
|
throw new Error("Cannot use stdio transport in export mode");
|
||||||
},
|
} else {
|
||||||
});
|
const { StdioClientTransport } = await import(
|
||||||
|
"@modelcontextprotocol/sdk/client/stdio.js"
|
||||||
|
);
|
||||||
|
transport = new StdioClientTransport({
|
||||||
|
command: config.command,
|
||||||
|
args: config.args,
|
||||||
|
env: {
|
||||||
|
...Object.fromEntries(
|
||||||
|
Object.entries(process.env)
|
||||||
|
.filter(([_, v]) => v !== undefined)
|
||||||
|
.map(([k, v]) => [k, v as string]),
|
||||||
|
),
|
||||||
|
...(config.env || {}),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const client = new Client(
|
const client = new Client(
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ export interface McpRequestMessage {
|
|||||||
id?: string | number;
|
id?: string | number;
|
||||||
method: "tools/call" | string;
|
method: "tools/call" | string;
|
||||||
params?: {
|
params?: {
|
||||||
|
name?: string;
|
||||||
[key: string]: unknown;
|
[key: string]: unknown;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -65,12 +66,14 @@ export const McpNotificationsSchema: z.ZodType<McpNotifications> = z.object({
|
|||||||
// Next Chat
|
// Next Chat
|
||||||
////////////
|
////////////
|
||||||
export interface ListToolsResponse {
|
export interface ListToolsResponse {
|
||||||
tools: {
|
tools: ToolSchema[];
|
||||||
name?: string;
|
}
|
||||||
description?: string;
|
|
||||||
inputSchema?: object;
|
export interface ToolSchema {
|
||||||
[key: string]: any;
|
name?: string;
|
||||||
};
|
description?: string;
|
||||||
|
inputSchema?: object;
|
||||||
|
[key: string]: any;
|
||||||
}
|
}
|
||||||
|
|
||||||
export type McpClientData =
|
export type McpClientData =
|
||||||
@@ -110,14 +113,31 @@ export interface ServerStatusResponse {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// MCP 服务器配置相关类型
|
// MCP 服务器配置相关类型
|
||||||
export interface ServerConfig {
|
|
||||||
|
export const isServerSseConfig = (c?: ServerConfig): c is ServerSseConfig =>
|
||||||
|
c !== null && typeof c === "object" && c.type === "sse";
|
||||||
|
export const isServerStdioConfig = (c?: ServerConfig): c is ServerStdioConfig =>
|
||||||
|
c !== null && typeof c === "object" && (!c.type || c.type === "stdio");
|
||||||
|
|
||||||
|
export type ServerConfig = ServerStdioConfig | ServerSseConfig;
|
||||||
|
|
||||||
|
export interface ServerStdioConfig {
|
||||||
|
type?: "stdio";
|
||||||
command: string;
|
command: string;
|
||||||
args: string[];
|
args: string[];
|
||||||
env?: Record<string, string>;
|
env?: Record<string, string>;
|
||||||
status?: "active" | "paused" | "error";
|
status?: "active" | "paused" | "error";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ServerSseConfig {
|
||||||
|
type: "sse";
|
||||||
|
url: string;
|
||||||
|
headers?: Record<string, string>;
|
||||||
|
status?: "active" | "paused" | "error";
|
||||||
|
}
|
||||||
|
|
||||||
export interface McpConfigData {
|
export interface McpConfigData {
|
||||||
|
enableMcp?: boolean;
|
||||||
// MCP Server 的配置
|
// MCP Server 的配置
|
||||||
mcpServers: Record<string, ServerConfig>;
|
mcpServers: Record<string, ServerConfig>;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -243,7 +243,12 @@ export const useAccessStore = createPersistStore(
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
fetch() {
|
fetch() {
|
||||||
if (fetchState > 0 || getClientConfig()?.buildMode === "export") return;
|
const clientConfig = getClientConfig();
|
||||||
|
if (!(fetchState > 0) && clientConfig?.buildMode === "export") {
|
||||||
|
set(clientConfig);
|
||||||
|
fetchState = 2;
|
||||||
|
}
|
||||||
|
if (fetchState > 0 || clientConfig?.buildMode === "export") return;
|
||||||
fetchState = 1;
|
fetchState = 1;
|
||||||
fetch("/api/config", {
|
fetch("/api/config", {
|
||||||
method: "post",
|
method: "post",
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
|
declare global {
|
||||||
|
const EXPORT_MODE: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
export type Updater<T> = (updater: (value: T) => void) => void;
|
export type Updater<T> = (updater: (value: T) => void) => void;
|
||||||
|
|
||||||
export const ROLES = ["system", "user", "assistant"] as const;
|
export const ROLES = ["system", "user", "assistant"] as const;
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import {
|
|||||||
UPLOAD_URL,
|
UPLOAD_URL,
|
||||||
REQUEST_TIMEOUT_MS,
|
REQUEST_TIMEOUT_MS,
|
||||||
} from "@/app/constant";
|
} from "@/app/constant";
|
||||||
import { RequestMessage } from "@/app/client/api";
|
import { MultimodalContent, RequestMessage } from "@/app/client/api";
|
||||||
import Locale from "@/app/locales";
|
import Locale from "@/app/locales";
|
||||||
import {
|
import {
|
||||||
EventStreamContentType,
|
EventStreamContentType,
|
||||||
@@ -70,8 +70,9 @@ export function compressImage(file: Blob, maxSize: number): Promise<string> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function preProcessImageContent(
|
export async function preProcessImageContentBase(
|
||||||
content: RequestMessage["content"],
|
content: RequestMessage["content"],
|
||||||
|
transformImageUrl: (url: string) => Promise<{ [key: string]: any }>,
|
||||||
) {
|
) {
|
||||||
if (typeof content === "string") {
|
if (typeof content === "string") {
|
||||||
return content;
|
return content;
|
||||||
@@ -81,7 +82,7 @@ export async function preProcessImageContent(
|
|||||||
if (part?.type == "image_url" && part?.image_url?.url) {
|
if (part?.type == "image_url" && part?.image_url?.url) {
|
||||||
try {
|
try {
|
||||||
const url = await cacheImageToBase64Image(part?.image_url?.url);
|
const url = await cacheImageToBase64Image(part?.image_url?.url);
|
||||||
result.push({ type: part.type, image_url: { url } });
|
result.push(await transformImageUrl(url));
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error processing image URL:", error);
|
console.error("Error processing image URL:", error);
|
||||||
}
|
}
|
||||||
@@ -92,6 +93,23 @@ export async function preProcessImageContent(
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function preProcessImageContent(
|
||||||
|
content: RequestMessage["content"],
|
||||||
|
) {
|
||||||
|
return preProcessImageContentBase(content, async (url) => ({
|
||||||
|
type: "image_url",
|
||||||
|
image_url: { url },
|
||||||
|
})) as Promise<MultimodalContent[] | string>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function preProcessImageContentForAlibabaDashScope(
|
||||||
|
content: RequestMessage["content"],
|
||||||
|
) {
|
||||||
|
return preProcessImageContentBase(content, async (url) => ({
|
||||||
|
image: url,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
const imageCaches: Record<string, string> = {};
|
const imageCaches: Record<string, string> = {};
|
||||||
export function cacheImageToBase64Image(imageUrl: string) {
|
export function cacheImageToBase64Image(imageUrl: string) {
|
||||||
if (imageUrl.includes(CACHE_URL_PREFIX)) {
|
if (imageUrl.includes(CACHE_URL_PREFIX)) {
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ const config: Config = {
|
|||||||
moduleNameMapper: {
|
moduleNameMapper: {
|
||||||
"^@/(.*)$": "<rootDir>/$1",
|
"^@/(.*)$": "<rootDir>/$1",
|
||||||
},
|
},
|
||||||
|
extensionsToTreatAsEsm: [".ts", ".tsx"],
|
||||||
|
injectGlobals: true,
|
||||||
};
|
};
|
||||||
|
|
||||||
// createJestConfig is exported this way to ensure that next/jest can load the Next.js config which is async
|
// createJestConfig is exported this way to ensure that next/jest can load the Next.js config which is async
|
||||||
|
|||||||
@@ -1,24 +1,22 @@
|
|||||||
// Learn more: https://github.com/testing-library/jest-dom
|
// Learn more: https://github.com/testing-library/jest-dom
|
||||||
import "@testing-library/jest-dom";
|
import "@testing-library/jest-dom";
|
||||||
|
import { jest } from "@jest/globals";
|
||||||
|
|
||||||
global.fetch = jest.fn(() =>
|
global.fetch = jest.fn(() =>
|
||||||
Promise.resolve({
|
Promise.resolve({
|
||||||
ok: true,
|
ok: true,
|
||||||
status: 200,
|
status: 200,
|
||||||
json: () => Promise.resolve({}),
|
json: () => Promise.resolve([]),
|
||||||
headers: new Headers(),
|
headers: new Headers(),
|
||||||
redirected: false,
|
redirected: false,
|
||||||
statusText: "OK",
|
statusText: "OK",
|
||||||
type: "basic",
|
type: "basic",
|
||||||
url: "",
|
url: "",
|
||||||
clone: function () {
|
|
||||||
return this;
|
|
||||||
},
|
|
||||||
body: null,
|
body: null,
|
||||||
bodyUsed: false,
|
bodyUsed: false,
|
||||||
arrayBuffer: () => Promise.resolve(new ArrayBuffer(0)),
|
arrayBuffer: () => Promise.resolve(new ArrayBuffer(0)),
|
||||||
blob: () => Promise.resolve(new Blob()),
|
blob: () => Promise.resolve(new Blob()),
|
||||||
formData: () => Promise.resolve(new FormData()),
|
formData: () => Promise.resolve(new FormData()),
|
||||||
text: () => Promise.resolve(""),
|
text: () => Promise.resolve(""),
|
||||||
}),
|
} as Response),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -6,9 +6,15 @@ console.log("[Next] build mode", mode);
|
|||||||
const disableChunk = !!process.env.DISABLE_CHUNK || mode === "export";
|
const disableChunk = !!process.env.DISABLE_CHUNK || mode === "export";
|
||||||
console.log("[Next] build with chunk: ", !disableChunk);
|
console.log("[Next] build with chunk: ", !disableChunk);
|
||||||
|
|
||||||
|
const EXPORT_MODE = mode === "export";
|
||||||
|
|
||||||
|
|
||||||
/** @type {import('next').NextConfig} */
|
/** @type {import('next').NextConfig} */
|
||||||
const nextConfig = {
|
const nextConfig = {
|
||||||
webpack(config) {
|
webpack(config) {
|
||||||
|
config.plugins.push(new webpack.DefinePlugin({
|
||||||
|
EXPORT_MODE: EXPORT_MODE
|
||||||
|
}));
|
||||||
config.module.rules.push({
|
config.module.rules.push({
|
||||||
test: /\.svg$/,
|
test: /\.svg$/,
|
||||||
use: ["@svgr/webpack"],
|
use: ["@svgr/webpack"],
|
||||||
|
|||||||
@@ -17,8 +17,8 @@
|
|||||||
"prompts": "node ./scripts/fetch-prompts.mjs",
|
"prompts": "node ./scripts/fetch-prompts.mjs",
|
||||||
"prepare": "husky install",
|
"prepare": "husky install",
|
||||||
"proxy-dev": "sh ./scripts/init-proxy.sh && proxychains -f ./scripts/proxychains.conf yarn dev",
|
"proxy-dev": "sh ./scripts/init-proxy.sh && proxychains -f ./scripts/proxychains.conf yarn dev",
|
||||||
"test": "jest --watch",
|
"test": "node --no-warnings --experimental-vm-modules $(yarn bin jest) --watch",
|
||||||
"test:ci": "jest --ci"
|
"test:ci": "node --no-warnings --experimental-vm-modules $(yarn bin jest) --ci"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fortaine/fetch-event-source": "^3.0.6",
|
"@fortaine/fetch-event-source": "^3.0.6",
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { jest } from "@jest/globals";
|
||||||
import { isVisionModel } from "../app/utils";
|
import { isVisionModel } from "../app/utils";
|
||||||
|
|
||||||
describe("isVisionModel", () => {
|
describe("isVisionModel", () => {
|
||||||
@@ -50,7 +51,7 @@ describe("isVisionModel", () => {
|
|||||||
|
|
||||||
test("should identify models from VISION_MODELS env var", () => {
|
test("should identify models from VISION_MODELS env var", () => {
|
||||||
process.env.VISION_MODELS = "custom-vision-model,another-vision-model";
|
process.env.VISION_MODELS = "custom-vision-model,another-vision-model";
|
||||||
|
|
||||||
expect(isVisionModel("custom-vision-model")).toBe(true);
|
expect(isVisionModel("custom-vision-model")).toBe(true);
|
||||||
expect(isVisionModel("another-vision-model")).toBe(true);
|
expect(isVisionModel("another-vision-model")).toBe(true);
|
||||||
expect(isVisionModel("unrelated-model")).toBe(false);
|
expect(isVisionModel("unrelated-model")).toBe(false);
|
||||||
@@ -64,4 +65,4 @@ describe("isVisionModel", () => {
|
|||||||
expect(isVisionModel("unrelated-model")).toBe(false);
|
expect(isVisionModel("unrelated-model")).toBe(false);
|
||||||
expect(isVisionModel("gpt-4-vision")).toBe(true);
|
expect(isVisionModel("gpt-4-vision")).toBe(true);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user