mirror of
https://github.com/labring/FastGPT.git
synced 2025-07-23 21:13:50 +00:00
V4.9.7 feature (#4669)
* update doc * feat: Add coupon redemption feature for team subscriptions (#4595) * feat: Add coupon redemption feature for team subscriptions - Introduced `TeamCouponSub` and `TeamCouponSchema` types - Added `redeemCoupon` API endpoint - Updated UI to include a modal for coupon redemption - Added new icon and translations for "Redeem coupon" * perf: remove field teamId * perf: use dynamic import * refactor: move to page component * perf: coupon code * perf: mcp server * perf: test * auto layout (#4634) * fix 4.9.6 (#4631) * fix debug quote list * delete next text node match * fix extract default boolean value * export latest 100 chat items * fix quote item ui * doc * fix doc * feat: auto layout * perf: auto layout * fix: auto layout null * add start node --------- Co-authored-by: heheer <heheer@sealos.io> * fix: share link (#4644) * Add workflow run duration;Get audio duration (#4645) * add duration * get audio duration * Custom config path (#4649) * feat: 通过环境变量DATA_PATH获取配置文件目录 (#4622) 通过环境变量DATA_PATH获取配置文件目录,以应对不同的部署方式的多样化需求 * feat: custom configjson path * doc --------- Co-authored-by: John Chen <sss1991@163.com> * 程序api调用场景下,如果大量调用带有图片或视频,产生的聊天记录会导致后台mongo数据库异常。这个修改给api客户端一个禁止生成聊天记录的选项,避免这个后果。 (#3964) * update special chatId * perf: vector db rename * update operationLog (#4647) * update operationLog * combine operationLogMap * solve operationI18nLogMap bug * remoce log * feat: Rerank usage (#4654) * refresh concat when update (#4655) * fix: refresh code * perf: timer lock * Fix operationLog (#4657) * perf: http streamable mcp * add alipay (#4630) * perf: subplan ui * perf: pay code * hiden bank tip * Fix: pay error (#4665) * fix quote number (#4666) * remove log --------- Co-authored-by: a.e. <49438478+I-Info@users.noreply.github.com> Co-authored-by: heheer <heheer@sealos.io> Co-authored-by: John Chen <sss1991@163.com> Co-authored-by: gaord <bengao168@msn.com> Co-authored-by: gggaaallleee <91131304+gggaaallleee@users.noreply.github.com>
This commit is contained in:
@@ -2,50 +2,38 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js';
|
||||
import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
|
||||
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
|
||||
import { ToolType } from '@fastgpt/global/core/app/type';
|
||||
import { addLog } from '../../common/system/log';
|
||||
import { retryFn } from '@fastgpt/global/common/system/utils';
|
||||
|
||||
export class MCPClient {
|
||||
private client: Client | null = null;
|
||||
private client: Client;
|
||||
private url: string;
|
||||
|
||||
constructor(config: { url: string }) {
|
||||
this.url = config.url;
|
||||
this.client = new Client({
|
||||
name: 'FastGPT-MCP-client',
|
||||
version: '1.0.0'
|
||||
});
|
||||
}
|
||||
|
||||
private async getConnection(): Promise<Client> {
|
||||
if (this.client) {
|
||||
return this.client;
|
||||
}
|
||||
|
||||
try {
|
||||
const client = new Client({
|
||||
name: 'FastGPT-MCP-http-client',
|
||||
version: '1.0.0'
|
||||
});
|
||||
const transport = new StreamableHTTPClientTransport(new URL(this.url));
|
||||
await client.connect(transport);
|
||||
this.client = client;
|
||||
return client;
|
||||
await this.client.connect(transport);
|
||||
return this.client;
|
||||
} catch (error) {
|
||||
const client = new Client({
|
||||
name: 'FastGPT-MCP-sse-client',
|
||||
version: '1.0.0'
|
||||
});
|
||||
const sseTransport = new SSEClientTransport(new URL(this.url));
|
||||
await client.connect(sseTransport);
|
||||
this.client = client;
|
||||
return client;
|
||||
await this.client.connect(new SSEClientTransport(new URL(this.url)));
|
||||
return this.client;
|
||||
}
|
||||
}
|
||||
|
||||
// 内部方法:关闭连接
|
||||
private async closeConnection() {
|
||||
if (this.client) {
|
||||
try {
|
||||
await this.client.close();
|
||||
this.client = null;
|
||||
} catch (error) {
|
||||
console.error('Failed to close MCP client:', error);
|
||||
}
|
||||
try {
|
||||
await retryFn(() => this.client.close(), 3);
|
||||
} catch (error) {
|
||||
addLog.error('[MCP Client] Failed to close connection:', error);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,7 +46,11 @@ export class MCPClient {
|
||||
const client = await this.getConnection();
|
||||
const response = await client.listTools();
|
||||
|
||||
const tools = (response.tools || []).map((tool: any) => ({
|
||||
if (!Array.isArray(response.tools)) {
|
||||
return Promise.reject('[MCP Client] Get tools response is not an array');
|
||||
}
|
||||
|
||||
const tools = response.tools.map((tool) => ({
|
||||
name: tool.name,
|
||||
description: tool.description || '',
|
||||
inputSchema: tool.inputSchema || {
|
||||
@@ -67,9 +59,10 @@ export class MCPClient {
|
||||
}
|
||||
}));
|
||||
|
||||
// @ts-ignore
|
||||
return tools;
|
||||
} catch (error) {
|
||||
console.error('Failed to get MCP tools:', error);
|
||||
addLog.error('[MCP Client] Failed to get tools:', error);
|
||||
return Promise.reject(error);
|
||||
} finally {
|
||||
await this.closeConnection();
|
||||
@@ -85,28 +78,17 @@ export class MCPClient {
|
||||
public async toolCall(toolName: string, params: Record<string, any>): Promise<any> {
|
||||
try {
|
||||
const client = await this.getConnection();
|
||||
console.log(`Call tool: ${toolName}`, params);
|
||||
addLog.debug(`[MCP Client] Call tool: ${toolName}`, params);
|
||||
|
||||
const result = await client.callTool({
|
||||
return await client.callTool({
|
||||
name: toolName,
|
||||
arguments: params
|
||||
});
|
||||
|
||||
return result;
|
||||
} catch (error) {
|
||||
console.error(`Failed to call tool ${toolName}:`, error);
|
||||
addLog.error(`[MCP Client] Failed to call tool ${toolName}:`, error);
|
||||
return Promise.reject(error);
|
||||
} finally {
|
||||
await this.closeConnection();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Create MCP client
|
||||
* @param config Client configuration, containing url
|
||||
* @returns MCPClient instance
|
||||
*/
|
||||
export default function getMCPClient(config: { url: string }): MCPClient {
|
||||
return new MCPClient(config);
|
||||
}
|
||||
|
Reference in New Issue
Block a user