chore: release v3.4.11.2 (#1257)

chore: bump version 3.4.11

.gitignore

@@ -19,7 +19,7 @@ cookies.json
 data/labels/announcement_saved.json
 cmdpriv.json
 tips.py
-.venv
+venv*
 bin/
 .vscode
 test_*

README.md

@@ -9,7 +9,7 @@
 <a href="https://trendshift.io/repositories/12901" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12901" alt="RockChinQ%2FLangBot | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 
 <a href="https://docs.langbot.app">项目主页</a> ｜
-<a href="https://docs.langbot.app/insight/intro.htmll">功能介绍</a> ｜
+<a href="https://docs.langbot.app/insight/intro.html">功能介绍</a> ｜
 <a href="https://docs.langbot.app/insight/guide.html">部署文档</a> ｜
 <a href="https://docs.langbot.app/usage/faq.html">常见问题</a> ｜
 <a href="https://docs.langbot.app/plugin/plugin-intro.html">插件介绍</a> ｜
@@ -26,7 +26,7 @@
 [![QQ Group](https://img.shields.io/badge/%E7%A4%BE%E5%8C%BAQQ%E7%BE%A4-966235608-blue)](https://qm.qq.com/q/JLi38whHum)
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/RockChinQ/LangBot)](https://github.com/RockChinQ/LangBot/releases/latest)
  ![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.qchatgpt.rockchin.top%2Fapi%2Fv2%2Fview%2Frealtime%2Fcount_query%3Fminute%3D10080&query=%24.data.count&label=%E4%BD%BF%E7%94%A8%E9%87%8F%EF%BC%887%E6%97%A5%EF%BC%89)
-<img src="https://img.shields.io/badge/python-3.10 | 3.11 | 3.12-blue.svg" alt="python">
+<img src="https://img.shields.io/badge/python-3.10 ~ 3.13 -blue.svg" alt="python">
 [![star](https://gitcode.com/RockChinQ/LangBot/star/badge.svg)](https://gitcode.com/RockChinQ/LangBot)
 
 [简体中文](README.md) / [English](README_EN.md) / [日本語](README_JP.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)
 
 ## 📦 开始使用
@@ -93,11 +93,13 @@
 | 钉钉 | ✅ |  |
 | Discord | ✅ |  |
 | Telegram | ✅ |  |
+| Slack | 🚧 |  |
+| LINE | 🚧 |  |
 | WhatsApp | 🚧 |  |
 
 🚧: 正在开发中
 
-### 大模型
+### 大模型能力
 
 | 模型 | 状态 | 备注 |
 | --- | --- | --- |
@@ -114,12 +116,33 @@
 | [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
+
+| 平台/模型 | 备注 |
+| --- | --- |
+| [FishAudio](https://fish.audio/zh-CN/discovery/) | [插件](https://github.com/the-lazy-me/NewChatVoice) |
+| [海豚 AI](https://www.ttson.cn/?source=thelazy) | [插件](https://github.com/the-lazy-me/NewChatVoice) |
+| [AzureTTS](https://portal.azure.com/) | [插件](https://github.com/Ingnaryk/LangBot_AzureTTS) |
+
+### 文生图
+
+| 平台/模型 | 备注 |
+| --- | --- |
+| 阿里云百炼 | [插件](https://github.com/Thetail001/LangBot_BailianTextToImagePlugin)
 
 ## 😘 社区贡献
 
-LangBot 离不开以下贡献者和社区内所有人的贡献，我们欢迎任何形式的贡献和反馈。
+感谢以下[代码贡献者](https://github.com/RockChinQ/LangBot/graphs/contributors)和社区里其他成员对 LangBot 的贡献：
-
 
 <a href="https://github.com/RockChinQ/LangBot/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=RockChinQ/LangBot" />
 </a>
+
+以及 LangBot 核心团队成员：
+
+- [RockChinQ](https://github.com/RockChinQ)
+- [the-lazy-me](https://github.com/the-lazy-me)
+- [wangcham](https://github.com/wangcham)
+- [KaedeSAMA](https://github.com/KaedeSAMA)

README_EN.md

@@ -8,7 +8,7 @@
 <a href="https://trendshift.io/repositories/12901" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12901" alt="RockChinQ%2FLangBot | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 
 <a href="https://docs.langbot.app">Home</a> ｜
-<a href="https://docs.langbot.app/insight/intro.htmll">Features</a> ｜
+<a href="https://docs.langbot.app/insight/intro.html">Features</a> ｜
 <a href="https://docs.langbot.app/insight/guide.html">Deployment</a> ｜
 <a href="https://docs.langbot.app/usage/faq.html">FAQ</a> ｜
 <a href="https://docs.langbot.app/plugin/plugin-intro.html">Plugin</a> ｜
@@ -24,7 +24,7 @@
 [![Discord](https://img.shields.io/discord/1335141740050649118?logo=discord&labelColor=%20%235462eb&logoColor=%20%23f5f5f5&color=%20%235462eb)](https://discord.gg/wdNEHETs87)
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/RockChinQ/LangBot)](https://github.com/RockChinQ/LangBot/releases/latest)
  ![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.qchatgpt.rockchin.top%2Fapi%2Fv2%2Fview%2Frealtime%2Fcount_query%3Fminute%3D10080&query=%24.data.count&label=Usage(7days))
-<img src="https://img.shields.io/badge/python-3.10 | 3.11 | 3.12-blue.svg" alt="python">
+<img src="https://img.shields.io/badge/python-3.10 ~ 3.13 -blue.svg" alt="python">
 
 [简体中文](README.md) / [English](README_EN.md) / [日本語](README_JP.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
@@ -90,6 +90,8 @@ Directly use the released version to run, see the [Manual Deployment](https://do
 | DingTalk | ✅ |  |
 | Discord | ✅ |  |
 | Telegram | ✅ |  |
+| Slack | 🚧 |  |
+| LINE | 🚧 |  |
 | WhatsApp | 🚧 |  |
 
 🚧: In development
@@ -111,14 +113,19 @@ 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
 
-Thanks to the following contributors and everyone in the community for their contributions.
+Thank you for the following [code contributors](https://github.com/RockChinQ/LangBot/graphs/contributors) and other members in the community for their contributions to LangBot:
-
 
 <a href="https://github.com/RockChinQ/LangBot/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=RockChinQ/LangBot" />
 </a>
 
+And the core team members of LangBot:
 
+- [RockChinQ](https://github.com/RockChinQ)
+- [the-lazy-me](https://github.com/the-lazy-me)
+- [wangcham](https://github.com/wangcham)
+- [KaedeSAMA](https://github.com/KaedeSAMA)

README_JP.md

@@ -8,7 +8,7 @@
 <a href="https://trendshift.io/repositories/12901" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12901" alt="RockChinQ%2FLangBot | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 
 <a href="https://docs.langbot.app">ホーム</a> ｜
-<a href="https://docs.langbot.app/insight/intro.htmll">機能</a> ｜
+<a href="https://docs.langbot.app/insight/intro.html">機能</a> ｜
 <a href="https://docs.langbot.app/insight/guide.html">デプロイ</a> ｜
 <a href="https://docs.langbot.app/usage/faq.html">FAQ</a> ｜
 <a href="https://docs.langbot.app/plugin/plugin-intro.html">プラグイン</a> ｜
@@ -23,7 +23,7 @@
 [![Discord](https://img.shields.io/discord/1335141740050649118?logo=discord&labelColor=%20%235462eb&logoColor=%20%23f5f5f5&color=%20%235462eb)](https://discord.gg/wdNEHETs87)
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/RockChinQ/LangBot)](https://github.com/RockChinQ/LangBot/releases/latest)
  ![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.qchatgpt.rockchin.top%2Fapi%2Fv2%2Fview%2Frealtime%2Fcount_query%3Fminute%3D10080&query=%24.data.count&label=Usage(7days))
-<img src="https://img.shields.io/badge/python-3.10 | 3.11 | 3.12-blue.svg" alt="python">
+<img src="https://img.shields.io/badge/python-3.10 ~ 3.13 -blue.svg" alt="python">
 
 [简体中文](README.md) / [English](README_EN.md) / [日本語](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)を参照。
 
 ## 📦 始め方
@@ -89,6 +89,8 @@ LangBotはBTPanelにリストされています。BTPanelをインストール
 | DingTalk | ✅ |  |
 | Discord | ✅ |  |
 | Telegram | ✅ |  |
+| Slack | 🚧 |  |
+| LINE | 🚧 |  |
 | WhatsApp | 🚧 |  |
 
 🚧: 開発中
@@ -110,14 +112,19 @@ 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プロトコルをサポート |
 
 ## 🤝 コミュニティ貢献
 
-以下の貢献者とコミュニティの皆さんの貢献に感謝します。
+LangBot への貢献に対して、以下の [コード貢献者](https://github.com/RockChinQ/LangBot/graphs/contributors) とコミュニティの他のメンバーに感謝します。
-
 
 <a href="https://github.com/RockChinQ/LangBot/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=RockChinQ/LangBot" />
 </a>
 
+LangBot の核心チームメンバー:
 
+- [RockChinQ](https://github.com/RockChinQ)
+- [the-lazy-me](https://github.com/the-lazy-me)
+- [wangcham](https://github.com/wangcham)
+- [KaedeSAMA](https://github.com/KaedeSAMA)

components.yaml

@@ -10,6 +10,10 @@ spec:
     ComponentTemplate:
       fromFiles:
         - pkg/platform/adapter.yaml
+        - pkg/provider/modelmgr/requester.yaml
     MessagePlatformAdapter:
       fromDirs:
         - path: pkg/platform/sources/
+    LLMAPIRequester:
+      fromDirs:
+        - path: pkg/provider/modelmgr/requesters/

libs/dingtalk_api/EchoHandler.py

@@ -1,4 +1,5 @@
 import asyncio
+import json
 import dingtalk_stream
 from dingtalk_stream import AckMessage
 
@@ -17,11 +18,12 @@ class EchoTextHandler(dingtalk_stream.ChatbotHandler):
         await self.client.update_incoming_message(incoming_message)
 
         return AckMessage.STATUS_OK, 'OK'
-    
+
     async def get_incoming_message(self):
         """异步等待消息的到来"""
         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

@@ -1,4 +1,5 @@
 import base64
+import json
 import time
 from typing import Callable
 import dingtalk_stream
@@ -92,8 +93,31 @@ class DingTalkClient:
                 base64_str = base64.b64encode(file_bytes).decode('utf-8')  # 返回字符串格式
                 return base64_str
             else:
-                raise Exception("获取图片失败")
+                raise Exception("获取文件失败")
-
+            
+    async def get_audio_url(self,download_code:str):
+        if not await self.check_access_token():
+            await self.get_access_token()
+        url = 'https://api.dingtalk.com/v1.0/robot/messageFiles/download'
+        params = {
+            "downloadCode":download_code,
+            "robotCode":self.robot_code
+        }
+        headers ={
+            "x-acs-dingtalk-access-token": self.access_token
+        }
+        async with httpx.AsyncClient() as client:
+            response = await client.post(url, headers=headers, json=params)
+            if response.status_code == 200:
+                result = response.json()
+                download_url = result.get("downloadUrl")
+                if download_url:
+                    return await self.download_url_to_base64(download_url)
+                else:
+                    raise Exception("获取音频失败")
+            else:
+                raise Exception(f"Error: {response.status_code}, {response.text}")
+                
     async def update_incoming_message(self, message):
         """异步更新 DingTalkClient 中的 incoming_message"""
         message_data = await self.get_message(message)
@@ -133,6 +157,8 @@ 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,
             }
@@ -160,14 +186,65 @@ class DingTalkClient:
                 message_data['Picture'] = await self.download_image(incoming_message.get_image_list()[0])
                 
                 message_data['Type'] = 'image'
+            elif incoming_message.message_type == 'audio':
+                message_data['Audio'] = await self.get_audio_url(incoming_message.to_dict()['content']['downloadCode'])
 
-            # 删掉开头的@消息
+                message_data['Type'] = 'audio'
-            if message_data["Content"].startswith("@"+self.robot_name):
+
-                message_data["Content"][len("@"+self.robot_name):]
+            copy_message_data = message_data.copy()
+            del copy_message_data['IncomingMessage']
+            # print("message_data:", json.dumps(copy_message_data, indent=4, ensure_ascii=False))
         except Exception:
             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/dingtalk_api/dingtalkevent.py

@@ -1,4 +1,5 @@
 from typing import Dict, Any, Optional
+import dingtalk_stream
 
 class DingTalkEvent(dict):
     @staticmethod
@@ -15,7 +16,7 @@ class DingTalkEvent(dict):
         return self.get("Content","")
 
     @property
-    def incoming_message(self):
+    def incoming_message(self) -> Optional["dingtalk_stream.chatbot.ChatbotMessage"]:
         return self.get("IncomingMessage")
 
     @property
@@ -25,6 +26,10 @@ class DingTalkEvent(dict):
     @property
     def picture(self):
         return self.get("Picture","")
+    
+    @property
+    def audio(self):
+        return self.get("Audio","")
 
     @property
     def conversation(self):
@@ -61,4 +66,4 @@ class DingTalkEvent(dict):
         Returns:
             str: 字符串表示。
         """
-        return f"<WecomEvent {super().__repr__()}>"
+        return f"<DingTalkEvent {super().__repr__()}>"

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,7 @@ xml_template = """
 </xml>
 """
 
+
 class OAClient():
 
     def __init__(self,token:str,EncodingAESKey:str,AppID:str,Appsecret:str):
@@ -41,6 +44,7 @@ class OAClient():
         }
         self.access_token_expiry_time = None
         self.msg_id_map = {}
+        self.generated_content = {}
 
     async def handle_callback_request(self):
 
@@ -83,12 +87,10 @@ class OAClient():
                 from_user = root.find("FromUserName").text  # 发送者
                 to_user = root.find("ToUserName").text  # 机器人
                 
-                from pkg.platform.sources import officialaccount
-                
                 timeout = 4.80
                 interval = 0.1
                 while True:
-                    content = officialaccount.generated_content.pop(message_data["MsgId"], None)
+                    content = self.generated_content.pop(message_data["MsgId"], None)
                     if content:
                         response_xml = xml_template.format(
                             to_user=from_user,
@@ -168,6 +170,168 @@ class OAClient():
             for handler in self._message_handlers[msg_type]:
                 await handler(event)
 
+    async def set_message(self,msg_id:int,content:str):
+        self.generated_content[msg_id] = content
+
+
+
+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
+        self.msg_queue = {}
+        self.user_msg_queue = {}
+
+    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
+
+
+                if self.msg_queue.get(from_user) and self.msg_queue[from_user][0]["content"]:
+
+                    queue_top = self.msg_queue[from_user].pop(0)
+                    queue_content = queue_top["content"]
+
+                    # 弹出用户消息
+                    if self.user_msg_queue.get(from_user) and self.user_msg_queue[from_user]:
+                        self.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 self.user_msg_queue.get(from_user) and self.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:
+                                self.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)
+
+    async def set_message(self,from_user:int,message_id:int,content:str):
+        if  from_user not in self.msg_queue:
+            self.msg_queue[from_user] = []
+        
+        self.msg_queue[from_user].append(
+            {
+                "msg_id":message_id,
+                "content":content,
+            }
+        )
+        
+
+
 
             
 

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/api/http/controller/main.py

@@ -66,8 +66,42 @@ class HTTPController:
 
         @self.quart_app.route("/")
         async def index():
-            return await quart.send_from_directory(frontend_path, "index.html")
+            return await quart.send_from_directory(
+                frontend_path,
+                "index.html",
+                mimetype="text/html"
+            )
 
         @self.quart_app.route("/<path:path>")
         async def static_file(path: str):
-            return await quart.send_from_directory(frontend_path, path)
+
+            mimetype = None
+
+            if path.endswith(".html"):
+                mimetype = "text/html"
+            elif path.endswith(".js"):
+                mimetype = "application/javascript"
+            elif path.endswith(".css"):
+                mimetype = "text/css"
+            elif path.endswith(".png"):
+                mimetype = "image/png"
+            elif path.endswith(".jpg"):
+                mimetype = "image/jpeg"
+            elif path.endswith(".jpeg"):
+                mimetype = "image/jpeg"
+            elif path.endswith(".gif"):
+                mimetype = "image/gif"
+            elif path.endswith(".svg"):
+                mimetype = "image/svg+xml"
+            elif path.endswith(".ico"):
+                mimetype = "image/x-icon"
+            elif path.endswith(".json"):
+                mimetype = "application/json"
+            elif path.endswith(".txt"):
+                mimetype = "text/plain"
+
+            return await quart.send_from_directory(
+                frontend_path,
+                path,
+                mimetype=mimetype
+            )

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/discover/engine.py

@@ -187,6 +187,9 @@ class ComponentDiscoveryEngine:
             if name == 'ComponentTemplate':
                 continue
             components[name] = self.load_blueprint_comp_group(component, owner)
+        
+        self.ap.logger.debug(f'Components: {components}')
+
         return blueprint_manifest, components
 
 

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

@@ -110,7 +110,7 @@ class PlatformManager:
         if len(self.adapters) == 0:
             self.ap.logger.warning('未运行平台适配器，请根据文档配置并启用平台适配器。')
 
-    async def write_back_config(self, adapter_name: str, adapter_inst: msadapter.MessagePlatformAdapter, config: dict):
+    def write_back_config(self, adapter_name: str, adapter_inst: msadapter.MessagePlatformAdapter, config: dict):
         index = -2
 
         for i, adapter in enumerate(self.adapters):
@@ -137,7 +137,7 @@ class PlatformManager:
             **config
         }
         self.ap.platform_cfg.data['platform-adapters'][real_index] = new_cfg
-        await self.ap.platform_cfg.dump_config()
+        self.ap.platform_cfg.dump_config_sync()
 
     async def send(self, event: platform_events.MessageEvent, msg: platform_message.MessageChain, adapter: msadapter.MessagePlatformAdapter):
         
@@ -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/aiocqhttp.py

@@ -57,7 +57,7 @@ class AiocqhttpMessageConverter(adapter.MessageConverter):
                 elif msg.path:
                     arg = msg.path
                     msg_list.append(aiocqhttp.MessageSegment.record(msg.path))
-            elif type(msg) is forward.Forward:
+            elif type(msg) is platform_message.Forward:
 
                 for node in msg.node_list:
                     msg_list.extend((await AiocqhttpMessageConverter.yiri2target(node.message_chain))[0])
@@ -101,69 +101,8 @@ class AiocqhttpMessageConverter(adapter.MessageConverter):
 class AiocqhttpEventConverter(adapter.EventConverter):
 
     @staticmethod
-    async def yiri2target(event: platform_events.Event, bot_account_id: int):
+    async def yiri2target(event: platform_events.MessageEvent, bot_account_id: int):
-
+        return event.source_platform_object
-        msg, msg_id, msg_time = await AiocqhttpMessageConverter.yiri2target(event.message_chain)
-
-        if type(event) is platform_events.GroupMessage:
-            role = "member"
-
-            if event.sender.permission == "ADMINISTRATOR":
-                role = "admin"
-            elif event.sender.permission == "OWNER":
-                role = "owner"
-
-            payload = {
-                "post_type": "message",
-                "message_type": "group",
-                "time": int(msg_time.timestamp()),
-                "self_id": bot_account_id,
-                "sub_type": "normal",
-                "anonymous": None,
-                "font": 0,
-                "message": str(msg),
-                "raw_message": str(msg),
-                "sender": {
-                    "age": 0,
-                    "area": "",
-                    "card": "",
-                    "level": "",
-                    "nickname": event.sender.member_name,
-                    "role": role,
-                    "sex": "unknown",
-                    "title": "",
-                    "user_id": event.sender.id,
-                },
-                "user_id": event.sender.id,
-                "message_id": msg_id,
-                "group_id": event.group.id,
-                "message_seq": 0,
-            }
-
-            return aiocqhttp.Event.from_payload(payload)
-        elif type(event) is platform_events.FriendMessage:
-
-            payload = {
-                "post_type": "message",
-                "message_type": "private",
-                "time": int(msg_time.timestamp()),
-                "self_id": bot_account_id,
-                "sub_type": "friend",
-                "target_id": bot_account_id,
-                "message": str(msg),
-                "raw_message": str(msg),
-                "font": 0,
-                "sender": {
-                    "age": 0,
-                    "nickname": event.sender.nickname,
-                    "sex": "unknown",
-                    "user_id": event.sender.id,
-                },
-                "message_id": msg_id,
-                "user_id": event.sender.id,
-            }
-            
-            return aiocqhttp.Event.from_payload(payload)
 
     @staticmethod
     async def target2yiri(event: aiocqhttp.Event):
@@ -196,6 +135,7 @@ class AiocqhttpEventConverter(adapter.EventConverter):
                 ),
                 message_chain=yiri_chain,
                 time=event.time,
+                source_platform_object=event
             )
             return converted_event
         elif event.message_type == "private":
@@ -207,6 +147,7 @@ class AiocqhttpEventConverter(adapter.EventConverter):
                 ),
                 message_chain=yiri_chain,
                 time=event.time,
+                source_platform_object=event
             )
 
 

pkg/platform/sources/dingtalk.py

@@ -28,16 +28,23 @@ class DingTalkMessageConverter(adapter.MessageConverter):
                 return msg.text
 
     @staticmethod
-    async def target2yiri(event:DingTalkEvent):
+    async def target2yiri(event:DingTalkEvent, bot_name:str):
         yiri_msg_list = []
         yiri_msg_list.append(
-            platform_message.Source(id = '0',time=datetime.datetime.now())
+            platform_message.Source(id = event.incoming_message.message_id,time=datetime.datetime.now())
         )
 
+        for atUser in event.incoming_message.at_users:
+            if atUser.dingtalk_id == event.incoming_message.chatbot_user_id:
+                yiri_msg_list.append(platform_message.At(target=bot_name))
+
         if event.content:
-            yiri_msg_list.append(platform_message.Plain(text=event.content))
+            text_content = event.content.replace("@"+bot_name, '')
+            yiri_msg_list.append(platform_message.Plain(text=text_content))
         if event.picture:
             yiri_msg_list.append(platform_message.Image(base64=event.picture))
+        if event.audio:
+            yiri_msg_list.append(platform_message.Voice(base64=event.audio))
 
         chain = platform_message.MessageChain(yiri_msg_list)
         
@@ -54,33 +61,33 @@ class DingTalkEventConverter(adapter.EventConverter):
 
     @staticmethod
     async def target2yiri(
-        event:DingTalkEvent
+        event:DingTalkEvent,
+        bot_name:str
     ):
         
-        message_chain = await DingTalkMessageConverter.target2yiri(event)
+        message_chain = await DingTalkMessageConverter.target2yiri(event, bot_name)
 
 
         if event.conversation == 'FriendMessage':
 
             return platform_events.FriendMessage(
                 sender=platform_entities.Friend(
-                    id= 0,
+                    id=event.incoming_message.sender_id,
-                    nickname ='nickname',
+                    nickname = event.incoming_message.sender_nick,
                     remark=""
                 ),
                 message_chain = message_chain,
-                time = datetime.datetime.now(),
+                time = event.incoming_message.create_at,
                 source_platform_object=event,
             )
         elif event.conversation == 'GroupMessage':
-            message_chain.insert(0, platform_message.At(target="justbot"))
             sender = platform_entities.GroupMember(
-                id = 111,
+                id = event.incoming_message.sender_id,
-                member_name="name",
+                member_name=event.incoming_message.sender_nick,
                 permission= 'MEMBER',
                 group = platform_entities.Group(
-                    id = 111,
+                    id = event.incoming_message.conversation_id,
-                    name = 'MEMBER',
+                    name = event.incoming_message.conversation_title,
                     permission=platform_entities.Permission.Member
                 ),
                 special_title='',
@@ -88,7 +95,7 @@ class DingTalkEventConverter(adapter.EventConverter):
                 last_speak_timestamp=0,
                 mute_time_remaining=0
             )
-            time = datetime.datetime.now(),
+            time = event.incoming_message.create_at
             return platform_events.GroupMessage(
                 sender =sender,
                 message_chain = message_chain,
@@ -117,6 +124,8 @@ class DingTalkAdapter(adapter.MessagePlatformAdapter):
         missing_keys = [key for key in required_keys if key not in config]
         if missing_keys:
             raise ParamNotEnoughError("钉钉缺少相关配置项，请查看文档或联系管理员")
+
+        self.bot_account_id = self.config["robot_name"]
         
         self.bot = DingTalkClient(
             client_id=config["client_id"],
@@ -143,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,
@@ -153,10 +166,9 @@ class DingTalkAdapter(adapter.MessagePlatformAdapter):
         ],
     ):
         async def on_message(event: DingTalkEvent):
-            self.bot_account_id = 'justbot'
             try:
                 return await callback(
-                    await self.event_converter.target2yiri(event), self
+                    await self.event_converter.target2yiri(event, self.config["robot_name"]), self
                 )
             except:
                 traceback.print_exc()
@@ -167,7 +179,6 @@ class DingTalkAdapter(adapter.MessagePlatformAdapter):
             self.bot.on_message("GroupMessage")(on_message)
 
     async def run_async(self):
-
         await self.bot.start()
 
     async def kill(self) -> bool:

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):
@@ -43,9 +44,11 @@ class GewechatMessageConverter(adapter.MessageConverter):
             elif isinstance(component, platform_message.Plain):
                 content_list.append({"type": "text", "content": component.text})
             elif isinstance(component, platform_message.Image):
-                content_list.append({"type": "image", "url": component.url})
+                if not component.url:
-                # content_list.append({"type": "image", "image_id": component.image_id})
+                    pass
-                #pass
+                content_list.append({"type": "image", "image": component.url})
+
+
             elif isinstance(component, platform_message.Voice):
                 content_list.append({"type": "voice", "url": component.url, "length": component.length})
             elif isinstance(component, platform_message.Forward):
@@ -60,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"])]
 
@@ -86,6 +102,7 @@ class GewechatMessageConverter(adapter.MessageConverter):
                     platform_message.Plain(text="[图片内容为空]")
                 ])
 
+
             try:
                 base64_str, image_format = await image.get_gewechat_image_base64(
                     gewechat_url=self.config["gewechat_url"],
@@ -104,7 +121,7 @@ class GewechatMessageConverter(adapter.MessageConverter):
             except Exception as e:
                 print(f"处理图片消息失败: {str(e)}")
                 return platform_message.MessageChain([
-                    platform_message.Plain(text="[图片处理失败]")
+                    platform_message.Plain(text=f"[图片处理失败]")
                 ])
         elif message["Data"]["MsgType"] == 34:
             audio_base64 = message["Data"]["ImgBuf"]["buffer"]
@@ -115,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_data = ET.fromstring(xml_data)
-                    content_bytes = content.encode('utf-8')
+                # print(xml_data)
-                    decoded_content = base64.b64decode(content_bytes)
+                # 拿到细分消息类型，按照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(
@@ -149,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:
@@ -224,6 +310,16 @@ class GeWeChatAdapter(adapter.MessagePlatformAdapter):
         async def gewechat_callback():
             data = await quart.request.json
             # print(json.dumps(data, indent=4, ensure_ascii=False))
+            self.ap.logger.debug(
+                f"Gewechat callback event: {data}"
+            )
+            
+            if 'data' in data:
+                data['Data'] = data['data']
+            if 'type_name' in data:
+                data['TypeName'] = data['type_name']
+            # print(json.dumps(data, indent=4, ensure_ascii=False))
+
 
             if 'testMsg' in data:
                 return 'ok'
@@ -245,11 +341,31 @@ class GeWeChatAdapter(adapter.MessagePlatformAdapter):
         target_id: str,
         message: platform_message.MessageChain
     ):
-        geweap_msg = await GewechatMessageConverter.yiri2target(message)
+        geweap_msg = await self.message_converter.yiri2target(message)
+        # 此处加上群消息at处理
+        ats = [item["target"] for item in geweap_msg if item["type"] == "at"]
+
 
         for msg in geweap_msg:
+            # at主动发送消息
             if msg['type'] == 'text':
-                await 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':
+
+                self.bot.post_image(app_id=self.config['app_id'], to_wxid=target_id, img_url=msg["image"])
+
+
 
     async def reply_message(
         self,
@@ -278,7 +394,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:
@@ -315,26 +431,28 @@ class GeWeChatAdapter(adapter.MessagePlatformAdapter):
             self.config["token"]
         )
 
-        app_id, error_msg = self.bot.login(self.config["app_id"])
+        def gewechat_login_process():
-        if error_msg:
-            raise Exception(f"Gewechat 登录失败: {error_msg}")
 
-        self.config["app_id"] = app_id
+            app_id, error_msg = self.bot.login(self.config["app_id"])
+            if error_msg:
+                raise Exception(f"Gewechat 登录失败: {error_msg}")
 
-        self.ap.logger.info(f"Gewechat 登录成功，app_id: {app_id}")
+            self.config["app_id"] = app_id
 
-        await self.ap.platform_mgr.write_back_config('gewechat', self, self.config)
+            self.ap.logger.info(f"Gewechat 登录成功，app_id: {app_id}")
 
-        # 获取 nickname
+            self.ap.platform_mgr.write_back_config('gewechat', self, self.config)
-        profile = self.bot.get_profile(self.config["app_id"])
+
-        self.bot_account_id = profile["data"]["nickName"]
+            # 获取 nickname
+            profile = self.bot.get_profile(self.config["app_id"])
+            self.bot_account_id = profile["data"]["nickName"]
+
+            time.sleep(2)
 
-        def thread_set_callback():
-            time.sleep(3)
             ret = self.bot.set_callback(self.config["token"], self.config["callback_url"])
             print('设置 Gewechat 回调：', ret)
 
-        threading.Thread(target=thread_set_callback).start()
+        threading.Thread(target=gewechat_login_process).start()
 
         async def shutdown_trigger_placeholder():
             while True:

pkg/platform/sources/lark.py

@@ -328,6 +328,10 @@ class LarkAdapter(adapter.MessagePlatformAdapter):
             try:
                 data = await quart.request.json
 
+                self.ap.logger.debug(
+                    f"Lark callback event: {data}"
+                )
+
                 if 'encrypt' in data:
                     cipher = AESCipher(self.config['encrypt-key'])
                     data = cipher.decrypt_string(data['encrypt'])

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
-
+from collections import deque
-import aiocqhttp
-import aiohttp
 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
@@ -24,9 +22,6 @@ from ..types import entities as platform_entities
 from ...command.errors import ParamNotEnoughError
 
 
-# 生成的ai回答
-generated_content = {}
-
 class OAMessageConverter(adapter.MessageConverter):
     @staticmethod
     async def yiri2target(message_chain: platform_message.MessageChain):
@@ -70,7 +65,7 @@ class OAEventConverter(adapter.EventConverter):
 
 class OfficialAccountAdapter(adapter.MessagePlatformAdapter):
 
-    bot : OAClient
+    bot : OAClient | OAClientForLongerResponse
     ap : app.Application
     bot_account_id: str
     message_converter: OAMessageConverter = OAMessageConverter()
@@ -88,27 +83,44 @@ 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'],
+        if self.config['Mode'] == "drop":
-            EncodingAESKey=config['EncodingAESKey'],
+            self.bot = OAClient(
-            Appsecret=config['AppSecret'],
+                token=config['token'],
-            AppID=config['AppID'], 
+                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
 
         content = await OAMessageConverter.yiri2target(
             message
         )
+        if type(self.bot) == OAClient:
+            await self.bot.set_message(message_source.message_chain.message_id,content)
+        if type(self.bot) == OAClientForLongerResponse:
+            from_user = message_source.sender.id
+            await self.bot.set_message(from_user,message_source.message_chain.message_id,content)
 
-        generated_content[message_source.message_chain.message_id] = 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
@@ -74,7 +73,11 @@ class QQOfficialEventConverter(adapter.EventConverter):
                 remark = "",
             )
             return platform_events.FriendMessage(
-                sender = friend,message_chain = yiri_chain,time = event.timestamp,
+                sender = friend,message_chain = yiri_chain,time = int(
+                    datetime.datetime.strptime(
+                        event.timestamp, "%Y-%m-%dT%H:%M:%S%z"
+                    ).timestamp()
+                ),
                 source_platform_object=event
             )
         
@@ -96,7 +99,7 @@ class QQOfficialEventConverter(adapter.EventConverter):
                 member_name= event.t,
                 permission= 'MEMBER',
                 group = platform_entities.Group(
-                    id = 0,
+                    id = event.group_openid,
                     name = 'MEMBER',
                     permission= platform_entities.Permission.Member
                 ),
@@ -105,7 +108,11 @@ class QQOfficialEventConverter(adapter.EventConverter):
                 last_speak_timestamp=0,
                 mute_time_remaining=0
             )
-            time = event.timestamp
+            time = int(
+                    datetime.datetime.strptime(
+                        event.timestamp, "%Y-%m-%dT%H:%M:%S%z"
+                    ).timestamp()
+                )
             return platform_events.GroupMessage(
                 sender = sender,
                 message_chain=yiri_chain,
@@ -119,7 +126,7 @@ class QQOfficialEventConverter(adapter.EventConverter):
                 member_name=event.t,
                 permission= 'MEMBER',
                 group = platform_entities.Group(
-                    id = 0,
+                    id = event.channel_id,
                     name = 'MEMBER',
                     permission=platform_entities.Permission.Member
                 ),
@@ -128,7 +135,11 @@ class QQOfficialEventConverter(adapter.EventConverter):
                 last_speak_timestamp=0,
                 mute_time_remaining=0
             )
-            time = event.timestamp,
+            time = int(
+                    datetime.datetime.strptime(
+                        event.timestamp, "%Y-%m-%dT%H:%M:%S%z"
+                    ).timestamp()
+                )
             return platform_events.GroupMessage(
                 sender  =sender,
                 message_chain = yiri_chain,

pkg/platform/sources/wecom.py

@@ -2,18 +2,15 @@ from __future__ import annotations
 import typing
 import asyncio
 import traceback
-import time
+
 import datetime
 
-import aiocqhttp
-import aiohttp
 from libs.wecom_api.api import WecomClient
 from pkg.platform.adapter import MessagePlatformAdapter
 from pkg.platform.types import events as platform_events, message as platform_message
 from libs.wecom_api.wecomevent import WecomEvent
 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
@@ -200,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/platform/types/entities.py

@@ -13,27 +13,20 @@ import pydantic.v1 as pydantic
 class Entity(pydantic.BaseModel):
     """实体，表示一个用户或群。"""
     id: int
-    """QQ 号或群号。"""
+    """ID。"""
-    @abc.abstractmethod
-    def get_avatar_url(self) -> str:
-        """头像图片链接。"""
-
     @abc.abstractmethod
     def get_name(self) -> str:
         """名称。"""
 
 
 class Friend(Entity):
-    """好友。"""
+    """私聊对象。"""
     id: typing.Union[int, str]
-    """QQ 号。"""
+    """ID。"""
     nickname: typing.Optional[str]
     """昵称。"""
     remark: typing.Optional[str]
     """备注。"""
-    def get_avatar_url(self) -> str:
-        return f'http://q4.qlogo.cn/g?b=qq&nk={self.id}&s=140'
-
     def get_name(self) -> str:
         return self.nickname or self.remark or ''
 
@@ -59,8 +52,6 @@ class Group(Entity):
     """群名称。"""
     permission: Permission
     """Bot 在群中的权限。"""
-    def get_avatar_url(self) -> str:
-        return f'https://p.qlogo.cn/gh/{self.id}/{self.id}/'
 
     def get_name(self) -> str:
         return self.name
@@ -69,11 +60,11 @@ class Group(Entity):
 class GroupMember(Entity):
     """群成员。"""
     id: typing.Union[int, str]
-    """QQ 号。"""
+    """群员 ID。"""
     member_name: str
-    """群成员名称。"""
+    """群员名称。"""
     permission: Permission
-    """Bot 在群中的权限。"""
+    """在群中的权限。"""
     group: Group
     """群。"""
     special_title: str = ''
@@ -84,61 +75,6 @@ class GroupMember(Entity):
     """最后一次发言的时间。"""
     mute_time_remaining: int = 0
     """禁言剩余时间。"""
-    def get_avatar_url(self) -> str:
-        return f'http://q4.qlogo.cn/g?b=qq&nk={self.id}&s=140'
 
     def get_name(self) -> str:
         return self.member_name
-
-
-class Client(Entity):
-    """来自其他客户端的用户。"""
-    id: typing.Union[int, str]
-    """识别 id。"""
-    platform: str
-    """来源平台。"""
-    def get_avatar_url(self) -> str:
-        raise NotImplementedError
-
-    def get_name(self) -> str:
-        return self.platform
-
-
-class Subject(pydantic.BaseModel):
-    """另一种实体类型表示。"""
-    id: typing.Union[int, str]
-    """QQ 号或群号。"""
-    kind: typing.Literal['Friend', 'Group', 'Stranger']
-    """类型。"""
-
-
-class Config(pydantic.BaseModel):
-    """配置项类型。"""
-    def modify(self, **kwargs) -> 'Config':
-        """修改部分设置。"""
-        for k, v in kwargs.items():
-            if k in self.__fields__:
-                setattr(self, k, v)
-            else:
-                raise ValueError(f'未知配置项: {k}')
-        return self
-
-
-class GroupConfigModel(Config):
-    """群配置。"""
-    name: str
-    """群名称。"""
-    confess_talk: bool
-    """是否允许坦白说。"""
-    allow_member_invite: bool
-    """是否允许成员邀请好友入群。"""
-    auto_approve: bool
-    """是否开启自动审批入群。"""
-    anonymous_chat: bool
-    """是否开启匿名聊天。"""
-    announcement: str = ''
-    """群公告。"""
-
-
-class MemberInfoModel(Config, GroupMember):
-    """群成员信息。"""

pkg/platform/types/events.py

@@ -43,21 +43,6 @@ class Event(pydantic.BaseModel):
             return Event
 
 
-###############################
-# Bot Event
-class BotEvent(Event):
-    """Bot 自身事件。
-
-    Args:
-        type: 事件名。
-        qq: Bot 的 QQ 号。
-    """
-    type: str
-    """事件名。"""
-    qq: int
-    """Bot 的 QQ 号。"""
-
-
 ###############################
 # Message Event
 class MessageEvent(Event):
@@ -72,6 +57,9 @@ class MessageEvent(Event):
     message_chain: platform_message.MessageChain
     """消息内容。"""
 
+    time: float | None = None
+    """消息发送时间戳。"""
+
     source_platform_object: typing.Optional[typing.Any] = None
     """原消息平台对象。
     供消息平台适配器开发者使用，如果回复用户时需要使用原消息事件对象的信息，
@@ -79,7 +67,7 @@ class MessageEvent(Event):
 
 
 class FriendMessage(MessageEvent):
-    """好友消息。
+    """私聊消息。
 
     Args:
         type: 事件名。
@@ -111,19 +99,3 @@ class GroupMessage(MessageEvent):
     @property
     def group(self) -> platform_entities.Group:
         return self.sender.group
-
-
-class StrangerMessage(MessageEvent):
-    """陌生人消息。
-
-    Args:
-        type: 事件名。
-        sender: 发送消息的人。
-        message_chain: 消息内容。
-    """
-    type: str = 'StrangerMessage'
-    """事件名。"""
-    sender: platform_entities.Friend
-    """发送消息的人。"""
-    message_chain: platform_message.MessageChain
-    """消息内容。"""

pkg/platform/types/message.py

@@ -116,18 +116,6 @@ class MessageChain(PlatformBaseModel):
         print('At Me')
     ```
 
-    消息链对索引操作进行了增强。以消息组件类型为索引，获取消息链中的全部该类型的消息组件。
-    ```py
-    plain_list = message_chain[Plain]
-    '[Plain("Hello World!")]'
-    ```
-
-    可以用加号连接两个消息链。
-    ```py
-    MessageChain(['Hello World!']) + MessageChain(['Goodbye World!'])
-    # 返回 MessageChain([Plain("Hello World!"), Plain("Goodbye World!")])
-    ```
-
     """
     __root__: typing.List[MessageComponent]
 
@@ -488,9 +476,9 @@ class Quote(MessageComponent):
     group_id: typing.Optional[typing.Union[int, str]] = None
     """被引用回复的原消息所接收的群号，当为好友消息时为0。"""
     sender_id: typing.Optional[typing.Union[int, str]] = None
-    """被引用回复的原消息的发送者的QQ号。"""
+    """被引用回复的原消息的发送者的ID。"""
     target_id: typing.Optional[typing.Union[int, str]] = None
-    """被引用回复的原消息的接收者者的QQ号（或群号）。"""
+    """被引用回复的原消息的接收者者的ID或群ID。"""
     origin: MessageChain
     """被引用回复的原消息的消息链对象。"""
 
@@ -504,7 +492,7 @@ class At(MessageComponent):
     type: str = "At"
     """消息组件类型。"""
     target: typing.Union[int, str]
-    """群员 QQ 号。"""
+    """群员 ID。"""
     display: typing.Optional[str] = None
     """At时显示的文字，发送消息时无效，自动使用群名片。"""
     def __eq__(self, other):
@@ -527,9 +515,9 @@ class Image(MessageComponent):
     type: str = "Image"
     """消息组件类型。"""
     image_id: typing.Optional[str] = None
-    """图片的 image_id，群图片与好友图片格式不同。不为空时将忽略 url 属性。"""
+    """图片的 image_id，不为空时将忽略 url 属性。"""
     url: typing.Optional[pydantic.HttpUrl] = None
-    """图片的 URL，发送时可作网络图片的链接；接收时为腾讯图片服务器的链接，可用于图片下载。"""
+    """图片的 URL，发送时可作网络图片的链接；接收时为图片的链接，可用于图片下载。"""
     path: typing.Union[str, Path, None] = None
     """图片的路径，发送本地图片。"""
     base64: typing.Optional[str] = None
@@ -663,7 +651,7 @@ class Voice(MessageComponent):
     voice_id: typing.Optional[str] = None
     """语音的 voice_id，不为空时将忽略 url 属性。"""
     url: typing.Optional[str] = None
-    """语音的 URL，发送时可作网络语音的链接；接收时为腾讯语音服务器的链接，可用于语音下载。"""
+    """语音的 URL，发送时可作网络语音的链接；接收时为语音文件的链接，可用于语音下载。"""
     path: typing.Optional[str] = None
     """语音的路径，发送本地语音。"""
     base64: typing.Optional[str] = None
@@ -691,8 +679,6 @@ class Voice(MessageComponent):
     ):
         """下载语音到本地。
 
-        语音采用 silk v3 格式，silk 格式的编码解码请使用 [graiax-silkcoder](https://pypi.org/project/graiax-silkcoder/)。
-
         Args:
             filename: 下载到本地的文件路径。与 `directory` 二选一。
             directory: 下载到本地的文件夹路径。与 `filename` 二选一。
@@ -750,13 +736,13 @@ class Voice(MessageComponent):
 class ForwardMessageNode(pydantic.BaseModel):
     """合并转发中的一条消息。"""
     sender_id: typing.Optional[typing.Union[int, str]] = None
-    """发送人QQ号。"""
+    """发送人ID。"""
     sender_name: typing.Optional[str] = None
     """显示名称。"""
     message_chain: typing.Optional[MessageChain] = None
     """消息内容。"""
     message_id: typing.Optional[int] = None
-    """消息的 message_id，可以只使用此属性，从缓存中读取消息内容。"""
+    """消息的 message_id。"""
     time: typing.Optional[datetime] = None
     """发送时间。"""
     @pydantic.validator('message_chain', check_fields=False)

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:
-        if len(repo) > 0:  # github
             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/modelmgr/modelmgr.py

@@ -4,7 +4,7 @@ import aiohttp
 
 from . import entities, requester
 from ...core import app
-
+from ...discover import engine
 from . import token
 from .requesters import bailianchatcmpl, chatcmpl, anthropicmsgs, moonshotchatcmpl, deepseekchatcmpl, ollamachat, giteeaichatcmpl, volcarkchatcmpl, xaichatcmpl, zhipuaichatcmpl, lmstudiochatcmpl, siliconflowchatcmpl, volcarkchatcmpl
 
@@ -16,6 +16,8 @@ class ModelManager:
 
     ap: app.Application
 
+    requester_components: list[engine.Component]
+
     model_list: list[entities.LLMModelInfo]
 
     requesters: dict[str, requester.LLMAPIRequester]
@@ -38,14 +40,21 @@ class ModelManager:
     
     async def initialize(self):
 
+        self.requester_components = self.ap.discover.get_components_by_kind('LLMAPIRequester')
+
         # 初始化token_mgr, requester
         for k, v in self.ap.provider_cfg.data['keys'].items():
             self.token_mgrs[k] = token.TokenManager(k, v)
 
-        for api_cls in requester.preregistered_requesters:
+        # for api_cls in requester.preregistered_requesters:
+        #     api_inst = api_cls(self.ap)
+        #     await api_inst.initialize()
+        #     self.requesters[api_inst.name] = api_inst
+        for component in self.requester_components:
+            api_cls = component.get_python_component_class()
             api_inst = api_cls(self.ap)
             await api_inst.initialize()
-            self.requesters[api_inst.name] = api_inst
+            self.requesters[component.metadata.name] = api_inst
 
         # 尝试从api获取最新的模型信息
         try:

pkg/provider/modelmgr/requester.py

@@ -10,18 +10,6 @@ from . import entities as modelmgr_entities
 from ..tools import entities as tools_entities
 
 
-preregistered_requesters: list[typing.Type[LLMAPIRequester]] = []
-
-def requester_class(name: str):
-
-    def decorator(cls: typing.Type[LLMAPIRequester]) -> typing.Type[LLMAPIRequester]:
-        cls.name = name
-        preregistered_requesters.append(cls)
-        return cls
-
-    return decorator
-
-
 class LLMAPIRequester(metaclass=abc.ABCMeta):
     """LLM API请求器
     """

pkg/provider/modelmgr/requesters/anthropicmsgs.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import typing
+import json
 import traceback
 import base64
 
@@ -16,7 +17,6 @@ from ...tools import entities as tools_entities
 from ....utils import image
 
 
-@requester.requester_class("anthropic-messages")
 class AnthropicMessages(requester.LLMAPIRequester):
     """Anthropic Messages API 请求器"""
 
@@ -25,7 +25,7 @@ class AnthropicMessages(requester.LLMAPIRequester):
     async def initialize(self):
 
         httpx_client = anthropic._base_client.AsyncHttpxClientWrapper(
-            base_url=self.ap.provider_cfg.data['requester']['anthropic-messages']['base-url'],
+            base_url=self.ap.provider_cfg.data['requester']['anthropic-messages']['base-url'].replace(' ', ''),
             # cast to a valid type because mypy doesn't understand our type narrowing
             timeout=typing.cast(httpx.Timeout, self.ap.provider_cfg.data['requester']['anthropic-messages']['timeout']),
             limits=anthropic._constants.DEFAULT_CONNECTION_LIMITS,
@@ -59,9 +59,11 @@ class AnthropicMessages(requester.LLMAPIRequester):
             if m.role == "system":
                 system_role_message = m
 
-                messages.pop(i)
                 break
 
+        if system_role_message:
+            messages.pop(i)
+
         if isinstance(system_role_message, llm_entities.Message) \
             and isinstance(system_role_message.content, str):
             args['system'] = system_role_message.content
@@ -69,11 +71,32 @@ class AnthropicMessages(requester.LLMAPIRequester):
         req_messages = []
 
         for m in messages:
-            if isinstance(m.content, str) and m.content.strip() != "":
+            if m.role == 'tool':
-                req_messages.append(m.dict(exclude_none=True))
+                tool_call_id = m.tool_call_id
-            elif isinstance(m.content, list):
 
-                msg_dict = m.dict(exclude_none=True)
+                req_messages.append({
+                    "role": "user",
+                    "content": [
+                        {
+                            "type": "tool_result",
+                            "tool_use_id": tool_call_id,
+                            "content": m.content
+                        }
+                    ]
+                })
+
+                continue
+
+            msg_dict = m.dict(exclude_none=True)
+
+            if isinstance(m.content, str) and m.content.strip() != "":
+                msg_dict["content"] = [
+                    {
+                        "type": "text",
+                        "text": m.content
+                    }
+                ]
+            elif isinstance(m.content, list):
 
                 for i, ce in enumerate(m.content):
 
@@ -90,25 +113,60 @@ class AnthropicMessages(requester.LLMAPIRequester):
                         }
                         msg_dict["content"][i] = alter_image_ele
 
-                req_messages.append(msg_dict)
+            if m.tool_calls:
+
+                for tool_call in m.tool_calls:
+                    msg_dict["content"].append({
+                        "type": "tool_use",
+                        "id": tool_call.id,
+                        "name": tool_call.function.name,
+                        "input": json.loads(tool_call.function.arguments)
+                    })
+
+                del msg_dict["tool_calls"]
+
+            req_messages.append(msg_dict)
+                
 
         args["messages"] = req_messages
+        
+        if funcs:
+            tools = await self.ap.tool_mgr.generate_tools_for_anthropic(funcs)
 
-        # anthropic的tools处在beta阶段，sdk不稳定，故暂时不支持
+            if tools:
-        #
+                args["tools"] = tools
-        # if funcs:
-        #     tools = await self.ap.tool_mgr.generate_tools_for_openai(funcs)
-
-        #     if tools:
-        #         args["tools"] = tools
 
         try:
+            # print(json.dumps(args, indent=4, ensure_ascii=False))
             resp = await self.client.messages.create(**args)
 
-            return llm_entities.Message(
+            args = {
-                content=resp.content[0].text,
+                'content': '',
-                role=resp.role
+                'role': resp.role,
-            )
+            }
+            
+            assert type(resp) is anthropic.types.message.Message
+
+            for block in resp.content:
+                if block.type == 'thinking':
+                    args['content'] = '<think>' + block.thinking + '</think>\n' + args['content']
+                elif block.type == 'text':
+                    args['content'] += block.text
+                elif block.type == 'tool_use':
+                    assert type(block) is anthropic.types.tool_use_block.ToolUseBlock
+                    tool_call = llm_entities.ToolCall(
+                        id=block.id,
+                        type="function",
+                        function=llm_entities.FunctionCall(
+                            name=block.name,
+                            arguments=json.dumps(block.input)
+                        )
+                    )
+                    if 'tool_calls' not in args:
+                        args['tool_calls'] = []
+                    args['tool_calls'].append(tool_call)
+
+            return llm_entities.Message(**args)
         except anthropic.AuthenticationError as e:
             raise errors.RequesterError(f'api-key 无效: {e.message}')
         except anthropic.BadRequestError as e:

pkg/provider/modelmgr/requesters/anthropicmsgs.yaml

@@ -0,0 +1,34 @@
+apiVersion: v1
+kind: LLMAPIRequester
+metadata:
+  name: anthropic-messages
+  label:
+    en_US: Anthropic
+    zh_CN: Anthropic
+spec:
+  config:
+    - name: base-url
+      label:
+        en_US: Base URL
+        zh_CN: 基础 URL
+      type: string
+      required: true
+      default: "https://api.anthropic.com/v1"
+    - name: args
+      label:
+        en_US: Args
+        zh_CN: 附加参数
+      type: object
+      required: true
+      default: {}
+    - name: timeout
+      label:
+        en_US: Timeout
+        zh_CN: 超时时间
+      type: int
+      required: true
+      default: 120
+execution:
+  python:
+    path: ./anthropicmsgs.py
+    attr: AnthropicMessages

pkg/provider/modelmgr/requesters/bailianchatcmpl.py

@@ -7,7 +7,6 @@ from .. import requester
 from ....core import app
 
 
-@requester.requester_class("bailian-chat-completions")
 class BailianChatCompletions(chatcmpl.OpenAIChatCompletions):
     """阿里云百炼大模型平台 ChatCompletion API 请求器"""
 

pkg/provider/modelmgr/requesters/bailianchatcmpl.yaml

@@ -0,0 +1,34 @@
+apiVersion: v1
+kind: LLMAPIRequester
+metadata:
+  name: bailian-chat-completions
+  label:
+    en_US: Aliyun Bailian
+    zh_CN: 阿里云百炼
+spec:
+  config:
+    - name: base-url
+      label:
+        en_US: Base URL
+        zh_CN: 基础 URL
+      type: string
+      required: true
+      default: "https://dashscope.aliyuncs.com/compatible-mode/v1"
+    - name: args
+      label:
+        en_US: Args
+        zh_CN: 附加参数
+      type: object
+      required: true
+      default: {}
+    - name: timeout
+      label:
+        en_US: Timeout
+        zh_CN: 超时时间
+      type: int
+      required: true
+      default: 120
+execution:
+  python:
+    path: ./bailianchatcmpl.py
+    attr: BailianChatCompletions

pkg/provider/modelmgr/requesters/chatcmpl.py

@@ -20,7 +20,6 @@ from ...tools import entities as tools_entities
 from ....utils import image
 
 
-@requester.requester_class("openai-chat-completions")
 class OpenAIChatCompletions(requester.LLMAPIRequester):
     """OpenAI ChatCompletion API 请求器"""
 
@@ -37,7 +36,7 @@ class OpenAIChatCompletions(requester.LLMAPIRequester):
 
         self.client = openai.AsyncClient(
             api_key="",
-            base_url=self.requester_cfg['base-url'],
+            base_url=self.requester_cfg['base-url'].replace(' ', ''),
             timeout=self.requester_cfg['timeout'],
             http_client=httpx.AsyncClient(
                 trust_env=True,
@@ -48,8 +47,9 @@ class OpenAIChatCompletions(requester.LLMAPIRequester):
     async def _req(
         self,
         args: dict,
+        extra_body: dict = {},
     ) -> chat_completion.ChatCompletion:
-        return await self.client.chat.completions.create(**args)
+        return await self.client.chat.completions.create(**args, extra_body=extra_body)
 
     async def _make_msg(
         self,
@@ -74,7 +74,7 @@ class OpenAIChatCompletions(requester.LLMAPIRequester):
     ) -> llm_entities.Message:
         self.client.api_key = use_model.token_mgr.get_token()
 
-        args = self.requester_cfg['args'].copy()
+        args = {}
         args["model"] = use_model.name if use_model.model_name is None else use_model.model_name
 
         if use_funcs:
@@ -100,7 +100,7 @@ class OpenAIChatCompletions(requester.LLMAPIRequester):
         args["messages"] = messages
 
         # 发送请求
-        resp = await self._req(args)
+        resp = await self._req(args, extra_body=self.requester_cfg['args'])
 
         # 处理请求结果
         message = await self._make_msg(resp)

pkg/provider/modelmgr/requesters/chatcmpl.yaml

@@ -0,0 +1,34 @@
+apiVersion: v1
+kind: LLMAPIRequester
+metadata:
+  name: openai-chat-completions
+  label:
+    en_US: OpenAI
+    zh_CN: OpenAI
+spec:
+  config:
+    - name: base-url
+      label:
+        en_US: Base URL
+        zh_CN: 基础 URL
+      type: string
+      required: true
+      default: "https://api.openai.com/v1"
+    - name: args
+      label:
+        en_US: Args
+        zh_CN: 附加参数
+      type: object
+      required: true
+      default: {}
+    - name: timeout
+      label:
+        en_US: Timeout
+        zh_CN: 超时时间
+      type: int
+      required: true
+      default: 120
+execution:
+  python:
+    path: ./chatcmpl.py
+    attr: OpenAIChatCompletions

pkg/provider/modelmgr/requesters/deepseekchatcmpl.py

@@ -7,7 +7,6 @@ from ... import entities as llm_entities
 from ...tools import entities as tools_entities
 
 
-@requester.requester_class("deepseek-chat-completions")
 class DeepseekChatCompletions(chatcmpl.OpenAIChatCompletions):
     """Deepseek ChatCompletion API 请求器"""
 
@@ -24,7 +23,7 @@ class DeepseekChatCompletions(chatcmpl.OpenAIChatCompletions):
     ) -> llm_entities.Message:
         self.client.api_key = use_model.token_mgr.get_token()
 
-        args = self.requester_cfg['args'].copy()
+        args = {}
         args["model"] = use_model.name if use_model.model_name is None else use_model.model_name
 
         if use_funcs:
@@ -44,7 +43,7 @@ class DeepseekChatCompletions(chatcmpl.OpenAIChatCompletions):
         args["messages"] = messages
 
         # 发送请求
-        resp = await self._req(args)
+        resp = await self._req(args, extra_body=self.requester_cfg['args'])
 
         if resp is None:
             raise errors.RequesterError('接口返回为空，请确定模型提供商服务是否正常')

pkg/provider/modelmgr/requesters/deepseekchatcmpl.yaml

@@ -0,0 +1,34 @@
+apiVersion: v1
+kind: LLMAPIRequester
+metadata:
+  name: deepseek-chat-completions
+  label:
+    en_US: DeepSeek
+    zh_CN: 深度求索
+spec:
+  config:
+    - name: base-url
+      label:
+        en_US: Base URL
+        zh_CN: 基础 URL
+      type: string
+      required: true
+      default: "https://api.deepseek.com"
+    - name: args
+      label:
+        en_US: Args
+        zh_CN: 附加参数
+      type: object
+      required: true
+      default: {}
+    - name: timeout
+      label:
+        en_US: Timeout
+        zh_CN: 超时时间
+      type: int
+      required: true
+      default: 120
+execution:
+  python:
+    path: ./deepseekchatcmpl.py
+    attr: DeepseekChatCompletions

pkg/provider/modelmgr/requesters/giteeaichatcmpl.py

@@ -14,7 +14,6 @@ from ...tools import entities as tools_entities
 from .. import entities as modelmgr_entities
 
 
-@requester.requester_class("gitee-ai-chat-completions")
 class GiteeAIChatCompletions(chatcmpl.OpenAIChatCompletions):
     """Gitee AI ChatCompletions API 请求器"""
 
@@ -31,7 +30,7 @@ class GiteeAIChatCompletions(chatcmpl.OpenAIChatCompletions):
     ) -> llm_entities.Message:
         self.client.api_key = use_model.token_mgr.get_token()
 
-        args = self.requester_cfg['args'].copy()
+        args = {}
         args["model"] = use_model.name if use_model.model_name is None else use_model.model_name
 
         if use_funcs:
@@ -47,7 +46,7 @@ class GiteeAIChatCompletions(chatcmpl.OpenAIChatCompletions):
 
         args["messages"] = req_messages
 
-        resp = await self._req(args)
+        resp = await self._req(args, extra_body=self.requester_cfg['args'])
 
         message = await self._make_msg(resp)
 

pkg/provider/modelmgr/requesters/giteeaichatcmpl.yaml

@@ -0,0 +1,34 @@
+apiVersion: v1
+kind: LLMAPIRequester
+metadata:
+  name: gitee-ai-chat-completions
+  label:
+    en_US: Gitee AI
+    zh_CN: Gitee AI
+spec:
+  config:
+    - name: base-url
+      label:
+        en_US: Base URL
+        zh_CN: 基础 URL
+      type: string
+      required: true
+      default: "https://ai.gitee.com/v1"
+    - name: args
+      label:
+        en_US: Args
+        zh_CN: 附加参数
+      type: object
+      required: true
+      default: {}
+    - name: timeout
+      label:
+        en_US: Timeout
+        zh_CN: 超时时间
+      type: int
+      required: true
+      default: 120
+execution:
+  python:
+    path: ./giteeaichatcmpl.py
+    attr: GiteeAIChatCompletions

pkg/provider/modelmgr/requesters/lmstudiochatcmpl.py

@@ -7,7 +7,6 @@ from .. import requester
 from ....core import app
 
 
-@requester.requester_class("lmstudio-chat-completions")
 class LmStudioChatCompletions(chatcmpl.OpenAIChatCompletions):
     """LMStudio ChatCompletion API 请求器"""
 

pkg/provider/modelmgr/requesters/lmstudiochatcmpl.yaml

@@ -0,0 +1,34 @@
+apiVersion: v1
+kind: LLMAPIRequester
+metadata:
+  name: lmstudio-chat-completions
+  label:
+    en_US: LM Studio
+    zh_CN: LM Studio
+spec:
+  config:
+    - name: base-url
+      label:
+        en_US: Base URL
+        zh_CN: 基础 URL
+      type: string
+      required: true
+      default: "http://127.0.0.1:1234/v1"
+    - name: args
+      label:
+        en_US: Args
+        zh_CN: 附加参数
+      type: object
+      required: true
+      default: {}
+    - name: timeout
+      label:
+        en_US: Timeout
+        zh_CN: 超时时间
+      type: int
+      required: true
+      default: 120
+execution:
+  python:
+    path: ./lmstudiochatcmpl.py
+    attr: LmStudioChatCompletions

pkg/provider/modelmgr/requesters/moonshotchatcmpl.py

@@ -9,7 +9,6 @@ from ... import entities as llm_entities
 from ...tools import entities as tools_entities
 
 
-@requester.requester_class("moonshot-chat-completions")
 class MoonshotChatCompletions(chatcmpl.OpenAIChatCompletions):
     """Moonshot ChatCompletion API 请求器"""
 
@@ -26,7 +25,7 @@ class MoonshotChatCompletions(chatcmpl.OpenAIChatCompletions):
     ) -> llm_entities.Message:
         self.client.api_key = use_model.token_mgr.get_token()
 
-        args = self.requester_cfg['args'].copy()
+        args = {}
         args["model"] = use_model.name if use_model.model_name is None else use_model.model_name
 
         if use_funcs:
@@ -49,7 +48,7 @@ class MoonshotChatCompletions(chatcmpl.OpenAIChatCompletions):
         args["messages"] = messages
 
         # 发送请求
-        resp = await self._req(args)
+        resp = await self._req(args, extra_body=self.requester_cfg['args'])
 
         # 处理请求结果
         message = await self._make_msg(resp)

pkg/provider/modelmgr/requesters/moonshotchatcmpl.yaml

@@ -0,0 +1,34 @@
+apiVersion: v1
+kind: LLMAPIRequester
+metadata:
+  name: moonshot-chat-completions
+  label:
+    en_US: Moonshot
+    zh_CN: 月之暗面
+spec:
+  config:
+    - name: base-url
+      label:
+        en_US: Base URL
+        zh_CN: 基础 URL
+      type: string
+      required: true
+      default: "https://api.moonshot.com/v1"
+    - name: args
+      label:
+        en_US: Args
+        zh_CN: 附加参数
+      type: object
+      required: true
+      default: {}
+    - name: timeout
+      label:
+        en_US: Timeout
+        zh_CN: 超时时间
+      type: int
+      required: true
+      default: 120
+execution:
+  python:
+    path: ./moonshotchatcmpl.py
+    attr: MoonshotChatCompletions

pkg/provider/modelmgr/requesters/ollamachat.py

@@ -20,7 +20,6 @@ from ....utils import image
 REQUESTER_NAME: str = "ollama-chat"
 
 
-@requester.requester_class(REQUESTER_NAME)
 class OllamaChatCompletions(requester.LLMAPIRequester):
     """Ollama平台 ChatCompletion API请求器"""
     client: ollama.AsyncClient

pkg/provider/modelmgr/requesters/ollamachat.yaml

@@ -0,0 +1,34 @@
+apiVersion: v1
+kind: LLMAPIRequester
+metadata:
+  name: ollama-chat
+  label:
+    en_US: Ollama
+    zh_CN: Ollama
+spec:
+  config:
+    - name: base-url
+      label:
+        en_US: Base URL
+        zh_CN: 基础 URL
+      type: string
+      required: true
+      default: "http://127.0.0.1:11434"
+    - name: args
+      label:
+        en_US: Args
+        zh_CN: 附加参数
+      type: object
+      required: true
+      default: {}
+    - name: timeout
+      label:
+        en_US: Timeout
+        zh_CN: 超时时间
+      type: int
+      required: true
+      default: 120
+execution:
+  python:
+    path: ./ollamachat.py
+    attr: OllamaChatCompletions

pkg/provider/modelmgr/requesters/siliconflowchatcmpl.py

@@ -7,7 +7,6 @@ from .. import requester
 from ....core import app
 
 
-@requester.requester_class("siliconflow-chat-completions")
 class SiliconFlowChatCompletions(chatcmpl.OpenAIChatCompletions):
     """SiliconFlow ChatCompletion API 请求器"""
 

pkg/provider/modelmgr/requesters/siliconflowchatcmpl.yaml

@@ -0,0 +1,34 @@
+apiVersion: v1
+kind: LLMAPIRequester
+metadata:
+  name: siliconflow-chat-completions
+  label:
+    en_US: SiliconFlow
+    zh_CN: 硅基流动
+spec:
+  config:
+    - name: base-url
+      label:
+        en_US: Base URL
+        zh_CN: 基础 URL
+      type: string
+      required: true
+      default: "https://api.siliconflow.cn/v1"
+    - name: args
+      label:
+        en_US: Args
+        zh_CN: 附加参数
+      type: object
+      required: true
+      default: {}
+    - name: timeout
+      label:
+        en_US: Timeout
+        zh_CN: 超时时间
+      type: int
+      required: true
+      default: 120
+execution:
+  python:
+    path: ./siliconflowchatcmpl.py
+    attr: SiliconFlowChatCompletions

pkg/provider/modelmgr/requesters/volcarkchatcmpl.py

@@ -7,7 +7,6 @@ from .. import requester
 from ....core import app
 
 
-@requester.requester_class("volcark-chat-completions")
 class VolcArkChatCompletions(chatcmpl.OpenAIChatCompletions):
     """火山方舟大模型平台 ChatCompletion API 请求器"""
 

pkg/provider/modelmgr/requesters/volcarkchatcmpl.yaml

@@ -0,0 +1,34 @@
+apiVersion: v1
+kind: LLMAPIRequester
+metadata:
+  name: volcark-chat-completions
+  label:
+    en_US: Volc Engine Ark
+    zh_CN: 火山方舟
+spec:
+  config:
+    - name: base-url
+      label:
+        en_US: Base URL
+        zh_CN: 基础 URL
+      type: string
+      required: true
+      default: "https://ark.cn-beijing.volces.com/api/v3"
+    - name: args
+      label:
+        en_US: Args
+        zh_CN: 附加参数
+      type: object
+      required: true
+      default: {}
+    - name: timeout
+      label:
+        en_US: Timeout
+        zh_CN: 超时时间
+      type: int
+      required: true
+      default: 120
+execution:
+  python:
+    path: ./volcarkchatcmpl.py
+    attr: VolcArkChatCompletions

pkg/provider/modelmgr/requesters/xaichatcmpl.py

@@ -7,7 +7,6 @@ from .. import requester
 from ....core import app
 
 
-@requester.requester_class("xai-chat-completions")
 class XaiChatCompletions(chatcmpl.OpenAIChatCompletions):
     """xAI ChatCompletion API 请求器"""
 

pkg/provider/modelmgr/requesters/xaichatcmpl.yaml

@@ -0,0 +1,34 @@
+apiVersion: v1
+kind: LLMAPIRequester
+metadata:
+  name: xai-chat-completions
+  label:
+    en_US: xAI
+    zh_CN: xAI
+spec:
+  config:
+    - name: base-url
+      label:
+        en_US: Base URL
+        zh_CN: 基础 URL
+      type: string
+      required: true
+      default: "https://api.x.ai/v1"
+    - name: args
+      label:
+        en_US: Args
+        zh_CN: 附加参数
+      type: object
+      required: true
+      default: {}
+    - name: timeout
+      label:
+        en_US: Timeout
+        zh_CN: 超时时间
+      type: int
+      required: true
+      default: 120
+execution:
+  python:
+    path: ./xaichatcmpl.py
+    attr: XaiChatCompletions

pkg/provider/modelmgr/requesters/zhipuaichatcmpl.py

@@ -7,7 +7,6 @@ from . import chatcmpl
 from .. import requester
 
 
-@requester.requester_class("zhipuai-chat-completions")
 class ZhipuAIChatCompletions(chatcmpl.OpenAIChatCompletions):
     """智谱AI ChatCompletion API 请求器"""
 

pkg/provider/modelmgr/requesters/zhipuaichatcmpl.yaml

@@ -0,0 +1,34 @@
+apiVersion: v1
+kind: LLMAPIRequester
+metadata:
+  name: zhipuai-chat-completions
+  label:
+    en_US: ZhipuAI
+    zh_CN: 智谱 AI
+spec:
+  config:
+    - name: base-url
+      label:
+        en_US: Base URL
+        zh_CN: 基础 URL
+      type: string
+      required: true
+      default: "https://open.bigmodel.cn/api/paas/v4"
+    - name: args
+      label:
+        en_US: Args
+        zh_CN: 附加参数
+      type: object
+      required: true
+      default: {}
+    - name: timeout
+      label:
+        en_US: Timeout
+        zh_CN: 超时时间
+      type: int
+      required: true
+      default: 120
+execution:
+  python:
+    path: ./zhipuaichatcmpl.py
+    attr: ZhipuAIChatCompletions

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

@@ -5,6 +5,7 @@ import json
 import uuid
 import re
 import base64
+import datetime
 
 import aiohttp
 
@@ -69,6 +70,7 @@ class DifyServiceAPIRunner(runner.RequestRunner):
         """
         plain_text = ""
         image_ids = []
+
         if isinstance(query.user_message.content, list):
             for ce in query.user_message.content:
                 if ce.type == "text":
@@ -109,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,
@@ -160,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",
@@ -215,6 +225,8 @@ class DifyServiceAPIRunner(runner.RequestRunner):
                         role="assistant",
                         content=[llm_entities.ContentElement.from_image_url(image_url)],
                     )
+            if chunk['event'] == 'error':
+                raise errors.DifyAPIError("dify 服务错误: " + chunk['message'])
 
         query.session.using_conversation.uuid = chunk["conversation_id"]
 
@@ -225,8 +237,8 @@ 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)
 
@@ -241,12 +253,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={
+            inputs=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,
-            },
             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(
+        for loader_cls in tools_loader.preregistered_loaders:
-        self, name: str
+            loader_inst = loader_cls(self.ap)
-    ) -> typing.Tuple[entities.LLMFunction, plugin_context.BasePlugin]:
+            await loader_inst.initialize()
-        """获取函数和插件实例"""
+            self.loaders.append(loader_inst)
-        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 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(
+        for loader in self.loaders:
-            enabled=plugin_enabled, status=plugin_status
+            all_functions.extend(await loader.get_tools(plugin_enabled))
-        ):
-            all_functions.extend(plugin.content_functions)
 
         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)
+    async def shutdown(self):
-            if function is None:
+        """关闭所有工具"""
-                return None
+        for loader in self.loaders:
-
+            await loader.shutdown()
-            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,
-                )

pkg/utils/constants.py

@@ -1,4 +1,4 @@
-semantic_version = "v3.4.9.5"
+semantic_version = "v3.4.11.2"
 
 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/metadata/llm-models.json

@@ -74,19 +74,29 @@
             "name": "claude-3-opus-latest",
             "requester": "anthropic-messages",
             "token_mgr": "anthropic",
-            "vision_supported": true
+            "vision_supported": true,
+            "tool_call_supported": true
         },
         {
             "name": "claude-3-5-sonnet-latest",
             "requester": "anthropic-messages",
             "token_mgr": "anthropic",
-            "vision_supported": true
+            "vision_supported": true,
+            "tool_call_supported": true
         },
         {
             "name": "claude-3-5-haiku-latest",
             "requester": "anthropic-messages",
             "token_mgr": "anthropic",
-            "vision_supported": true
+            "vision_supported": true,
+            "tool_call_supported": true
+        },
+        {
+            "name": "claude-3-7-sonnet-latest",
+            "requester": "anthropic-messages",
+            "token_mgr": "anthropic",
+            "vision_supported": true,
+            "tool_call_supported": true
         },
         {
             "name": "moonshot-v1-8k",
@@ -156,61 +166,72 @@
         {
             "name": "glm-4-plus",
             "requester": "zhipuai-chat-completions",
-            "token_mgr": "zhipuai"
+            "token_mgr": "zhipuai",
+            "tool_call_supported": true
         },
         {
             "name": "glm-4-0520",
             "requester": "zhipuai-chat-completions",
-            "token_mgr": "zhipuai"
+            "token_mgr": "zhipuai",
+            "tool_call_supported": true
         },
         {
             "name": "glm-4-air",
             "requester": "zhipuai-chat-completions",
-            "token_mgr": "zhipuai"
+            "token_mgr": "zhipuai",
+            "tool_call_supported": true
         },
         {
             "name": "glm-4-airx",
             "requester": "zhipuai-chat-completions",
-            "token_mgr": "zhipuai"
+            "token_mgr": "zhipuai",
+            "tool_call_supported": true
         },
         {
             "name": "glm-4-long",
             "requester": "zhipuai-chat-completions",
-            "token_mgr": "zhipuai"
+            "token_mgr": "zhipuai",
+            "tool_call_supported": true
         },
         {
             "name": "glm-4-flashx",
             "requester": "zhipuai-chat-completions",
-            "token_mgr": "zhipuai"
+            "token_mgr": "zhipuai",
+            "tool_call_supported": true
         },
         {
             "name": "glm-4-flash",
             "requester": "zhipuai-chat-completions",
-            "token_mgr": "zhipuai"
+            "token_mgr": "zhipuai",
+            "tool_call_supported": true
         },
         {
             "name": "glm-4v-plus",
             "requester": "zhipuai-chat-completions",
             "token_mgr": "zhipuai",
-            "vision_supported": true
+            "vision_supported": true,
+            "tool_call_supported": true
         },
         {
             "name": "glm-4v",
             "requester": "zhipuai-chat-completions",
             "token_mgr": "zhipuai",
-            "vision_supported": true
+            "vision_supported": true,
+            "tool_call_supported": true
         },
         {
             "name": "glm-4v-flash",
             "requester": "zhipuai-chat-completions",
             "token_mgr": "zhipuai",
-            "vision_supported": true
+            "vision_supported": true,
+            "tool_call_supported": true
         },
         {
             "name": "glm-zero-preview",
             "requester": "zhipuai-chat-completions",
             "token_mgr": "zhipuai",
-            "vision_supported": true
+            "vision_supported": true,
+            "tool_call_supported": true
         }
     ]
 }

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"
                 }
             }