Merge pull request #1217 from RockChinQ/version/3.4.11

chore: bump version 3.4.11

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
 
 | 平台/模型 | 备注 |

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
 

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プロトコルをサポート |
 
 ## 🤝 コミュニティ貢献
 

libs/dingtalk_api/EchoHandler.py

@@ -23,6 +23,7 @@ class EchoTextHandler(dingtalk_stream.ChatbotHandler):
         """异步等待消息的到来"""
         while self.incoming_message is None:
             await asyncio.sleep(0.1)  # 异步等待，避免阻塞
+
         return self.incoming_message
 
 async def get_dingtalk_client(client_id, client_secret):

libs/dingtalk_api/api.py

@@ -157,6 +157,7 @@ class DingTalkClient:
 
     async def get_message(self,incoming_message:dingtalk_stream.chatbot.ChatbotMessage):
         try:
+            
             # print(json.dumps(incoming_message.to_dict(), indent=4, ensure_ascii=False))
             message_data = {
                 "IncomingMessage":incoming_message,
@@ -197,6 +198,53 @@ class DingTalkClient:
             traceback.print_exc()
             
         return message_data
+
+    async def send_proactive_message_to_one(self,target_id:str,content:str):
+        if not await self.check_access_token():
+            await self.get_access_token()
+
+        url = 'https://api.dingtalk.com/v1.0/robot/oToMessages/batchSend'
+
+        headers ={
+            "x-acs-dingtalk-access-token":self.access_token,
+            "Content-Type":"application/json",
+        }
+
+        data ={
+            "robotCode":self.robot_code,
+            "userIds":[target_id],
+            "msgKey": "sampleText",
+            "msgParam": json.dumps({"content":content}),
+        }
+        try:
+            async with httpx.AsyncClient() as client:
+                response  = await client.post(url,headers=headers,json=data)
+        except Exception:
+            traceback.print_exc()
+
+
+    async def send_proactive_message_to_group(self,target_id:str,content:str):
+        if not await self.check_access_token():
+            await self.get_access_token()
+
+        url = 'https://api.dingtalk.com/v1.0/robot/groupMessages/send'
+
+        headers ={
+            "x-acs-dingtalk-access-token":self.access_token,
+            "Content-Type":"application/json",
+        }
+
+        data ={
+            "robotCode":self.robot_code,
+            "openConversationId":target_id,
+            "msgKey": "sampleText",
+            "msgParam": json.dumps({"content":content}),
+        }
+        try:
+            async with httpx.AsyncClient() as client:
+                response  = await client.post(url,headers=headers,json=data)
+        except Exception:
+            traceback.print_exc()
     
     async def start(self):
         """启动 WebSocket 连接，监听消息"""

libs/official_account_api/api.py

@@ -1,4 +1,5 @@
 # 微信公众号的加解密算法与企业微信一样，所以直接使用企业微信的加解密算法文件
+from collections import deque
 import time
 import traceback
 from ..wecom_api.WXBizMsgCrypt3 import WXBizMsgCrypt
@@ -12,6 +13,7 @@ import httpx
 import asyncio
 import time
 import xml.etree.ElementTree as ET
+from pkg.platform.sources import officialaccount as oa
 
 
 
@@ -25,6 +27,8 @@ xml_template = """
 </xml>
 """
 
+user_msg_queue = {}
+
 class OAClient():
 
     def __init__(self,token:str,EncodingAESKey:str,AppID:str,Appsecret:str):
@@ -169,6 +173,153 @@ class OAClient():
                 await handler(event)
 
 
+
+class OAClientForLongerResponse():
+    
+    def __init__(self,token:str,EncodingAESKey:str,AppID:str,Appsecret:str,LoadingMessage:str):
+        self.token = token
+        self.aes = EncodingAESKey
+        self.appid = AppID
+        self.appsecret = Appsecret
+        self.base_url = 'https://api.weixin.qq.com'
+        self.access_token = ''
+        self.app = Quart(__name__)
+        self.app.add_url_rule('/callback/command', 'handle_callback', self.handle_callback_request, methods=['GET', 'POST'])
+        self._message_handlers = {
+            "example":[],
+        }
+        self.access_token_expiry_time = None
+        self.loading_message = LoadingMessage
+
+    async def handle_callback_request(self):
+        try:
+            start_time = time.time()
+            signature = request.args.get("signature", "")
+            timestamp = request.args.get("timestamp", "")
+            nonce = request.args.get("nonce", "")
+            echostr = request.args.get("echostr", "")
+            msg_signature = request.args.get("msg_signature", "")
+
+            if msg_signature is None:
+                raise Exception("msg_signature不在请求体中")
+
+            if request.method == 'GET':
+                check_str = "".join(sorted([self.token, timestamp, nonce]))
+                check_signature = hashlib.sha1(check_str.encode("utf-8")).hexdigest()
+                return echostr if check_signature == signature else "拒绝请求"
+
+            elif request.method == "POST":
+                encryt_msg = await request.data
+                wxcpt = WXBizMsgCrypt(self.token, self.aes, self.appid)
+                ret, xml_msg = wxcpt.DecryptMsg(encryt_msg, msg_signature, timestamp, nonce)
+                xml_msg = xml_msg.decode('utf-8')
+
+                if ret != 0:
+                    raise Exception("消息解密失败")
+
+                # 解析 XML
+                root = ET.fromstring(xml_msg)
+                from_user = root.find("FromUserName").text
+                to_user = root.find("ToUserName").text
+
+                
+                from pkg.platform.sources import officialaccount as oa
+
+                
+                if oa.msg_queue.get(from_user) and oa.msg_queue[from_user][0]["content"]:
+                    queue_top = oa.msg_queue[from_user].pop(0)
+                    queue_content = queue_top["content"]
+
+                    # 弹出用户消息
+                    if user_msg_queue.get(from_user) and user_msg_queue[from_user]:
+                        user_msg_queue[from_user].pop(0)
+
+                    response_xml = xml_template.format(
+                        to_user=from_user,
+                        from_user=to_user,
+                        create_time=int(time.time()),
+                        content=queue_content
+                    )
+                    return response_xml
+
+                else:
+                    response_xml = xml_template.format(
+                        to_user=from_user,
+                        from_user=to_user,
+                        create_time=int(time.time()),
+                        content=self.loading_message
+                    )
+                    
+                    if user_msg_queue.get(from_user) and user_msg_queue[from_user][0]["content"]:
+                        return response_xml
+                    else:
+                        message_data = await self.get_message(xml_msg)
+                        
+                        if message_data:
+                            event = OAEvent.from_payload(message_data)
+                            if event:
+                                user_msg_queue.setdefault(from_user,[]).append(
+                                    {
+                                        "content":event.message,
+                                    }
+                                )
+                                await self._handle_message(event)
+
+                        return response_xml
+
+        except Exception as e:
+            traceback.print_exc()
+
+
+
+    async def get_message(self, xml_msg: str):
+
+        root = ET.fromstring(xml_msg)
+
+        message_data = {
+                "ToUserName": root.find("ToUserName").text,
+                "FromUserName": root.find("FromUserName").text,
+                "CreateTime": int(root.find("CreateTime").text),
+                "MsgType": root.find("MsgType").text,
+                "Content": root.find("Content").text if root.find("Content") is not None else None,
+                "MsgId": int(root.find("MsgId").text) if root.find("MsgId") is not None else None,
+        }
+
+        return message_data
+
+    
+
+    async def run_task(self, host: str, port: int, *args, **kwargs):
+        """
+        启动 Quart 应用。
+        """
+        await self.app.run_task(host=host, port=port, *args, **kwargs)
+
+
+
+    def on_message(self, msg_type: str):
+        """
+        注册消息类型处理器。
+        """
+        def decorator(func: Callable[[OAEvent], None]):
+            if msg_type not in self._message_handlers:
+                self._message_handlers[msg_type] = []
+            self._message_handlers[msg_type].append(func)
+            return func
+        return decorator
+
+    async def _handle_message(self, event: OAEvent):
+        """
+        处理消息事件。
+        """
+
+        msg_type = event.type
+        if msg_type in self._message_handlers:
+            for handler in self._message_handlers[msg_type]:
+                await handler(event)
+
+
+
             
 
             

libs/wecom_api/api.py

@@ -66,7 +66,7 @@ class WecomClient():
             else:
                 raise Exception("未获取用户")
             
-    async def send_to_all(self,content:str):
+    async def send_to_all(self,content:str,agent_id:int):
         if not self.check_access_token_for_contacts():
             self.access_token_for_contacts = await self.get_access_token(self.secret_for_contacts)
 
@@ -77,7 +77,7 @@ class WecomClient():
                 params = {
                 "touser" : user_ids_string,
                 "msgtype" : "text",
-                "agentid" : 1000002,
+                "agentid" : agent_id,
                 "text" : {
                     "content" : content,
                 },

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:

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)

pkg/core/bootutils/deps.py

@@ -33,6 +33,8 @@ required_deps = {
     "dingtalk_stream": "dingtalk_stream",
     "dashscope": "dashscope",
     "telegram": "python-telegram-bot",
+    "certifi": "certifi",
+    "mcp": "mcp",
 }
 
 

pkg/core/entities.py

@@ -72,6 +72,9 @@ class Query(pydantic.BaseModel):
     user_message: typing.Optional[llm_entities.Message] = None
     """此次请求的用户消息对象，由前置处理器阶段设置"""
 
+    variables: typing.Optional[dict[str, typing.Any]] = None
+    """变量，由前置处理器阶段设置。在prompt中嵌入或由 Runner 传递到 LLMOps 平台。"""
+
     use_model: typing.Optional[entities.LLMModelInfo] = None
     """使用的模型，由前置处理器阶段设置"""
 
@@ -86,10 +89,31 @@ class Query(pydantic.BaseModel):
 
     # ======= 内部保留 =======
     current_stage: "pkg.pipeline.stagemgr.StageInstContainer" = None
+    """当前所处阶段"""
 
     class Config:
         arbitrary_types_allowed = True
 
+    # ========== 插件可调用的 API（请求 API） ==========
+
+    def set_variable(self, key: str, value: typing.Any):
+        """设置变量"""
+        if self.variables is None:
+            self.variables = {}
+        self.variables[key] = value
+    
+    def get_variable(self, key: str) -> typing.Any:
+        """获取变量"""
+        if self.variables is None:
+            return None
+        return self.variables.get(key)
+    
+    def get_variables(self) -> dict[str, typing.Any]:
+        """获取所有变量"""
+        if self.variables is None:
+            return {}
+        return self.variables
+
 
 class Conversation(pydantic.BaseModel):
     """对话，包含于 Session 中，一个 Session 可以有多个历史 Conversation，但只有一个当前使用的 Conversation"""

pkg/core/migrations/m035_wxoa_mode.py

@@ -0,0 +1,26 @@
+from __future__ import annotations
+
+from .. import migration
+
+
+@migration.migration_class("wxoa-mode", 35)
+class WxoaModeMigration(migration.Migration):
+    """迁移"""
+
+    async def need_migrate(self) -> bool:
+        """判断当前环境是否需要运行此迁移"""
+
+        for adapter in self.ap.platform_cfg.data['platform-adapters']:
+            if adapter['adapter'] == 'officialaccount':
+                if 'Mode' 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 'Mode' not in adapter:
+                    adapter['Mode'] = 'drop'
+
+        await self.ap.platform_cfg.dump_config()

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()

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()

pkg/core/stages/migrate.py

@@ -11,7 +11,9 @@ 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
+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):

