ChatGPT/FastGPT
1
0
Fork 0
mirror of https://github.com/labring/FastGPT.git synced 2025-10-14 15:11:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: reference history format;perf: add error to chat log (#5153)

Browse Source 
* perf: add error to chat log

* fix: reference history format
This commit is contained in:
Archer
2025-07-04 12:12:54 +08:00
committed by GitHub
parent cd1d80488c
commit ea8b14cd32
7 changed files with 190 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
docSite/content/zh-cn/docs/development/upgrading/4101.md Normal file
View File

@@ -0,0 +1,22 @@
---
title: 'V4.10.0'
description: 'FastGPT V4.10.0 更新说明'
icon: 'upgrade'
draft: false
toc: true
weight: 784
---
## 🚀 新增内容
## ⚙️ 优化
1. 定时任务报错日志记录到对话日志
## 🐛 修复
1. 搜索类型系统工具无法正常显示
2. 部分系统工具向下兼容问题
3. AI 节点，手动选择历史记录时，会导致 system 记录重复。

10
packages/service/core/workflow/dispatch/utils.ts
View File

@@ -83,16 +83,14 @@ export const filterToolNodeIdByEdges = ({
export const getHistories = (history?: ChatItemType[] | number, histories: ChatItemType[] = []) => {
if (!history) return [];
// Select reference history
if (Array.isArray(history)) return history;
// history is number
const systemHistoryIndex = histories.findIndex((item) => item.obj !== ChatRoleEnum.System);
const systemHistories = histories.slice(0, systemHistoryIndex);
const chatHistories = histories.slice(systemHistoryIndex);
const filterHistories = (() => {
if (typeof history === 'number') return chatHistories.slice(-(history * 2));
if (Array.isArray(history)) return history;
return [];
})();
const filterHistories = chatHistories.slice(-(history * 2));
return [...systemHistories, ...filterHistories];
};

2
projects/app/src/pageComponents/app/detail/Logs/index.tsx
View File

@@ -120,7 +120,7 @@ const Logs = () => {
refreshDeps: [chatSources, logTitle]
}
);
console.log(dateRange, 111);
return (
<Flex
flexDirection={'column'}

2
projects/app/src/pages/api/core/app/getChatLogs.ts
View File

@@ -170,7 +170,7 @@ async function handler(
),
MongoChat.countDocuments(where, { ...readFromSecondary })
]);
console.log(list);
const listWithSourceMember = await addSourceMember({
list
});

1
projects/app/src/service/common/system/cron.ts
View File

