mirror of
https://github.com/labring/FastGPT.git
synced 2025-07-21 03:35:36 +00:00
perf: human check;perf: recursion get node response (#4888)
* perf: human check * version * perf: recursion get node response
This commit is contained in:
@@ -22,10 +22,12 @@ weight: 790
|
|||||||
3. 纠正原先知识库的“表格数据集”名称,改成“备份导入”。同时支持知识库索引的导出和导入。
|
3. 纠正原先知识库的“表格数据集”名称,改成“备份导入”。同时支持知识库索引的导出和导入。
|
||||||
4. 工作流知识库引用上限,如果工作流中没有相关 AI 节点,则交互模式改成纯手动输入,并且上限为 1000万。
|
4. 工作流知识库引用上限,如果工作流中没有相关 AI 节点,则交互模式改成纯手动输入,并且上限为 1000万。
|
||||||
5. 语音输入,移动端判断逻辑,准确判断是否为手机,而不是小屏。
|
5. 语音输入,移动端判断逻辑,准确判断是否为手机,而不是小屏。
|
||||||
|
6. 优化上下文截取算法,至少保证留下一组 Human 信息。
|
||||||
|
|
||||||
## 🐛 修复
|
## 🐛 修复
|
||||||
|
|
||||||
1. 全文检索多知识库时排序得分排序不正确。
|
1. 全文检索多知识库时排序得分排序不正确。
|
||||||
2. 流响应捕获 finish_reason 可能不正确。
|
2. 流响应捕获 finish_reason 可能不正确。
|
||||||
3. 工具调用模式,未保存思考输出。
|
3. 工具调用模式,未保存思考输出。
|
||||||
4. 知识库 indexSize 参数未生效。
|
4. 知识库 indexSize 参数未生效。
|
||||||
|
5. 工作流嵌套 2 层后,获取预览引用、上下文不正确。
|
@@ -65,8 +65,8 @@ export const filterGPTMessageByMaxContext = async ({
|
|||||||
if (lastMessage.role === ChatCompletionRequestMessageRoleEnum.User) {
|
if (lastMessage.role === ChatCompletionRequestMessageRoleEnum.User) {
|
||||||
const tokens = await countGptMessagesTokens([lastMessage, ...tmpChats]);
|
const tokens = await countGptMessagesTokens([lastMessage, ...tmpChats]);
|
||||||
maxContext -= tokens;
|
maxContext -= tokens;
|
||||||
// 该轮信息整体 tokens 超出范围,这段数据不要了
|
// 该轮信息整体 tokens 超出范围,这段数据不要了。但是至少保证一组。
|
||||||
if (maxContext < 0) {
|
if (maxContext < 0 && chats.length > 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "app",
|
"name": "app",
|
||||||
"version": "4.9.9",
|
"version": "4.9.10",
|
||||||
"private": false,
|
"private": false,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
|
@@ -7,6 +7,7 @@ import { type ChatHistoryItemResType } from '@fastgpt/global/core/chat/type';
|
|||||||
import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
|
import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
|
||||||
import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
|
import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
|
||||||
import { useTranslation } from 'next-i18next';
|
import { useTranslation } from 'next-i18next';
|
||||||
|
import { getFlatAppResponses } from '@/global/core/chat/utils';
|
||||||
const isLLMNode = (item: ChatHistoryItemResType) =>
|
const isLLMNode = (item: ChatHistoryItemResType) =>
|
||||||
item.moduleType === FlowNodeTypeEnum.chatNode || item.moduleType === FlowNodeTypeEnum.tools;
|
item.moduleType === FlowNodeTypeEnum.chatNode || item.moduleType === FlowNodeTypeEnum.tools;
|
||||||
|
|
||||||
@@ -16,17 +17,7 @@ const ContextModal = ({ onClose, dataId }: { onClose: () => void; dataId: string
|
|||||||
const { loading: isLoading, data: contextModalData } = useRequest2(
|
const { loading: isLoading, data: contextModalData } = useRequest2(
|
||||||
() =>
|
() =>
|
||||||
getHistoryResponseData({ dataId }).then((res) => {
|
getHistoryResponseData({ dataId }).then((res) => {
|
||||||
const flatResData: ChatHistoryItemResType[] =
|
const flatResData = getFlatAppResponses(res || []);
|
||||||
res
|
|
||||||
?.map((item) => {
|
|
||||||
return [
|
|
||||||
item,
|
|
||||||
...(item.pluginDetail || []),
|
|
||||||
...(item.toolDetail || []),
|
|
||||||
...(item.loopDetail || [])
|
|
||||||
];
|
|
||||||
})
|
|
||||||
.flat() || [];
|
|
||||||
return flatResData.find(isLLMNode)?.historyPreview || [];
|
return flatResData.find(isLLMNode)?.historyPreview || [];
|
||||||
}),
|
}),
|
||||||
{ manual: false }
|
{ manual: false }
|
||||||
|
@@ -19,23 +19,25 @@ export function transformPreviewHistories(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const getFlatAppResponses = (res: ChatHistoryItemResType[]): ChatHistoryItemResType[] => {
|
||||||
|
return res
|
||||||
|
.map((item) => {
|
||||||
|
return [
|
||||||
|
item,
|
||||||
|
...getFlatAppResponses(item.pluginDetail || []),
|
||||||
|
...getFlatAppResponses(item.toolDetail || []),
|
||||||
|
...getFlatAppResponses(item.loopDetail || [])
|
||||||
|
];
|
||||||
|
})
|
||||||
|
.flat();
|
||||||
|
};
|
||||||
export function addStatisticalDataToHistoryItem(historyItem: ChatItemType) {
|
export function addStatisticalDataToHistoryItem(historyItem: ChatItemType) {
|
||||||
if (historyItem.obj !== ChatRoleEnum.AI) return historyItem;
|
if (historyItem.obj !== ChatRoleEnum.AI) return historyItem;
|
||||||
if (historyItem.totalQuoteList !== undefined) return historyItem;
|
if (historyItem.totalQuoteList !== undefined) return historyItem;
|
||||||
if (!historyItem.responseData) return historyItem;
|
if (!historyItem.responseData) return historyItem;
|
||||||
|
|
||||||
// Flat children
|
// Flat children
|
||||||
const flatResData: ChatHistoryItemResType[] =
|
const flatResData = getFlatAppResponses(historyItem.responseData || []);
|
||||||
historyItem.responseData
|
|
||||||
?.map((item) => {
|
|
||||||
return [
|
|
||||||
item,
|
|
||||||
...(item.pluginDetail || []),
|
|
||||||
...(item.toolDetail || []),
|
|
||||||
...(item.loopDetail || [])
|
|
||||||
];
|
|
||||||
})
|
|
||||||
.flat() || [];
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...historyItem,
|
...historyItem,
|
||||||
|
@@ -1,8 +1,4 @@
|
|||||||
import {
|
import { type ChatHistoryItemResType, type ChatSchema } from '@fastgpt/global/core/chat/type';
|
||||||
type AIChatItemType,
|
|
||||||
type ChatHistoryItemResType,
|
|
||||||
type ChatSchema
|
|
||||||
} from '@fastgpt/global/core/chat/type';
|
|
||||||
import { MongoChat } from '@fastgpt/service/core/chat/chatSchema';
|
import { MongoChat } from '@fastgpt/service/core/chat/chatSchema';
|
||||||
import { type AuthModeType } from '@fastgpt/service/support/permission/type';
|
import { type AuthModeType } from '@fastgpt/service/support/permission/type';
|
||||||
import { authOutLink } from './outLink';
|
import { authOutLink } from './outLink';
|
||||||
@@ -12,6 +8,7 @@ import { AuthUserTypeEnum, ReadPermissionVal } from '@fastgpt/global/support/per
|
|||||||
import { authApp } from '@fastgpt/service/support/permission/app/auth';
|
import { authApp } from '@fastgpt/service/support/permission/app/auth';
|
||||||
import { MongoChatItem } from '@fastgpt/service/core/chat/chatItemSchema';
|
import { MongoChatItem } from '@fastgpt/service/core/chat/chatItemSchema';
|
||||||
import { DatasetErrEnum } from '@fastgpt/global/common/error/code/dataset';
|
import { DatasetErrEnum } from '@fastgpt/global/common/error/code/dataset';
|
||||||
|
import { getFlatAppResponses } from '@/global/core/chat/utils';
|
||||||
|
|
||||||
/*
|
/*
|
||||||
检查chat的权限:
|
检查chat的权限:
|
||||||
@@ -221,18 +218,7 @@ export const authCollectionInChat = async ({
|
|||||||
if (!chatItem) return Promise.reject(DatasetErrEnum.unAuthDatasetCollection);
|
if (!chatItem) return Promise.reject(DatasetErrEnum.unAuthDatasetCollection);
|
||||||
|
|
||||||
// 找 responseData 里,是否有该文档 id
|
// 找 responseData 里,是否有该文档 id
|
||||||
const responseData = chatItem.responseData || [];
|
const flatResData = getFlatAppResponses(chatItem.responseData || []);
|
||||||
const flatResData: ChatHistoryItemResType[] =
|
|
||||||
responseData
|
|
||||||
?.map((item) => {
|
|
||||||
return [
|
|
||||||
item,
|
|
||||||
...(item.pluginDetail || []),
|
|
||||||
...(item.toolDetail || []),
|
|
||||||
...(item.loopDetail || [])
|
|
||||||
];
|
|
||||||
})
|
|
||||||
.flat() || [];
|
|
||||||
|
|
||||||
const quoteListSet = new Set(
|
const quoteListSet = new Set(
|
||||||
flatResData
|
flatResData
|
||||||
|
Reference in New Issue
Block a user