pkg/pipeline/preproc/preproc.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import datetime
 
 from .. import stage, entities, stagemgr
 from ...core import entities as core_entities
@@ -34,7 +35,7 @@ class PreProcessor(stage.PipelineStage):
 
         conversation = await self.ap.sess_mgr.get_conversation(session)
 
-        # 从会话取出消息和情景预设到query
+        # 设置query
         query.session = session
         query.prompt = conversation.prompt.copy()
         query.messages = conversation.messages.copy()
@@ -43,6 +44,11 @@ class PreProcessor(stage.PipelineStage):
 
         query.use_funcs = conversation.use_funcs if query.use_model.tool_call_supported else None
 
+        query.variables = {
+            "session_id": f"{query.session.launcher_type.value}_{query.session.launcher_id}",
+            "conversation_id": conversation.uuid,
+            "msg_create_time": int(query.message_event.time) if query.message_event.time else int(datetime.datetime.now().timestamp()),
+        }
 
         # 检查vision是否启用，没启用就删除所有图片
         if not self.ap.provider_cfg.data['enable-vision'] or (self.ap.provider_cfg.data['runner'] == 'local-agent' and not query.use_model.vision_supported):
@@ -54,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:
@@ -66,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

pkg/platform/manager.py

@@ -170,7 +170,8 @@ class PlatformManager:
                         self.ap.logger.debug(f"Traceback: {traceback.format_exc()}")
 
                 tasks.append(exception_wrapper(adapter))