@@ -78,6 +78,7 @@ const scheduleTriggerAppCron = () => {
getScheduleTriggerApp();
}
});
getScheduleTriggerApp();
};
export const startCron = () => {

57
projects/app/src/service/core/app/utils.ts
View File

@@ -22,8 +22,11 @@ import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runti
import { type UserChatItemValueItemType } from '@fastgpt/global/core/chat/type';
import { saveChat } from '@fastgpt/service/core/chat/saveChat';
import { getAppLatestVersion } from '@fastgpt/service/core/app/version/controller';
import { getErrText } from '@fastgpt/global/common/error/utils';
export const getScheduleTriggerApp = async () => {
addLog.info('Schedule trigger app');
// 1. Find all the app
const apps = await retryFn(() => {
return MongoApp.find({
@@ -35,16 +38,16 @@ export const getScheduleTriggerApp = async () => {
// 2. Run apps
await Promise.allSettled(
apps.map(async (app) => {
try {
if (!app.scheduledTriggerConfig) return;
const chatId = getNanoid();
// random delay 0 ~ 60s
await delay(Math.floor(Math.random() * 60 * 1000));
const { timezone, externalProvider } = await getUserChatInfoAndAuthTeamPoints(app.tmbId);
const { timezone, externalProvider } = await retryFn(() =>
getUserChatInfoAndAuthTeamPoints(app.tmbId)
);
// Get app latest version
const { nodes, edges, chatConfig } = await getAppLatestVersion(app._id, app);
const chatId = getNanoid();
const { nodes, edges, chatConfig } = await retryFn(() => getAppLatestVersion(app._id, app));
const userQuery: UserChatItemValueItemType[] = [
{
type: ChatItemValueTypeEnum.text,
@@ -54,6 +57,7 @@ export const getScheduleTriggerApp = async () => {
}
];
try {
const { flowUsages, assistantResponses, flowResponses, durationSeconds, system_memories } =
await retryFn(() => {
return dispatchWorkFlow({
@@ -82,6 +86,8 @@ export const getScheduleTriggerApp = async () => {
});
});
const error = flowResponses[flowResponses.length - 1]?.error;
// Save chat
await saveChat({
chatId,
@@ -106,7 +112,8 @@ export const getScheduleTriggerApp = async () => {
memories: system_memories
}
],
durationSeconds
durationSeconds,
errorMsg: getErrText(error)
});
createChatUsage({
appName: app.name,
@@ -116,15 +123,39 @@ export const getScheduleTriggerApp = async () => {
source: UsageSourceEnum.cronJob,
flowUsages
});
} catch (error) {
addLog.error('Schedule trigger error', error);
await saveChat({
chatId,
appId: app._id,
teamId: String(app.teamId),
tmbId: String(app.tmbId),
nodes,
appChatConfig: chatConfig,
variables: {},
isUpdateUseTime: false, // owner update use time
newTitle: 'Cron Job',
source: ChatSourceEnum.cronJob,
content: [
{
obj: ChatRoleEnum.Human,
value: userQuery
},
{
obj: ChatRoleEnum.AI,
value: [],
[DispatchNodeResponseKeyEnum.nodeResponse]: []
}
],
durationSeconds: 0,
errorMsg: getErrText(error)
});
}
// update next time
app.scheduledTriggerNextTime = getNextTimeByCronStringAndTimezone(
app.scheduledTriggerConfig
);
await app.save();
} catch (error) {
addLog.warn('Schedule trigger error', { error });
}
app.scheduledTriggerNextTime = getNextTimeByCronStringAndTimezone(app.scheduledTriggerConfig);
await app.save().catch();
})
);
};

106
test/cases/function/packages/service/core/app/workflow/dispatch/utils.test.ts Normal file
View File

@@ -0,0 +1,106 @@
import { describe, expect, it } from 'vitest';
import { getHistories } from '@fastgpt/service/core/workflow/dispatch/utils';
import { ChatItemValueTypeEnum, ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
import type { ChatItemType } from '@fastgpt/global/core/chat/type';
describe('getHistories test', async () => {
const MockHistories: ChatItemType[] = [
{
obj: ChatRoleEnum.System,
value: [
{
type: ChatItemValueTypeEnum.text,
text: {
content: '你好'
}
}
]
},
{
obj: ChatRoleEnum.Human,
value: [
{
type: ChatItemValueTypeEnum.text,
text: {
content: '你好'
}
}
]
},
{
obj: ChatRoleEnum.AI,
value: [
{
type: ChatItemValueTypeEnum.text,
text: {
content: '你好2'
}
}
]
},
{
obj: ChatRoleEnum.Human,
value: [
{
type: ChatItemValueTypeEnum.text,
text: {
content: '你好3'
}
}
]
},
{
obj: ChatRoleEnum.AI,
value: [
{
type: ChatItemValueTypeEnum.text,
text: {
content: '你好4'
}
}
]
}
];
it('getHistories', async () => {
// Number
expect(getHistories(1, MockHistories)).toEqual([
...MockHistories.slice(0, 1),
...MockHistories.slice(-2)
]);
expect(getHistories(2, MockHistories)).toEqual([...MockHistories.slice(0)]);
expect(getHistories(4, MockHistories)).toEqual([...MockHistories.slice(0)]);
// Array
expect(
getHistories(
[
{
obj: ChatRoleEnum.Human,
value: [
{
type: ChatItemValueTypeEnum.text,
text: {
content: '你好'
}
}
]
}
],
MockHistories
)
).toEqual([
{
obj: ChatRoleEnum.Human,
value: [
{
type: ChatItemValueTypeEnum.text,
text: {
content: '你好'
}
}
]
}
]);
});
});