mirror of
https://github.com/labring/FastGPT.git
synced 2026-05-07 01:02:55 +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>
301 lines
8.7 KiB
TypeScript
301 lines
8.7 KiB
TypeScript
import { type DispatchNodeResponseType } from '../workflow/runtime/type';
|
|
import { FlowNodeTypeEnum } from '../workflow/node/constant';
|
|
import { ChatRoleEnum, ChatSourceEnum } from './constants';
|
|
import {
|
|
type AIChatItemValueItemType,
|
|
type ChatHistoryItemResType,
|
|
type ChatItemType,
|
|
type UserChatItemValueItemType
|
|
} from './type';
|
|
import { sliceStrStartEnd } from '../../common/string/tools';
|
|
import { PublishChannelEnum } from '../../support/outLink/constant';
|
|
import { removeDatasetCiteText } from '../ai/llm/utils';
|
|
import type { WorkflowInteractiveResponseType } from '../workflow/template/system/interactive/type';
|
|
import { ConfirmPlanAgentText } from '../workflow/runtime/constants';
|
|
|
|
// Concat 2 -> 1, and sort by role
|
|
export const concatHistories = (histories1: ChatItemType[], histories2: ChatItemType[]) => {
|
|
const newHistories = [...histories1, ...histories2];
|
|
return newHistories.sort((a, b) => {
|
|
if (a.obj === ChatRoleEnum.System) {
|
|
return -1;
|
|
}
|
|
return 1;
|
|
});
|
|
};
|
|
|
|
export const getChatTitleFromChatMessage = (message?: ChatItemType, defaultValue = '新对话') => {
|
|
// @ts-ignore
|
|
const textMsg = message?.value.find((item) => 'text' in item && item.text);
|
|
|
|
if (textMsg?.text?.content) {
|
|
return textMsg.text.content.slice(0, 20);
|
|
}
|
|
|
|
return defaultValue;
|
|
};
|
|
|
|
// Keep the first n and last n characters
|
|
export const getHistoryPreview = (
|
|
completeMessages: ChatItemType[],
|
|
size = 100,
|
|
useVision = false
|
|
): {
|
|
obj: `${ChatRoleEnum}`;
|
|
value: string;
|
|
}[] => {
|
|
return completeMessages.map((item, i) => {
|
|
const n =
|
|
(item.obj === ChatRoleEnum.System && i === 0) || i >= completeMessages.length - 2 ? size : 50;
|
|
|
|
// Get message text content
|
|
const rawText = (() => {
|
|
if (item.obj === ChatRoleEnum.System) {
|
|
return item.value?.map((item) => item.text?.content).join('') || '';
|
|
} else if (item.obj === ChatRoleEnum.Human) {
|
|
return (
|
|
item.value
|
|
?.map((item) => {
|
|
if (item?.text?.content) return item?.text?.content;
|
|
if (item.file?.type === 'image' && useVision)
|
|
return `}...)`;
|
|
return '';
|
|
})
|
|
.join('\n') || ''
|
|
);
|
|
} else if (item.obj === ChatRoleEnum.AI) {
|
|
return (
|
|
item.value
|
|
?.map((item) => {
|
|
return (
|
|
item.text?.content || item?.tools?.map((item) => item.toolName).join(',') || ''
|
|
);
|
|
})
|
|
.join('')
|
|
.trim() || ''
|
|
);
|
|
}
|
|
return '';
|
|
})();
|
|
|
|
return {
|
|
obj: item.obj,
|
|
value: sliceStrStartEnd(rawText, n, n)
|
|
};
|
|
});
|
|
};
|
|
|
|
// Filter workflow public response
|
|
export const filterPublicNodeResponseData = ({
|
|
nodeRespones = [],
|
|
responseDetail = false
|
|
}: {
|
|
nodeRespones?: ChatHistoryItemResType[];
|
|
responseDetail?: boolean;
|
|
}) => {
|
|
const publicNodeMap: Record<string, any> = {
|
|
[FlowNodeTypeEnum.appModule]: true,
|
|
[FlowNodeTypeEnum.pluginModule]: true,
|
|
[FlowNodeTypeEnum.datasetSearchNode]: true,
|
|
[FlowNodeTypeEnum.agent]: true,
|
|
[FlowNodeTypeEnum.pluginOutput]: true,
|
|
[FlowNodeTypeEnum.runApp]: true,
|
|
[FlowNodeTypeEnum.toolCall]: true
|
|
};
|
|
|
|
const filedMap: Record<string, boolean> = responseDetail
|
|
? {
|
|
quoteList: true,
|
|
moduleType: true,
|
|
pluginOutput: true,
|
|
runningTime: true
|
|
}
|
|
: {
|
|
moduleType: true,
|
|
pluginOutput: true,
|
|
runningTime: true
|
|
};
|
|
|
|
return nodeRespones
|
|
.filter((item) => publicNodeMap[item.moduleType])
|
|
.map((item) => {
|
|
const obj: DispatchNodeResponseType = {};
|
|
for (let key in item) {
|
|
if (key === 'toolDetail' || key === 'pluginDetail') {
|
|
// @ts-ignore
|
|
obj[key] = filterPublicNodeResponseData({ nodeRespones: item[key], responseDetail });
|
|
} else if (filedMap[key]) {
|
|
// @ts-ignore
|
|
obj[key] = item[key];
|
|
}
|
|
}
|
|
return obj as ChatHistoryItemResType;
|
|
});
|
|
};
|
|
|
|
// Remove dataset cite in ai response
|
|
export const removeAIResponseCite = <T extends AIChatItemValueItemType[] | string>(
|
|
value: T,
|
|
retainCite: boolean
|
|
): T => {
|
|
if (retainCite) return value;
|
|
|
|
if (typeof value === 'string') {
|
|
return removeDatasetCiteText(value, false) as T;
|
|
}
|
|
|
|
return value.map<AIChatItemValueItemType>((item) => {
|
|
if (item.text?.content) {
|
|
return {
|
|
...item,
|
|
text: {
|
|
...item.text,
|
|
content: removeDatasetCiteText(item.text.content, false)
|
|
}
|
|
};
|
|
}
|
|
if (item.reasoning?.content) {
|
|
return {
|
|
...item,
|
|
reasoning: {
|
|
...item.reasoning,
|
|
content: removeDatasetCiteText(item.reasoning.content, false)
|
|
}
|
|
};
|
|
}
|
|
return item;
|
|
}) as T;
|
|
};
|
|
|
|
export const removeEmptyUserInput = (input?: UserChatItemValueItemType[]) => {
|
|
return (
|
|
input?.filter((item) => {
|
|
// 有文本内容,保留
|
|
if (item.text?.content?.trim()) {
|
|
return true;
|
|
}
|
|
// 有文件且文件有 key 或 url,保留
|
|
if (item.file && (item.file.key || item.file.url)) {
|
|
return true;
|
|
}
|
|
// 其他情况过滤掉
|
|
return false;
|
|
}) || []
|
|
);
|
|
};
|
|
|
|
export const getPluginOutputsFromChatResponses = (responses: ChatHistoryItemResType[]) => {
|
|
const outputs =
|
|
responses.find((item) => item.moduleType === FlowNodeTypeEnum.pluginOutput)?.pluginOutput ?? {};
|
|
return outputs;
|
|
};
|
|
|
|
export const getChatSourceByPublishChannel = (publishChannel: PublishChannelEnum) => {
|
|
switch (publishChannel) {
|
|
case PublishChannelEnum.share:
|
|
return ChatSourceEnum.share;
|
|
case PublishChannelEnum.iframe:
|
|
return ChatSourceEnum.share;
|
|
case PublishChannelEnum.apikey:
|
|
return ChatSourceEnum.api;
|
|
case PublishChannelEnum.feishu:
|
|
return ChatSourceEnum.feishu;
|
|
case PublishChannelEnum.wecom:
|
|
return ChatSourceEnum.wecom;
|
|
case PublishChannelEnum.officialAccount:
|
|
return ChatSourceEnum.official_account;
|
|
default:
|
|
return ChatSourceEnum.online;
|
|
}
|
|
};
|
|
|
|
// 扁平化响应
|
|
export const getFlatAppResponses = (res: ChatHistoryItemResType[]): ChatHistoryItemResType[] => {
|
|
return res
|
|
.map((item) => {
|
|
return [
|
|
item,
|
|
...getFlatAppResponses(item.pluginDetail || []),
|
|
...getFlatAppResponses(item.toolDetail || []),
|
|
...getFlatAppResponses(item.loopDetail || []),
|
|
...getFlatAppResponses(item.childrenResponses || [])
|
|
];
|
|
})
|
|
.flat();
|
|
};
|
|
|
|
/*
|
|
对于交互模式下,有两种响应:
|
|
1. 提交交互结果,此时不会新增一条 user 消息
|
|
2. 发送 user 消息,此时对话会新增一条 user 消息
|
|
*/
|
|
export const checkInteractiveResponseStatus = ({
|
|
interactive,
|
|
input
|
|
}: {
|
|
interactive: { type: WorkflowInteractiveResponseType['type'] };
|
|
input: string;
|
|
}): 'submit' | 'query' => {
|
|
if (interactive.type === 'agentPlanAskQuery') {
|
|
return 'query';
|
|
}
|
|
if (interactive.type === 'agentPlanAskUserForm') {
|
|
try {
|
|
// 如果是表单提交,会是一个对象,如果解析失败,则认为是非表单提交。
|
|
JSON.parse(input);
|
|
} catch {
|
|
return 'query';
|
|
}
|
|
} else if (interactive.type === 'agentPlanCheck' && input !== ConfirmPlanAgentText) {
|
|
return 'query';
|
|
}
|
|
return 'submit';
|
|
};
|
|
|
|
/*
|
|
Merge chat responseData
|
|
1. Same tool mergeSignId (Interactive tool node)
|
|
2. Recursively merge plugin details with same mergeSignId
|
|
*/
|
|
export const mergeChatResponseData = (
|
|
responseDataList: ChatHistoryItemResType[]
|
|
): ChatHistoryItemResType[] => {
|
|
const result: ChatHistoryItemResType[] = [];
|
|
const mergeMap = new Map<string, number>(); // mergeSignId -> result index
|
|
|
|
for (const item of responseDataList) {
|
|
if (item.mergeSignId && mergeMap.has(item.mergeSignId)) {
|
|
// Merge with existing item
|
|
const existingIndex = mergeMap.get(item.mergeSignId)!;
|
|
const existing = result[existingIndex];
|
|
|
|
result[existingIndex] = {
|
|
...item,
|
|
runningTime: +((existing.runningTime || 0) + (item.runningTime || 0)).toFixed(2),
|
|
totalPoints: (existing.totalPoints || 0) + (item.totalPoints || 0),
|
|
childTotalPoints: (existing.childTotalPoints || 0) + (item.childTotalPoints || 0),
|
|
toolDetail: mergeChatResponseData([
|
|
...(existing.toolDetail || []),
|
|
...(item.toolDetail || [])
|
|
]),
|
|
loopDetail: mergeChatResponseData([
|
|
...(existing.loopDetail || []),
|
|
...(item.loopDetail || [])
|
|
]),
|
|
pluginDetail: mergeChatResponseData([
|
|
...(existing.pluginDetail || []),
|
|
...(item.pluginDetail || [])
|
|
])
|
|
};
|
|
} else {
|
|
// Add new item
|
|
result.push(item);
|
|
if (item.mergeSignId) {
|
|
mergeMap.set(item.mergeSignId, result.length - 1);
|
|
}
|
|
}
|
|
}
|
|
|
|
return result;
|
|
};
|