-            
+
+
             for task in tasks:
                 self.ap.task_mgr.create_task(
                     task,

pkg/platform/sources/dingtalk.py

@@ -152,7 +152,11 @@ class DingTalkAdapter(adapter.MessagePlatformAdapter):
     async def send_message(
         self, target_type: str, target_id: str, message: platform_message.MessageChain
     ):
-        pass
+        content = await DingTalkMessageConverter.yiri2target(message)
+        if target_type == 'person':
+            await self.bot.send_proactive_message_to_one(target_id,content)
+        if target_type == 'group':
+            await self.bot.send_proactive_message_to_group(target_id,content)
 
     def register_listener(
         self,

pkg/platform/sources/gewechat.py

@@ -25,6 +25,7 @@ from ..types import message as platform_message
 from ..types import events as platform_events
 from ..types import entities as platform_entities
 from ...utils import image
+import xml.etree.ElementTree as ET
 
 
 class GewechatMessageConverter(adapter.MessageConverter):
@@ -62,20 +63,33 @@ class GewechatMessageConverter(adapter.MessageConverter):
         bot_account_id: str
     ) -> platform_message.MessageChain:
 
+
+
         if message["Data"]["MsgType"] == 1:
             # 检查消息开头，如果有 wxid_sbitaz0mt65n22:\n 则删掉
             regex = re.compile(r"^wxid_.*:")
+            # print(message)
 
             line_split = message["Data"]["Content"]["string"].split("\n")
 
             if len(line_split) > 0 and regex.match(line_split[0]):
                 message["Data"]["Content"]["string"] = "\n".join(line_split[1:])
 
-            at_string = f'@{bot_account_id}'
+
+            # 正则表达式模式，匹配'@'后跟任意数量的非空白字符
+            pattern = r'@\S+'
+            at_string = f"@{bot_account_id}"
             content_list = []
             if at_string in message["Data"]["Content"]["string"]:
                 content_list.append(platform_message.At(target=bot_account_id))
-                content_list.append(platform_message.Plain(message["Data"]["Content"]["string"].replace(at_string, "", 1)))
+                content_list.append(platform_message.Plain(message["Data"]["Content"]["string"].replace(at_string, '', 1)))
+            # 更优雅的替换改名后@机器人，仅仅限于单独AT的情况
+            elif "PushContent" in message['Data'] and '在群聊中@了你' in message["Data"]["PushContent"]:
+                if '@所有人' in message["Data"]["Content"]["string"]:  # at全员时候传入atll不当作at自己
+                    content_list.append(platform_message.AtAll())
+                else:
+                    content_list.append(platform_message.At(target=bot_account_id))
+                content_list.append(platform_message.Plain(re.sub(pattern, '', message["Data"]["Content"]["string"])))
             else:
                 content_list = [platform_message.Plain(message["Data"]["Content"]["string"])]
 
@@ -118,17 +132,78 @@ class GewechatMessageConverter(adapter.MessageConverter):
             # 支持微信聊天记录的消息类型，将 XML 内容转换为 MessageChain 传递
             try:
                 content = message["Data"]["Content"]["string"]
+                # 有三种可能的消息结构weid开头，私聊直接<?xml>和直接<msg>
+                if content.startswith('wxid'):
+                    xml_list = content.split('\n')[2:]
+                    xml_data = '\n'.join(xml_list)
+                elif content.startswith('<?xml'):
+                    xml_list = content.split('\n')[1:]
+                    xml_data = '\n'.join(xml_list)
+                else:
+                    xml_data = content
 
-                try:
-                    content_bytes = content.encode('utf-8')
-                    decoded_content = base64.b64decode(content_bytes)
+                content_data = ET.fromstring(xml_data)
+                # print(xml_data)
+                # 拿到细分消息类型，按照gewe接口中描述
+                '''
+                小程序：33/36
+                引用消息：57
+                转账消息：2000
+                红包消息：2001
+                视频号消息：51
+                '''
+                appmsg_data = content_data.find('.//appmsg')
+                data_type = appmsg_data.find('.//type').text
+                if data_type == '57':
+                    user_data = appmsg_data.find('.//title').text  # 拿到用户消息
+                    quote_data = appmsg_data.find('.//refermsg').find('.//content').text  # 引用原文
+                    sender_id = appmsg_data.find('.//refermsg').find('.//chatusr').text  # 引用用户id
+                    from_name = message['Data']['FromUserName']['string']
+                    message_list =[]
+                    if message['Wxid'] == sender_id and from_name.endswith('@chatroom'):  # 因为引用机制暂时无法响应用户，所以当引用用户是机器人是构建一个at激活机器人
+                        message_list.append(platform_message.At(target=bot_account_id))
+                    message_list.append(platform_message.Quote(
+                            sender_id=sender_id,
+                            origin=platform_message.MessageChain(
+                                [platform_message.Plain(quote_data)]
+                            )))
+                    message_list.append(platform_message.Plain(user_data))
+                    return platform_message.MessageChain(message_list)
+                elif data_type == '51':
                     return platform_message.MessageChain(
-                        [platform_message.Unknown(content=decoded_content)]
+                        [platform_message.Plain(text=f'[视频号消息]')]
                     )
-                except Exception as e:
+                    # print(content_data)
+                elif data_type == '2000':
                     return platform_message.MessageChain(
-                        [platform_message.Plain(text=content)]
+                        [platform_message.Plain(text=f'[转账消息]')]
                     )
+                elif data_type == '2001':
+                    return platform_message.MessageChain(
+                        [platform_message.Plain(text=f'[红包消息]')]
+                    )
+                elif data_type == '5':
+                    return platform_message.MessageChain(
+                        [platform_message.Plain(text=f'[公众号消息]')]
+                    )
+                elif data_type == '33' or data_type == '36':
+                    return platform_message.MessageChain(
+                        [platform_message.Plain(text=f'[小程序消息]')]
+                    )
+                # print(data_type.text)
+                else:
+
+
+                    try:
+                        content_bytes = content.encode('utf-8')
+                        decoded_content = base64.b64decode(content_bytes)
+                        return platform_message.MessageChain(
+                            [platform_message.Unknown(content=decoded_content)]
+                        )
+                    except Exception as e:
+                        return platform_message.MessageChain(
+                            [platform_message.Plain(text=content)]
+                        )
             except Exception as e:
                 print(f"Error processing type 49 message: {str(e)}")
                 return platform_message.MessageChain(
@@ -152,6 +227,14 @@ class GewechatEventConverter(adapter.EventConverter):
         event: dict,
         bot_account_id: str
     ) -> platform_events.MessageEvent:
+        # print(event)
+        # 排除自己发消息回调回答问题
+        if event['Wxid'] == event['Data']['FromUserName']['string']:
+            return None
+        # 排除公众号以及微信团队消息
+        if event['Data']['FromUserName']['string'].startswith('gh_')\
+                or event['Data']['FromUserName']['string'].startswith('weixin'):
+            return None
         message_chain = await self.message_converter.target2yiri(copy.deepcopy(event), bot_account_id)
 
         if not message_chain:
@@ -257,11 +340,23 @@ class GeWeChatAdapter(adapter.MessagePlatformAdapter):
     ):
         geweap_msg = await self.message_converter.yiri2target(message)
         # 此处加上群消息at处理
