Compare commits

..

1 Commits

Author SHA1 Message Date
RiverRay
b95b1ac6f3 Update README.md 2025-02-21 08:56:21 +08:00
9 changed files with 46 additions and 102 deletions

View File

@@ -22,6 +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) / [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.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)

View File

@@ -40,11 +40,6 @@ 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[];

View File

@@ -7,10 +7,7 @@ import {
ChatMessageTool, ChatMessageTool,
usePluginStore, usePluginStore,
} from "@/app/store"; } from "@/app/store";
import { import { streamWithThink } from "@/app/utils/chat";
preProcessImageContentForAlibabaDashScope,
streamWithThink,
} from "@/app/utils/chat";
import { import {
ChatOptions, ChatOptions,
getHeaders, getHeaders,
@@ -18,14 +15,12 @@ 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";
@@ -94,6 +89,14 @@ 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,
@@ -102,21 +105,6 @@ 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,
@@ -141,7 +129,7 @@ export class QwenApi implements LLMApi {
"X-DashScope-SSE": shouldStream ? "enable" : "disable", "X-DashScope-SSE": shouldStream ? "enable" : "disable",
}; };
const chatPath = this.path(Alibaba.ChatPath(modelConfig.model)); const chatPath = this.path(Alibaba.ChatPath);
const chatPayload = { const chatPayload = {
method: "POST", method: "POST",
body: JSON.stringify(requestPayload), body: JSON.stringify(requestPayload),
@@ -174,7 +162,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 | MultimodalContentForAlibaba[]; content: string | null;
tool_calls: ChatMessageTool[]; tool_calls: ChatMessageTool[];
reasoning_content: string | null; reasoning_content: string | null;
}; };
@@ -224,9 +212,7 @@ export class QwenApi implements LLMApi {
} else if (content && content.length > 0) { } else if (content && content.length > 0) {
return { return {
isThinking: false, isThinking: false,
content: Array.isArray(content) content: content,
? content.map((item) => item.text).join(",")
: content,
}; };
} }

View File

