mirror of
https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git
synced 2025-10-17 07:23:42 +08:00
Compare commits
1 Commits
eb6cfc61da
...
Leizhenpen
Author | SHA1 | Date | |
---|---|---|---|
|
c9ef6d58ed |
11
README.md
11
README.md
@@ -40,13 +40,12 @@ English / [简体中文](./README_CN.md)
|
||||
|
||||
</div>
|
||||
|
||||
## 🥳 Cheer for DeepSeek, China's AI star!
|
||||
> Purpose-Built UI for DeepSeek Reasoner Model
|
||||
## 🥳 Cheer for NextChat iOS Version Online!
|
||||
> [ 👉 Click Here Install Now](https://apps.apple.com/us/app/nextchat-ai/id6743085599)
|
||||
|
||||

|
||||
|
||||
|
||||
<img src="https://github.com/user-attachments/assets/f3952210-3af1-4dc0-9b81-40eaa4847d9a"/>
|
||||
|
||||
|
||||
|
||||
## 🫣 NextChat Support MCP !
|
||||
> Before build, please set env ENABLE_MCP=true
|
||||
|
||||
|
@@ -90,14 +90,6 @@ export async function requestOpenai(req: NextRequest) {
|
||||
|
||||
const fetchUrl = cloudflareAIGatewayUrl(`${baseUrl}/${path}`);
|
||||
console.log("fetchUrl", fetchUrl);
|
||||
|
||||
let payload = await req.text();
|
||||
if (baseUrl.includes("openrouter.ai")) {
|
||||
const body = JSON.parse(payload);
|
||||
body["include_reasoning"] = true;
|
||||
payload = JSON.stringify(body);
|
||||
}
|
||||
|
||||
const fetchOptions: RequestInit = {
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
@@ -108,7 +100,7 @@ export async function requestOpenai(req: NextRequest) {
|
||||
}),
|
||||
},
|
||||
method: req.method,
|
||||
body: payload,
|
||||
body: req.body,
|
||||
// to fix #2485: https://stackoverflow.com/questions/55920957/cloudflare-worker-typeerror-one-time-use-body
|
||||
redirect: "manual",
|
||||
// @ts-ignore
|
||||
@@ -119,7 +111,10 @@ export async function requestOpenai(req: NextRequest) {
|
||||
// #1815 try to refuse gpt4 request
|
||||
if (serverConfig.customModels && req.body) {
|
||||
try {
|
||||
const jsonBody = JSON.parse(payload) as { model?: string };
|
||||
const clonedBody = await req.text();
|
||||
fetchOptions.body = clonedBody;
|
||||
|
||||
const jsonBody = JSON.parse(clonedBody) as { model?: string };
|
||||
|
||||
// not undefined and is false
|
||||
if (
|
||||
|
@@ -2,10 +2,10 @@
|
||||
// azure and openai, using same models. so using same LLMApi.
|
||||
import {
|
||||
ApiPath,
|
||||
Azure,
|
||||
DEFAULT_MODELS,
|
||||
OPENAI_BASE_URL,
|
||||
DEFAULT_MODELS,
|
||||
OpenaiPath,
|
||||
Azure,
|
||||
REQUEST_TIMEOUT_MS,
|
||||
ServiceProvider,
|
||||
} from "@/app/constant";
|
||||
@@ -18,13 +18,13 @@ import {
|
||||
} from "@/app/store";
|
||||
import { collectModelsWithDefaultModel } from "@/app/utils/model";
|
||||
import {
|
||||
base64Image2Blob,
|
||||
preProcessImageContent,
|
||||
streamWithThink,
|
||||
uploadImage,
|
||||
base64Image2Blob,
|
||||
streamWithThink,
|
||||
} from "@/app/utils/chat";
|
||||
import { cloudflareAIGatewayUrl } from "@/app/utils/cloudflare";
|
||||
import { DalleQuality, DalleStyle, ModelSize } from "@/app/typing";
|
||||
import { ModelSize, DalleQuality, DalleStyle } from "@/app/typing";
|
||||
|
||||
import {
|
||||
ChatOptions,
|
||||
@@ -39,9 +39,9 @@ import Locale from "../../locales";
|
||||
import { getClientConfig } from "@/app/config/client";
|
||||
import {
|
||||
getMessageTextContent,
|
||||
getTimeoutMSByModel,
|
||||
isDalle3 as _isDalle3,
|
||||
isVisionModel,
|
||||
isDalle3 as _isDalle3,
|
||||
getTimeoutMSByModel,
|
||||
} from "@/app/utils";
|
||||
import { fetch } from "@/app/utils/stream";
|
||||
|
||||
@@ -294,13 +294,6 @@ export class ChatGPTApi implements LLMApi {
|
||||
useChatStore.getState().currentSession().mask?.plugin || [],
|
||||
);
|
||||
// console.log("getAsTools", tools, funcs);
|
||||
|
||||
// Add "include_reasoning" for OpenRouter: https://openrouter.ai/announcements/reasoning-tokens-for-thinking-models
|
||||
if (chatPath.includes("openrouter.ai")) {
|
||||
// @ts-ignore
|
||||
requestPayload["include_reasoning"] = true;
|
||||
}
|
||||
|
||||
streamWithThink(
|
||||
chatPath,
|
||||
requestPayload,
|
||||
@@ -317,7 +310,6 @@ export class ChatGPTApi implements LLMApi {
|
||||
content: string;
|
||||
tool_calls: ChatMessageTool[];
|
||||
reasoning_content: string | null;
|
||||
reasoning: string | null;
|
||||
};
|
||||
}>;
|
||||
|
||||
@@ -343,9 +335,7 @@ export class ChatGPTApi implements LLMApi {
|
||||
}
|
||||
}
|
||||
|
||||
const reasoning =
|
||||
choices[0]?.delta?.reasoning_content ||
|
||||
choices[0]?.delta?.reasoning;
|
||||
const reasoning = choices[0]?.delta?.reasoning_content;
|
||||
const content = choices[0]?.delta?.content;
|
||||
|
||||
// Skip if both content and reasoning_content are empty or null
|
||||
@@ -421,7 +411,6 @@ export class ChatGPTApi implements LLMApi {
|
||||
options.onError?.(e as Error);
|
||||
}
|
||||
}
|
||||
|
||||
async usage() {
|
||||
const formatDate = (d: Date) =>
|
||||
`${d.getFullYear()}-${(d.getMonth() + 1).toString().padStart(2, "0")}-${d
|
||||
@@ -525,5 +514,4 @@ export class ChatGPTApi implements LLMApi {
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
export { OpenaiPath };
|
||||
|
@@ -1,7 +1,7 @@
|
||||
import {
|
||||
CACHE_URL_PREFIX,
|
||||
REQUEST_TIMEOUT_MS,
|
||||
UPLOAD_URL,
|
||||
REQUEST_TIMEOUT_MS,
|
||||
} from "@/app/constant";
|
||||
import { MultimodalContent, RequestMessage } from "@/app/client/api";
|
||||
import Locale from "@/app/locales";
|
||||
@@ -111,7 +111,6 @@ export async function preProcessImageContentForAlibabaDashScope(
|
||||
}
|
||||
|
||||
const imageCaches: Record<string, string> = {};
|
||||
|
||||
export function cacheImageToBase64Image(imageUrl: string) {
|
||||
if (imageUrl.includes(CACHE_URL_PREFIX)) {
|
||||
if (!imageCaches[imageUrl]) {
|
||||
@@ -386,7 +385,6 @@ export function stream(
|
||||
openWhenHidden: true,
|
||||
});
|
||||
}
|
||||
|
||||
console.debug("[ChatAPI] start");
|
||||
chatApi(chatPath, headers, requestPayload, tools); // call fetchEventSource
|
||||
}
|
||||
@@ -629,9 +627,16 @@ export function streamWithThink(
|
||||
if (remainText.length > 0) {
|
||||
remainText += "\n";
|
||||
}
|
||||
remainText += "> ";
|
||||
remainText += "> " + chunk.content;
|
||||
} else {
|
||||
// Handle newlines in thinking content
|
||||
if (chunk.content.includes("\n\n")) {
|
||||
const lines = chunk.content.split("\n\n");
|
||||
remainText += lines.join("\n\n> ");
|
||||
} else {
|
||||
remainText += chunk.content;
|
||||
}
|
||||
}
|
||||
remainText += chunk.content.replaceAll("\n", "\n> ");
|
||||
} else {
|
||||
// If in normal mode
|
||||
if (isInThinkingMode || isThinkingChanged) {
|
||||
@@ -657,7 +662,6 @@ export function streamWithThink(
|
||||
openWhenHidden: true,
|
||||
});
|
||||
}
|
||||
|
||||
console.debug("[ChatAPI] start");
|
||||
chatApi(chatPath, headers, requestPayload, tools); // call fetchEventSource
|
||||
}
|
||||
|
Reference in New Issue
Block a user