-        # ats = [item["target"] for item in geweap_msg if item["type"] == "at"]
+        ats = [item["target"] for item in geweap_msg if item["type"] == "at"]
+
 
         for msg in geweap_msg:
+            # at主动发送消息
             if msg['type'] == 'text':
-                self.bot.post_text(app_id=self.config['app_id'], to_wxid=target_id, content=msg['content'])
+                if ats:
+                    member_info = self.bot.get_chatroom_member_detail(
+                        self.config["app_id"],
+                        target_id,
+                        ats[::-1]
+                    )["data"]
+
+                    for member in member_info:
+                        msg['content'] = f'@{member["nickName"]} {msg["content"]}'
+                self.bot.post_text(app_id=self.config['app_id'], to_wxid=target_id, content=msg['content'],
+                                   ats=",".join(ats))
 
             elif msg['type'] == 'image':
 
@@ -296,7 +391,7 @@ class GeWeChatAdapter(adapter.MessagePlatformAdapter):
                     app_id=self.config["app_id"],
                     to_wxid=message_source.source_platform_object["Data"]["FromUserName"]["string"],
                     content=msg["content"],
-                    ats=','.join(ats)
+                    ats=",".join(ats)
                 )
 
     async def is_muted(self, group_id: int) -> bool:

pkg/platform/sources/officialaccount.py

