mirror of
https://github.com/labring/FastGPT.git
synced 2026-05-02 01:02:05 +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>
234 lines
6.0 KiB
TypeScript
234 lines
6.0 KiB
TypeScript
import type { NextApiResponse } from 'next';
|
||
import { SseResponseEventEnum } from '@fastgpt/global/core/workflow/runtime/constants';
|
||
import { proxyError, ERROR_RESPONSE, ERROR_ENUM } from '@fastgpt/global/common/error/errorCode';
|
||
import { replaceSensitiveText } from '@fastgpt/global/common/string/tools';
|
||
import { UserError } from '@fastgpt/global/common/error/utils';
|
||
import { clearCookie } from '../../support/permission/auth/common';
|
||
import { ZodError } from 'zod';
|
||
import type Stream from 'node:stream';
|
||
import { getLogger, LogCategories } from '../logger';
|
||
|
||
const logger = getLogger(LogCategories.HTTP.ERROR);
|
||
|
||
export interface ResponseType<T = any> {
|
||
code: number;
|
||
message: string;
|
||
data: T;
|
||
}
|
||
|
||
export interface ProcessedError {
|
||
code: number;
|
||
statusText: string;
|
||
message: string;
|
||
shouldClearCookie: boolean;
|
||
data?: any;
|
||
zodError?: any;
|
||
}
|
||
|
||
/**
|
||
* 通用错误处理函数,提取错误信息并分类记录日志
|
||
* @param params - 包含错误对象、URL和默认状态码的参数
|
||
* @returns 处理后的错误对象
|
||
*/
|
||
export function processError(params: {
|
||
error: any;
|
||
url?: string;
|
||
defaultCode?: number;
|
||
}): ProcessedError {
|
||
const { error, url, defaultCode = 500 } = params;
|
||
let zodError;
|
||
|
||
const errResponseKey = typeof error === 'string' ? error : error?.message;
|
||
|
||
// 1. 处理特定的业务错误(ERROR_RESPONSE)
|
||
if (ERROR_RESPONSE[errResponseKey]) {
|
||
const shouldClearCookie = errResponseKey === ERROR_ENUM.unAuthorization;
|
||
|
||
// 记录业务侧错误日志
|
||
logger.info('API response error', {
|
||
url,
|
||
code: ERROR_RESPONSE[errResponseKey].code,
|
||
message: ERROR_RESPONSE[errResponseKey].message,
|
||
statusText: ERROR_RESPONSE[errResponseKey].statusText,
|
||
data: ERROR_RESPONSE[errResponseKey].data
|
||
});
|
||
|
||
return {
|
||
code: ERROR_RESPONSE[errResponseKey].code || defaultCode,
|
||
statusText: ERROR_RESPONSE[errResponseKey].statusText || 'error',
|
||
message: ERROR_RESPONSE[errResponseKey].message,
|
||
data: ERROR_RESPONSE[errResponseKey].data,
|
||
shouldClearCookie
|
||
};
|
||
}
|
||
|
||
// 2. 提取通用错误消息
|
||
let msg = error?.response?.statusText || error?.message || '请求错误';
|
||
if (typeof error === 'string') {
|
||
msg = error;
|
||
} else if (proxyError[error?.code]) {
|
||
msg = '网络连接异常';
|
||
} else if (error?.response?.data?.error?.message) {
|
||
msg = error?.response?.data?.error?.message;
|
||
} else if (error?.error?.message) {
|
||
msg = error?.error?.message;
|
||
}
|
||
|
||
// 3. 根据错误类型记录不同级别的日志
|
||
if (error instanceof UserError) {
|
||
logger.info('Request error', { url, message: msg });
|
||
} else if (error instanceof ZodError) {
|
||
zodError = (() => {
|
||
try {
|
||
return JSON.parse(error.message);
|
||
} catch (error) {}
|
||
})();
|
||
logger.error('Zod validation error', { url, data: zodError, error });
|
||
msg = error.message;
|
||
} else {
|
||
logger.error('System unexpected error', { url, message: msg, error });
|
||
}
|
||
|
||
// 4. 返回处理后的错误信息
|
||
return {
|
||
code: defaultCode,
|
||
statusText: 'error',
|
||
message: replaceSensitiveText(msg),
|
||
shouldClearCookie: false,
|
||
zodError
|
||
};
|
||
}
|
||
|
||
export const jsonRes = <T = any>(
|
||
res: NextApiResponse,
|
||
props?: {
|
||
code?: number;
|
||
message?: string;
|
||
data?: T;
|
||
error?: any;
|
||
url?: string;
|
||
}
|
||
) => {
|
||
const { code = 200, message = '', data = null, error, url } = props || {};
|
||
|
||
// 如果有错误,使用统一的错误处理逻辑
|
||
if (error) {
|
||
const processedError = processError({ error, url, defaultCode: code });
|
||
|
||
// 如果需要清除 cookie
|
||
if (processedError.shouldClearCookie) {
|
||
clearCookie(res);
|
||
}
|
||
|
||
res.status(500).json({
|
||
code: processedError.code,
|
||
statusText: processedError.statusText,
|
||
message: message || processedError.message,
|
||
data: processedError.data !== undefined ? processedError.data : null,
|
||
zodError: processedError.zodError
|
||
});
|
||
|
||
return;
|
||
}
|
||
|
||
// 成功响应
|
||
res.status(code).json({
|
||
code,
|
||
statusText: '',
|
||
message: replaceSensitiveText(message),
|
||
data: data !== undefined ? data : null
|
||
});
|
||
};
|
||
|
||
export const sseErrRes = (res: NextApiResponse, error: any) => {
|
||
const errResponseKey = typeof error === 'string' ? error : error?.message;
|
||
|
||
// Specified error
|
||
if (ERROR_RESPONSE[errResponseKey]) {
|
||
// login is expired
|
||
if (errResponseKey === ERROR_ENUM.unAuthorization) {
|
||
clearCookie(res);
|
||
}
|
||
|
||
return responseWrite({
|
||
res,
|
||
event: SseResponseEventEnum.error,
|
||
data: JSON.stringify(ERROR_RESPONSE[errResponseKey])
|
||
});
|
||
}
|
||
|
||
let msg = error?.response?.statusText || error?.message || '请求错误';
|
||
if (typeof error === 'string') {
|
||
msg = error;
|
||
} else if (proxyError[error?.code]) {
|
||
msg = '网络连接异常';
|
||
} else if (error?.response?.data?.error?.message) {
|
||
msg = error?.response?.data?.error?.message;
|
||
} else if (error?.error?.message) {
|
||
msg = `${error?.error?.code} ${error?.error?.message}`;
|
||
}
|
||
|
||
logger.error('SSE error', { message: msg, error });
|
||
|
||
responseWrite({
|
||
res,
|
||
event: SseResponseEventEnum.error,
|
||
data: JSON.stringify({ message: replaceSensitiveText(msg) })
|
||
});
|
||
};
|
||
|
||
export function responseWriteController({
|
||
res,
|
||
readStream
|
||
}: {
|
||
res: NextApiResponse;
|
||
readStream: Stream.Readable;
|
||
}) {
|
||
res.on('drain', () => {
|
||
readStream?.resume?.();
|
||
});
|
||
|
||
return (text: string | Buffer) => {
|
||
const writeResult = res.write(text);
|
||
if (!writeResult) {
|
||
readStream?.pause?.();
|
||
}
|
||
};
|
||
}
|
||
|
||
export function responseWrite({
|
||
res,
|
||
event,
|
||
data
|
||
}: {
|
||
res?: NextApiResponse;
|
||
event?: string;
|
||
data: string;
|
||
}) {
|
||
const Write = res?.write;
|
||
|
||
if (!Write) return;
|
||
|
||
event && Write(`event: ${event}\n`);
|
||
Write(`data: ${data}\n\n`);
|
||
}
|
||
|
||
export const responseWriteNodeStatus = ({
|
||
res,
|
||
status = 'running',
|
||
name
|
||
}: {
|
||
res?: NextApiResponse;
|
||
status?: 'running';
|
||
name: string;
|
||
}) => {
|
||
responseWrite({
|
||
res,
|
||
event: SseResponseEventEnum.flowNodeStatus,
|
||
data: JSON.stringify({
|
||
status,
|
||
name
|
||
})
|
||
});
|
||
};
|