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>
258 lines
5.8 KiB
TypeScript
258 lines
5.8 KiB
TypeScript
import { connectionMongo, getMongoModel } from '../../../common/mongo';
|
|
import { getLogger, LogCategories } from '../../../common/logger';
|
|
const { Schema } = connectionMongo;
|
|
|
|
export const DatasetMigrationLogCollectionName = 'dataset_migration_logs';
|
|
|
|
export type DatasetMigrationLogSchemaType = {
|
|
_id: string;
|
|
|
|
// 迁移批次信息
|
|
batchId: string; // 同一次运行的迁移使用相同的 batchId
|
|
migrationVersion: string; // 如 'v4.14.3'
|
|
|
|
// 资源类型和标识
|
|
resourceType: 'collection' | 'dataset_image'; // 支持不同类型的文件迁移
|
|
resourceId: string; // collection._id 或 image._id
|
|
teamId: string;
|
|
datasetId?: string; // collection 有,image 可能没有
|
|
|
|
// 迁移前后的存储信息
|
|
sourceStorage: {
|
|
type: 'gridfs';
|
|
fileId: string; // GridFS 的 ObjectId
|
|
bucketName: string; // 'dataset' or 'chat'
|
|
fileSize?: number; // 文件大小(字节)
|
|
checksum?: string; // MD5/SHA256
|
|
};
|
|
|
|
targetStorage?: {
|
|
type: 's3';
|
|
key: string; // S3 key
|
|
bucket?: string; // S3 bucket名称
|
|
fileSize?: number;
|
|
checksum?: string;
|
|
};
|
|
|
|
// 迁移状态
|
|
status: 'pending' | 'processing' | 'completed' | 'failed' | 'rollback' | 'verified';
|
|
|
|
// 时间戳
|
|
createdAt: Date; // 创建时间
|
|
startedAt?: Date; // 开始迁移时间
|
|
completedAt?: Date; // 完成时间
|
|
rolledBackAt?: Date; // 回滚时间
|
|
|
|
// 重试信息
|
|
attemptCount: number; // 尝试次数
|
|
maxAttempts: number; // 最大重试次数
|
|
lastAttemptAt?: Date; // 最后一次尝试时间
|
|
|
|
// 错误信息
|
|
error?: {
|
|
message: string;
|
|
stack?: string;
|
|
code?: string; // 错误代码,便于分类统计
|
|
phase: 'download' | 'upload' | 'verify' | 'update_db'; // 错误发生在哪个阶段
|
|
};
|
|
|
|
// 校验信息
|
|
verified: boolean; // 是否已验证数据一致性
|
|
verifiedAt?: Date;
|
|
|
|
// 操作日志(记录详细步骤)
|
|
operations: Array<{
|
|
action: string; // 'start_download', 'upload_to_s3', 'update_collection', 'rollback' 等
|
|
timestamp: Date;
|
|
success: boolean;
|
|
duration?: number; // 耗时(毫秒)
|
|
details?: any; // 额外信息
|
|
}>;
|
|
|
|
// 元数据(用于调试和审计)
|
|
metadata: {
|
|
fileName?: string; // 原文件名
|
|
fileType?: string; // 文件类型
|
|
originalUpdateTime?: Date; // collection 的原始更新时间
|
|
executorIp?: string; // 执行迁移的服务器 IP
|
|
nodeEnv?: string; // 'production' or 'development'
|
|
};
|
|
|
|
// 回滚信息
|
|
rollbackInfo?: {
|
|
reason: string; // 回滚原因
|
|
rolledBackBy?: string; // 操作人员或系统
|
|
s3FileDeleted: boolean; // S3 文件是否已删除
|
|
dbRestored: boolean; // 数据库是否已恢复
|
|
};
|
|
};
|
|
|
|
const DatasetMigrationLogSchema = new Schema({
|
|
// 批次信息
|
|
batchId: {
|
|
type: String,
|
|
required: true,
|
|
index: true
|
|
},
|
|
migrationVersion: {
|
|
type: String,
|
|
required: true
|
|
},
|
|
|
|
// 资源类型和标识
|
|
resourceType: {
|
|
type: String,
|
|
enum: ['collection', 'dataset_image'],
|
|
required: true
|
|
},
|
|
resourceId: {
|
|
type: Schema.Types.ObjectId,
|
|
required: true,
|
|
index: true
|
|
},
|
|
teamId: {
|
|
type: Schema.Types.ObjectId,
|
|
required: true,
|
|
index: true
|
|
},
|
|
datasetId: {
|
|
type: Schema.Types.ObjectId,
|
|
index: true
|
|
},
|
|
|
|
// 存储信息
|
|
sourceStorage: {
|
|
type: {
|
|
type: String,
|
|
default: 'gridfs'
|
|
},
|
|
fileId: {
|
|
type: String,
|
|
required: true
|
|
},
|
|
bucketName: String,
|
|
fileSize: Number,
|
|
checksum: String
|
|
},
|
|
|
|
targetStorage: {
|
|
type: {
|
|
type: String,
|
|
default: 's3'
|
|
},
|
|
key: String,
|
|
bucket: String,
|
|
fileSize: Number,
|
|
checksum: String
|
|
},
|
|
|
|
// 状态
|
|
status: {
|
|
type: String,
|
|
enum: ['pending', 'processing', 'completed', 'failed', 'rollback', 'verified'],
|
|
default: 'pending',
|
|
required: true,
|
|
index: true
|
|
},
|
|
|
|
// 时间戳
|
|
createdAt: {
|
|
type: Date,
|
|
default: () => new Date(),
|
|
index: true
|
|
},
|
|
startedAt: Date,
|
|
completedAt: Date,
|
|
rolledBackAt: Date,
|
|
|
|
// 重试信息
|
|
attemptCount: {
|
|
type: Number,
|
|
default: 0
|
|
},
|
|
maxAttempts: {
|
|
type: Number,
|
|
default: 3
|
|
},
|
|
lastAttemptAt: Date,
|
|
|
|
// 错误信息
|
|
error: {
|
|
message: String,
|
|
stack: String,
|
|
code: String,
|
|
phase: {
|
|
type: String,
|
|
enum: ['download', 'upload', 'verify', 'update_db']
|
|
}
|
|
},
|
|
|
|
// 校验信息
|
|
verified: {
|
|
type: Boolean,
|
|
default: false
|
|
},
|
|
verifiedAt: Date,
|
|
|
|
// 操作日志
|
|
operations: [
|
|
{
|
|
action: String,
|
|
timestamp: {
|
|
type: Date,
|
|
default: () => new Date()
|
|
},
|
|
success: Boolean,
|
|
duration: Number,
|
|
details: Schema.Types.Mixed
|
|
}
|
|
],
|
|
|
|
// 元数据
|
|
metadata: {
|
|
fileName: String,
|
|
fileType: String,
|
|
originalUpdateTime: Date,
|
|
executorIp: String,
|
|
nodeEnv: String
|
|
},
|
|
|
|
// 回滚信息
|
|
rollbackInfo: {
|
|
reason: String,
|
|
rolledBackBy: String,
|
|
s3FileDeleted: Boolean,
|
|
dbRestored: Boolean
|
|
}
|
|
});
|
|
|
|
// 索引优化
|
|
try {
|
|
// 查询某个批次的迁移状态
|
|
DatasetMigrationLogSchema.index({ batchId: 1, status: 1 });
|
|
|
|
// 查询某个资源的迁移历史
|
|
DatasetMigrationLogSchema.index({ resourceType: 1, resourceId: 1 });
|
|
|
|
// 查询失败的迁移(需要重试)
|
|
DatasetMigrationLogSchema.index({
|
|
status: 1,
|
|
attemptCount: 1,
|
|
lastAttemptAt: 1
|
|
});
|
|
|
|
// 查询某个团队的迁移情况
|
|
DatasetMigrationLogSchema.index({ teamId: 1, status: 1 });
|
|
|
|
// 唯一索引:同一个资源在同一个批次只能有一条记录
|
|
DatasetMigrationLogSchema.index({ batchId: 1, resourceType: 1, resourceId: 1 }, { unique: true });
|
|
} catch (error) {
|
|
const logger = getLogger(LogCategories.INFRA.MONGO);
|
|
logger.error('Failed to build dataset migration indexes', { error });
|
|
}
|
|
|
|
export const MongoDatasetMigrationLog = getMongoModel<DatasetMigrationLogSchemaType>(
|
|
DatasetMigrationLogCollectionName,
|
|
DatasetMigrationLogSchema
|
|
);
|