@@ -2,21 +2,19 @@ from __future__ import annotations
 import typing
 import asyncio
 import traceback
-import time
+
 import datetime
 from pkg.core import app
 from pkg.platform.adapter import MessagePlatformAdapter
 from pkg.platform.types import events as platform_events, message as platform_message
-
-import aiocqhttp
-import aiohttp
+from collections import deque
 from libs.official_account_api.oaevent import OAEvent
 from pkg.platform.adapter import MessagePlatformAdapter
 from pkg.platform.types import events as platform_events, message as platform_message
 from libs.official_account_api.api import OAClient
+from libs.official_account_api.api import OAClientForLongerResponse
 from pkg.core import app
 from .. import adapter
-from ...pipeline.longtext.strategies import forward
 from ...core import app
 from ..types import message as platform_message
 from ..types import events as platform_events
@@ -26,6 +24,7 @@ from ...command.errors import ParamNotEnoughError
 
 # 生成的ai回答
 generated_content = {}
+msg_queue = {}
 
 class OAMessageConverter(adapter.MessageConverter):
     @staticmethod
@@ -88,17 +87,31 @@ class OfficialAccountAdapter(adapter.MessagePlatformAdapter):
             "EncodingAESKey",
             "AppSecret",
             "AppID",
+            "Mode",
         ]
         missing_keys = [key for key in required_keys if key not in config]
         if missing_keys:
