mirror of
https://github.com/labring/FastGPT.git
synced 2026-04-27 02:08:10 +08:00
76d6234de6
* Agent features (#6345) * Test agent (#6220) * squash: compress all commits into one * feat: plan response in ui * response ui * perf: agent config * merge * tool select ux * perf: chat ui * perf: agent editform * tmp code * feat: save chat * Complete agent parent (#6049) * add role and tools filling * add: file-upload --------- Co-authored-by: xxyyh <2289112474@qq> * perf: top agent code * top agent (#6062) Co-authored-by: xxyyh <2289112474@qq> * fix: ts * skill editor ui * ui * perf: rewrite type with zod * skill edit ui * skill agent (#6089) * cp skill chat * rebasefdf933dand add skill chat * 1. skill 的 CRUD 2. skill 的信息渲染到前端界面 * solve comment * remove chatid and chatItemId * skill match * perf: skill manage * fix: ts --------- Co-authored-by: xxyyh <2289112474@qq> Co-authored-by: archer <545436317@qq.com> * fix: ts * fix: loop import * skill tool config (#6114) Co-authored-by: xxyyh <2289112474@qq> * feat: load tool in agent * skill memory (#6126) Co-authored-by: xxyyh <2289112474@qq> * perf: agent skill editor * perf: helperbot ui * agent code * perf: context * fix: request context * agent usage * perf: agent context and pause * perf: plan response * Test agent sigle skill (#6184) * feat:top box fill * prompt fix --------- Co-authored-by: xxyyh <2289112474@qq> * perf: agent chat ui * Test agent new (#6219) * have-replan * agent --------- Co-authored-by: xxyyh <2289112474@qq> * fix: ts --------- Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com> Co-authored-by: xxyyh <2289112474@qq> * feat: consolidate agent and MCP improvements This commit consolidates 17 commits including: - MCP tools enhancements and fixes - Agent system improvements and optimizations - Auth limit and prompt updates - Tool response compression and error tracking - Simple app adaptation - Code quality improvements (TypeScript, ESLint, Zod) - Version type migration to schema - Remove deprecated useRequest2 - Add LLM error tracking - Toolset ID validation fixes --------- Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com> Co-authored-by: xxyyh <2289112474@qq> * fix: transform avatar copy;perf: filter invalid tool * update llm response storage time * fix: openapi schema * update skill desc * feat: cache hit data * i18n * lock * chat logs support error filter & user search (#6373) * chat log support searching by user name * support error filter * fix * fix overflow * optimize * fix init script * fix * perf: get log users * updat ecomment * fix: ts * fix: test --------- Co-authored-by: archer <545436317@qq.com> * Fix: agent (#6376) * Agent features (#6345) * Test agent (#6220) * squash: compress all commits into one * feat: plan response in ui * response ui * perf: agent config * merge * tool select ux * perf: chat ui * perf: agent editform * tmp code * feat: save chat * Complete agent parent (#6049) * add role and tools filling * add: file-upload --------- Co-authored-by: xxyyh <2289112474@qq> * perf: top agent code * top agent (#6062) Co-authored-by: xxyyh <2289112474@qq> * fix: ts * skill editor ui * ui * perf: rewrite type with zod * skill edit ui * skill agent (#6089) * cp skill chat * rebasefdf933dand add skill chat * 1. skill 的 CRUD 2. skill 的信息渲染到前端界面 * solve comment * remove chatid and chatItemId * skill match * perf: skill manage * fix: ts --------- Co-authored-by: xxyyh <2289112474@qq> Co-authored-by: archer <545436317@qq.com> * fix: ts * fix: loop import * skill tool config (#6114) Co-authored-by: xxyyh <2289112474@qq> * feat: load tool in agent * skill memory (#6126) Co-authored-by: xxyyh <2289112474@qq> * perf: agent skill editor * perf: helperbot ui * agent code * perf: context * fix: request context * agent usage * perf: agent context and pause * perf: plan response * Test agent sigle skill (#6184) * feat:top box fill * prompt fix --------- Co-authored-by: xxyyh <2289112474@qq> * perf: agent chat ui * Test agent new (#6219) * have-replan * agent --------- Co-authored-by: xxyyh <2289112474@qq> * fix: ts --------- Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com> Co-authored-by: xxyyh <2289112474@qq> * feat: consolidate agent and MCP improvements This commit consolidates 17 commits including: - MCP tools enhancements and fixes - Agent system improvements and optimizations - Auth limit and prompt updates - Tool response compression and error tracking - Simple app adaptation - Code quality improvements (TypeScript, ESLint, Zod) - Version type migration to schema - Remove deprecated useRequest2 - Add LLM error tracking - Toolset ID validation fixes --------- Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com> Co-authored-by: xxyyh <2289112474@qq> * 1. 把辅助生成前端上的 system prompt 加入到上下文中 2. mcp工具的前端渲染(图标) 3. 文件读取工具和文件上传进行关联 4. 添加了辅助生成返回格式出错的重试方案 5. ask 不出现在 plan 步骤中 6. 添加了辅助生成的头像和交互 UI * fix:read_file * helperbot ui * ts error * helper ui * delete Unused import * perf: helper bot * lock --------- Co-authored-by: Archer <545436317@qq.com> Co-authored-by: xxyyh <2289112474@qq> * fix date variable required & model auth (#6386) * fix date variable required & model auth * doc * feat: add chat id to finish callback * fix: iphone safari shareId (#6387) * fix: iphone safari shareId * fix: mcp file list can't setting * fix: reason output field * fix: skip JSON validation for HTTP tool body with variable (#6392) * fix: skip JSON validation for HTTP tool body with variable * doc * workflow fitview * perf: selecting memory * perf: cp api * ui * perf: toolcall auto adapt * fix: catch workflow error * fix: ts * perf: pagination type * remove * ignore * update doc * fix: simple app tool select * add default avatar to logs user * perf: loading user * select dataset ui * rename version * feat: add global/common test * perf: packages/global/common test * feat: package/global/ai,app test * add global/chat test * global/core test * global/core test * feat: packages/global all test * perf: test * add server api test * perf: init shell * perf: init4150 shell * remove invalid code * update doc * remove log * fix: chat effect * fix: plan fake tool (#6398) * 1. 提示词防注入功能 2. 无工具不进入 plan,防止虚拟工具生成 * Agent-dataset * dataset * dataset presetInfo * prefix * perf: prompt --------- Co-authored-by: xxyyh <2289112474@qq> Co-authored-by: archer <545436317@qq.com> * fix: review * adapt kimi2.5 think toolcall * feat: invoke fastgpt user info (#6403) feat: invoke fastgpt user info * fix: invoke fastgpt user info return orgs (#6404) * skill and version * retry helperbot (#6405) Co-authored-by: xxyyh <2289112474@qq> * update template * remove log * doc * update doc * doc * perf: internal ip check * adapt get paginationRecords * tool call adapt * fix: test * doc * fix: agent initial version * adapt completions v1 * feat: instrumentation check * rename skill * add workflow demo mode tracks (#6407) * chore: 统一 skills 目录命名为小写 将 .claude/Skills/ 重命名为 .claude/skills/ 以保持命名一致性。 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * add workflow demo mode tracks * code * optimize * fix: improve workflowDemoTrack based on PR review - Add comment to empty catch block for maintainability - Add @param docs to onDemoChange clarifying nodeCount usage - Replace silent .catch with console.debug for dev debugging - Handle appId changes by reporting old data before re-init Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: archer <545436317@qq.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * remove repeat skill * fix(workflow): filter out orphan edges to prevent runtime errors (#6399) * fix(workflow): filter out orphan edges to prevent runtime errors Runtime edges that reference non-existent nodes (orphan edges) can cause unexpected behavior or crashes during workflow dispatch. This change adds a pre-check to filter out such edges before execution begins, ensuring system stability even with inconsistent graph data. * fix(workflow): enhance orphan edge filtering with logging and tests - Refactor: Extract logic to 'filterOrphanEdges' in utils.ts for better reusability - Feat: Add performance monitoring (warn if >100ms) and comprehensive logging - Feat: Support detailed edge inspection in debug mode - Docs: Add JSDoc explaining causes of orphan edges (migration, manual edits) - Test: Add unit tests covering edge cases and performance (1000 edges) Addresses PR review feedback regarding logging, variable naming, and testing." * move code * move code * add more unit test --------- Co-authored-by: archer <545436317@qq.com> * test * perf: test * add server/common/string test * fix: resolve $ref references in MCP tool input schemas (#6395) (#6409) * fix: resolve $ref references in MCP tool input schemas (#6395) * add test code --------- Co-authored-by: archer <545436317@qq.com> * chore(docs): add fastgpt, fastgpt-plugin version choice guide (#6411) * chore(doc): add fastgpt version description * doc * doc --------- Co-authored-by: archer <545436317@qq.com> * fix:dataset cite and description info (#6410) * 1. 添加知识库引用(plan 步骤和直接知识库调用) 2. 提示词框中的@知识库工具 3. plan 中 step 的 description dataset_search 改为中文 * fix: i18n * prompt * prompt --------- Co-authored-by: xxyyh <2289112474@qq> * fix: tool call * perf: workflow props * fix: merge ECharts toolbox options instead of overwriting (#6269) (#6412) * feat: integrate logtape and otel (#6400) * fix: deps * feat(logger): integrate logtape and otel * wip(log): add basic infras logs * wip(log): add request id and inject it into context * wip(log): add basic tx logs * wip(log): migrate * wip(log): category * wip(log): more sub category * fix: type * fix: sessionRun * fix: export getLogger from client.ts * chore: improve logs * docs: update signoz and changelog * change type * fix: ts * remove skill.md * fix: lockfile specifier * fix: test --------- Co-authored-by: archer <545436317@qq.com> * init log * doc * remove invalid log * fix: review * template * replace new log * fix: ts * remove log * chore: migrate all addLog to logtape * move skill * chore: migrate all addLog to logtape (#6417) * update skill * remove log * fix: tool check --------- Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com> Co-authored-by: xxyyh <2289112474@qq> Co-authored-by: heheer <heheer@sealos.io> Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: xuyafei1996 <54217479+xuyafei1996@users.noreply.github.com> Co-authored-by: ToukoYui <2331631097@qq.com> Co-authored-by: roy <whoeverimf5@gmail.com>
353 lines
10 KiB
TypeScript
353 lines
10 KiB
TypeScript
import type { ChatHistoryItemResType, ChatItemType } from '@fastgpt/global/core/chat/type';
|
|
import { MongoChatItem } from './chatItemSchema';
|
|
import { MongoChat } from './chatSchema';
|
|
import { DispatchNodeResponseKeyEnum } from '@fastgpt/global/core/workflow/runtime/constants';
|
|
import { ChatRoleEnum } from '@fastgpt/global/core/chat/constants';
|
|
import { MongoChatItemResponse } from './chatItemResponseSchema';
|
|
import type { ClientSession } from '../../common/mongo';
|
|
import { Types } from '../../common/mongo';
|
|
import { mongoSessionRun } from '../../common/mongo/sessionRun';
|
|
import { UserError } from '@fastgpt/global/common/error/utils';
|
|
import { getLogger, LogCategories } from '../../common/logger';
|
|
|
|
const logger = getLogger(LogCategories.MODULE.CHAT.HISTORY);
|
|
|
|
export async function getChatItems({
|
|
includeDeleted = false,
|
|
appId,
|
|
chatId,
|
|
field,
|
|
limit,
|
|
|
|
offset,
|
|
initialId,
|
|
prevId,
|
|
nextId
|
|
}: {
|
|
includeDeleted?: boolean;
|
|
appId: string;
|
|
chatId?: string;
|
|
field: string;
|
|
limit: number;
|
|
|
|
offset?: number;
|
|
initialId?: string;
|
|
prevId?: string;
|
|
nextId?: string;
|
|
}): Promise<{
|
|
histories: ChatItemType[];
|
|
total: number;
|
|
hasMorePrev: boolean;
|
|
hasMoreNext: boolean;
|
|
}> {
|
|
if (!chatId) {
|
|
return { histories: [], total: 0, hasMorePrev: false, hasMoreNext: false };
|
|
}
|
|
|
|
// Extend dataId
|
|
field = `dataId ${field}`;
|
|
const baseCondition = includeDeleted ? { appId, chatId } : { appId, chatId, deleteTime: null };
|
|
|
|
const { histories, total, hasMorePrev, hasMoreNext } = await (async () => {
|
|
// Mode 1: offset pagination (original logic)
|
|
if (offset !== undefined) {
|
|
const [foundHistories, count] = await Promise.all([
|
|
MongoChatItem.find(baseCondition, field).sort({ _id: -1 }).skip(offset).limit(limit).lean(),
|
|
MongoChatItem.countDocuments(baseCondition)
|
|
]);
|
|
return {
|
|
histories: foundHistories.reverse(),
|
|
total: count,
|
|
hasMorePrev: count > limit,
|
|
hasMoreNext: offset > 0
|
|
};
|
|
}
|
|
// Mode 2: prevId - get records before the target
|
|
else if (prevId) {
|
|
const prevItem = await MongoChatItem.findOne(
|
|
{
|
|
...baseCondition,
|
|
dataId: prevId
|
|
},
|
|
{ _id: 1 }
|
|
).lean();
|
|
if (!prevItem) return Promise.reject(new UserError('Prev item not found'));
|
|
|
|
const [items, count] = await Promise.all([
|
|
MongoChatItem.find({ ...baseCondition, _id: { $lt: prevItem._id } }, field)
|
|
.sort({ _id: -1 })
|
|
.limit(limit + 1)
|
|
.lean(),
|
|
MongoChatItem.countDocuments({ ...baseCondition })
|
|
]);
|
|
|
|
return {
|
|
histories: items.slice(0, limit).reverse(),
|
|
total: count,
|
|
hasMorePrev: items.length > limit,
|
|
hasMoreNext: true
|
|
};
|
|
}
|
|
// Mode 3: nextId - get records after the target
|
|
else if (nextId) {
|
|
const nextItem = await MongoChatItem.findOne(
|
|
{
|
|
...baseCondition,
|
|
dataId: nextId
|
|
},
|
|
{ _id: 1 }
|
|
).lean();
|
|
if (!nextItem) return Promise.reject(new UserError('Next item not found'));
|
|
|
|
const [items, total] = await Promise.all([
|
|
MongoChatItem.find({ ...baseCondition, _id: { $gt: nextItem._id } }, field)
|
|
.sort({ _id: 1 })
|
|
.limit(limit + 1)
|
|
.lean(),
|
|
MongoChatItem.countDocuments({ ...baseCondition })
|
|
]);
|
|
|
|
return {
|
|
histories: items.slice(0, limit),
|
|
total,
|
|
hasMorePrev: true,
|
|
hasMoreNext: items.length > limit
|
|
};
|
|
}
|
|
// Mode 2: initialId - get records around the target
|
|
else {
|
|
if (!initialId) {
|
|
const [foundHistories, count] = await Promise.all([
|
|
MongoChatItem.find(baseCondition, field).sort({ _id: -1 }).skip(0).limit(limit).lean(),
|
|
MongoChatItem.countDocuments(baseCondition)
|
|
]);
|
|
return {
|
|
histories: foundHistories.reverse(),
|
|
total: count,
|
|
hasMorePrev: count > limit,
|
|
hasMoreNext: false
|
|
};
|
|
}
|
|
|
|
const halfLimit = Math.floor(limit / 2);
|
|
const ceilLimit = Math.ceil(limit / 2);
|
|
|
|
const targetItem = await MongoChatItem.findOne(
|
|
{ ...baseCondition, dataId: initialId },
|
|
field
|
|
).lean();
|
|
if (!targetItem) return Promise.reject(new UserError('Target item not found'));
|
|
|
|
const [prevItems, nextItems, count] = await Promise.all([
|
|
MongoChatItem.find({ ...baseCondition, _id: { $lt: targetItem._id } }, field)
|
|
.sort({ _id: -1 })
|
|
.limit(halfLimit + 1)
|
|
.lean(),
|
|
MongoChatItem.find({ ...baseCondition, _id: { $gt: targetItem._id } }, field)
|
|
.sort({ _id: 1 })
|
|
.limit(ceilLimit + 1)
|
|
.lean(),
|
|
MongoChatItem.countDocuments(baseCondition)
|
|
]);
|
|
|
|
return {
|
|
histories: [
|
|
...prevItems.slice(0, halfLimit).reverse(),
|
|
targetItem,
|
|
...nextItems.slice(0, ceilLimit)
|
|
].filter(Boolean),
|
|
total: count,
|
|
hasMorePrev: prevItems.length > halfLimit,
|
|
hasMoreNext: nextItems.length > ceilLimit
|
|
};
|
|
}
|
|
})();
|
|
|
|
// Add node responses field
|
|
if (field.includes(DispatchNodeResponseKeyEnum.nodeResponse) && histories.length > 0) {
|
|
const chatItemDataIds = histories
|
|
.filter((item) => item.obj === ChatRoleEnum.AI && !item.responseData?.length)
|
|
.map((item) => item.dataId);
|
|
|
|
if (chatItemDataIds.length > 0) {
|
|
const chatItemResponsesMap = await MongoChatItemResponse.find(
|
|
{ appId, chatId, chatItemDataId: { $in: chatItemDataIds } },
|
|
{ chatItemDataId: 1, data: 1 }
|
|
)
|
|
.lean()
|
|
.then((res) => {
|
|
const map = new Map<string, ChatHistoryItemResType[]>();
|
|
res.forEach((item) => {
|
|
const val = map.get(item.chatItemDataId) || [];
|
|
val.push(item.data);
|
|
map.set(item.chatItemDataId, val);
|
|
});
|
|
return map;
|
|
});
|
|
|
|
histories.forEach((item) => {
|
|
const val = chatItemResponsesMap.get(String(item.dataId));
|
|
if (item.obj === ChatRoleEnum.AI && val) {
|
|
item.responseData = val;
|
|
}
|
|
});
|
|
}
|
|
}
|
|
|
|
return { histories, total, hasMorePrev, hasMoreNext };
|
|
}
|
|
|
|
/**
|
|
* Update feedback count statistics for a chat in Chat table
|
|
* This method aggregates feedback data from chatItems and updates the Chat table
|
|
*
|
|
* @param appId - Application ID
|
|
* @param chatId - Chat ID
|
|
* @param session - Optional MongoDB session for transaction support
|
|
*/
|
|
export async function updateChatFeedbackCount({
|
|
appId,
|
|
chatId,
|
|
session
|
|
}: {
|
|
appId: string;
|
|
chatId: string;
|
|
session?: ClientSession;
|
|
}): Promise<void> {
|
|
try {
|
|
// Aggregate feedback statistics from chatItems
|
|
const stats = await MongoChatItem.aggregate(
|
|
[
|
|
{
|
|
$match: {
|
|
appId: new Types.ObjectId(appId),
|
|
chatId,
|
|
obj: ChatRoleEnum.AI
|
|
}
|
|
},
|
|
{
|
|
$group: {
|
|
_id: null,
|
|
goodFeedbackCount: {
|
|
$sum: {
|
|
$cond: [{ $ifNull: ['$userGoodFeedback', false] }, 1, 0]
|
|
}
|
|
},
|
|
badFeedbackCount: {
|
|
$sum: {
|
|
$cond: [{ $ifNull: ['$userBadFeedback', false] }, 1, 0]
|
|
}
|
|
},
|
|
// Calculate unread good feedback count
|
|
unreadGoodFeedbackCount: {
|
|
$sum: {
|
|
$cond: [
|
|
{
|
|
$and: [
|
|
{ $ne: [{ $ifNull: ['$isFeedbackRead', false] }, true] },
|
|
{ $ne: [{ $ifNull: ['$userGoodFeedback', null] }, null] }
|
|
]
|
|
},
|
|
1,
|
|
0
|
|
]
|
|
}
|
|
},
|
|
// Calculate unread bad feedback count
|
|
unreadBadFeedbackCount: {
|
|
$sum: {
|
|
$cond: [
|
|
{
|
|
$and: [
|
|
{ $ne: [{ $ifNull: ['$isFeedbackRead', false] }, true] },
|
|
{ $ne: [{ $ifNull: ['$userBadFeedback', null] }, null] }
|
|
]
|
|
},
|
|
1,
|
|
0
|
|
]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
],
|
|
{ session }
|
|
);
|
|
|
|
const feedbackStats = stats[0] || {
|
|
goodFeedbackCount: 0,
|
|
badFeedbackCount: 0,
|
|
unreadGoodFeedbackCount: 0,
|
|
unreadBadFeedbackCount: 0
|
|
};
|
|
|
|
// Calculate boolean flags
|
|
const hasGoodFeedback = feedbackStats.goodFeedbackCount > 0;
|
|
const hasBadFeedback = feedbackStats.badFeedbackCount > 0;
|
|
const hasUnreadGoodFeedback = feedbackStats.unreadGoodFeedbackCount > 0;
|
|
const hasUnreadBadFeedback = feedbackStats.unreadBadFeedbackCount > 0;
|
|
|
|
// Build update object - only set fields that are true, unset fields that are false
|
|
const updateObj: Record<string, any> = {};
|
|
const unsetObj: Record<string, any> = {};
|
|
|
|
if (hasGoodFeedback) {
|
|
updateObj.hasGoodFeedback = true;
|
|
} else {
|
|
unsetObj.hasGoodFeedback = '';
|
|
}
|
|
|
|
if (hasBadFeedback) {
|
|
updateObj.hasBadFeedback = true;
|
|
} else {
|
|
unsetObj.hasBadFeedback = '';
|
|
}
|
|
|
|
if (hasUnreadGoodFeedback) {
|
|
updateObj.hasUnreadGoodFeedback = true;
|
|
} else {
|
|
unsetObj.hasUnreadGoodFeedback = '';
|
|
}
|
|
|
|
if (hasUnreadBadFeedback) {
|
|
updateObj.hasUnreadBadFeedback = true;
|
|
} else {
|
|
unsetObj.hasUnreadBadFeedback = '';
|
|
}
|
|
|
|
// Build the final update query
|
|
const updateQuery: Record<string, any> = {};
|
|
if (Object.keys(updateObj).length > 0) {
|
|
updateQuery.$set = updateObj;
|
|
}
|
|
if (Object.keys(unsetObj).length > 0) {
|
|
updateQuery.$unset = unsetObj;
|
|
}
|
|
|
|
// Update Chat table with aggregated statistics and boolean flags
|
|
await MongoChat.updateOne(
|
|
{
|
|
appId,
|
|
chatId
|
|
},
|
|
updateQuery,
|
|
{
|
|
session
|
|
}
|
|
);
|
|
|
|
logger.debug('Chat feedback count updated', {
|
|
appId,
|
|
chatId,
|
|
stats: feedbackStats,
|
|
hasGoodFeedback,
|
|
hasBadFeedback,
|
|
hasUnreadGoodFeedback,
|
|
hasUnreadBadFeedback
|
|
});
|
|
} catch (error) {
|
|
logger.error('Failed to update chat feedback count', { appId, chatId, error });
|
|
throw error;
|
|
}
|
|
}
|