From 233e82677882ecbda34eef40d588420d4886ec99 Mon Sep 17 00:00:00 2001 From: NFish Date: Fri, 16 May 2025 11:15:54 +0800 Subject: [PATCH] fix: test run failed --- web/app/components/base/chat/utils.ts | 55 --------------------------- web/service/fetch.ts | 4 +- 2 files changed, 2 insertions(+), 57 deletions(-) diff --git a/web/app/components/base/chat/utils.ts b/web/app/components/base/chat/utils.ts index 476e8b8d52..bdac5998fe 100644 --- a/web/app/components/base/chat/utils.ts +++ b/web/app/components/base/chat/utils.ts @@ -1,8 +1,6 @@ import { UUID_NIL } from './constants' import type { IChatItem } from './chat/type' import type { ChatItem, ChatItemInTree } from './types' -import { addFileInfos, sortAgentSorts } from '../../tools/utils' -import { getProcessedFilesFromResponse } from '../file-uploader/utils' async function decodeBase64AndDecompress(base64String: string) { try { @@ -42,58 +40,6 @@ async function getProcessedSystemVariablesFromUrlParams(): Promise file.belongs_to === 'assistant') || [] - chatList.push({ - id: item.id, - content: item.answer, - agent_thoughts: addFileInfos(item.agent_thoughts ? sortAgentSorts(item.agent_thoughts) : item.agent_thoughts, item.message_files), - feedback: item.feedback, - isAnswer: true, - citation: item.retriever_resources, - message_files: getProcessedFilesFromResponse(answerFiles.map((item: any) => ({ ...item, related_id: item.id }))), - }) - const questionFiles = item.message_files?.filter((file: any) => file.belongs_to === 'user') || [] - chatList.push({ - id: `question-${item.id}`, - content: item.query, - isAnswer: false, - message_files: getProcessedFilesFromResponse(questionFiles.map((item: any) => ({ ...item, related_id: item.id }))), - }) -} - -/** - * Computes the latest thread messages from all messages of the conversation. - * Same logic as backend codebase `api/core/prompt/utils/extract_thread_messages.py` - * - * @param fetchedMessages - The history chat list data from the backend, sorted by created_at in descending order. This includes all flattened history messages of the conversation. - * @returns An array of ChatItems representing the latest thread. - */ - -function getPrevChatList(fetchedMessages: any[]) { - const ret: ChatItem[] = [] - let nextMessageId = null - - for (const item of fetchedMessages) { - if (!item.parent_message_id) { - appendQAToChatList(ret, item) - break - } - - if (!nextMessageId) { - appendQAToChatList(ret, item) - nextMessageId = item.parent_message_id - } - else { - if (item.id === nextMessageId || nextMessageId === UUID_NIL) { - appendQAToChatList(ret, item) - nextMessageId = item.parent_message_id - } - } - } - return ret.reverse() -} function isValidGeneratedAnswer(item?: ChatItem | ChatItemInTree): boolean { return !!item && item.isAnswer && !item.id.startsWith('answer-placeholder-') && !item.isOpeningStatement @@ -241,7 +187,6 @@ export { getProcessedInputsFromUrlParams, getProcessedSystemVariablesFromUrlParams, isValidGeneratedAnswer, - getPrevChatList, getLastAnswer, buildChatItemTree, getThreadMessages, diff --git a/web/service/fetch.ts b/web/service/fetch.ts index 05d39c6b3e..b1efb86e9b 100644 --- a/web/service/fetch.ts +++ b/web/service/fetch.ts @@ -135,9 +135,9 @@ async function base(url: string, options: FetchOptionType = {}, otherOptions: let base: string if (isMarketplaceAPI) base = MARKETPLACE_API_PREFIX - else if (isPublicAPI) + else if (isPublicAPI) base = PUBLIC_API_PREFIX - else + else base = API_PREFIX if (getAbortController) {