-            raise ParamNotEnoughError("企业微信缺少相关配置项，请查看文档或联系管理员")
+            raise ParamNotEnoughError("微信公众号缺少相关配置项，请查看文档或联系管理员")
         
-        self.bot = OAClient(
-            token=config['token'],
-            EncodingAESKey=config['EncodingAESKey'],
-            Appsecret=config['AppSecret'],
-            AppID=config['AppID'], 
-        )
+        
+        if self.config['Mode'] == "drop":
+            self.bot = OAClient(
+                token=config['token'],
+                EncodingAESKey=config['EncodingAESKey'],
+                Appsecret=config['AppSecret'],
+                AppID=config['AppID'], 
+            )
+        elif self.config['Mode'] == "passive":
+            self.bot = OAClientForLongerResponse(
+                token=config['token'],
+                EncodingAESKey=config['EncodingAESKey'],
+                Appsecret=config['AppSecret'],
+                AppID=config['AppID'], 
+                LoadingMessage=config['LoadingMessage']
+            )
+        else:
+            raise KeyError("请设置微信公众号通信模式")
+
 
     async def reply_message(self, message_source: platform_events.FriendMessage, message: platform_message.MessageChain, quote_origin: bool = False):
         global generated_content
@@ -109,6 +122,20 @@ class OfficialAccountAdapter(adapter.MessagePlatformAdapter):
 
         generated_content[message_source.message_chain.message_id] = content
         
+        from_user = message_source.sender.id
+
+
+        if  from_user not in msg_queue:
+            msg_queue[from_user] = []
+        
+        msg_queue[from_user].append(
+            {
+                "msg_id":message_source.message_chain.message_id,
+                "content":content,
+            }
+        )
+
+            
     async def send_message(
         self, target_type: str, target_id: str, message: platform_message.MessageChain
     ):

pkg/platform/sources/qqofficial.py

@@ -2,15 +2,14 @@ from __future__ import annotations
 import typing
 import asyncio
 import traceback
-import time
+
 import datetime
-import aiocqhttp
-import aiohttp
+
 from pkg.platform.adapter import MessagePlatformAdapter
 from pkg.platform.types import events as platform_events, message as platform_message
 from pkg.core import app
 from .. import adapter
-from ...pipeline.longtext.strategies import forward
+
 from ...core import app
 from ..types import message as platform_message
 from ..types import events as platform_events

pkg/platform/sources/wecom.py

@@ -197,7 +197,19 @@ class WecomAdapter(adapter.MessagePlatformAdapter):
     async def send_message(
         self, target_type: str, target_id: str, message: platform_message.MessageChain
     ):
