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>
247 lines
7.3 KiB
TypeScript
247 lines
7.3 KiB
TypeScript
import {
|
|
Client,
|
|
type RemoveOptions,
|
|
type CopyConditions,
|
|
S3Error,
|
|
InvalidObjectNameError,
|
|
InvalidXMLError
|
|
} from 'minio';
|
|
import {
|
|
type CreatePostPresignedUrlOptions,
|
|
type CreatePostPresignedUrlParams,
|
|
type CreatePostPresignedUrlResult,
|
|
type createPreviewUrlParams,
|
|
CreateGetPresignedUrlParamsSchema
|
|
} from '../type';
|
|
import { getSystemMaxFileSize, Mimes } from '../constants';
|
|
import path from 'node:path';
|
|
import { MongoS3TTL } from '../schema';
|
|
import { addHours, addMinutes, differenceInSeconds } from 'date-fns';
|
|
import { getLogger, LogCategories } from '../../logger';
|
|
import { addS3DelJob } from '../mq';
|
|
import { type UploadFileByBufferParams, UploadFileByBufferSchema } from '../type';
|
|
import type { createStorage } from '@fastgpt-sdk/storage';
|
|
import { parseFileExtensionFromUrl } from '@fastgpt/global/common/string/tools';
|
|
|
|
const logger = getLogger(LogCategories.INFRA.S3);
|
|
|
|
type IStorage = ReturnType<typeof createStorage>;
|
|
|
|
// Check if the error is a "file not found" type error, which should be treated as success
|
|
export const isFileNotFoundError = (error: any): boolean => {
|
|
if (error instanceof S3Error) {
|
|
// Handle various "not found" error codes
|
|
return (
|
|
error.code === 'NoSuchKey' ||
|
|
error.code === 'InvalidObjectName' ||
|
|
error.message === 'Not Found' ||
|
|
error.message ===
|
|
'The request signature we calculated does not match the signature you provided. Check your key and signing method.' ||
|
|
error.message.includes('Resource name contains bad components') ||
|
|
error.message.includes('Object name contains unsupported characters.')
|
|
);
|
|
}
|
|
if (error instanceof InvalidObjectNameError || error instanceof InvalidXMLError) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
export class S3BaseBucket {
|
|
constructor(
|
|
private readonly _client: IStorage,
|
|
private readonly _externalClient: IStorage | undefined
|
|
) {}
|
|
|
|
get client(): IStorage {
|
|
return this._client;
|
|
}
|
|
|
|
get externalClient(): IStorage {
|
|
return this._externalClient ?? this._client;
|
|
}
|
|
|
|
get bucketName(): string {
|
|
return this.client.bucketName;
|
|
}
|
|
|
|
async checkBucketHealth() {
|
|
await this.createPresignedPutUrl({
|
|
rawKey: 'health-check.txt',
|
|
filename: 'health-check.txt',
|
|
metadata: {
|
|
contentDisposition: 'attachment; filename="health-check.txt"',
|
|
originFilename: 'health-check.txt',
|
|
uploadTime: new Date().toISOString()
|
|
}
|
|
});
|
|
}
|
|
|
|
// TODO: 加到 MQ 里保障幂等
|
|
async move({ from, to }: { from: string; to: string }): Promise<void> {
|
|
await this.copy({ from, to, options: { temporary: false } });
|
|
await this.removeObject(from);
|
|
}
|
|
|
|
async copy({
|
|
from,
|
|
to,
|
|
options
|
|
}: {
|
|
from: string;
|
|
to: string;
|
|
options?: {
|
|
temporary?: boolean;
|
|
};
|
|
}) {
|
|
if (options?.temporary) {
|
|
await MongoS3TTL.create({
|
|
minioKey: to,
|
|
bucketName: this.bucketName,
|
|
expiredTime: addHours(new Date(), 24)
|
|
});
|
|
}
|
|
return this.client.copyObjectInSelfBucket({ sourceKey: from, targetKey: to });
|
|
}
|
|
|
|
async removeObject(objectKey: string): Promise<void> {
|
|
this.client.deleteObject({ key: objectKey }).catch((err) => {
|
|
if (isFileNotFoundError(err)) {
|
|
return Promise.resolve();
|
|
}
|
|
logger.error('S3 delete object failed', {
|
|
key: objectKey,
|
|
code: err?.code,
|
|
error: err
|
|
});
|
|
throw err;
|
|
});
|
|
}
|
|
|
|
addDeleteJob(params: Omit<Parameters<typeof addS3DelJob>[0], 'bucketName'>) {
|
|
return addS3DelJob({ ...params, bucketName: this.bucketName });
|
|
}
|
|
|
|
async isObjectExists(key: string) {
|
|
const { exists } = await this.client.checkObjectExists({ key });
|
|
|
|
return exists ?? false;
|
|
}
|
|
|
|
async createPresignedPutUrl(
|
|
params: CreatePostPresignedUrlParams,
|
|
options: CreatePostPresignedUrlOptions = {}
|
|
): Promise<CreatePostPresignedUrlResult> {
|
|
try {
|
|
const { expiredHours, maxFileSize = getSystemMaxFileSize() } = options;
|
|
const formatMaxFileSize = maxFileSize * 1024 * 1024;
|
|
const filename = params.filename;
|
|
const ext = path.extname(filename).toLowerCase();
|
|
const contentType = Mimes[ext as keyof typeof Mimes] ?? 'application/octet-stream';
|
|
const expiredSeconds = differenceInSeconds(addMinutes(new Date(), 10), new Date());
|
|
|
|
const { metadata, url } = await this.externalClient.generatePresignedPutUrl({
|
|
key: params.rawKey,
|
|
expiredSeconds,
|
|
contentType,
|
|
metadata: {
|
|
contentDisposition: `attachment; filename="${encodeURIComponent(filename)}"`,
|
|
originFilename: encodeURIComponent(filename),
|
|
uploadTime: new Date().toISOString(),
|
|
...params.metadata
|
|
}
|
|
});
|
|
|
|
if (expiredHours) {
|
|
await MongoS3TTL.create({
|
|
minioKey: params.rawKey,
|
|
bucketName: this.bucketName,
|
|
expiredTime: addHours(new Date(), expiredHours)
|
|
});
|
|
}
|
|
|
|
return {
|
|
url: url,
|
|
key: params.rawKey,
|
|
headers: {
|
|
...metadata
|
|
},
|
|
maxSize: formatMaxFileSize
|
|
};
|
|
} catch (error) {
|
|
logger.error('Failed to create S3 presigned PUT URL', {
|
|
key: params.rawKey,
|
|
filename: params.filename,
|
|
error
|
|
});
|
|
return Promise.reject('Failed to create presigned put url');
|
|
}
|
|
}
|
|
|
|
async createExternalUrl(params: createPreviewUrlParams) {
|
|
const parsed = CreateGetPresignedUrlParamsSchema.parse(params);
|
|
|
|
const { key, expiredHours } = parsed;
|
|
const expires = expiredHours ? expiredHours * 60 * 60 : 30 * 60; // expires 的单位是秒 默认 30 分钟
|
|
|
|
return await this.externalClient.generatePresignedGetUrl({ key, expiredSeconds: expires });
|
|
}
|
|
|
|
async createPreviewUrl(params: createPreviewUrlParams) {
|
|
const parsed = CreateGetPresignedUrlParamsSchema.parse(params);
|
|
|
|
const { key, expiredHours } = parsed;
|
|
const expires = expiredHours ? expiredHours * 60 * 60 : 30 * 60; // expires 的单位是秒 默认 30 分钟
|
|
|
|
return await this.client.generatePresignedGetUrl({ key, expiredSeconds: expires });
|
|
}
|
|
|
|
async uploadFileByBuffer(params: UploadFileByBufferParams) {
|
|
const { key, buffer, contentType } = UploadFileByBufferSchema.parse(params);
|
|
|
|
await MongoS3TTL.create({
|
|
minioKey: key,
|
|
bucketName: this.bucketName,
|
|
expiredTime: addHours(new Date(), 1)
|
|
});
|
|
|
|
await this.client.uploadObject({
|
|
key,
|
|
body: buffer,
|
|
contentType: contentType || 'application/octet-stream'
|
|
});
|
|
|
|
return {
|
|
key,
|
|
accessUrl: await this.createExternalUrl({
|
|
key,
|
|
expiredHours: 2
|
|
})
|
|
};
|
|
}
|
|
|
|
async getFileMetadata(key: string) {
|
|
const metadataResponse = await this.client.getObjectMetadata({ key });
|
|
if (!metadataResponse) return;
|
|
|
|
const contentLength = metadataResponse.contentLength;
|
|
const filename: string = decodeURIComponent(metadataResponse.metadata.originFilename || '');
|
|
const extension = parseFileExtensionFromUrl(filename);
|
|
const contentType: string = metadataResponse.contentType || 'application/octet-stream';
|
|
|
|
return {
|
|
filename,
|
|
extension,
|
|
contentType,
|
|
contentLength
|
|
};
|
|
}
|
|
|
|
async getFileStream(key: string) {
|
|
const downloadResponse = await this.client.downloadObject({ key });
|
|
if (!downloadResponse) return;
|
|
|
|
return downloadResponse.body;
|
|
}
|
|
}
|