From ae2a6612017510eb2f8ff0a72e192fb2ef5b95ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?George=C2=B7Dong?= Date: Sat, 29 Mar 2025 21:21:22 +0800 Subject: [PATCH] fix(ApiService): context clear failed --- src/renderer/src/services/ApiService.ts | 4 ++-- src/renderer/src/services/MessagesService.ts | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/renderer/src/services/ApiService.ts b/src/renderer/src/services/ApiService.ts index db211552..e70e5cba 100644 --- a/src/renderer/src/services/ApiService.ts +++ b/src/renderer/src/services/ApiService.ts @@ -18,7 +18,7 @@ import { getTranslateModel } from './AssistantService' import { EVENT_NAMES, EventEmitter } from './EventService' -import { filterMessages, filterUsefulMessages } from './MessagesService' +import { filterContextMessages, filterMessages, filterUsefulMessages } from './MessagesService' import { estimateMessagesUsage } from './TokenService' import WebSearchService from './WebSearchService' @@ -112,7 +112,7 @@ export async function fetchChatCompletion({ } await AI.completions({ - messages: filterUsefulMessages(messages), + messages: filterUsefulMessages(filterContextMessages(messages)), assistant, onFilterMessages: (messages) => (_messages = messages), onChunk: ({ text, reasoning_content, usage, metrics, search, citations, mcpToolResponse, generateImage }) => { diff --git a/src/renderer/src/services/MessagesService.ts b/src/renderer/src/services/MessagesService.ts index 11b0cef1..567efaa2 100644 --- a/src/renderer/src/services/MessagesService.ts +++ b/src/renderer/src/services/MessagesService.ts @@ -80,11 +80,7 @@ export function filterUsefulMessages(messages: Message[]): Message[] { // 过滤两条及以上 user 类型消息相邻的情况，只保留最新一条 user 消息 _messages = _messages.filter((message, index, origin) => { - if ( - message.role === 'user' - && index + 1 < origin.length - && origin[index + 1].role === 'user' - ) { + if (message.role === 'user' && index + 1 < origin.length && origin[index + 1].role === 'user') { return false } return true