-        pass
+        """企业微信目前只有发送给个人的方法，
+        构造target_id的方式为前半部分为账户id，后半部分为agent_id,中间使用“|”符号隔开。
+        """
+        content_list = await WecomMessageConverter.yiri2target(message, self.bot)
+        parts = target_id.split("|")
+        user_id = parts[0]
+        agent_id = int(parts[1])
+        if target_type == 'person':
+            for content in content_list:
+                if content["type"] == "text":
+                    await self.bot.send_private_msg(user_id,agent_id,content["content"])
+                if content["type"] == "image":
+                    await self.bot.send_image(user_id,agent_id,content["media"])
 
     def register_listener(
         self,

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('插件无源码信息，无法更新')

pkg/provider/runners/dashscopeapi.py

@@ -167,6 +167,10 @@ class DashScopeAPIRunner(runner.RequestRunner):
         image_ids = []          # 用户输入的图片ID列表 （暂不支持）
         
         plain_text, image_ids = await self._preprocess_user_message(query)
+
+        biz_params = {}
+        biz_params.update(self.biz_params)
+        biz_params.update(query.variables)
         
         #发送对话请求
         response = dashscope.Application.call(
@@ -176,7 +180,7 @@ class DashScopeAPIRunner(runner.RequestRunner):
             stream=True,                                        # 流式输出
             incremental_output=True,                            # 增量输出，使用流式输出需要开启增量输出
             session_id=query.session.using_conversation.uuid,   # 会话ID用于，多轮对话
-            biz_params=self.biz_params                          # 工作流应用的自定义输入参数传递
+            biz_params=biz_params,                              # 工作流应用的自定义输入参数传递
             # rag_options={                                     # 主要用于文件交互，暂不支持
             #     "session_file_ids": ["FILE_ID1"],             # FILE_ID1 替换为实际的临时文件ID,逗号隔开多个
             # }

pkg/provider/runners/difysvapi.py

@@ -111,8 +111,12 @@ class DifyServiceAPIRunner(runner.RequestRunner):
 
         basic_mode_pending_chunk = ''
 
+        inputs = {}
+        
+        inputs.update(query.variables)
+
         async for chunk in self.dify_client.chat_messages(
-            inputs={},
+            inputs=inputs,
             query=plain_text,
             user=f"{query.session.launcher_type.value}_{query.session.launcher_id}",
             conversation_id=cov_id,
@@ -162,8 +166,12 @@ class DifyServiceAPIRunner(runner.RequestRunner):
 
         ignored_events = ["agent_message"]
 
+        inputs = {}
+        
+        inputs.update(query.variables)
+
         async for chunk in self.dify_client.chat_messages(
-            inputs={},
+            inputs=inputs,
             query=plain_text,
             user=f"{query.session.launcher_type.value}_{query.session.launcher_id}",
             response_mode="streaming",
@@ -227,14 +235,11 @@ class DifyServiceAPIRunner(runner.RequestRunner):
 
         if not query.session.using_conversation.uuid:
             query.session.using_conversation.uuid = str(uuid.uuid4())
-
-        cov_id = query.session.using_conversation.uuid
+        
+        query.variables["conversation_id"] = query.session.using_conversation.uuid
 
         plain_text, image_ids = await self._preprocess_user_message(query)
 
-        # 尝试获取 CreateTime
-        create_time = int(query.message_event.time) if query.message_event.time else int(datetime.datetime.now().timestamp())
-
         files = [
             {
                 "type": "image",
@@ -246,13 +251,17 @@ class DifyServiceAPIRunner(runner.RequestRunner):
 
         ignored_events = ["text_chunk", "workflow_started"]
 
+        inputs = {  # these variables are legacy variables, we need to keep them for compatibility
+            "langbot_user_message_text": plain_text,
+            "langbot_session_id": query.variables["session_id"],
+            "langbot_conversation_id": query.variables["conversation_id"],
+            "langbot_msg_create_time": query.variables["msg_create_time"],
+        }
+        
+        inputs.update(query.variables)
+
         async for chunk in self.dify_client.workflow_run(
-            inputs={
-                "langbot_user_message_text": plain_text,
-                "langbot_session_id": f"{query.session.launcher_type.value}_{query.session.launcher_id}",
-                "langbot_conversation_id": cov_id,
-                "langbot_msg_create_time": create_time,
-            },
+            inputs=inputs,
             user=f"{query.session.launcher_type.value}_{query.session.launcher_id}",
             files=files,
             timeout=self.ap.provider_cfg.data["dify-service-api"]["workflow"]["timeout"],

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)

pkg/provider/tools/loader.py

@@ -0,0 +1,54 @@
+from __future__ import annotations
+
+import abc
+import typing
+
+from ...core import app, entities as core_entities
+from . import entities as tools_entities
+
+
+preregistered_loaders: list[typing.Type[ToolLoader]] = []
+
+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
+    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
+
+    @abc.abstractmethod
+    async def shutdown(self):
+        """关闭工具"""
+        pass

pkg/provider/tools/loaders/mcp.py

@@ -0,0 +1,161 @@
+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.session = None
+
+        self.exit_stack = AsyncExitStack()
+        self.functions = []
+
+    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,
+            ))
+
+    async def shutdown(self):
+        """关闭工具"""
+        await self.session._exit_stack.aclose()
+
+@loader.loader_class("mcp")
+class MCPLoader(loader.ToolLoader):
+    """MCP 工具加载器。
+    
+    在此加载器中管理所有与 MCP Server 的连接。
+    """
+
+    sessions: dict[str, RuntimeMCPSession] = {}
+
+    _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", []):
+            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 session in self.sessions.values():
+            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}")
+
+    async def shutdown(self):
+        """关闭工具"""
+        for session in self.sessions.values():
+            await session.shutdown()

pkg/provider/tools/loaders/plugin.py

@@ -0,0 +1,92 @@
+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,
+                )
+
+    async def shutdown(self):
+        """关闭工具"""
+        pass

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, mcp
 
 
 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,13 @@ class ToolManager:
     ) -> typing.Any:
         """执行函数调用"""
 
-        try:
+        for loader in self.loaders:
+            if await loader.has_tool(name):
+                return await loader.invoke_tool(query, name, parameters)
+        else:
+            raise ValueError(f"未找到工具: {name}")
 
-            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,
-                )
+    async def shutdown(self):
+        """关闭所有工具"""
+        for loader in self.loaders:
+            await loader.shutdown()

