mirror of
https://github.com/Yidadaa/ChatGPT-Next-Web.git
synced 2025-08-30 18:46:58 +08:00
Compare commits
11 Commits
feat-mcp
...
bestsanmao
Author | SHA1 | Date | |
---|---|---|---|
|
8680182921 | ||
|
2173c82bb5 | ||
|
0d5e66a9ae | ||
|
2f9cb5a68f | ||
|
55cacfb7e2 | ||
|
6a862372f7 | ||
|
81bd83eb44 | ||
|
b2b6fd81be | ||
|
f22cfd7b33 | ||
|
8111acff34 | ||
|
4cad55379d |
@@ -1,6 +1,11 @@
|
||||
|
||||
|
||||
# Your openai api key. (required)
|
||||
OPENAI_API_KEY=sk-xxxx
|
||||
|
||||
# DeepSeek Api Key. (Optional)
|
||||
DEEPSEEK_API_KEY=
|
||||
|
||||
# Access password, separated by comma. (optional)
|
||||
CODE=your-password
|
||||
|
||||
@@ -70,5 +75,6 @@ ANTHROPIC_API_VERSION=
|
||||
### anthropic claude Api url (optional)
|
||||
ANTHROPIC_URL=
|
||||
|
||||
|
||||
### (optional)
|
||||
WHITE_WEBDAV_ENDPOINTS=
|
@@ -1,2 +1,3 @@
|
||||
public/serviceWorker.js
|
||||
app/mcp/mcp_config.json
|
||||
app/mcp/mcp_config.json
|
||||
app/mcp/mcp_config.default.json
|
@@ -42,7 +42,7 @@ COPY --from=builder /app/.next/static ./.next/static
|
||||
COPY --from=builder /app/.next/server ./.next/server
|
||||
|
||||
RUN mkdir -p /app/app/mcp && chmod 777 /app/app/mcp
|
||||
COPY --from=builder /app/app/mcp/mcp_config.json /app/app/mcp/
|
||||
COPY --from=builder /app/app/mcp/mcp_config.default.json /app/app/mcp/mcp_config.json
|
||||
|
||||
EXPOSE 3000
|
||||
|
||||
|
23
README.md
23
README.md
@@ -5,6 +5,7 @@
|
||||
</a>
|
||||
|
||||
|
||||
|
||||
<h1 align="center">NextChat (ChatGPT Next Web)</h1>
|
||||
|
||||
English / [简体中文](./README_CN.md)
|
||||
@@ -39,6 +40,12 @@ One-Click to get a well-designed cross-platform ChatGPT web UI, with Claude, GPT
|
||||
|
||||
</div>
|
||||
|
||||
## 🫣 NextChat Support MCP !
|
||||
> Before build, please set env ENABLE_MCP=true
|
||||
|
||||
<img src="https://github.com/user-attachments/assets/d8851f40-4e36-4335-b1a4-ec1e11488c7e"/>
|
||||
|
||||
|
||||
## Enterprise Edition
|
||||
|
||||
Meeting Your Company's Privatization and Customization Deployment Requirements:
|
||||
@@ -333,6 +340,12 @@ Stability API key.
|
||||
|
||||
Customize Stability API url.
|
||||
|
||||
|
||||
### `ENABLE_MCP` (optional)
|
||||
|
||||
Enable MCP(Model Context Protocol)Feature
|
||||
|
||||
|
||||
## Requirements
|
||||
|
||||
NodeJS >= 18, Docker >= 20
|
||||
@@ -391,6 +404,16 @@ If your proxy needs password, use:
|
||||
-e PROXY_URL="http://127.0.0.1:7890 user pass"
|
||||
```
|
||||
|
||||
If enable MCP, use:
|
||||
|
||||
```
|
||||
docker run -d -p 3000:3000 \
|
||||
-e OPENAI_API_KEY=sk-xxxx \
|
||||
-e CODE=your-password \
|
||||
-e ENABLE_MCP=true \
|
||||
yidadaa/chatgpt-next-web
|
||||
```
|
||||
|
||||
### Shell
|
||||
|
||||
```shell
|
||||
|
@@ -27,7 +27,8 @@
|
||||
|
||||
企业版咨询: **business@nextchat.dev**
|
||||
|
||||
<img width="300" src="https://github.com/user-attachments/assets/3daeb7b6-ab63-4542-9141-2e4a12c80601">
|
||||
<img width="300" src="https://github.com/user-attachments/assets/bb29a11d-ff75-48a8-b1f8-d2d7238cf987">
|
||||
|
||||
|
||||
## 开始使用
|
||||
|
||||
|
@@ -72,6 +72,9 @@ import {
|
||||
safeLocalStorage,
|
||||
getModelSizes,
|
||||
supportsCustomSize,
|
||||
useMobileScreen,
|
||||
selectOrCopy,
|
||||
showPlugins,
|
||||
} from "../utils";
|
||||
|
||||
import { uploadImage as uploadImageRemote } from "@/app/utils/chat";
|
||||
|
@@ -255,6 +255,6 @@ export const getServerSideConfig = () => {
|
||||
defaultModel,
|
||||
visionModels,
|
||||
allowedWebDavEndpoints,
|
||||
enableMcp: !!process.env.ENABLE_MCP,
|
||||
enableMcp: process.env.ENABLE_MCP === "true",
|
||||
};
|
||||
};
|
||||
|
@@ -393,6 +393,7 @@ You are an AI assistant with access to system tools. Your role is to help users
|
||||
|
||||
export const SUMMARIZE_MODEL = "gpt-4o-mini";
|
||||
export const GEMINI_SUMMARIZE_MODEL = "gemini-pro";
|
||||
export const DEEPSEEK_SUMMARIZE_MODEL = "deepseek-chat";
|
||||
|
||||
export const KnowledgeCutOffDate: Record<string, string> = {
|
||||
default: "2021-09",
|
||||
@@ -561,7 +562,7 @@ const iflytekModels = [
|
||||
"4.0Ultra",
|
||||
];
|
||||
|
||||
const deepseekModels = ["deepseek-chat", "deepseek-coder"];
|
||||
const deepseekModels = ["deepseek-chat", "deepseek-coder", "deepseek-reasoner"];
|
||||
|
||||
const xAIModes = ["grok-beta"];
|
||||
|
||||
|
@@ -365,6 +365,8 @@ export async function getMcpConfigFromFile(): Promise<McpConfigData> {
|
||||
// 更新 MCP 配置文件
|
||||
async function updateMcpConfig(config: McpConfigData): Promise<void> {
|
||||
try {
|
||||
// 确保目录存在
|
||||
await fs.mkdir(path.dirname(CONFIG_PATH), { recursive: true });
|
||||
await fs.writeFile(CONFIG_PATH, JSON.stringify(config, null, 2));
|
||||
} catch (error) {
|
||||
throw error;
|
||||
|
3
app/mcp/mcp_config.default.json
Normal file
3
app/mcp/mcp_config.default.json
Normal file
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"mcpServers": {}
|
||||
}
|
@@ -20,6 +20,7 @@ import {
|
||||
DEFAULT_MODELS,
|
||||
DEFAULT_SYSTEM_TEMPLATE,
|
||||
GEMINI_SUMMARIZE_MODEL,
|
||||
DEEPSEEK_SUMMARIZE_MODEL,
|
||||
KnowledgeCutOffDate,
|
||||
MCP_SYSTEM_TEMPLATE,
|
||||
MCP_TOOLS_TEMPLATE,
|
||||
@@ -35,7 +36,7 @@ import { ModelConfig, ModelType, useAppConfig } from "./config";
|
||||
import { useAccessStore } from "./access";
|
||||
import { collectModelsWithDefaultModel } from "../utils/model";
|
||||
import { createEmptyMask, Mask } from "./mask";
|
||||
import { executeMcpAction, getAllTools } from "../mcp/actions";
|
||||
import { executeMcpAction, getAllTools, isMcpEnabled } from "../mcp/actions";
|
||||
import { extractMcpJson, isMcpJson } from "../mcp/utils";
|
||||
|
||||
const localStorage = safeLocalStorage();
|
||||
@@ -143,7 +144,10 @@ function getSummarizeModel(
|
||||
}
|
||||
if (currentModel.startsWith("gemini")) {
|
||||
return [GEMINI_SUMMARIZE_MODEL, ServiceProvider.Google];
|
||||
} else if (currentModel.startsWith("deepseek-")) {
|
||||
return [DEEPSEEK_SUMMARIZE_MODEL, ServiceProvider.DeepSeek];
|
||||
}
|
||||
|
||||
return [currentModel, providerName];
|
||||
}
|
||||
|
||||
@@ -245,7 +249,7 @@ export const useChatStore = createPersistStore(
|
||||
|
||||
newSession.topic = currentSession.topic;
|
||||
// 深拷贝消息
|
||||
newSession.messages = currentSession.messages.map(msg => ({
|
||||
newSession.messages = currentSession.messages.map((msg) => ({
|
||||
...msg,
|
||||
id: nanoid(), // 生成新的消息 ID
|
||||
}));
|
||||
@@ -551,27 +555,32 @@ export const useChatStore = createPersistStore(
|
||||
(session.mask.modelConfig.model.startsWith("gpt-") ||
|
||||
session.mask.modelConfig.model.startsWith("chatgpt-"));
|
||||
|
||||
const mcpSystemPrompt = await getMcpSystemPrompt();
|
||||
const mcpEnabled = await isMcpEnabled();
|
||||
const mcpSystemPrompt = mcpEnabled ? await getMcpSystemPrompt() : "";
|
||||
|
||||
var systemPrompts: ChatMessage[] = [];
|
||||
systemPrompts = shouldInjectSystemPrompts
|
||||
? [
|
||||
createMessage({
|
||||
role: "system",
|
||||
content:
|
||||
fillTemplateWith("", {
|
||||
...modelConfig,
|
||||
template: DEFAULT_SYSTEM_TEMPLATE,
|
||||
}) + mcpSystemPrompt,
|
||||
}),
|
||||
]
|
||||
: [
|
||||
createMessage({
|
||||
role: "system",
|
||||
content: mcpSystemPrompt,
|
||||
}),
|
||||
];
|
||||
|
||||
if (shouldInjectSystemPrompts) {
|
||||
systemPrompts = [
|
||||
createMessage({
|
||||
role: "system",
|
||||
content:
|
||||
fillTemplateWith("", {
|
||||
...modelConfig,
|
||||
template: DEFAULT_SYSTEM_TEMPLATE,
|
||||
}) + mcpSystemPrompt,
|
||||
}),
|
||||
];
|
||||
} else if (mcpEnabled) {
|
||||
systemPrompts = [
|
||||
createMessage({
|
||||
role: "system",
|
||||
content: mcpSystemPrompt,
|
||||
}),
|
||||
];
|
||||
}
|
||||
|
||||
if (shouldInjectSystemPrompts || mcpEnabled) {
|
||||
console.log(
|
||||
"[Global System Prompt] ",
|
||||
systemPrompts.at(0)?.content ?? "empty",
|
||||
@@ -816,6 +825,8 @@ export const useChatStore = createPersistStore(
|
||||
|
||||
/** check if the message contains MCP JSON and execute the MCP action */
|
||||
checkMcpJson(message: ChatMessage) {
|
||||
const mcpEnabled = isMcpEnabled();
|
||||
if (!mcpEnabled) return;
|
||||
const content = getMessageTextContent(message);
|
||||
if (isMcpJson(content)) {
|
||||
try {
|
||||
|
Reference in New Issue
Block a user