mirror of
https://github.com/labring/FastGPT.git
synced 2026-04-26 02:07:28 +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>
300 lines
8.5 KiB
TypeScript
300 lines
8.5 KiB
TypeScript
import jwt from 'jsonwebtoken';
|
|
import { isAfter, differenceInSeconds } from 'date-fns';
|
|
import { ERROR_ENUM } from '@fastgpt/global/common/error/errorCode';
|
|
import type { ClientSession } from 'mongoose';
|
|
import { MongoS3TTL } from './schema';
|
|
import { S3Buckets } from './constants';
|
|
import { S3PrivateBucket } from './buckets/private';
|
|
import { S3Sources, type UploadImage2S3BucketParams } from './type';
|
|
import { S3PublicBucket } from './buckets/public';
|
|
import { getNanoid } from '@fastgpt/global/common/string/tools';
|
|
import path from 'node:path';
|
|
import type { ParsedFileContentS3KeyParams } from './sources/dataset/type';
|
|
import { EndpointUrl } from '@fastgpt/global/common/file/constants';
|
|
import type { HelperBotTypeEnumType } from '@fastgpt/global/core/chat/helperBot/type';
|
|
|
|
// S3文件名最大长度配置
|
|
export const S3_FILENAME_MAX_LENGTH = 50;
|
|
|
|
/**
|
|
* 截断文件名,确保不超过最大长度,同时保留扩展名
|
|
* @param filename 原始文件名
|
|
* @param maxLength 最大长度限制
|
|
* @returns 截断后的文件名
|
|
*/
|
|
export function truncateFilename(
|
|
filename: string,
|
|
maxLength: number = S3_FILENAME_MAX_LENGTH
|
|
): string {
|
|
if (!filename) return filename;
|
|
|
|
// 如果文件名长度已经符合要求,直接返回
|
|
if (filename.length <= maxLength) {
|
|
return filename;
|
|
}
|
|
|
|
const extension = path.extname(filename); // 包含点的扩展名,如 ".pdf"
|
|
const nameWithoutExt = path.basename(filename, extension); // 不包含扩展名的文件名
|
|
|
|
// 计算名称部分的最大长度(总长度减去扩展名长度)
|
|
const maxNameLength = maxLength - extension.length;
|
|
|
|
// 如果扩展名本身就很长导致没有空间放名称,则截断扩展名
|
|
if (maxNameLength <= 0) {
|
|
// 保留扩展名的开头部分,至少保留一个点
|
|
const truncatedExt = extension.substring(0, Math.min(maxLength, extension.length));
|
|
return truncatedExt;
|
|
}
|
|
|
|
// 截断文件名部分
|
|
const truncatedName = nameWithoutExt.substring(0, maxNameLength);
|
|
|
|
return truncatedName + extension;
|
|
}
|
|
|
|
/**
|
|
*
|
|
* @param objectKey
|
|
* @param expiredTime
|
|
* @returns
|
|
*/
|
|
export function jwtSignS3ObjectKey(objectKey: string, expiredTime: Date) {
|
|
const secret = process.env.FILE_TOKEN_KEY as string;
|
|
const expiresIn = differenceInSeconds(expiredTime, new Date());
|
|
const token = jwt.sign({ objectKey }, secret, { expiresIn });
|
|
|
|
return `${EndpointUrl}/api/system/file/${token}`;
|
|
}
|
|
|
|
export function jwtVerifyS3ObjectKey(token: string) {
|
|
const secret = process.env.FILE_TOKEN_KEY as string;
|
|
return new Promise<{ objectKey: string }>((resolve, reject) => {
|
|
jwt.verify(token, secret, (err, payload) => {
|
|
if (err || !payload || !(payload as jwt.JwtPayload).objectKey) {
|
|
reject(ERROR_ENUM.unAuthFile);
|
|
}
|
|
|
|
resolve(payload as { objectKey: string });
|
|
});
|
|
});
|
|
}
|
|
|
|
export function removeS3TTL({
|
|
key,
|
|
bucketName,
|
|
session
|
|
}: {
|
|
key: string[] | string;
|
|
bucketName: keyof typeof S3Buckets;
|
|
session?: ClientSession;
|
|
}) {
|
|
if (!key) return;
|
|
|
|
if (Array.isArray(key)) {
|
|
return MongoS3TTL.deleteMany(
|
|
{
|
|
minioKey: { $in: key },
|
|
bucketName: S3Buckets[bucketName]
|
|
},
|
|
{ session }
|
|
);
|
|
}
|
|
|
|
if (typeof key === 'string') {
|
|
return MongoS3TTL.deleteOne(
|
|
{
|
|
minioKey: key,
|
|
bucketName: S3Buckets[bucketName]
|
|
},
|
|
{ session }
|
|
);
|
|
}
|
|
}
|
|
|
|
export async function uploadImage2S3Bucket(
|
|
bucketName: keyof typeof S3Buckets,
|
|
params: UploadImage2S3BucketParams
|
|
) {
|
|
const { base64Img, filename, mimetype, uploadKey, expiredTime } = params;
|
|
|
|
const bucket = bucketName === 'private' ? new S3PrivateBucket() : new S3PublicBucket();
|
|
|
|
const base64Data = base64Img.split(',')[1] || base64Img;
|
|
const buffer = Buffer.from(base64Data, 'base64');
|
|
|
|
await bucket.client.uploadObject({
|
|
key: uploadKey,
|
|
body: buffer,
|
|
contentType: mimetype,
|
|
metadata: {
|
|
uploadTime: new Date().toISOString(),
|
|
originFilename: encodeURIComponent(filename)
|
|
}
|
|
});
|
|
|
|
const now = new Date();
|
|
if (expiredTime && isAfter(expiredTime, now)) {
|
|
await MongoS3TTL.create({
|
|
minioKey: uploadKey,
|
|
bucketName: bucket.bucketName,
|
|
expiredTime: expiredTime
|
|
});
|
|
}
|
|
|
|
return uploadKey;
|
|
}
|
|
|
|
export const getFormatedFilename = (filename?: string) => {
|
|
if (!filename) {
|
|
return {
|
|
formatedFilename: getNanoid(12),
|
|
extension: ''
|
|
};
|
|
}
|
|
|
|
const id = getNanoid(6);
|
|
// 先截断文件名,再进行格式化
|
|
const truncatedFilename = truncateFilename(filename);
|
|
// 移除扩展名
|
|
const extension = path.extname(truncatedFilename);
|
|
let name = sanitizeS3ObjectKey(path.basename(truncatedFilename, extension));
|
|
|
|
// 移除末尾的 (_随机数)
|
|
const splitName = name.split('_');
|
|
if (splitName.length > 1 && splitName[splitName.length - 1]?.length === 6) {
|
|
splitName.pop();
|
|
name = splitName.join('_');
|
|
}
|
|
|
|
return {
|
|
formatedFilename: `${name}_${id}`,
|
|
extension: extension.replace('.', '')
|
|
};
|
|
};
|
|
|
|
export const getFileS3Key = {
|
|
// 临时的文件路径(比如 evaluation)
|
|
temp: ({ teamId, filename }: { teamId: string; filename?: string }) => {
|
|
const { formatedFilename, extension } = getFormatedFilename(filename);
|
|
|
|
return {
|
|
fileKey: [
|
|
S3Sources.temp,
|
|
teamId,
|
|
`${formatedFilename}${extension ? `.${extension}` : ''}`
|
|
].join('/'),
|
|
fileParsedPrefix: [S3Sources.temp, teamId, `${formatedFilename}-parsed`].join('/')
|
|
};
|
|
},
|
|
|
|
avatar: ({ teamId, filename }: { teamId: string; filename?: string }) => {
|
|
const { formatedFilename, extension } = getFormatedFilename(filename);
|
|
return {
|
|
fileKey: [
|
|
S3Sources.avatar,
|
|
teamId,
|
|
`${formatedFilename}${extension ? `.${extension}` : ''}`
|
|
].join('/')
|
|
};
|
|
},
|
|
|
|
// 对话中上传的文件的解析结果的图片的 Key
|
|
chat: ({
|
|
appId,
|
|
chatId,
|
|
uId,
|
|
filename
|
|
}: {
|
|
chatId: string;
|
|
uId: string;
|
|
appId: string;
|
|
filename?: string;
|
|
}) => {
|
|
const { formatedFilename, extension } = getFormatedFilename(filename);
|
|
const basePrefix = [S3Sources.chat, appId, uId, chatId].filter(Boolean).join('/');
|
|
|
|
return {
|
|
fileKey: [basePrefix, `${formatedFilename}${extension ? `.${extension}` : ''}`].join('/'),
|
|
fileParsedPrefix: [basePrefix, `${formatedFilename}-parsed`].join('/')
|
|
};
|
|
},
|
|
|
|
helperBot: ({
|
|
type,
|
|
chatId,
|
|
userId,
|
|
filename
|
|
}: {
|
|
type: HelperBotTypeEnumType;
|
|
chatId: string;
|
|
userId: string;
|
|
filename: string;
|
|
}) => {
|
|
const { formatedFilename, extension } = getFormatedFilename(filename);
|
|
const basePrefix = [S3Sources.helperBot, type, userId, chatId].filter(Boolean).join('/');
|
|
return {
|
|
fileKey: [basePrefix, `${formatedFilename}${extension ? `.${extension}` : ''}`].join('/'),
|
|
fileParsedPrefix: [basePrefix, `${formatedFilename}-parsed`].join('/')
|
|
};
|
|
},
|
|
|
|
// 上传数据集的文件的解析结果的图片的 Key
|
|
dataset: (params: ParsedFileContentS3KeyParams) => {
|
|
const { datasetId, filename } = params;
|
|
const { formatedFilename, extension } = getFormatedFilename(filename);
|
|
|
|
return {
|
|
fileKey: [
|
|
S3Sources.dataset,
|
|
datasetId,
|
|
`${formatedFilename}${extension ? `.${extension}` : ''}`
|
|
].join('/'),
|
|
fileParsedPrefix: [S3Sources.dataset, datasetId, `${formatedFilename}-parsed`].join('/')
|
|
};
|
|
},
|
|
|
|
s3Key: (key: string) => {
|
|
// 特殊处理,不包含/的key,认为是根级别的key
|
|
if (!key.includes('/')) {
|
|
return {
|
|
fileKey: key,
|
|
fileParsedPrefix: `${path.basename(key, path.extname(key))}-parsed`
|
|
};
|
|
}
|
|
|
|
const prefix = `${path.dirname(key)}/${path.basename(key, path.extname(key))}-parsed`;
|
|
return {
|
|
fileKey: key,
|
|
fileParsedPrefix: prefix
|
|
};
|
|
},
|
|
|
|
rawText: ({ hash, customPdfParse }: { hash: string; customPdfParse?: boolean }) => {
|
|
return [S3Sources.rawText, `${hash}${customPdfParse ? '-true' : ''}`].join('/');
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Check if a key is a valid S3 object key
|
|
* @param key - The key to check
|
|
* @param source - The source of the key
|
|
* @returns True if the key is a valid S3 object key
|
|
*/
|
|
export function isS3ObjectKey<T extends keyof typeof S3Sources>(
|
|
key: string | undefined | null,
|
|
source: T
|
|
): key is `${T}/${string}` {
|
|
return typeof key === 'string' && key.startsWith(`${S3Sources[source]}/`);
|
|
}
|
|
|
|
export function sanitizeS3ObjectKey(key: string) {
|
|
// 替换掉圆括号
|
|
const replaceParentheses = (key: string) => {
|
|
return key.replace(/[()]/g, (match) => (match === '(' ? '[' : ']'));
|
|
};
|
|
|
|
key = replaceParentheses(key);
|
|
|
|
return key;
|
|
}
|