pkg/utils/constants.py

@@ -1,4 +1,4 @@
-semantic_version = "v3.4.10.3"
+semantic_version = "v3.4.11"
 
 debug_mode = False
 

pkg/utils/image.py

@@ -15,6 +15,9 @@ import asyncio
 from urllib.parse import urlparse
 
 
+
+
+
 async def get_gewechat_image_base64(
         gewechat_url: str,
         gewechat_file_url: str,
@@ -67,6 +70,7 @@ async def get_gewechat_image_base64(
                         }
                 ) as response:
                     if response.status != 200:
+                        # print(response)
                         raise Exception(f"获取gewechat图片下载失败: {await response.text()}")
 
                     resp_data = await response.json()
@@ -108,6 +112,9 @@ async def get_gewechat_image_base64(
         raise Exception(f"获取图片失败: {str(e)}") from e
 
 
+
+
+
 async def get_wecom_image_base64(pic_url: str) -> tuple[str, str]:
     """
     下载企业微信图片并转换为 base64

requirements.txt

@@ -32,6 +32,8 @@ gewechat-client
 dingtalk_stream
 dashscope
 python-telegram-bot
+certifi
+mcp
 
 # indirect
 taskgroup==0.0.0a4

templates/pipeline.json

@@ -16,7 +16,7 @@
     },
     "income-msg-check": true,
     "ignore-rules": {
-        "prefix": ["/"],
+        "prefix": [],
         "regexp": []
     },
     "check-sensitive-words": true,

templates/platform.json

@@ -77,6 +77,8 @@
             "EncodingAESKey":"",
             "AppID":"",
             "AppSecret":"",
+            "Mode":"drop",
+            "LoadingMessage":"AI正在思考中，请发送任意内容获取回复。",
             "host": "0.0.0.0",
             "port": 2287
         },

templates/provider.json

@@ -138,5 +138,8 @@
                 "date": "2023-08-10"
             }
         }
+    },
+    "mcp": {
+        "servers": []
     }
 }

templates/schema/pipeline.json

@@ -23,7 +23,7 @@
                     "items": {
                         "type": "string",
                         "format": "regex",
-                        "pattern": "^(person|group)_(\\d)*$"
+                        "pattern": "^(person|group)_.*$"
                     },
                     "default": []
                 },
@@ -34,7 +34,7 @@
                     "items": {
                         "type": "string",
                         "format": "regex",
-                        "pattern": "^(person|group)_(\\d)*$"
+                        "pattern": "^(person|group)_.*$"
                     },
                     "default": []
                 }
@@ -99,7 +99,7 @@
                 }
             },
             "patternProperties": {
-                "^\\d+$": {
+                "^.*$": {
                     "type": "object",
                     "properties": {
                         "at": {

templates/schema/platform.json

@@ -385,6 +385,17 @@
                                 "default": "",
                                 "description": "微信公众号的AppSecret"
                             },
+                            "Mode": {
+                                "type": "string",
+                                "default": "drop",
+                                "description": "对于超过15s的响应的处理模式",
+                                "enum": ["drop", "passive"]
+                            },
+                            "LoadingMessage": {
+                                "type": "string",
+                                "default": "AI正在思考中，请发送任意内容获取回复。",
+                                "description": "当使用被动模式时，显示给用户的提示信息"
+                            },
                             "host": {
                                 "type": "string",
                                 "default": "0.0.0.0",

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
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                }
+            }
         }
     }
 }

templates/schema/system.json

@@ -9,7 +9,7 @@
             "items": {
                 "type": "string",
                 "format": "regex",
-                "pattern": "^(person|group)_(\\d+)$"
+                "pattern": "^(person|group)_.*$"
             },
             "default": []
         },
@@ -52,7 +52,7 @@
                 }
             },
             "patternProperties": {
-                "^(person|group)_(\\d+)$": {
+                "^(person|group)_.*$": {
                     "type": "integer"
                 }
             }