mirror of
https://github.com/labring/FastGPT.git
synced 2026-02-28 01:02:28 +08:00
V4.14.7 features (#6406)
* 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>
This commit is contained in:
Archer
@@ -1 +1,8 @@
|
||||
FASTGPT_ENDPOINT=http://localhost:3000
|
||||
FASTGPT_ENDPOINT=http://localhost:3000
|
||||
|
||||
LOG_ENABLE_CONSOLE=true
|
||||
LOG_ENABLE_DEBUG_LEVEL=true
|
||||
LOG_ENABLE_OTEL=false
|
||||
LOG_OTEL_SERVICE_NAME=fastgpt-mcp-server
|
||||
LOG_OTEL_URL=http://localhost:4318/v1/logs
|
||||
LOG_ENABLE_MONGO_LOG=false
|
||||
|
||||
@@ -9,6 +9,7 @@ RUN npm install -g pnpm@9.4.0
|
||||
# 复制package.json
|
||||
COPY pnpm-lock.yaml pnpm-workspace.yaml ./
|
||||
COPY packages/global ./packages/global
|
||||
COPY packages/service ./packages/service
|
||||
COPY packages/web ./packages/web
|
||||
COPY projects/mcp_server/package.json ./projects/mcp_server/package.json
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@fastgpt/global": "workspace:*",
|
||||
"@fastgpt/service": "workspace:*",
|
||||
"@modelcontextprotocol/sdk": "^1.26.0",
|
||||
"chalk": "^5.3.0",
|
||||
"dayjs": "^1.11.7",
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
import { addLog } from '../utils/log';
|
||||
import { getLogger, LogCategories } from '@fastgpt/service/common/logger';
|
||||
|
||||
const logger = getLogger(LogCategories.MODULE.MCP.SERVER);
|
||||
|
||||
type ConfigType = {
|
||||
headers?: Record<string, string>;
|
||||
@@ -28,7 +30,7 @@ function checkRes(data: ResponseDataType) {
|
||||
* 响应错误处理
|
||||
*/
|
||||
function responseError(err: any) {
|
||||
addLog.error(`Fetch request error`, err);
|
||||
logger.error('Fetch request error', { error: err });
|
||||
const data = err?.response?.data || err;
|
||||
|
||||
if (!err) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env node
|
||||
import './init';
|
||||
import { init } from './init';
|
||||
import { Server } from '@modelcontextprotocol/sdk/server/index.js';
|
||||
import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
|
||||
import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
|
||||
@@ -7,10 +7,11 @@ import { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js';
|
||||
import express from 'express';
|
||||
|
||||
import { callTool, getTools } from './api/fastgpt';
|
||||
import { addLog } from './utils/log';
|
||||
import { getErrText } from '@fastgpt/global/common/error/utils';
|
||||
import { configureLogger, getLogger, LogCategories } from '@fastgpt/service/common/logger';
|
||||
|
||||
const app = express();
|
||||
const logger = getLogger(LogCategories.MODULE.MCP.SERVER);
|
||||
|
||||
const transportMap: Record<string, SSEServerTransport> = {};
|
||||
|
||||
@@ -35,18 +36,18 @@ app.get('/:key/sse', async (req, res) => {
|
||||
);
|
||||
|
||||
transport.onclose = () => {
|
||||
addLog.info(`Transport closed ${transport.sessionId}`);
|
||||
logger.info(`Transport closed ${transport.sessionId}`);
|
||||
delete transportMap[transport.sessionId];
|
||||
};
|
||||
transport.onerror = (err) => {
|
||||
addLog.error(`Transport error ${transport.sessionId}`, err);
|
||||
logger.error(`Transport error ${transport.sessionId}`, { error: err });
|
||||
};
|
||||
server.onclose = () => {
|
||||
addLog.info(`Server closed ${transport.sessionId}`);
|
||||
logger.info(`Server closed ${transport.sessionId}`);
|
||||
delete transportMap[transport.sessionId];
|
||||
};
|
||||
server.onerror = (err) => {
|
||||
addLog.error(`Server error ${transport.sessionId}`, err);
|
||||
logger.error(`Server error ${transport.sessionId}`, { error: err });
|
||||
};
|
||||
|
||||
server.setRequestHandler(ListToolsRequestSchema, async () => ({
|
||||
@@ -58,7 +59,7 @@ app.get('/:key/sse', async (req, res) => {
|
||||
args: Record<string, any>
|
||||
): Promise<CallToolResult> => {
|
||||
try {
|
||||
addLog.info(`Call tool: ${name} with args: ${JSON.stringify(args)}`);
|
||||
logger.info(`Call tool: ${name} with args: ${JSON.stringify(args)}`);
|
||||
const result = await callTool({ key, toolName: name, inputs: args });
|
||||
|
||||
return {
|
||||
@@ -83,7 +84,7 @@ app.get('/:key/sse', async (req, res) => {
|
||||
);
|
||||
|
||||
await server.connect(transport);
|
||||
addLog.info(`Server connected: ${transport.sessionId}`);
|
||||
logger.info(`Server connected: ${transport.sessionId}`);
|
||||
});
|
||||
|
||||
app.post('/:key/messages', (req, res) => {
|
||||
@@ -96,10 +97,18 @@ app.post('/:key/messages', (req, res) => {
|
||||
});
|
||||
|
||||
const PORT = process.env.PORT || 3000;
|
||||
app
|
||||
.listen(PORT, () => {
|
||||
addLog.info(`Server is running on port ${PORT}`);
|
||||
})
|
||||
.on('error', (err) => {
|
||||
addLog.error(`Server error`, err);
|
||||
});
|
||||
|
||||
async function bootstrap() {
|
||||
await init();
|
||||
await configureLogger();
|
||||
|
||||
app
|
||||
.listen(PORT, () => {
|
||||
logger.info(`Server is running on port ${PORT}`);
|
||||
})
|
||||
.on('error', (err) => {
|
||||
logger.error('Server error', { error: err });
|
||||
});
|
||||
}
|
||||
|
||||
void bootstrap();
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
import * as dotenv from 'dotenv';
|
||||
dotenv.config();
|
||||
dotenv.config({ path: '.env.local' });
|
||||
|
||||
export async function init() {
|
||||
dotenv.config();
|
||||
dotenv.config({ path: '.env.local' });
|
||||
}
|
||||
|
||||
@@ -1,68 +0,0 @@
|
||||
import chalk from 'chalk';
|
||||
import dayjs from 'dayjs';
|
||||
|
||||
export enum LogLevelEnum {
|
||||
debug = 0,
|
||||
info = 1,
|
||||
warn = 2,
|
||||
error = 3
|
||||
}
|
||||
|
||||
const logMap = {
|
||||
[LogLevelEnum.debug]: {
|
||||
levelLog: chalk.green('[Debug]')
|
||||
},
|
||||
[LogLevelEnum.info]: {
|
||||
levelLog: chalk.blue('[Info]')
|
||||
},
|
||||
[LogLevelEnum.warn]: {
|
||||
levelLog: chalk.yellow('[Warn]')
|
||||
},
|
||||
[LogLevelEnum.error]: {
|
||||
levelLog: chalk.red('[Error]')
|
||||
}
|
||||
};
|
||||
|
||||
/* add logger */
|
||||
export const addLog = {
|
||||
log(level: LogLevelEnum, msg: string, obj: Record<string, any> = {}) {
|
||||
const stringifyObj = JSON.stringify(obj);
|
||||
const isEmpty = Object.keys(obj).length === 0;
|
||||
|
||||
console.log(
|
||||
`${logMap[level].levelLog} ${dayjs().format('YYYY-MM-DD HH:mm:ss')} ${msg} ${
|
||||
level !== LogLevelEnum.error && !isEmpty ? stringifyObj : ''
|
||||
}`
|
||||
);
|
||||
|
||||
level === LogLevelEnum.error && console.error(obj);
|
||||
},
|
||||
debug(msg: string, obj?: Record<string, any>) {
|
||||
this.log(LogLevelEnum.debug, msg, obj);
|
||||
},
|
||||
info(msg: string, obj?: Record<string, any>) {
|
||||
this.log(LogLevelEnum.info, msg, obj);
|
||||
},
|
||||
warn(msg: string, obj?: Record<string, any>) {
|
||||
this.log(LogLevelEnum.warn, msg, obj);
|
||||
},
|
||||
error(msg: string, error?: any) {
|
||||
this.log(LogLevelEnum.error, msg, {
|
||||
message: error?.message || error,
|
||||
stack: error?.stack,
|
||||
...(error?.config && {
|
||||
config: {
|
||||
headers: error.config.headers,
|
||||
url: error.config.url,
|
||||
data: error.config.data
|
||||
}
|
||||
}),
|
||||
...(error?.response && {
|
||||
response: {
|
||||
status: error.response.status,
|
||||
statusText: error.response.statusText
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
};
|
||||
Reference in New Issue
Block a user