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>
155 lines
4.5 KiB
TypeScript
155 lines
4.5 KiB
TypeScript
import { axios } from '../../api/axios';
|
|
import { serverRequestBaseUrl } from '../../api/serverRequest';
|
|
import { retryFn } from '@fastgpt/global/common/system/utils';
|
|
import { getContentTypeFromHeader } from '../utils';
|
|
import { getLogger, LogCategories } from '../../logger';
|
|
|
|
const logger = getLogger(LogCategories.MODULE.DATASET.FILE);
|
|
|
|
// 图片格式魔数映射表
|
|
const IMAGE_SIGNATURES: { type: string; magic: number[]; check?: (buffer: Buffer) => boolean }[] = [
|
|
{ type: 'image/jpeg', magic: [0xff, 0xd8, 0xff] },
|
|
{ type: 'image/png', magic: [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a] },
|
|
{ type: 'image/gif', magic: [0x47, 0x49, 0x46, 0x38] },
|
|
{
|
|
type: 'image/webp',
|
|
magic: [0x52, 0x49, 0x46, 0x46],
|
|
check: (buffer) => buffer.length >= 12 && buffer.slice(8, 12).toString('ascii') === 'WEBP'
|
|
},
|
|
{ type: 'image/bmp', magic: [0x42, 0x4d] },
|
|
{ type: 'image/tiff', magic: [0x49, 0x49, 0x2a, 0x00] },
|
|
{ type: 'image/tiff', magic: [0x4d, 0x4d, 0x00, 0x2a] },
|
|
{ type: 'image/svg+xml', magic: [0x3c, 0x73, 0x76, 0x67] },
|
|
{ type: 'image/x-icon', magic: [0x00, 0x00, 0x01, 0x00] }
|
|
];
|
|
|
|
// 有效的图片 MIME 类型
|
|
const VALID_IMAGE_TYPES = new Set([
|
|
'image/jpeg',
|
|
'image/jpg',
|
|
'image/png',
|
|
'image/gif',
|
|
'image/webp',
|
|
'image/bmp',
|
|
'image/svg+xml',
|
|
'image/tiff',
|
|
'image/x-icon',
|
|
'image/vnd.microsoft.icon',
|
|
'image/ico',
|
|
'image/heic',
|
|
'image/heif',
|
|
'image/avif'
|
|
]);
|
|
|
|
// Base64 首字符到图片类型的映射
|
|
const BASE64_PREFIX_MAP: Record<string, string> = {
|
|
'/': 'image/jpeg',
|
|
i: 'image/png',
|
|
R: 'image/gif',
|
|
U: 'image/webp',
|
|
Q: 'image/bmp',
|
|
P: 'image/svg+xml',
|
|
T: 'image/tiff',
|
|
J: 'image/jp2',
|
|
S: 'image/x-tga',
|
|
I: 'image/ief',
|
|
V: 'image/vnd.microsoft.icon',
|
|
W: 'image/vnd.wap.wbmp',
|
|
X: 'image/x-xbitmap',
|
|
Z: 'image/x-xpixmap',
|
|
Y: 'image/x-xwindowdump'
|
|
};
|
|
|
|
const DEFAULT_IMAGE_TYPE = 'image/jpeg';
|
|
|
|
export const isValidImageContentType = (contentType: string): boolean => {
|
|
if (!contentType) return false;
|
|
return VALID_IMAGE_TYPES.has(contentType);
|
|
};
|
|
|
|
export const detectImageTypeFromBuffer = (buffer: Buffer): string | undefined => {
|
|
if (!buffer || buffer.length === 0) return;
|
|
|
|
for (const { type, magic, check } of IMAGE_SIGNATURES) {
|
|
if (buffer.length < magic.length) continue;
|
|
|
|
const matches = magic.every((byte, index) => buffer[index] === byte);
|
|
if (matches && (!check || check(buffer))) {
|
|
return type;
|
|
}
|
|
}
|
|
|
|
return;
|
|
};
|
|
|
|
export const guessBase64ImageType = (str: string): string => {
|
|
if (!str || typeof str !== 'string') return DEFAULT_IMAGE_TYPE;
|
|
|
|
// 尝试从 base64 解码并检测文件头
|
|
try {
|
|
const buffer = Buffer.from(str, 'base64');
|
|
const detectedType = detectImageTypeFromBuffer(buffer);
|
|
if (detectedType) return detectedType;
|
|
} catch {}
|
|
|
|
// 回退到首字符映射
|
|
return BASE64_PREFIX_MAP[str.charAt(0)] || DEFAULT_IMAGE_TYPE;
|
|
};
|
|
|
|
export const getImageBase64 = async (url: string) => {
|
|
logger.debug('Load image to base64', { url });
|
|
|
|
try {
|
|
const response = await retryFn(() =>
|
|
axios.get(url, {
|
|
baseURL: serverRequestBaseUrl,
|
|
responseType: 'arraybuffer'
|
|
})
|
|
);
|
|
|
|
const buffer = Buffer.from(response.data);
|
|
const base64 = buffer.toString('base64');
|
|
const headerContentType = getContentTypeFromHeader(response.headers['content-type']);
|
|
|
|
// 检测图片类型的优先级策略
|
|
const imageType = (() => {
|
|
// 1. 如果 Header 是有效的图片类型,直接使用
|
|
if (headerContentType && isValidImageContentType(headerContentType)) {
|
|
return headerContentType;
|
|
}
|
|
|
|
// 2. 使用文件头检测(适用于通用二进制类型或无效类型)
|
|
const detectedType = detectImageTypeFromBuffer(buffer);
|
|
if (detectedType) {
|
|
return detectedType;
|
|
}
|
|
|
|
// 3. 回退到 base64 推断
|
|
return guessBase64ImageType(base64);
|
|
})();
|
|
|
|
return {
|
|
completeBase64: `data:${imageType};base64,${base64}`,
|
|
base64,
|
|
mime: imageType
|
|
};
|
|
} catch (error) {
|
|
logger.warn('Load image to base64 failed', { url, error });
|
|
return Promise.reject(error);
|
|
}
|
|
};
|
|
|
|
export const addEndpointToImageUrl = (text: string) => {
|
|
const baseURL = process.env.FE_DOMAIN;
|
|
const subRoute = process.env.NEXT_PUBLIC_BASE_URL || '';
|
|
if (!baseURL) return text;
|
|
const regex = new RegExp(
|
|
`(?<!https?:\\/\\/[^\\s]*)(?:${subRoute}\\/api\\/system\\/img\\/[^\\s.]*\\.[^\\s]*)`,
|
|
'g'
|
|
);
|
|
// 匹配 ${subRoute}/api/system/img/xxx.xx 的图片链接,并追加 baseURL
|
|
return text.replace(regex, (match) => {
|
|
return `${baseURL}${match}`;
|
|
});
|
|
};
|