@@ -75,25 +75,6 @@ export class DeepSeekApi implements LLMApi {
} }
} }
// 检测并修复消息顺序确保除system外的第一个消息是user
const filteredMessages: ChatOptions["messages"] = [];
let hasFoundFirstUser = false;
for (const msg of messages) {
if (msg.role === "system") {
// Keep all system messages
filteredMessages.push(msg);
} else if (msg.role === "user") {
// User message directly added
filteredMessages.push(msg);
hasFoundFirstUser = true;
} else if (hasFoundFirstUser) {
// After finding the first user message, all subsequent non-system messages are retained.
filteredMessages.push(msg);
}
// If hasFoundFirstUser is false and it is not a system message, it will be skipped.
}
const modelConfig = { const modelConfig = {
...useAppConfig.getState().modelConfig, ...useAppConfig.getState().modelConfig,
...useChatStore.getState().currentSession().mask.modelConfig, ...useChatStore.getState().currentSession().mask.modelConfig,
@@ -104,7 +85,7 @@ export class DeepSeekApi implements LLMApi {
}; };
const requestPayload: RequestPayload = { const requestPayload: RequestPayload = {
messages: filteredMessages, messages,
stream: options.config.stream, stream: options.config.stream,
model: modelConfig.model, model: modelConfig.model,
temperature: modelConfig.temperature, temperature: modelConfig.temperature,

View File

@@ -66,11 +66,11 @@ export function Avatar(props: { model?: ModelType; avatar?: string }) {
LlmIcon = BotIconGemma; LlmIcon = BotIconGemma;
} else if (modelName.startsWith("claude")) { } else if (modelName.startsWith("claude")) {
LlmIcon = BotIconClaude; LlmIcon = BotIconClaude;
} else if (modelName.includes("llama")) { } else if (modelName.toLowerCase().includes("llama")) {
LlmIcon = BotIconMeta; LlmIcon = BotIconMeta;
} else if (modelName.startsWith("mixtral") || modelName.startsWith("codestral")) { } else if (modelName.startsWith("mixtral")) {
LlmIcon = BotIconMistral; LlmIcon = BotIconMistral;
} else if (modelName.includes("deepseek")) { } else if (modelName.toLowerCase().includes("deepseek")) {
LlmIcon = BotIconDeepseek; LlmIcon = BotIconDeepseek;
} else if (modelName.startsWith("moonshot")) { } else if (modelName.startsWith("moonshot")) {
LlmIcon = BotIconMoonshot; LlmIcon = BotIconMoonshot;
@@ -85,7 +85,7 @@ export function Avatar(props: { model?: ModelType; avatar?: string }) {
} else if (modelName.startsWith("doubao") || modelName.startsWith("ep-")) { } else if (modelName.startsWith("doubao") || modelName.startsWith("ep-")) {
LlmIcon = BotIconDoubao; LlmIcon = BotIconDoubao;
} else if ( } else if (
modelName.includes("glm") || modelName.toLowerCase().includes("glm") ||
modelName.startsWith("cogview-") || modelName.startsWith("cogview-") ||
modelName.startsWith("cogvideox-") modelName.startsWith("cogvideox-")
) { ) {

View File

@@ -52,10 +52,13 @@
.sidebar-header-bar { .sidebar-header-bar {
display: flex; display: flex;
margin-bottom: 20px; margin-bottom: 20px;
gap: 10px;
.sidebar-bar-button { .sidebar-bar-button {
flex-grow: 1; flex-grow: 1;
&:not(:last-child) {
margin-right: 10px;
}
} }
} }
@@ -249,6 +252,13 @@
.sidebar-header-bar { .sidebar-header-bar {
flex-direction: column; flex-direction: column;
.sidebar-bar-button {
&:not(:last-child) {
margin-right: 0;
margin-bottom: 10px;
}
}
} }
.chat-item { .chat-item {
@@ -298,10 +308,15 @@
.sidebar-tail { .sidebar-tail {
flex-direction: column-reverse; flex-direction: column-reverse;
align-items: center; align-items: center;
gap: 15px;
.sidebar-actions { .sidebar-actions {
display: contents; flex-direction: column-reverse;
align-items: center;
.sidebar-action {
margin-right: 0;
margin-top: 15px;
}
} }
} }
} }
@@ -314,7 +329,10 @@
.sidebar-actions { .sidebar-actions {
display: inline-flex; display: inline-flex;
gap: 15px; }
.sidebar-action:not(:last-child) {
margin-right: 15px;
} }
.loading-content { .loading-content {
@@ -328,9 +346,4 @@
.rtl-screen { .rtl-screen {
direction: rtl; direction: rtl;
.sidebar-drag {
right: unset;
left: 0;
}
} }

View File

@@ -13,7 +13,7 @@ import McpIcon from "../icons/mcp.svg";
import DragIcon from "../icons/drag.svg"; import DragIcon from "../icons/drag.svg";
import DiscoveryIcon from "../icons/discovery.svg"; import DiscoveryIcon from "../icons/discovery.svg";
import Locale, { getLang } from "../locales"; import Locale from "../locales";
import { useAppConfig, useChatStore } from "../store"; import { useAppConfig, useChatStore } from "../store";
@@ -91,11 +91,7 @@ export function useDragSideBar() {
return; return;
} }
lastUpdateTime.current = Date.now(); lastUpdateTime.current = Date.now();
let d = e.clientX - startX.current; const d = e.clientX - startX.current;
// If text and other elements go from right to left
if (getLang() === "ar") {
d = -1 * d;
}
const nextWidth = limit(startDragWidth.current + d); const nextWidth = limit(startDragWidth.current + d);
config.update((config) => { config.update((config) => {
if (nextWidth < MIN_SIDEBAR_WIDTH) { if (nextWidth < MIN_SIDEBAR_WIDTH) {

View File

@@ -221,12 +221,7 @@ export const ByteDance = {
export const Alibaba = { export const Alibaba = {
ExampleEndpoint: ALIBABA_BASE_URL, ExampleEndpoint: ALIBABA_BASE_URL,
ChatPath: (modelName: string) => { ChatPath: "v1/services/aigc/text-generation/generation",
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 = {
@@ -540,8 +535,6 @@ const anthropicModels = [
"claude-3-5-sonnet-20240620", "claude-3-5-sonnet-20240620",
"claude-3-5-sonnet-20241022", "claude-3-5-sonnet-20241022",
"claude-3-5-sonnet-latest", "claude-3-5-sonnet-latest",
"claude-3-7-sonnet-20250219",
"claude-3-7-sonnet-latest",
]; ];
const baiduModels = [ const baiduModels = [
@@ -575,9 +568,6 @@ 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 = [

View File

@@ -3,7 +3,7 @@ import {
UPLOAD_URL, UPLOAD_URL,
REQUEST_TIMEOUT_MS, REQUEST_TIMEOUT_MS,
} from "@/app/constant"; } from "@/app/constant";
import { MultimodalContent, RequestMessage } from "@/app/client/api"; import { RequestMessage } from "@/app/client/api";
import Locale from "@/app/locales"; import Locale from "@/app/locales";
import { import {
EventStreamContentType, EventStreamContentType,
@@ -70,9 +70,8 @@ export function compressImage(file: Blob, maxSize: number): Promise<string> {
}); });
} }
export async function preProcessImageContentBase( export async function preProcessImageContent(
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;
@@ -82,7 +81,7 @@ export async function preProcessImageContentBase(
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(await transformImageUrl(url)); result.push({ type: part.type, image_url: { url } });
} catch (error) { } catch (error) {
console.error("Error processing image URL:", error); console.error("Error processing image URL:", error);
} }
@@ -93,23 +92,6 @@ export async function preProcessImageContentBase(
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)) {