From fa233e0a241462bded36498293b79728a430f2b3 Mon Sep 17 00:00:00 2001 From: Junyan Qin Date: Mon, 17 Mar 2025 22:03:49 +0800 Subject: [PATCH 01/12] fix(variables): `user_message_text` not provided --- pkg/pipeline/preproc/preproc.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/pipeline/preproc/preproc.py b/pkg/pipeline/preproc/preproc.py index a69de78e..299aea5e 100644 --- a/pkg/pipeline/preproc/preproc.py +++ b/pkg/pipeline/preproc/preproc.py @@ -60,11 +60,14 @@ class PreProcessor(stage.PipelineStage): content_list = [] + plain_text = "" + for me in query.message_chain: if isinstance(me, platform_message.Plain): content_list.append( llm_entities.ContentElement.from_text(me.text) ) + plain_text += me.text elif isinstance(me, platform_message.Image): if self.ap.provider_cfg.data['enable-vision'] and (self.ap.provider_cfg.data['runner'] != 'local-agent' or query.use_model.vision_supported): if me.base64 is not None: @@ -72,6 +75,8 @@ class PreProcessor(stage.PipelineStage): llm_entities.ContentElement.from_image_base64(me.base64) ) + query.variables['user_message_text'] = plain_text + query.user_message = llm_entities.Message( role='user', content=content_list From a079821976a4240f8009612ee34f1567409c04f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B0=E8=8B=B7=E6=99=B6?= <2749332490@qq.com> Date: Mon, 17 Mar 2025 23:12:23 +0800 Subject: [PATCH 02/12] fix: fix SSL certificateverification error during GitHub plugin installation. - Create a custom SSL context using certifi for proper HTTPS certificate verification, meow - Add the ssl parameter to aiohttp requests to prevent download failure due to missing root certificates, meow - Improve error messages and enhance the overall plugin installation process, meow! --- pkg/plugin/installers/github.py | 55 ++++++++++----------------------- 1 file changed, 17 insertions(+), 38 deletions(-) diff --git a/pkg/plugin/installers/github.py b/pkg/plugin/installers/github.py index 45439579..039ff196 100644 --- a/pkg/plugin/installers/github.py +++ b/pkg/plugin/installers/github.py @@ -4,6 +4,8 @@ import re import os import shutil import zipfile +import ssl +import certifi import aiohttp import aiofiles @@ -21,44 +23,39 @@ class GitHubRepoInstaller(installer.PluginInstaller): def get_github_plugin_repo_label(self, repo_url: str) -> list[str]: """获取username, repo""" - - # 提取 username/repo , 正则表达式 repo = re.findall( r"(?:https?://github\.com/|git@github\.com:)([^/]+/[^/]+?)(?:\.git|/|$)", repo_url, ) - - if len(repo) > 0: # github + if len(repo) > 0: return repo[0].split("/") else: return None - + async def download_plugin_source_code(self, repo_url: str, target_path: str, task_context: taskmgr.TaskContext = taskmgr.TaskContext.placeholder()) -> str: """下载插件源码（全异步）""" - - # 提取 username/repo , 正则表达式 repo = self.get_github_plugin_repo_label(repo_url) - - target_path += repo[1] - if repo is None: raise errors.PluginInstallerError('仅支持GitHub仓库地址') + target_path += repo[1] self.ap.logger.debug("正在下载源码...") task_context.trace("下载源码...", "download-plugin-source-code") zipball_url = f"https://api.github.com/repos/{'/'.join(repo)}/zipball/HEAD" - zip_resp: bytes = None + + # 创建自定义SSL上下文，使用certifi提供的根证书 + ssl_context = ssl.create_default_context(cafile=certifi.where()) async with aiohttp.ClientSession(trust_env=True) as session: async with session.get( url=zipball_url, - timeout=aiohttp.ClientTimeout(total=300) + timeout=aiohttp.ClientTimeout(total=300), + ssl=ssl_context # 使用自定义SSL上下文来验证证书 ) as resp: if resp.status != 200: - raise errors.PluginInstallerError(f"下载源码失败: {resp.text}") - + raise errors.PluginInstallerError(f"下载源码失败: {await resp.text()}") zip_resp = await resp.read() if await aiofiles_os.path.exists("temp/" + target_path): @@ -80,15 +77,11 @@ class GitHubRepoInstaller(installer.PluginInstaller): await aiofiles_os.remove("temp/" + target_path + "/source.zip") import glob - unzip_dir = glob.glob("temp/" + target_path + "/*")[0] - await aioshutil.copytree(unzip_dir, target_path + "/") - await aioshutil.rmtree(unzip_dir) self.ap.logger.debug("源码下载完成。") - return repo[1] async def install_requirements(self, path: str): @@ -100,20 +93,14 @@ class GitHubRepoInstaller(installer.PluginInstaller): plugin_source: str, task_context: taskmgr.TaskContext = taskmgr.TaskContext.placeholder(), ): - """安装插件 - """ + """安装插件""" task_context.trace("下载插件源码...", "install-plugin") - repo_label = await self.download_plugin_source_code(plugin_source, "plugins/", task_context) - task_context.trace("安装插件依赖...", "install-plugin") - await self.install_requirements("plugins/" + repo_label) - task_context.trace("完成.", "install-plugin") - await self.ap.plugin_mgr.setting.record_installed_plugin_source( - "plugins/"+repo_label+'/', plugin_source + "plugins/" + repo_label + '/', plugin_source ) async def uninstall_plugin( @@ -121,10 +108,8 @@ class GitHubRepoInstaller(installer.PluginInstaller): plugin_name: str, task_context: taskmgr.TaskContext = taskmgr.TaskContext.placeholder(), ): - """卸载插件 - """ + """卸载插件""" plugin_container = self.ap.plugin_mgr.get_plugin_by_name(plugin_name) - if plugin_container is None: raise errors.PluginInstallerError('插件不存在或未成功加载') else: @@ -135,24 +120,18 @@ class GitHubRepoInstaller(installer.PluginInstaller): async def update_plugin( self, plugin_name: str, - plugin_source: str=None, + plugin_source: str = None, task_context: taskmgr.TaskContext = taskmgr.TaskContext.placeholder(), ): - """更新插件 - """ + """更新插件""" task_context.trace("更新插件...", "update-plugin") - plugin_container = self.ap.plugin_mgr.get_plugin_by_name(plugin_name) - if plugin_container is None: raise errors.PluginInstallerError('插件不存在或未成功加载') else: if plugin_container.plugin_source: plugin_source = plugin_container.plugin_source - task_context.trace("转交安装任务.", "update-plugin") - await self.install_plugin(plugin_source, task_context) - else: - raise errors.PluginInstallerError('插件无源码信息，无法更新') + raise errors.PluginInstallerError('插件无源码信息，无法更新') \ No newline at end of file From dd362780326c81384d3074f0620d3cca49521969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B0=E8=8B=B7=E6=99=B6?= <2749332490@qq.com> Date: Mon, 17 Mar 2025 23:16:51 +0800 Subject: [PATCH 03/12] fix: add certifi to requirement --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index a5fb776a..a867e055 100644 --- a/requirements.txt +++ b/requirements.txt @@ -32,6 +32,7 @@ gewechat-client dingtalk_stream dashscope python-telegram-bot +certifi # indirect taskgroup==0.0.0a4 \ No newline at end of file From 572182180cee6a8e1028aeed6f890234d9135887 Mon Sep 17 00:00:00 2001 From: Junyan Qin Date: Mon, 17 Mar 2025 23:53:29 +0800 Subject: [PATCH 04/12] deps: add `certifi` --- pkg/core/bootutils/deps.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/core/bootutils/deps.py b/pkg/core/bootutils/deps.py index 200b510d..805b50f7 100644 --- a/pkg/core/bootutils/deps.py +++ b/pkg/core/bootutils/deps.py @@ -33,6 +33,7 @@ required_deps = { "dingtalk_stream": "dingtalk_stream", "dashscope": "dashscope", "telegram": "python-telegram-bot", + "certifi": "certifi", } From a9ae36d362ca225fbba61cbde0072d16492a7306 Mon Sep 17 00:00:00 2001 From: wangcham Date: Tue, 18 Mar 2025 06:58:35 -0400 Subject: [PATCH 05/12] feat: add support for loading message in wxoa --- libs/official_account_api/api.py | 5 +++-- pkg/platform/sources/officialaccount.py | 1 + templates/platform.json | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/official_account_api/api.py b/libs/official_account_api/api.py index b777d626..58c9d067 100644 --- a/libs/official_account_api/api.py +++ b/libs/official_account_api/api.py @@ -176,7 +176,7 @@ class OAClient(): class OAClientForLongerResponse(): - def __init__(self,token:str,EncodingAESKey:str,AppID:str,Appsecret:str): + def __init__(self,token:str,EncodingAESKey:str,AppID:str,Appsecret:str,LoadingMessage:str): self.token = token self.aes = EncodingAESKey self.appid = AppID @@ -189,6 +189,7 @@ class OAClientForLongerResponse(): "example":[], } self.access_token_expiry_time = None + self.loading_message = LoadingMessage async def handle_callback_request(self): try: @@ -246,7 +247,7 @@ class OAClientForLongerResponse(): to_user=from_user, from_user=to_user, create_time=int(time.time()), - content="AI正在思考中，请发送任意内容获取回答。" + content=self.loading_message ) if user_msg_queue.get(from_user) and user_msg_queue[from_user][0]["content"]: diff --git a/pkg/platform/sources/officialaccount.py b/pkg/platform/sources/officialaccount.py index 13a53038..518794a6 100644 --- a/pkg/platform/sources/officialaccount.py +++ b/pkg/platform/sources/officialaccount.py @@ -107,6 +107,7 @@ class OfficialAccountAdapter(adapter.MessagePlatformAdapter): EncodingAESKey=config['EncodingAESKey'], Appsecret=config['AppSecret'], AppID=config['AppID'], + LoadingMessage=config['LoadingMessage'] ) else: raise KeyError("请设置微信公众号通信模式") diff --git a/templates/platform.json b/templates/platform.json index da233a53..fe39947c 100644 --- a/templates/platform.json +++ b/templates/platform.json @@ -78,6 +78,7 @@ "AppID":"", "AppSecret":"", "Mode":"drop", + "LoadingMessage":"AI正在思考中，请发送任意内容获取回复。", "host": "0.0.0.0", "port": 2287 }, From 61ab6a009badf3836205d3141eb6ee4ea20067f7 Mon Sep 17 00:00:00 2001 From: Junyan Qin Date: Tue, 18 Mar 2025 20:38:33 +0800 Subject: [PATCH 06/12] chore: migration for wxoa loading message --- .../migrations/m036_wxoa_loading_message.py | 26 +++++++++++++++++++ pkg/core/stages/migrate.py | 2 +- templates/schema/platform.json | 5 ++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 pkg/core/migrations/m036_wxoa_loading_message.py diff --git a/pkg/core/migrations/m036_wxoa_loading_message.py b/pkg/core/migrations/m036_wxoa_loading_message.py new file mode 100644 index 00000000..682be435 --- /dev/null +++ b/pkg/core/migrations/m036_wxoa_loading_message.py @@ -0,0 +1,26 @@ +from __future__ import annotations + +from .. import migration + + +@migration.migration_class("wxoa-loading-message", 36) +class WxoaLoadingMessageMigration(migration.Migration): + """迁移""" + + async def need_migrate(self) -> bool: + """判断当前环境是否需要运行此迁移""" + + for adapter in self.ap.platform_cfg.data['platform-adapters']: + if adapter['adapter'] == 'officialaccount': + if 'LoadingMessage' not in adapter: + return True + return False + + async def run(self): + """执行迁移""" + for adapter in self.ap.platform_cfg.data['platform-adapters']: + if adapter['adapter'] == 'officialaccount': + if 'LoadingMessage' not in adapter: + adapter['LoadingMessage'] = 'AI正在思考中，请发送任意内容获取回复。' + + await self.ap.platform_cfg.dump_config() diff --git a/pkg/core/stages/migrate.py b/pkg/core/stages/migrate.py index 2b09b87e..e528e164 100644 --- a/pkg/core/stages/migrate.py +++ b/pkg/core/stages/migrate.py @@ -11,7 +11,7 @@ from ..migrations import m015_gitee_ai_config, m016_dify_service_api, m017_dify_ from ..migrations import m020_wecom_config, m021_lark_config, m022_lmstudio_config, m023_siliconflow_config, m024_discord_config, m025_gewechat_config from ..migrations import m026_qqofficial_config, m027_wx_official_account_config, m028_aliyun_requester_config from ..migrations import m029_dashscope_app_api_config, m030_lark_config_cmpl, m031_dingtalk_config, m032_volcark_config -from ..migrations import m033_dify_thinking_config, m034_gewechat_file_url_config, m035_wxoa_mode +from ..migrations import m033_dify_thinking_config, m034_gewechat_file_url_config, m035_wxoa_mode, m036_wxoa_loading_message @stage.stage_class("MigrationStage") class MigrationStage(stage.BootingStage): diff --git a/templates/schema/platform.json b/templates/schema/platform.json index 8ecb20c1..4bc6f111 100644 --- a/templates/schema/platform.json +++ b/templates/schema/platform.json @@ -391,6 +391,11 @@ "description": "对于超过15s的响应的处理模式", "enum": ["drop", "passive"] }, + "LoadingMessage": { + "type": "string", + "default": "AI正在思考中，请发送任意内容获取回复。", + "description": "当使用被动模式时，显示给用户的提示信息" + }, "host": { "type": "string", "default": "0.0.0.0", From dea5cc9c0cbcd702f2b102114b4bf8ec7e19ad81 Mon Sep 17 00:00:00 2001 From: Junyan Qin Date: Tue, 18 Mar 2025 20:17:22 +0800 Subject: [PATCH 07/12] stash --- pkg/provider/tools/loader.py | 39 ++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkg/provider/tools/loader.py diff --git a/pkg/provider/tools/loader.py b/pkg/provider/tools/loader.py new file mode 100644 index 00000000..94f90a2c --- /dev/null +++ b/pkg/provider/tools/loader.py @@ -0,0 +1,39 @@ +from __future__ import annotations + +import abc +import typing + +from ...core import app +from . import entities as tools_entities + + +preregistered_loaders = [] + +def loader_class(name: str): + """注册一个工具加载器 + """ + def decorator(cls: typing.Type[ToolLoader]) -> typing.Type[ToolLoader]: + cls.name = name + preregistered_loaders.append(cls) + return cls + + return decorator + + +class ToolLoader(abc.ABC): + """工具加载器""" + + name: str = None + + ap: app.Application + + def __init__(self, ap: app.Application): + self.ap = ap + + async def initialize(self): + pass + + @abc.abstractmethod + def get_tools(self) -> list[tools_entities.LLMFunction]: + """获取所有工具""" + pass From 97603e8441c723b23df70d66e87c3bd55169552c Mon Sep 17 00:00:00 2001 From: Junyan Qin Date: Wed, 19 Mar 2025 09:36:03 +0800 Subject: [PATCH 08/12] feat: tool loader abstraction --- pkg/command/operators/func.py | 1 - pkg/provider/session/sessionmgr.py | 1 - pkg/provider/tools/loader.py | 16 ++++- pkg/provider/tools/loaders/plugin.py | 88 ++++++++++++++++++++++++++++ pkg/provider/tools/toolmgr.py | 70 ++++++---------------- 5 files changed, 118 insertions(+), 58 deletions(-) create mode 100644 pkg/provider/tools/loaders/plugin.py diff --git a/pkg/command/operators/func.py b/pkg/command/operators/func.py index 404813eb..ae2ba4c1 100644 --- a/pkg/command/operators/func.py +++ b/pkg/command/operators/func.py @@ -16,7 +16,6 @@ class FuncOperator(operator.CommandOperator): all_functions = await self.ap.tool_mgr.get_all_functions( plugin_enabled=True, - plugin_status=plugin_context.RuntimeContainerStatus.INITIALIZED, ) for func in all_functions: diff --git a/pkg/provider/session/sessionmgr.py b/pkg/provider/session/sessionmgr.py index f328ffff..00523472 100644 --- a/pkg/provider/session/sessionmgr.py +++ b/pkg/provider/session/sessionmgr.py @@ -54,7 +54,6 @@ class SessionManager: use_model=await self.ap.model_mgr.get_model_by_name(self.ap.provider_cfg.data['model']), use_funcs=await self.ap.tool_mgr.get_all_functions( plugin_enabled=True, - plugin_status=plugin_context.RuntimeContainerStatus.INITIALIZED, ), ) session.conversations.append(conversation) diff --git a/pkg/provider/tools/loader.py b/pkg/provider/tools/loader.py index 94f90a2c..82e6440d 100644 --- a/pkg/provider/tools/loader.py +++ b/pkg/provider/tools/loader.py @@ -3,11 +3,11 @@ from __future__ import annotations import abc import typing -from ...core import app +from ...core import app, entities as core_entities from . import entities as tools_entities -preregistered_loaders = [] +preregistered_loaders: list[typing.Type[ToolLoader]] = [] def loader_class(name: str): """注册一个工具加载器 @@ -34,6 +34,16 @@ class ToolLoader(abc.ABC): pass @abc.abstractmethod - def get_tools(self) -> list[tools_entities.LLMFunction]: + async def get_tools(self, enabled: bool=True) -> list[tools_entities.LLMFunction]: """获取所有工具""" pass + + @abc.abstractmethod + async def has_tool(self, name: str) -> bool: + """检查工具是否存在""" + pass + + @abc.abstractmethod + async def invoke_tool(self, query: core_entities.Query, name: str, parameters: dict) -> typing.Any: + """执行工具调用""" + pass \ No newline at end of file diff --git a/pkg/provider/tools/loaders/plugin.py b/pkg/provider/tools/loaders/plugin.py new file mode 100644 index 00000000..da0bc555 --- /dev/null +++ b/pkg/provider/tools/loaders/plugin.py @@ -0,0 +1,88 @@ +from __future__ import annotations + +import typing +import traceback + +from .. import loader, entities as tools_entities +from ....core import app, entities as core_entities +from ....plugin import context as plugin_context + + +@loader.loader_class("plugin-tool-loader") +class PluginToolLoader(loader.ToolLoader): + """插件工具加载器。 + + 本加载器中不存储工具信息，仅负责从插件系统中获取工具信息。 + """ + + async def get_tools(self, enabled: bool=True) -> list[tools_entities.LLMFunction]: + + # 从插件系统获取工具（内容函数） + all_functions: list[tools_entities.LLMFunction] = [] + + for plugin in self.ap.plugin_mgr.plugins( + enabled=enabled, status=plugin_context.RuntimeContainerStatus.INITIALIZED + ): + all_functions.extend(plugin.content_functions) + + return all_functions + + async def has_tool(self, name: str) -> bool: + """检查工具是否存在""" + for plugin in self.ap.plugin_mgr.plugins( + enabled=True, status=plugin_context.RuntimeContainerStatus.INITIALIZED + ): + for function in plugin.content_functions: + if function.name == name: + return True + return False + + async def _get_function_and_plugin( + self, name: str + ) -> typing.Tuple[tools_entities.LLMFunction, plugin_context.BasePlugin]: + """获取函数和插件实例""" + for plugin in self.ap.plugin_mgr.plugins( + enabled=True, status=plugin_context.RuntimeContainerStatus.INITIALIZED + ): + for function in plugin.content_functions: + if function.name == name: + return function, plugin.plugin_inst + return None, None + + async def invoke_tool(self, query: core_entities.Query, name: str, parameters: dict) -> typing.Any: + + try: + + function, plugin = await self._get_function_and_plugin(name) + if function is None: + return None + + parameters = parameters.copy() + + parameters = {"query": query, **parameters} + + return await function.func(plugin, **parameters) + except Exception as e: + self.ap.logger.error(f"执行函数 {name} 时发生错误: {e}") + traceback.print_exc() + return f"error occurred when executing function {name}: {e}" + finally: + plugin = None + + for p in self.ap.plugin_mgr.plugins(): + if function in p.content_functions: + plugin = p + break + + if plugin is not None: + + await self.ap.ctr_mgr.usage.post_function_record( + plugin={ + "name": plugin.plugin_name, + "remote": plugin.plugin_source, + "version": plugin.plugin_version, + "author": plugin.plugin_author, + }, + function_name=function.name, + function_description=function.description, + ) \ No newline at end of file diff --git a/pkg/provider/tools/toolmgr.py b/pkg/provider/tools/toolmgr.py index c7bd0018..9986d3ab 100644 --- a/pkg/provider/tools/toolmgr.py +++ b/pkg/provider/tools/toolmgr.py @@ -4,8 +4,9 @@ import typing import traceback from ...core import app, entities as core_entities -from . import entities +from . import entities, loader as tools_loader from ...plugin import context as plugin_context +from .loaders import plugin class ToolManager: @@ -13,33 +14,26 @@ class ToolManager: ap: app.Application + loaders: list[tools_loader.ToolLoader] + def __init__(self, ap: app.Application): self.ap = ap self.all_functions = [] + self.loaders = [] async def initialize(self): - pass - async def get_function_and_plugin( - self, name: str - ) -> typing.Tuple[entities.LLMFunction, plugin_context.BasePlugin]: - """获取函数和插件实例""" - for plugin in self.ap.plugin_mgr.plugins( - enabled=True, status=plugin_context.RuntimeContainerStatus.INITIALIZED - ): - for function in plugin.content_functions: - if function.name == name: - return function, plugin.plugin_inst - return None, None + for loader_cls in tools_loader.preregistered_loaders: + loader_inst = loader_cls(self.ap) + await loader_inst.initialize() + self.loaders.append(loader_inst) - async def get_all_functions(self, plugin_enabled: bool=None, plugin_status: plugin_context.RuntimeContainerStatus=None) -> list[entities.LLMFunction]: + async def get_all_functions(self, plugin_enabled: bool=None) -> list[entities.LLMFunction]: """获取所有函数""" all_functions: list[entities.LLMFunction] = [] - for plugin in self.ap.plugin_mgr.plugins( - enabled=plugin_enabled, status=plugin_status - ): - all_functions.extend(plugin.content_functions) + for loader in self.loaders: + all_functions.extend(await loader.get_tools(plugin_enabled)) return all_functions @@ -102,38 +96,8 @@ class ToolManager: ) -> typing.Any: """执行函数调用""" - try: - - function, plugin = await self.get_function_and_plugin(name) - if function is None: - return None - - parameters = parameters.copy() - - parameters = {"query": query, **parameters} - - return await function.func(plugin, **parameters) - except Exception as e: - self.ap.logger.error(f"执行函数 {name} 时发生错误: {e}") - traceback.print_exc() - return f"error occurred when executing function {name}: {e}" - finally: - plugin = None - - for p in self.ap.plugin_mgr.plugins(): - if function in p.content_functions: - plugin = p - break - - if plugin is not None: - - await self.ap.ctr_mgr.usage.post_function_record( - plugin={ - "name": plugin.plugin_name, - "remote": plugin.plugin_source, - "version": plugin.plugin_version, - "author": plugin.plugin_author, - }, - function_name=function.name, - function_description=function.description, - ) \ No newline at end of file + for loader in self.loaders: + if await loader.has_tool(name): + return await loader.invoke_tool(query, name, parameters) + else: + raise ValueError(f"未找到工具: {name}") \ No newline at end of file From 40275c3ef14ea22ef2f8449cf432510751da8d37 Mon Sep 17 00:00:00 2001 From: Junyan Qin Date: Wed, 19 Mar 2025 12:08:47 +0800 Subject: [PATCH 09/12] feat: add supports for loading mcp server as LLM tools provider --- pkg/core/bootutils/deps.py | 1 + pkg/core/migrations/m037_mcp_config.py | 20 ++++ pkg/core/stages/migrate.py | 2 + pkg/provider/tools/loaders/__init__.py | 0 pkg/provider/tools/loaders/mcp.py | 144 +++++++++++++++++++++++++ pkg/provider/tools/toolmgr.py | 2 +- requirements.txt | 1 + templates/provider.json | 3 + templates/schema/provider.json | 81 ++++++++++++++ 9 files changed, 253 insertions(+), 1 deletion(-) create mode 100644 pkg/core/migrations/m037_mcp_config.py create mode 100644 pkg/provider/tools/loaders/__init__.py create mode 100644 pkg/provider/tools/loaders/mcp.py diff --git a/pkg/core/bootutils/deps.py b/pkg/core/bootutils/deps.py index 805b50f7..c1db6482 100644 --- a/pkg/core/bootutils/deps.py +++ b/pkg/core/bootutils/deps.py @@ -34,6 +34,7 @@ required_deps = { "dashscope": "dashscope", "telegram": "python-telegram-bot", "certifi": "certifi", + "mcp": "mcp", } diff --git a/pkg/core/migrations/m037_mcp_config.py b/pkg/core/migrations/m037_mcp_config.py new file mode 100644 index 00000000..f045f0ff --- /dev/null +++ b/pkg/core/migrations/m037_mcp_config.py @@ -0,0 +1,20 @@ +from __future__ import annotations + +from .. import migration + + +@migration.migration_class("mcp-config", 37) +class MCPConfigMigration(migration.Migration): + """迁移""" + + async def need_migrate(self) -> bool: + """判断当前环境是否需要运行此迁移""" + return 'mcp' not in self.ap.provider_cfg.data + + async def run(self): + """执行迁移""" + self.ap.provider_cfg.data['mcp'] = { + "servers": [] + } + + await self.ap.provider_cfg.dump_config() diff --git a/pkg/core/stages/migrate.py b/pkg/core/stages/migrate.py index e528e164..fe0dc464 100644 --- a/pkg/core/stages/migrate.py +++ b/pkg/core/stages/migrate.py @@ -12,6 +12,8 @@ from ..migrations import m020_wecom_config, m021_lark_config, m022_lmstudio_conf from ..migrations import m026_qqofficial_config, m027_wx_official_account_config, m028_aliyun_requester_config from ..migrations import m029_dashscope_app_api_config, m030_lark_config_cmpl, m031_dingtalk_config, m032_volcark_config from ..migrations import m033_dify_thinking_config, m034_gewechat_file_url_config, m035_wxoa_mode, m036_wxoa_loading_message +from ..migrations import m037_mcp_config + @stage.stage_class("MigrationStage") class MigrationStage(stage.BootingStage): diff --git a/pkg/provider/tools/loaders/__init__.py b/pkg/provider/tools/loaders/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pkg/provider/tools/loaders/mcp.py b/pkg/provider/tools/loaders/mcp.py new file mode 100644 index 00000000..4d15bf60 --- /dev/null +++ b/pkg/provider/tools/loaders/mcp.py @@ -0,0 +1,144 @@ +from __future__ import annotations + +import typing +from contextlib import AsyncExitStack + +from mcp import ClientSession, StdioServerParameters +from mcp.client.stdio import stdio_client +from mcp.client.sse import sse_client + +from .. import loader, entities as tools_entities +from ....core import app, entities as core_entities + + +class RuntimeMCPSession: + """运行时 MCP 会话""" + + ap: app.Application + + server_name: str + + server_config: dict + + session: ClientSession + + exit_stack: AsyncExitStack + + functions: list[tools_entities.LLMFunction] = [] + + def __init__(self, server_name: str, server_config: dict, ap: app.Application): + self.server_name = server_name + self.server_config = server_config + self.ap = ap + + self.exit_stack = AsyncExitStack() + + async def _init_stdio_python_server(self): + server_params = StdioServerParameters( + command=self.server_config["command"], + args=self.server_config["args"], + env=self.server_config["env"], + ) + + stdio_transport = await self.exit_stack.enter_async_context( + stdio_client(server_params) + ) + + stdio, write = stdio_transport + + self.session = await self.exit_stack.enter_async_context( + ClientSession(stdio, write) + ) + + await self.session.initialize() + + async def _init_sse_server(self): + sse_transport = await self.exit_stack.enter_async_context( + sse_client( + self.server_config["url"], + headers=self.server_config.get("headers", {}), + timeout=self.server_config.get("timeout", 10), + ) + ) + + sseio, write = sse_transport + + self.session = await self.exit_stack.enter_async_context( + ClientSession(sseio, write) + ) + + await self.session.initialize() + + async def initialize(self): + self.ap.logger.debug(f"初始化 MCP 会话: {self.server_name} {self.server_config}") + + if self.server_config["mode"] == "stdio": + await self._init_stdio_python_server() + elif self.server_config["mode"] == "sse": + await self._init_sse_server() + else: + raise ValueError(f"无法识别 MCP 服务器类型: {self.server_name}: {self.server_config}") + + tools = await self.session.list_tools() + + self.ap.logger.debug(f"获取 MCP 工具: {tools}") + + for tool in tools.tools: + + async def func(query: core_entities.Query, **kwargs): + result = await self.session.call_tool(tool.name, kwargs) + if result.isError: + raise Exception(result.content[0].text) + return result.content[0].text + + func.__name__ = tool.name + + self.functions.append(tools_entities.LLMFunction( + name=tool.name, + human_desc=tool.description, + description=tool.description, + parameters=tool.inputSchema, + func=func, + )) + +@loader.loader_class("mcp") +class MCPLoader(loader.ToolLoader): + """MCP 工具加载器。 + + 在此加载器中管理所有与 MCP Server 的连接。 + """ + + sessions: dict[str, RuntimeMCPSession] = {} + + _last_listed_functions: list[tools_entities.LLMFunction] = [] + + async def initialize(self): + + for server_config in self.ap.provider_cfg.data.get("mcp", {}).get("servers", []): + if not server_config["enable"]: + continue + session = RuntimeMCPSession(server_config["name"], server_config, self.ap) + await session.initialize() + # self.ap.event_loop.create_task(session.initialize()) + self.sessions[server_config["name"]] = session + + async def get_tools(self, enabled: bool=True) -> list[tools_entities.LLMFunction]: + all_functions = [] + + for server_name, session in self.sessions.items(): + all_functions.extend(session.functions) + + self._last_listed_functions = all_functions + + return all_functions + + async def has_tool(self, name: str) -> bool: + return name in [f.name for f in self._last_listed_functions] + + async def invoke_tool(self, query: core_entities.Query, name: str, parameters: dict) -> typing.Any: + for server_name, session in self.sessions.items(): + for function in session.functions: + if function.name == name: + return await function.func(query, **parameters) + + raise ValueError(f"未找到工具: {name}") \ No newline at end of file diff --git a/pkg/provider/tools/toolmgr.py b/pkg/provider/tools/toolmgr.py index 9986d3ab..1688937d 100644 --- a/pkg/provider/tools/toolmgr.py +++ b/pkg/provider/tools/toolmgr.py @@ -6,7 +6,7 @@ import traceback from ...core import app, entities as core_entities from . import entities, loader as tools_loader from ...plugin import context as plugin_context -from .loaders import plugin +from .loaders import plugin, mcp class ToolManager: diff --git a/requirements.txt b/requirements.txt index a867e055..243d2da7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -33,6 +33,7 @@ dingtalk_stream dashscope python-telegram-bot certifi +mcp # indirect taskgroup==0.0.0a4 \ No newline at end of file diff --git a/templates/provider.json b/templates/provider.json index 76aa0218..e34f6d32 100644 --- a/templates/provider.json +++ b/templates/provider.json @@ -138,5 +138,8 @@ "date": "2023-08-10" } } + }, + "mcp": { + "servers": [] } } \ No newline at end of file diff --git a/templates/schema/provider.json b/templates/schema/provider.json index 0d2d2f01..def2cc12 100644 --- a/templates/schema/provider.json +++ b/templates/schema/provider.json @@ -520,6 +520,87 @@ } } } + }, + "mcp": { + "type": "object", + "title": "MCP 配置", + "properties": { + "servers": { + "type": "array", + "title": "MCP 服务器配置", + "default": [], + "items": { + "type": "object", + "oneOf": [ + { + "title": "Stdio 模式服务器", + "properties": { + "mode": { + "type": "string", + "title": "模式", + "const": "stdio" + }, + "enable": { + "type": "boolean", + "title": "启用" + }, + "name": { + "type": "string", + "title": "名称" + }, + "command": { + "type": "string", + "title": "启动命令" + }, + "args": { + "type": "array", + "title": "启动参数", + "items": { + "type": "string" + }, + "default": [] + }, + "env": { + "type": "object", + "default": {} + } + } + }, + { + "title": "SSE 模式服务器", + "properties": { + "mode": { + "type": "string", + "title": "模式", + "const": "sse" + }, + "enable": { + "type": "boolean", + "title": "启用" + }, + "name": { + "type": "string", + "title": "名称" + }, + "url": { + "type": "string", + "title": "URL" + }, + "headers": { + "type": "object", + "default": {} + }, + "timeout": { + "type": "number", + "title": "请求超时时间", + "default": 10 + } + } + } + ] + } + } + } } } } \ No newline at end of file From 5640dc332d01cb514b3966876d86f05d796ee5aa Mon Sep 17 00:00:00 2001 From: Junyan Qin Date: Wed, 19 Mar 2025 12:41:04 +0800 Subject: [PATCH 10/12] feat(mcp): available for provider reloading --- pkg/core/app.py | 2 ++ pkg/provider/tools/loader.py | 5 +++++ pkg/provider/tools/loaders/mcp.py | 21 +++++++++++++++++++-- pkg/provider/tools/loaders/plugin.py | 6 +++++- pkg/provider/tools/toolmgr.py | 7 ++++++- 5 files changed, 37 insertions(+), 4 deletions(-) diff --git a/pkg/core/app.py b/pkg/core/app.py index fd0c59a3..8fd36d63 100644 --- a/pkg/core/app.py +++ b/pkg/core/app.py @@ -204,6 +204,8 @@ class Application: case core_entities.LifecycleControlScope.PROVIDER.value: self.logger.info("执行热重载 scope="+scope) + await self.tool_mgr.shutdown() + latest_llm_model_config = await config.load_json_config("data/metadata/llm-models.json", "templates/metadata/llm-models.json") self.llm_models_meta = latest_llm_model_config llm_model_mgr_inst = llm_model_mgr.ModelManager(self) diff --git a/pkg/provider/tools/loader.py b/pkg/provider/tools/loader.py index 82e6440d..cae4a63f 100644 --- a/pkg/provider/tools/loader.py +++ b/pkg/provider/tools/loader.py @@ -46,4 +46,9 @@ class ToolLoader(abc.ABC): @abc.abstractmethod async def invoke_tool(self, query: core_entities.Query, name: str, parameters: dict) -> typing.Any: """执行工具调用""" + pass + + @abc.abstractmethod + async def shutdown(self): + """关闭工具""" pass \ No newline at end of file diff --git a/pkg/provider/tools/loaders/mcp.py b/pkg/provider/tools/loaders/mcp.py index 4d15bf60..a475f9b7 100644 --- a/pkg/provider/tools/loaders/mcp.py +++ b/pkg/provider/tools/loaders/mcp.py @@ -30,8 +30,11 @@ class RuntimeMCPSession: self.server_name = server_name self.server_config = server_config self.ap = ap + + self.session = None self.exit_stack = AsyncExitStack() + self.functions = [] async def _init_stdio_python_server(self): server_params = StdioServerParameters( @@ -101,6 +104,10 @@ class RuntimeMCPSession: func=func, )) + async def shutdown(self): + """关闭工具""" + await self.session._exit_stack.aclose() + @loader.loader_class("mcp") class MCPLoader(loader.ToolLoader): """MCP 工具加载器。 @@ -112,6 +119,11 @@ class MCPLoader(loader.ToolLoader): _last_listed_functions: list[tools_entities.LLMFunction] = [] + def __init__(self, ap: app.Application): + super().__init__(ap) + self.sessions = {} + self._last_listed_functions = [] + async def initialize(self): for server_config in self.ap.provider_cfg.data.get("mcp", {}).get("servers", []): @@ -125,7 +137,7 @@ class MCPLoader(loader.ToolLoader): async def get_tools(self, enabled: bool=True) -> list[tools_entities.LLMFunction]: all_functions = [] - for server_name, session in self.sessions.items(): + for session in self.sessions.values(): all_functions.extend(session.functions) self._last_listed_functions = all_functions @@ -141,4 +153,9 @@ class MCPLoader(loader.ToolLoader): if function.name == name: return await function.func(query, **parameters) - raise ValueError(f"未找到工具: {name}") \ No newline at end of file + raise ValueError(f"未找到工具: {name}") + + async def shutdown(self): + """关闭工具""" + for session in self.sessions.values(): + await session.shutdown() diff --git a/pkg/provider/tools/loaders/plugin.py b/pkg/provider/tools/loaders/plugin.py index da0bc555..08211334 100644 --- a/pkg/provider/tools/loaders/plugin.py +++ b/pkg/provider/tools/loaders/plugin.py @@ -85,4 +85,8 @@ class PluginToolLoader(loader.ToolLoader): }, function_name=function.name, function_description=function.description, - ) \ No newline at end of file + ) + + async def shutdown(self): + """关闭工具""" + pass diff --git a/pkg/provider/tools/toolmgr.py b/pkg/provider/tools/toolmgr.py index 1688937d..64befd8c 100644 --- a/pkg/provider/tools/toolmgr.py +++ b/pkg/provider/tools/toolmgr.py @@ -100,4 +100,9 @@ class ToolManager: if await loader.has_tool(name): return await loader.invoke_tool(query, name, parameters) else: - raise ValueError(f"未找到工具: {name}") \ No newline at end of file + raise ValueError(f"未找到工具: {name}") + + async def shutdown(self): + """关闭所有工具""" + for loader in self.loaders: + await loader.shutdown() From e6d7aaa4409d33f2982483e20e6dd6a9aab7ac36 Mon Sep 17 00:00:00 2001 From: Junyan Qin Date: Wed, 19 Mar 2025 13:10:01 +0800 Subject: [PATCH 11/12] doc(README): add mcp comments --- README.md | 6 +++--- README_EN.md | 3 ++- README_JP.md | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8587a8e4..0fe96571 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ - 💬 大模型对话、Agent：支持多种大模型，适配群聊和私聊；具有多轮对话、工具调用、多模态能力，并深度适配 [Dify](https://dify.ai)。目前支持 QQ、QQ频道、企业微信、个人微信、飞书、Discord、Telegram 等平台。 - 🛠️ 高稳定性、功能完备：原生支持访问控制、限速、敏感词过滤等机制；配置简单，支持多种部署方式。 -- 🧩 插件扩展、活跃社区：支持事件驱动、组件扩展等插件机制；丰富生态，目前已有数十个[插件](https://docs.langbot.app/plugin/plugin-intro.html) +- 🧩 插件扩展、活跃社区：支持事件驱动、组件扩展等插件机制；适配 Anthropic [MCP 协议](https://modelcontextprotocol.io/)；目前已有数十个[插件](https://docs.langbot.app/plugin/plugin-intro.html) - 😻 [New] Web 管理面板：支持通过浏览器管理 LangBot 实例，具体支持功能，查看[文档](https://docs.langbot.app/webui/intro.html) ## 📦 开始使用 @@ -97,7 +97,7 @@ 🚧: 正在开发中 -### 大模型 +### 大模型能力 | 模型 | 状态 | 备注 | | --- | --- | --- | @@ -114,7 +114,7 @@ | [SiliconFlow](https://siliconflow.cn/) | ✅ | 大模型聚合平台 | | [阿里云百炼](https://bailian.console.aliyun.com/) | ✅ | 大模型聚合平台, LLMOps 平台 | | [火山方舟](https://console.volcengine.com/ark/region:ark+cn-beijing/model?vendor=Bytedance&view=LIST_VIEW) | ✅ | 大模型聚合平台, LLMOps 平台 | - +| [MCP](https://modelcontextprotocol.io/) | ✅ | 支持通过 MCP 协议获取工具 | ### TTS | 平台/模型 | 备注 | diff --git a/README_EN.md b/README_EN.md index c84d0fe2..b313579c 100644 --- a/README_EN.md +++ b/README_EN.md @@ -36,7 +36,7 @@ - 💬 Chat with LLM / Agent: Supports multiple LLMs, adapt to group chats and private chats; Supports multi-round conversations, tool calls, and multi-modal capabilities. Deeply integrates with [Dify](https://dify.ai). Currently supports QQ, QQ Channel, WeCom, personal WeChat, Lark, DingTalk, Discord, Telegram, etc. - 🛠️ High Stability, Feature-rich: Native access control, rate limiting, sensitive word filtering, etc. mechanisms; Easy to use, supports multiple deployment methods. -- 🧩 Plugin Extension, Active Community: Support event-driven, component extension, etc. plugin mechanisms; Rich ecology, currently has dozens of [plugins](https://docs.langbot.app/plugin/plugin-intro.html) +- 🧩 Plugin Extension, Active Community: Support event-driven, component extension, etc. plugin mechanisms; Integrate Anthropic [MCP protocol](https://modelcontextprotocol.io/); Currently has dozens of [plugins](https://docs.langbot.app/plugin/plugin-intro.html) - 😻 [New] Web UI: Support management LangBot instance through the browser, for details, see [documentation](https://docs.langbot.app/webui/intro.html) ## 📦 Getting Started @@ -111,6 +111,7 @@ Directly use the released version to run, see the [Manual Deployment](https://do | [SiliconFlow](https://siliconflow.cn/) | ✅ | LLM gateway(MaaS) | | [Aliyun Bailian](https://bailian.console.aliyun.com/) | ✅ | LLM gateway(MaaS), LLMOps platform | | [Volc Engine Ark](https://console.volcengine.com/ark/region:ark+cn-beijing/model?vendor=Bytedance&view=LIST_VIEW) | ✅ | LLM gateway(MaaS), LLMOps platform | +| [MCP](https://modelcontextprotocol.io/) | ✅ | Support tool access through MCP protocol | ## 🤝 Community Contribution diff --git a/README_JP.md b/README_JP.md index 2cb8776d..c1c6c556 100644 --- a/README_JP.md +++ b/README_JP.md @@ -35,7 +35,7 @@ - 💬 LLM / エージェントとのチャット: 複数のLLMをサポートし、グループチャットとプライベートチャットに対応。マルチラウンドの会話、ツールの呼び出し、マルチモーダル機能をサポート。 [Dify](https://dify.ai) と深く統合。現在、QQ、QQ チャンネル、WeChat、個人 WeChat、Lark、DingTalk、Discord、Telegram など、複数のプラットフォームをサポートしています。 - 🛠️ 高い安定性、豊富な機能: ネイティブのアクセス制御、レート制限、敏感な単語のフィルタリングなどのメカニズムをサポート。使いやすく、複数のデプロイ方法をサポート。 -- 🧩 プラグイン拡張、活発なコミュニティ: イベント駆動、コンポーネント拡張などのプラグインメカニズムをサポート。豊富なエコシステム、現在数十の[プラグイン](https://docs.langbot.app/plugin/plugin-intro.html)が存在。 +- 🧩 プラグイン拡張、活発なコミュニティ: イベント駆動、コンポーネント拡張などのプラグインメカニズムをサポート。適配 Anthropic [MCP プロトコル](https://modelcontextprotocol.io/)；豊富なエコシステム、現在数十の[プラグイン](https://docs.langbot.app/plugin/plugin-intro.html)が存在。 - 😻 [新機能] Web UI: ブラウザを通じてLangBotインスタンスを管理することをサポート。詳細は[ドキュメント](https://docs.langbot.app/webui/intro.html)を参照。 ## 📦 始め方 @@ -110,6 +110,7 @@ LangBotはBTPanelにリストされています。BTPanelをインストール | [SiliconFlow](https://siliconflow.cn/) | ✅ | LLMゲートウェイ(MaaS) | | [Aliyun Bailian](https://bailian.console.aliyun.com/) | ✅ | LLMゲートウェイ(MaaS), LLMOpsプラットフォーム | | [Volc Engine Ark](https://console.volcengine.com/ark/region:ark+cn-beijing/model?vendor=Bytedance&view=LIST_VIEW) | ✅ | LLMゲートウェイ(MaaS), LLMOpsプラットフォーム | +| [MCP](https://modelcontextprotocol.io/) | ✅ | MCPプロトコルをサポート | ## 🤝 コミュニティ貢献 From 0d235aaef8026285503c6b415e5cdb7c5a616146 Mon Sep 17 00:00:00 2001 From: Junyan Qin Date: Wed, 19 Mar 2025 22:50:15 +0800 Subject: [PATCH 12/12] chore: bump version 3.4.11 --- pkg/utils/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/utils/constants.py b/pkg/utils/constants.py index e691d4d8..14b2b74c 100644 --- a/pkg/utils/constants.py +++ b/pkg/utils/constants.py @@ -1,4 +1,4 @@ -semantic_version = "v3.4.10.4" +semantic_version = "v3.4.11" debug_mode = False