chore: release v4.0.8.1

* feat: reset password with recovery key

* perf: formatting and multi language

README.md

@@ -119,8 +119,9 @@ docker compose up -d
 | [Anthropic](https://www.anthropic.com/) | ✅ |  |
 | [xAI](https://x.ai/) | ✅ |  |
 | [智谱AI](https://open.bigmodel.cn/) | ✅ |  |
+| [优云智算](https://www.compshare.cn/?ytag=GPU_YY-gh_langbot) | ✅ | 大模型和 GPU 资源平台 |
 | [PPIO](https://ppinfra.com/user/register?invited_by=QJKFYD&utm_source=github_langbot) | ✅ | 大模型和 GPU 资源平台 |
-| [302 AI](https://share.302.ai/SuTG99) | ✅ | 大模型聚合平台 |
+| [302.AI](https://share.302.ai/SuTG99) | ✅ | 大模型聚合平台 |
 | [Google Gemini](https://aistudio.google.com/prompts/new_chat) | ✅ | |
 | [Dify](https://dify.ai) | ✅ | LLMOps 平台 |
 | [Ollama](https://ollama.com/) | ✅ | 本地大模型运行平台 |

README_EN.md

@@ -116,9 +116,10 @@ Directly use the released version to run, see the [Manual Deployment](https://do
 | [Anthropic](https://www.anthropic.com/) | ✅ |  |
 | [xAI](https://x.ai/) | ✅ |  |
 | [Zhipu AI](https://open.bigmodel.cn/) | ✅ |  |
+| [CompShare](https://www.compshare.cn/?ytag=GPU_YY-gh_langbot) | ✅ | LLM and GPU resource platform |
 | [Dify](https://dify.ai) | ✅ | LLMOps platform |
 | [PPIO](https://ppinfra.com/user/register?invited_by=QJKFYD&utm_source=github_langbot) | ✅ | LLM and GPU resource platform |
-| [302 AI](https://share.302.ai/SuTG99) | ✅ | LLM gateway(MaaS) |
+| [302.AI](https://share.302.ai/SuTG99) | ✅ | LLM gateway(MaaS) |
 | [Google Gemini](https://aistudio.google.com/prompts/new_chat) | ✅ | |
 | [Ollama](https://ollama.com/) | ✅ | Local LLM running platform |
 | [LMStudio](https://lmstudio.ai/) | ✅ | Local LLM running platform |

README_JP.md

@@ -115,8 +115,9 @@ LangBotはBTPanelにリストされています。BTPanelをインストール
 | [Anthropic](https://www.anthropic.com/) | ✅ |  |
 | [xAI](https://x.ai/) | ✅ |  |
 | [Zhipu AI](https://open.bigmodel.cn/) | ✅ |  |
+| [CompShare](https://www.compshare.cn/?ytag=GPU_YY-gh_langbot) | ✅ | 大模型とGPUリソースプラットフォーム |
 | [PPIO](https://ppinfra.com/user/register?invited_by=QJKFYD&utm_source=github_langbot) | ✅ | 大模型とGPUリソースプラットフォーム |
-| [302 AI](https://share.302.ai/SuTG99) | ✅ | LLMゲートウェイ(MaaS) |
+| [302.AI](https://share.302.ai/SuTG99) | ✅ | LLMゲートウェイ(MaaS) |
 | [Google Gemini](https://aistudio.google.com/prompts/new_chat) | ✅ | |
 | [Dify](https://dify.ai) | ✅ | LLMOpsプラットフォーム |
 | [Ollama](https://ollama.com/) | ✅ | ローカルLLM実行プラットフォーム |

components.yaml

@@ -9,6 +9,7 @@ spec:
   components:
     ComponentTemplate:
       fromFiles:
+        - pkg/platform/adapter.yaml
         - pkg/provider/modelmgr/requester.yaml
     MessagePlatformAdapter:
       fromDirs:

libs/qq_official_api/api.py

@@ -3,7 +3,7 @@ from quart import request
 import httpx
 from quart import Quart
 from typing import Callable, Dict, Any
-import langbot_plugin.api.entities.builtin.platform.events as platform_events
+from pkg.platform.types import events as platform_events
 from .qqofficialevent import QQOfficialEvent
 import json
 import traceback
@@ -104,7 +104,7 @@ class QQOfficialClient:
             return {'code': 0, 'message': 'success'}
 
         except Exception as e:
-            await self.logger.error(f'Error in handle_callback_request: {traceback.format_exc()}')
+            await self.logger.error(f"Error in handle_callback_request: {traceback.format_exc()}")
             return {'error': str(e)}, 400
 
     async def run_task(self, host: str, port: int, *args, **kwargs):
@@ -168,6 +168,7 @@ class QQOfficialClient:
         if not await self.check_access_token():
             await self.get_access_token()
 
+
         url = self.base_url + '/v2/users/' + user_openid + '/messages'
         async with httpx.AsyncClient() as client:
             headers = {
@@ -192,6 +193,7 @@ class QQOfficialClient:
         if not await self.check_access_token():
             await self.get_access_token()
 
+
         url = self.base_url + '/v2/groups/' + group_openid + '/messages'
         async with httpx.AsyncClient() as client:
             headers = {
@@ -207,7 +209,7 @@ class QQOfficialClient:
             if response.status_code == 200:
                 return
             else:
-                await self.logger.error(f'发送群聊消息失败:{response.json()}')
+                await self.logger.error(f"发送群聊消息失败:{response.json()}")
                 raise Exception(response.read().decode())
 
     async def send_channle_group_text_msg(self, channel_id: str, content: str, msg_id: str):
@@ -215,6 +217,7 @@ class QQOfficialClient:
         if not await self.check_access_token():
             await self.get_access_token()
 
+
         url = self.base_url + '/channels/' + channel_id + '/messages'
         async with httpx.AsyncClient() as client:
             headers = {
@@ -237,6 +240,7 @@ class QQOfficialClient:
         """发送频道私聊消息"""
         if not await self.check_access_token():
             await self.get_access_token()
+        
 
         url = self.base_url + '/dms/' + guild_id + '/messages'
         async with httpx.AsyncClient() as client:

libs/slack_api/api.py

@@ -4,7 +4,7 @@ from quart import Quart, jsonify, request
 from slack_sdk.web.async_client import AsyncWebClient
 from .slackevent import SlackEvent
 from typing import Callable
-import langbot_plugin.api.entities.builtin.platform.events as platform_events
+from pkg.platform.types import events as platform_events
 
 
 class SlackClient:
@@ -34,6 +34,7 @@ class SlackClient:
 
             if self.bot_user_id and bot_user_id == self.bot_user_id:
                 return jsonify({'status': 'ok'})
+            
 
             # 处理私信
             if data and data.get('event', {}).get('channel_type') in ['im']:
@@ -51,7 +52,7 @@ class SlackClient:
             return jsonify({'status': 'ok'})
 
         except Exception as e:
-            await self.logger.error(f'Error in handle_callback_request: {traceback.format_exc()}')
+            await self.logger.error(f"Error in handle_callback_request: {traceback.format_exc()}")
             raise (e)
 
     async def _handle_message(self, event: SlackEvent):
@@ -81,7 +82,7 @@ class SlackClient:
                 self.bot_user_id = response['message']['bot_id']
             return
         except Exception as e:
-            await self.logger.error(f'Error in send_message: {e}')
+            await self.logger.error(f"Error in send_message: {e}")
             raise e
 
     async def send_message_to_one(self, text: str, user_id: str):
@@ -92,7 +93,7 @@ class SlackClient:
 
             return
         except Exception as e:
-            await self.logger.error(f'Error in send_message: {traceback.format_exc()}')
+            await self.logger.error(f"Error in send_message: {traceback.format_exc()}")
             raise e
 
     async def run_task(self, host: str, port: int, *args, **kwargs):

libs/wechatpad_api/__init__.py

@@ -1,4 +1 @@
-from .client import WeChatPadClient
-
-
-__all__ = ['WeChatPadClient']
+from .client import WeChatPadClient

libs/wechatpad_api/api/chatroom.py

@@ -1,4 +1,4 @@
-from libs.wechatpad_api.util.http_util import post_json
+from libs.wechatpad_api.util.http_util import async_request, post_json
 
 
 class ChatRoomApi:
@@ -7,6 +7,8 @@ class ChatRoomApi:
         self.token = token
 
     def get_chatroom_member_detail(self, chatroom_name):
-        params = {'ChatRoomName': chatroom_name}
+        params = {
+            "ChatRoomName": chatroom_name
+        }
         url = self.base_url + '/group/GetChatroomMemberDetail'
         return post_json(url, token=self.token, data=params)

libs/wechatpad_api/api/downloadpai.py

@@ -1,23 +1,32 @@
-from libs.wechatpad_api.util.http_util import post_json
+from libs.wechatpad_api.util.http_util import async_request, post_json
 import httpx
 import base64
 
-
 class DownloadApi:
     def __init__(self, base_url, token):
         self.base_url = base_url
         self.token = token
 
     def send_download(self, aeskey, file_type, file_url):
-        json_data = {'AesKey': aeskey, 'FileType': file_type, 'FileURL': file_url}
-        url = self.base_url + '/message/SendCdnDownload'
+        json_data = {
+                  "AesKey": aeskey,
+                  "FileType": file_type,
+                  "FileURL": file_url
+                }
+        url = self.base_url + "/message/SendCdnDownload"
         return post_json(url, token=self.token, data=json_data)
 
-    def get_msg_voice(self, buf_id, length, new_msgid):
-        json_data = {'Bufid': buf_id, 'Length': length, 'NewMsgId': new_msgid, 'ToUserName': ''}
-        url = self.base_url + '/message/GetMsgVoice'
+    def get_msg_voice(self,buf_id, length, new_msgid):
+        json_data = {
+            "Bufid": buf_id,
+            "Length": length,
+            "NewMsgId": new_msgid,
+            "ToUserName": ""
+        }
+        url = self.base_url + "/message/GetMsgVoice"
         return post_json(url, token=self.token, data=json_data)
 
+
     async def download_url_to_base64(self, download_url):
         async with httpx.AsyncClient() as client:
             response = await client.get(download_url)
@@ -27,4 +36,4 @@ class DownloadApi:
                 base64_str = base64.b64encode(file_bytes).decode('utf-8')  # 返回字符串格式
                 return base64_str
             else:
-                raise Exception('获取文件失败')
+                raise Exception('获取文件失败')

libs/wechatpad_api/api/friend.py

@@ -1,6 +1,11 @@
+from libs.wechatpad_api.util.http_util import post_json,async_request
+from typing import List, Dict, Any, Optional
+
+
 class FriendApi:
     """联系人API类，处理所有与联系人相关的操作"""
 
     def __init__(self, base_url: str, token: str):
         self.base_url = base_url
         self.token = token
+

libs/wechatpad_api/api/login.py

@@ -1,34 +1,37 @@
-from libs.wechatpad_api.util.http_util import post_json, get_json
+from libs.wechatpad_api.util.http_util import async_request,post_json,get_json
 
 
 class LoginApi:
     def __init__(self, base_url: str, token: str = None, admin_key: str = None):
-        """
+        '''
 
         Args:
             base_url: 原始路径
             token: token
             admin_key: 管理员key
-        """
+        '''
         self.base_url = base_url
         self.token = token
         # self.admin_key = admin_key
 
-    def get_token(self, admin_key, day: int = 365):
+    def get_token(self, admin_key, day: int=365):
         # 获取普通token
-        url = f'{self.base_url}/admin/GenAuthKey1'
-        json_data = {'Count': 1, 'Days': day}
+        url = f"{self.base_url}/admin/GenAuthKey1"
+        json_data = {
+                "Count": 1,
+                "Days": day
+            }
         return post_json(base_url=url, token=admin_key, data=json_data)
 
-    def get_login_qr(self, Proxy: str = ''):
-        """
+    def get_login_qr(self, Proxy: str = ""):
+        '''
 
         Args:
             Proxy:异地使用时代理
 
         Returns:json数据
 
-        """
+        '''
         """
         
         {
@@ -46,37 +49,54 @@ class LoginApi:
 }
         
         """
-        # 获取登录二维码
-        url = f'{self.base_url}/login/GetLoginQrCodeNew'
+        #获取登录二维码
+        url = f"{self.base_url}/login/GetLoginQrCodeNew"
         check = False
-        if Proxy != '':
+        if Proxy != "":
             check = True
-        json_data = {'Check': check, 'Proxy': Proxy}
+        json_data = {
+              "Check": check,
+              "Proxy": Proxy
+            }
         return post_json(base_url=url, token=self.token, data=json_data)
 
+
     def get_login_status(self):
         # 获取登录状态
         url = f'{self.base_url}/login/GetLoginStatus'
         return get_json(base_url=url, token=self.token)
 
+
+
     def logout(self):
         # 退出登录
         url = f'{self.base_url}/login/LogOut'
         return post_json(base_url=url, token=self.token)
 
-    def wake_up_login(self, Proxy: str = ''):
+
+
+
+    def wake_up_login(self, Proxy: str = ""):
         # 唤醒登录
         url = f'{self.base_url}/login/WakeUpLogin'
         check = False
-        if Proxy != '':
+        if Proxy != "":
             check = True
-        json_data = {'Check': check, 'Proxy': ''}
+        json_data = {
+            "Check": check,
+            "Proxy": ""
+        }
 
         return post_json(base_url=url, token=self.token, data=json_data)
 
-    def login(self, admin_key):
+
+
+    def login(self,admin_key):
         login_status = self.get_login_status()
-        if login_status['Code'] == 300 and login_status['Text'] == '你已退出微信':
-            print('token已经失效，重新获取')
+        if login_status["Code"] == 300 and login_status["Text"] == "你已退出微信":
+            print("token已经失效，重新获取")
             token_data = self.get_token(admin_key)
-            self.token = token_data['Data'][0]
+            self.token = token_data["Data"][0]
+
+
+

libs/wechatpad_api/api/message.py

@@ -1,4 +1,5 @@
-from libs.wechatpad_api.util.http_util import post_json
+
+from libs.wechatpad_api.util.http_util import async_request, post_json
 
 
 class MessageApi:
@@ -6,8 +7,8 @@ class MessageApi:
         self.base_url = base_url
         self.token = token
 
-    def post_text(self, to_wxid, content, ats: list = []):
-        """
+    def post_text(self, to_wxid, content, ats: list= []):
+        '''
 
         Args:
             app_id: 微信id
@@ -17,64 +18,106 @@ class MessageApi:
 
         Returns:
 
-        """
-        url = self.base_url + '/message/SendTextMessage'
+        '''
+        url = self.base_url + "/message/SendTextMessage"
         """发送文字消息"""
         json_data = {
-            'MsgItem': [
-                {'AtWxIDList': ats, 'ImageContent': '', 'MsgType': 0, 'TextContent': content, 'ToUserName': to_wxid}
-            ]
-        }
-        return post_json(base_url=url, token=self.token, data=json_data)
+                      "MsgItem": [
+                        {
+                          "AtWxIDList": ats,
+                          "ImageContent": "",
+                          "MsgType": 0,
+                          "TextContent": content,
+                          "ToUserName": to_wxid
+                        }
+                      ]
+                    }
+        return  post_json(base_url=url, token=self.token, data=json_data)
 
-    def post_image(self, to_wxid, img_url, ats: list = []):
+
+
+
+    def post_image(self, to_wxid, img_url, ats: list= []):
         """发送图片消息"""
         # 这里好像可以尝试发送多个暂时未测试
         json_data = {
-            'MsgItem': [
-                {'AtWxIDList': ats, 'ImageContent': img_url, 'MsgType': 0, 'TextContent': '', 'ToUserName': to_wxid}
+            "MsgItem": [
+                {
+                    "AtWxIDList": ats,
+                    "ImageContent": img_url,
+                    "MsgType": 0,
+                    "TextContent": '',
+                    "ToUserName": to_wxid
+                }
             ]
         }
-        url = self.base_url + '/message/SendImageMessage'
+        url = self.base_url + "/message/SendImageMessage"
         return post_json(base_url=url, token=self.token, data=json_data)
 
     def post_voice(self, to_wxid, voice_data, voice_forma, voice_duration):
         """发送语音消息"""
         json_data = {
-            'ToUserName': to_wxid,
-            'VoiceData': voice_data,
-            'VoiceFormat': voice_forma,
-            'VoiceSecond': voice_duration,
+            "ToUserName": to_wxid,
+            "VoiceData": voice_data,
+            "VoiceFormat": voice_forma,
+            "VoiceSecond": voice_duration
         }
-        url = self.base_url + '/message/SendVoice'
+        url = self.base_url + "/message/SendVoice"
         return post_json(base_url=url, token=self.token, data=json_data)
 
+
+
+
+
     def post_name_card(self, alias, to_wxid, nick_name, name_card_wxid, flag):
         """发送名片消息"""
         param = {
-            'CardAlias': alias,
-            'CardFlag': flag,
-            'CardNickName': nick_name,
-            'CardWxId': name_card_wxid,
-            'ToUserName': to_wxid,
+                "CardAlias": alias,
+                "CardFlag": flag,
+                "CardNickName": nick_name,
+                "CardWxId": name_card_wxid,
+                "ToUserName": to_wxid
         }
-        url = f'{self.base_url}/message/ShareCardMessage'
+        url = f"{self.base_url}/message/ShareCardMessage"
         return post_json(base_url=url, token=self.token, data=param)
 
-    def post_emoji(self, to_wxid, emoji_md5, emoji_size: int = 0):
+    def post_emoji(self, to_wxid, emoji_md5, emoji_size:int=0):
         """发送emoji消息"""
-        json_data = {'EmojiList': [{'EmojiMd5': emoji_md5, 'EmojiSize': emoji_size, 'ToUserName': to_wxid}]}
-        url = f'{self.base_url}/message/SendEmojiMessage'
+        json_data = {
+            "EmojiList": [
+                {
+                    "EmojiMd5": emoji_md5,
+                    "EmojiSize": emoji_size,
+                    "ToUserName": to_wxid
+                }
+            ]
+        }
+        url = f"{self.base_url}/message/SendEmojiMessage"
         return post_json(base_url=url, token=self.token, data=json_data)
 
-    def post_app_msg(self, to_wxid, xml_data, contenttype: int = 0):
+    def post_app_msg(self, to_wxid,xml_data, contenttype:int=0):
         """发送appmsg消息"""
-        json_data = {'AppList': [{'ContentType': contenttype, 'ContentXML': xml_data, 'ToUserName': to_wxid}]}
-        url = f'{self.base_url}/message/SendAppMessage'
+        json_data = {
+            "AppList": [
+                {
+                    "ContentType": contenttype,
+                    "ContentXML": xml_data,
+                    "ToUserName": to_wxid
+                }
+            ]
+        }
+        url = f"{self.base_url}/message/SendAppMessage"
         return post_json(base_url=url, token=self.token, data=json_data)
 
+
+
     def revoke_msg(self, to_wxid, msg_id, new_msg_id, create_time):
         """撤回消息"""
-        param = {'ClientMsgId': msg_id, 'CreateTime': create_time, 'NewMsgId': new_msg_id, 'ToUserName': to_wxid}
-        url = f'{self.base_url}/message/RevokeMsg'
-        return post_json(base_url=url, token=self.token, data=param)
+        param = {
+              "ClientMsgId": msg_id,
+              "CreateTime": create_time,
+              "NewMsgId": new_msg_id,
+              "ToUserName": to_wxid
+            }
+        url = f"{self.base_url}/message/RevokeMsg"
+        return post_json(base_url=url, token=self.token, data=param)

libs/wechatpad_api/api/user.py

@@ -12,9 +12,12 @@ class UserApi:
 
         return get_json(base_url=url, token=self.token)
 
-    def get_qr_code(self, recover: bool = True, style: int = 8):
+    def get_qr_code(self, recover:bool=True, style:int=8):
         """获取自己的二维码"""
-        param = {'Recover': recover, 'Style': style}
+        param = {
+              "Recover": recover,
+              "Style": style
+            }
         url = f'{self.base_url}/user/GetMyQRCode'
         return post_json(base_url=url, token=self.token, data=param)
 
@@ -23,8 +26,12 @@ class UserApi:
         url = f'{self.base_url}/equipment/GetSafetyInfo'
         return post_json(base_url=url, token=self.token)
 
-    async def update_head_img(self, head_img_base64):
+
+
+    async def update_head_img(self,  head_img_base64):
         """修改头像"""
-        param = {'Base64': head_img_base64}
+        param = {
+              "Base64": head_img_base64
+            }
         url = f'{self.base_url}/user/UploadHeadImage'
-        return await async_request(base_url=url, token_key=self.token, json=param)
+        return await async_request(base_url=url, token_key=self.token, json=param)

libs/wechatpad_api/client.py

@@ -1,3 +1,4 @@
+
 from libs.wechatpad_api.api.login import LoginApi
 from libs.wechatpad_api.api.friend import FriendApi
 from libs.wechatpad_api.api.message import MessageApi
@@ -6,6 +7,9 @@ from libs.wechatpad_api.api.downloadpai import DownloadApi
 from libs.wechatpad_api.api.chatroom import ChatRoomApi
 
 
+
+
+
 class WeChatPadClient:
     def __init__(self, base_url, token, logger=None):
         self._login_api = LoginApi(base_url, token)
@@ -16,16 +20,16 @@ class WeChatPadClient:
         self._chatroom_api = ChatRoomApi(base_url, token)
         self.logger = logger
 
-    def get_token(self, admin_key, day: int):
-        """获取token"""
+    def get_token(self,admin_key, day: int):
+        '''获取token'''
         return self._login_api.get_token(admin_key, day)
 
-    def get_login_qr(self, Proxy: str = ''):
+    def get_login_qr(self, Proxy:str=""):
         """登录二维码"""
         return self._login_api.get_login_qr(Proxy=Proxy)
 
-    def awaken_login(self, Proxy: str = ''):
-        """唤醒登录"""
+    def awaken_login(self, Proxy:str=""):
+        '''唤醒登录'''
         return self._login_api.wake_up_login(Proxy=Proxy)
 
     def log_out(self):
@@ -36,57 +40,59 @@ class WeChatPadClient:
         """获取登录状态"""
         return self._login_api.get_login_status()
 
-    def send_text_message(self, to_wxid, message, ats: list = []):
+    def send_text_message(self, to_wxid, message, ats: list=[]):
         """发送文本消息"""
-        return self._message_api.post_text(to_wxid, message, ats)
+        return  self._message_api.post_text(to_wxid, message, ats)
 
-    def send_image_message(self, to_wxid, img_url, ats: list = []):
+    def send_image_message(self, to_wxid, img_url, ats: list=[]):
         """发送图片消息"""
-        return self._message_api.post_image(to_wxid, img_url, ats)
+        return  self._message_api.post_image(to_wxid, img_url, ats)
 
     def send_voice_message(self, to_wxid, voice_data, voice_forma, voice_duration):
         """发送音频消息"""
-        return self._message_api.post_voice(to_wxid, voice_data, voice_forma, voice_duration)
+        return  self._message_api.post_voice(to_wxid, voice_data, voice_forma, voice_duration)
 
     def send_app_message(self, to_wxid, app_message, type):
         """发送app消息"""
-        return self._message_api.post_app_msg(to_wxid, app_message, type)
+        return  self._message_api.post_app_msg(to_wxid, app_message, type)
 
     def send_emoji_message(self, to_wxid, emoji_md5, emoji_size):
         """发送emoji消息"""
-        return self._message_api.post_emoji(to_wxid, emoji_md5, emoji_size)
+        return  self._message_api.post_emoji(to_wxid,emoji_md5,emoji_size)
 
     def revoke_msg(self, to_wxid, msg_id, new_msg_id, create_time):
         """撤回消息"""
-        return self._message_api.revoke_msg(to_wxid, msg_id, new_msg_id, create_time)
+        return  self._message_api.revoke_msg(to_wxid, msg_id, new_msg_id, create_time)
 
     def get_profile(self):
         """获取用户信息"""
         return self._user_api.get_profile()
 
-    def get_qr_code(self, recover: bool = True, style: int = 8):
+    def get_qr_code(self, recover:bool=True, style:int=8):
         """获取用户二维码"""
-        return self._user_api.get_qr_code(recover=recover, style=style)
+        return  self._user_api.get_qr_code(recover=recover, style=style)
 
     def get_safety_info(self):
         """获取设备信息"""
-        return self._user_api.get_safety_info()
+        return  self._user_api.get_safety_info()
 
-    def update_head_img(self, head_img_base64):
+    def update_head_img(self,  head_img_base64):
         """上传用户头像"""
-        return self._user_api.update_head_img(head_img_base64)
+        return  self._user_api.update_head_img(head_img_base64)
 
     def cdn_download(self, aeskey, file_type, file_url):
         """cdn下载"""
-        return self._download_api.send_download(aeskey, file_type, file_url)
+        return self._download_api.send_download( aeskey, file_type, file_url)
 
-    def get_msg_voice(self, buf_id, length, msgid):
+    def get_msg_voice(self,buf_id, length, msgid):
         """下载语音"""
         return self._download_api.get_msg_voice(buf_id, length, msgid)
 
-    async def download_base64(self, url):
+    async def download_base64(self,url):
         return await self._download_api.download_url_to_base64(download_url=url)
 
     def get_chatroom_member_detail(self, chatroom_name):
         """查看群成员详情"""
         return self._chatroom_api.get_chatroom_member_detail(chatroom_name)
+
+

libs/wechatpad_api/util/http_util.py

@@ -1,9 +1,10 @@
 import requests
-import aiohttp
-
 
 def post_json(base_url, token, data=None):
-    headers = {'Content-Type': 'application/json'}
+    headers = {
+        'Content-Type': 'application/json'
+    }
+
 
     url = base_url + f'?key={token}'
 
@@ -17,12 +18,14 @@ def post_json(base_url, token, data=None):
         else:
             raise RuntimeError(response.text)
     except Exception as e:
-        print(f'http请求失败, url={url}, exception={e}')
+        print(f"http请求失败, url={url}, exception={e}")
         raise RuntimeError(str(e))
 
-
 def get_json(base_url, token):
-    headers = {'Content-Type': 'application/json'}
+    headers = {
+        'Content-Type': 'application/json'
+    }
+
 
     url = base_url + f'?key={token}'
 
@@ -36,18 +39,21 @@ def get_json(base_url, token):
         else:
             raise RuntimeError(response.text)
     except Exception as e:
-        print(f'http请求失败, url={url}, exception={e}')
+        print(f"http请求失败, url={url}, exception={e}")
         raise RuntimeError(str(e))
 
+import aiohttp
+import asyncio
+
 
 async def async_request(
-    base_url: str,
-    token_key: str,
-    method: str = 'POST',
-    params: dict = None,
-    # headers: dict = None,
-    data: dict = None,
-    json: dict = None,
+        base_url: str,
+        token_key: str,
+        method: str = 'POST',
+        params: dict = None,
+        # headers: dict = None,
+        data: dict = None,
+        json: dict = None
 ):
     """
     通用异步请求函数
@@ -61,11 +67,18 @@ async def async_request(
     :param json: JSON数据
     :return: 响应文本
     """
-    headers = {'Content-Type': 'application/json'}
-    url = f'{base_url}?key={token_key}'
+    headers = {
+        'Content-Type': 'application/json'
+    }
+    url = f"{base_url}?key={token_key}"
     async with aiohttp.ClientSession() as session:
         async with session.request(
-            method=method, url=url, params=params, headers=headers, data=data, json=json
+                method=method,
+                url=url,
+                params=params,
+                headers=headers,
+                data=data,
+                json=json
         ) as response:
             response.raise_for_status()  # 如果状态码不是200，抛出异常
             result = await response.json()
@@ -76,3 +89,4 @@ async def async_request(
             #     return await result
             # else:
             #     raise RuntimeError("请求失败",response.text)
+

libs/wechatpad_api/util/terminal_printer.py

@@ -1,34 +1,31 @@
 import qrcode
 
-
 def print_green(text):
-    print(f'\033[32m{text}\033[0m')
-
+    print(f"\033[32m{text}\033[0m")
 
 def print_yellow(text):
-    print(f'\033[33m{text}\033[0m')
-
+    print(f"\033[33m{text}\033[0m")
 
 def print_red(text):
-    print(f'\033[31m{text}\033[0m')
-
+    print(f"\033[31m{text}\033[0m")
 
 def make_and_print_qr(url):
     """生成并打印二维码
-
+    
     Args:
         url: 需要生成二维码的URL字符串
-
+        
     Returns:
         None
-
+        
     功能:
         1. 在终端打印二维码的ASCII图形
         2. 同时提供在线二维码生成链接作为备选
     """
-    print_green('请扫描下方二维码登录')
+    print_green("请扫描下方二维码登录")
     qr = qrcode.QRCode()
     qr.add_data(url)
     qr.make()
     qr.print_ascii(invert=True)
-    print_green(f'也可以访问下方链接获取二维码:\nhttps://api.qrserver.com/v1/create-qr-code/?data={url}')
+    print_green(f"也可以访问下方链接获取二维码:\nhttps://api.qrserver.com/v1/create-qr-code/?data={url}")
+

libs/wecom_api/api.py

@@ -8,7 +8,7 @@ from quart import Quart
 import xml.etree.ElementTree as ET
 from typing import Callable, Dict, Any
 from .wecomevent import WecomEvent
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
+from pkg.platform.types import message as platform_message
 import aiofiles
 
 
@@ -57,7 +57,7 @@ class WecomClient:
             if 'access_token' in data:
                 return data['access_token']
             else:
-                await self.logger.error(f'获取accesstoken失败:{response.json()}')
+                await self.logger.error(f"获取accesstoken失败:{response.json()}")
                 raise Exception(f'未获取access token: {data}')
 
     async def get_users(self):
@@ -129,7 +129,7 @@ class WecomClient:
                 response = await client.post(url, json=params)
                 data = response.json()
             except Exception as e:
-                await self.logger.error(f'发送图片失败:{data}')
+                await self.logger.error(f"发送图片失败:{data}")
                 raise Exception('Failed to send image: ' + str(e))
 
             # 企业微信错误码40014和42001，代表accesstoken问题
@@ -164,7 +164,7 @@ class WecomClient:
                 self.access_token = await self.get_access_token(self.secret)
                 return await self.send_private_msg(user_id, agent_id, content)
             if data['errcode'] != 0:
-                await self.logger.error(f'发送消息失败:{data}')
+                await self.logger.error(f"发送消息失败:{data}")
                 raise Exception('Failed to send message: ' + str(data))
 
     async def handle_callback_request(self):
@@ -181,7 +181,7 @@ class WecomClient:
                 echostr = request.args.get('echostr')
                 ret, reply_echo_str = wxcpt.VerifyURL(msg_signature, timestamp, nonce, echostr)
                 if ret != 0:
-                    await self.logger.error('验证失败')
+                    await self.logger.error("验证失败")
                     raise Exception(f'验证失败，错误码: {ret}')
                 return reply_echo_str
 
@@ -189,8 +189,9 @@ class WecomClient:
                 encrypt_msg = await request.data
                 ret, xml_msg = wxcpt.DecryptMsg(encrypt_msg, msg_signature, timestamp, nonce)
                 if ret != 0:
-                    await self.logger.error('消息解密失败')
+                    await self.logger.error("消息解密失败")
                     raise Exception(f'消息解密失败，错误码: {ret}')
+                
 
                 # 解析消息并处理
                 message_data = await self.get_message(xml_msg)
@@ -201,7 +202,7 @@ class WecomClient:
 
                 return 'success'
         except Exception as e:
-            await self.logger.error(f'Error in handle_callback_request: {traceback.format_exc()}')
+            await self.logger.error(f"Error in handle_callback_request: {traceback.format_exc()}")
             return f'Error processing request: {str(e)}', 400
 
     async def run_task(self, host: str, port: int, *args, **kwargs):
@@ -300,7 +301,7 @@ class WecomClient:
             except binascii.Error as e:
                 raise ValueError(f'Invalid base64 string: {str(e)}')
         else:
-            await self.logger.error('Image对象出错')
+            await self.logger.error("Image对象出错")
             raise ValueError('image对象出错')
 
         # 设置 multipart/form-data 格式的文件
@@ -324,7 +325,7 @@ class WecomClient:
                 self.access_token = await self.get_access_token(self.secret)
                 media_id = await self.upload_to_work(image)
             if data.get('errcode', 0) != 0:
-                await self.logger.error(f'上传图片失败:{data}')
+                await self.logger.error(f"上传图片失败:{data}")
                 raise Exception('failed to upload file')
 
             media_id = data.get('media_id')

libs/wecom_customer_service_api/api.py

@@ -8,7 +8,7 @@ from quart import Quart
 import xml.etree.ElementTree as ET
 from typing import Callable
 from .wecomcsevent import WecomCSEvent
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
+from pkg.platform.types import message as platform_message
 import aiofiles
 
 
@@ -187,7 +187,7 @@ class WecomCSClient:
                 self.access_token = await self.get_access_token(self.secret)
                 return await self.send_text_msg(open_kfid, external_userid, msgid, content)
             if data['errcode'] != 0:
-                await self.logger.error(f'发送消息失败：{data}')
+                await self.logger.error(f"发送消息失败：{data}")
                 raise Exception('Failed to send message')
             return data
 
@@ -227,7 +227,7 @@ class WecomCSClient:
                 return 'success'
         except Exception as e:
             if self.logger:
-                await self.logger.error(f'Error in handle_callback_request: {traceback.format_exc()}')
+                await self.logger.error(f"Error in handle_callback_request: {traceback.format_exc()}")
             else:
                 traceback.print_exc()
             return f'Error processing request: {str(e)}', 400

main.py

@@ -47,13 +47,13 @@ async def main_entry(loop: asyncio.AbstractEventLoop):
     if not args.skip_plugin_deps_check:
         await deps.precheck_plugin_deps()
 
-    # # 检查pydantic版本，如果没有 pydantic.v1，则把 pydantic 映射为 v1
-    # import pydantic.version
+    # 检查pydantic版本，如果没有 pydantic.v1，则把 pydantic 映射为 v1
+    import pydantic.version
 
-    # if pydantic.version.VERSION < '2.0':
-    #     import pydantic
+    if pydantic.version.VERSION < '2.0':
+        import pydantic
 
-    #     sys.modules['pydantic.v1'] = pydantic
+        sys.modules['pydantic.v1'] = pydantic
 
     # 检查配置文件
 

pkg/api/http/controller/groups/plugins.py

@@ -1,11 +1,10 @@
 from __future__ import annotations
 
-import base64
+
 import quart
 
 from .....core import taskmgr
 from .. import group
-from langbot_plugin.runtime.plugin.mgr import PluginInstallSource
 
 
 @group.group_class('plugins', '/api/v1/plugins')
@@ -13,22 +12,35 @@ class PluginsRouterGroup(group.RouterGroup):
     async def initialize(self) -> None:
         @self.route('', methods=['GET'], auth_type=group.AuthType.USER_TOKEN)
         async def _() -> str:
-            plugins = await self.ap.plugin_connector.list_plugins()
+            plugins = self.ap.plugin_mgr.plugins()
 
-            return self.success(data={'plugins': plugins})
+            plugins_data = [plugin.model_dump() for plugin in plugins]
+
+            return self.success(data={'plugins': plugins_data})
 
         @self.route(
-            '/<author>/<plugin_name>/upgrade',
+            '/<author>/<plugin_name>/toggle',
+            methods=['PUT'],
+            auth_type=group.AuthType.USER_TOKEN,
+        )
+        async def _(author: str, plugin_name: str) -> str:
+            data = await quart.request.json
+            target_enabled = data.get('target_enabled')
+            await self.ap.plugin_mgr.update_plugin_switch(plugin_name, target_enabled)
+            return self.success()
+
+        @self.route(
+            '/<author>/<plugin_name>/update',
             methods=['POST'],
             auth_type=group.AuthType.USER_TOKEN,
         )
         async def _(author: str, plugin_name: str) -> str:
             ctx = taskmgr.TaskContext.new()
             wrapper = self.ap.task_mgr.create_user_task(
-                self.ap.plugin_connector.upgrade_plugin(author, plugin_name, task_context=ctx),
+                self.ap.plugin_mgr.update_plugin(plugin_name, task_context=ctx),
                 kind='plugin-operation',
-                name=f'plugin-upgrade-{plugin_name}',
-                label=f'Upgrading plugin {plugin_name}',
+                name=f'plugin-update-{plugin_name}',
+                label=f'更新插件 {plugin_name}',
                 context=ctx,
             )
             return self.success(data={'task_id': wrapper.id})
@@ -40,17 +52,17 @@ class PluginsRouterGroup(group.RouterGroup):
         )
         async def _(author: str, plugin_name: str) -> str:
             if quart.request.method == 'GET':
-                plugin = await self.ap.plugin_connector.get_plugin_info(author, plugin_name)
+                plugin = self.ap.plugin_mgr.get_plugin(author, plugin_name)
                 if plugin is None:
                     return self.http_status(404, -1, 'plugin not found')
-                return self.success(data={'plugin': plugin})
+                return self.success(data={'plugin': plugin.model_dump()})
             elif quart.request.method == 'DELETE':
                 ctx = taskmgr.TaskContext.new()
                 wrapper = self.ap.task_mgr.create_user_task(
-                    self.ap.plugin_connector.delete_plugin(author, plugin_name, task_context=ctx),
+                    self.ap.plugin_mgr.uninstall_plugin(plugin_name, task_context=ctx),
                     kind='plugin-operation',
                     name=f'plugin-remove-{plugin_name}',
-                    label=f'Removing plugin {plugin_name}',
+                    label=f'删除插件 {plugin_name}',
                     context=ctx,
                 )
 
@@ -62,19 +74,24 @@ class PluginsRouterGroup(group.RouterGroup):
             auth_type=group.AuthType.USER_TOKEN,
         )
         async def _(author: str, plugin_name: str) -> quart.Response:
-            plugin = await self.ap.plugin_connector.get_plugin_info(author, plugin_name)
+            plugin = self.ap.plugin_mgr.get_plugin(author, plugin_name)
             if plugin is None:
                 return self.http_status(404, -1, 'plugin not found')
-
             if quart.request.method == 'GET':
-                return self.success(data={'config': plugin['plugin_config']})
+                return self.success(data={'config': plugin.plugin_config})
             elif quart.request.method == 'PUT':
                 data = await quart.request.json
 
-                await self.ap.plugin_connector.set_plugin_config(author, plugin_name, data)
+                await self.ap.plugin_mgr.set_plugin_config(plugin, data)
 
                 return self.success(data={})
 
+        @self.route('/reorder', methods=['PUT'], auth_type=group.AuthType.USER_TOKEN)
+        async def _() -> str:
+            data = await quart.request.json
+            await self.ap.plugin_mgr.reorder_plugins(data.get('plugins'))
+            return self.success()
+
         @self.route('/install/github', methods=['POST'], auth_type=group.AuthType.USER_TOKEN)
         async def _() -> str:
             data = await quart.request.json
@@ -85,47 +102,7 @@ class PluginsRouterGroup(group.RouterGroup):
                 self.ap.plugin_mgr.install_plugin(data['source'], task_context=ctx),
                 kind='plugin-operation',
                 name='plugin-install-github',
-                label=f'Installing plugin from github ...{short_source_str}',
-                context=ctx,
-            )
-
-            return self.success(data={'task_id': wrapper.id})
-
-        @self.route('/install/marketplace', methods=['POST'], auth_type=group.AuthType.USER_TOKEN)
-        async def _() -> str:
-            data = await quart.request.json
-
-            ctx = taskmgr.TaskContext.new()
-            wrapper = self.ap.task_mgr.create_user_task(
-                self.ap.plugin_connector.install_plugin(PluginInstallSource.MARKETPLACE, data, task_context=ctx),
-                kind='plugin-operation',
-                name='plugin-install-marketplace',
-                label=f'Installing plugin from marketplace ...{data}',
-                context=ctx,
-            )
-
-            return self.success(data={'task_id': wrapper.id})
-
-        @self.route('/install/local', methods=['POST'], auth_type=group.AuthType.USER_TOKEN)
-        async def _() -> str:
-            file = (await quart.request.files).get('file')
-            if file is None:
-                return self.http_status(400, -1, 'file is required')
-
-            file_bytes = file.read()
-
-            file_base64 = base64.b64encode(file_bytes).decode('utf-8')
-
-            data = {
-                'plugin_file': file_base64,
-            }
-
-            ctx = taskmgr.TaskContext.new()
-            wrapper = self.ap.task_mgr.create_user_task(
-                self.ap.plugin_connector.install_plugin(PluginInstallSource.LOCAL, data, task_context=ctx),
-                kind='plugin-operation',
-                name='plugin-install-local',
-                label=f'Installing plugin from local ...{file.filename}',
+                label=f'安装插件 ...{short_source_str}',
                 context=ctx,
             )
 

pkg/api/http/controller/groups/system.py

@@ -14,11 +14,6 @@ class SystemRouterGroup(group.RouterGroup):
                     'version': constants.semantic_version,
                     'debug': constants.debug_mode,
                     'enabled_platform_count': len(self.ap.platform_mgr.get_running_adapters()),
-                    'cloud_service_url': (
-                        self.ap.instance_config.data['plugin']['cloud_service_url']
-                        if 'cloud_service_url' in self.ap.instance_config.data['plugin']
-                        else 'https://space.langbot.app'
-                    ),
                 }
             )
 
@@ -40,7 +35,16 @@ class SystemRouterGroup(group.RouterGroup):
 
             return self.success(data=task.to_dict())
 
-        @self.route('/debug/exec', methods=['POST'], auth_type=group.AuthType.USER_TOKEN)
+        @self.route('/reload', methods=['POST'], auth_type=group.AuthType.USER_TOKEN)
+        async def _() -> str:
+            json_data = await quart.request.json
+
+            scope = json_data.get('scope')
+
+            await self.ap.reload(scope=scope)
+            return self.success()
+
+        @self.route('/_debug/exec', methods=['POST'], auth_type=group.AuthType.USER_TOKEN)
         async def _() -> str:
             if not constants.debug_mode:
                 return self.http_status(403, 403, 'Forbidden')
@@ -50,39 +54,3 @@ class SystemRouterGroup(group.RouterGroup):
             ap = self.ap
 
             return self.success(data=exec(py_code, {'ap': ap}))
-
-        @self.route('/debug/tools/call', methods=['POST'], auth_type=group.AuthType.USER_TOKEN)
-        async def _() -> str:
-            if not constants.debug_mode:
-                return self.http_status(403, 403, 'Forbidden')
-
-            data = await quart.request.json
-
-            return self.success(
-                data=await self.ap.tool_mgr.execute_func_call(data['tool_name'], data['tool_parameters'])
-            )
-
-        @self.route(
-            '/debug/plugin/action',
-            methods=['POST'],
-            auth_type=group.AuthType.USER_TOKEN,
-        )
-        async def _() -> str:
-            if not constants.debug_mode:
-                return self.http_status(403, 403, 'Forbidden')
-
-            data = await quart.request.json
-
-            class AnoymousAction:
-                value = 'anonymous_action'
-
-                def __init__(self, value: str):
-                    self.value = value
-
-            resp = await self.ap.plugin_connector.handler.call_action(
-                AnoymousAction(data['action']),
-                data['data'],
-                timeout=data.get('timeout', 10),
-            )
-
-            return self.success(data=resp)

pkg/api/http/controller/groups/user.py

@@ -1,5 +1,6 @@
 import quart
 import argon2
+import asyncio
 
 from .. import group
 
@@ -40,3 +41,29 @@ class UserRouterGroup(group.RouterGroup):
             token = await self.ap.user_service.generate_jwt_token(user_email)
 
             return self.success(data={'token': token})
+
+        @self.route('/reset-password', methods=['POST'], auth_type=group.AuthType.NONE)
+        async def _() -> str:
+            json_data = await quart.request.json
+
+            user_email = json_data['user']
+            recovery_key = json_data['recovery_key']
+            new_password = json_data['new_password']
+
+            # hard sleep 3s for security
+            await asyncio.sleep(3)
+
+            if not await self.ap.user_service.is_initialized():
+                return self.http_status(400, -1, 'system not initialized')
+
+            user_obj = await self.ap.user_service.get_user_by_email(user_email)
+
+            if user_obj is None:
+                return self.http_status(400, -1, 'user not found')
+
+            if recovery_key != self.ap.instance_config.data['system']['recovery_key']:
+                return self.http_status(403, -1, 'invalid recovery key')
+
+            await self.ap.user_service.reset_password(user_email, new_password)
+
+            return self.success(data={'user': user_email})

pkg/api/http/service/bot.py

@@ -17,19 +17,15 @@ class BotService:
     def __init__(self, ap: app.Application) -> None:
         self.ap = ap
 
-    async def get_bots(self, include_secret: bool = True) -> list[dict]:
+    async def get_bots(self) -> list[dict]:
         """获取所有机器人"""
         result = await self.ap.persistence_mgr.execute_async(sqlalchemy.select(persistence_bot.Bot))
 
         bots = result.all()
 
-        masked_columns = []
-        if not include_secret:
-            masked_columns = ['adapter_config']
+        return [self.ap.persistence_mgr.serialize_model(persistence_bot.Bot, bot) for bot in bots]
 
-        return [self.ap.persistence_mgr.serialize_model(persistence_bot.Bot, bot, masked_columns) for bot in bots]
-
-    async def get_bot(self, bot_uuid: str, include_secret: bool = True) -> dict | None:
+    async def get_bot(self, bot_uuid: str) -> dict | None:
         """获取机器人"""
         result = await self.ap.persistence_mgr.execute_async(
             sqlalchemy.select(persistence_bot.Bot).where(persistence_bot.Bot.uuid == bot_uuid)
@@ -40,27 +36,7 @@ class BotService:
         if bot is None:
             return None
 
-        masked_columns = []
-        if not include_secret:
-            masked_columns = ['adapter_config']
-
-        return self.ap.persistence_mgr.serialize_model(persistence_bot.Bot, bot, masked_columns)
-
-    async def get_runtime_bot_info(self, bot_uuid: str, include_secret: bool = True) -> dict:
-        """获取机器人运行时信息"""
-        persistence_bot = await self.get_bot(bot_uuid, include_secret)
-        if persistence_bot is None:
-            raise Exception('Bot not found')
-
-        adapter_runtime_values = {}
-
-        runtime_bot = await self.ap.platform_mgr.get_bot_by_uuid(bot_uuid)
-        if runtime_bot is not None:
-            adapter_runtime_values['bot_account_id'] = runtime_bot.adapter.bot_account_id
-
-        persistence_bot['adapter_runtime_values'] = adapter_runtime_values
-
-        return persistence_bot
+        return self.ap.persistence_mgr.serialize_model(persistence_bot.Bot, bot)
 
     async def create_bot(self, bot_data: dict) -> str:
         """创建机器人"""

pkg/api/http/service/model.py

@@ -7,7 +7,7 @@ from ....core import app
 from ....entity.persistence import model as persistence_model
 from ....entity.persistence import pipeline as persistence_pipeline
 from ....provider.modelmgr import requester as model_requester
-from langbot_plugin.api.entities.builtin.provider import message as provider_message
+from ....provider import entities as llm_entities
 
 
 class ModelsService:
@@ -16,19 +16,11 @@ class ModelsService:
     def __init__(self, ap: app.Application) -> None:
         self.ap = ap
 
-    async def get_llm_models(self, include_secret: bool = True) -> list[dict]:
+    async def get_llm_models(self) -> list[dict]:
         result = await self.ap.persistence_mgr.execute_async(sqlalchemy.select(persistence_model.LLMModel))
 
         models = result.all()
-
-        masked_columns = []
-        if not include_secret:
-            masked_columns = ['api_keys']
-
-        return [
-            self.ap.persistence_mgr.serialize_model(persistence_model.LLMModel, model, masked_columns)
-            for model in models
-        ]
+        return [self.ap.persistence_mgr.serialize_model(persistence_model.LLMModel, model) for model in models]
 
     async def create_llm_model(self, model_data: dict) -> str:
         model_data['uuid'] = str(uuid.uuid4())
@@ -107,7 +99,7 @@ class ModelsService:
         await runtime_llm_model.requester.invoke_llm(
             query=None,
             model=runtime_llm_model,
-            messages=[provider_message.Message(role='user', content='Hello, world!')],
+            messages=[llm_entities.Message(role='user', content='Hello, world!')],
             funcs=[],
             extra_args={},
         )

pkg/api/http/service/user.py

@@ -73,3 +73,12 @@ class UserService:
         jwt_secret = self.ap.instance_config.data['system']['jwt']['secret']
 
         return jwt.decode(token, jwt_secret, algorithms=['HS256'])['user']
+
+    async def reset_password(self, user_email: str, new_password: str) -> None:
+        ph = argon2.PasswordHasher()
+
+        hashed_password = ph.hash(new_password)
+
+        await self.ap.persistence_mgr.execute_async(
+            sqlalchemy.update(user.User).where(user.User.user == user_email).values(password=hashed_password)
+        )

pkg/command/cmdmgr.py

@@ -2,12 +2,9 @@ from __future__ import annotations
 
 import typing
 
-from ..core import app
-from . import operator
+from ..core import app, entities as core_entities
+from . import entities, operator, errors
 from ..utils import importutil
-import langbot_plugin.api.entities.builtin.provider.session as provider_session
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
-from langbot_plugin.api.entities.builtin.command import context as command_context, errors as command_errors
 
 # 引入所有算子以便注册
 from . import operators
@@ -16,11 +13,13 @@ importutil.import_modules_in_pkg(operators)
 
 
 class CommandManager:
+    """命令管理器"""
+
     ap: app.Application
 
     cmd_list: list[operator.CommandOperator]
     """
-    Runtime command list, flat storage, each object contains a reference to the corresponding child node
+    运行时命令列表，扁平存储，各个对象包含对应的子节点引用
     """
 
     def __init__(self, ap: app.Application):
@@ -56,28 +55,43 @@ class CommandManager:
 
     async def _execute(
         self,
-        context: command_context.ExecuteContext,
+        context: entities.ExecuteContext,
         operator_list: list[operator.CommandOperator],
         operator: operator.CommandOperator = None,
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    ) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         """执行命令"""
 
-        command_list = await self.ap.plugin_connector.list_commands()
+        found = False
+        if len(context.crt_params) > 0:  # 查找下一个参数是否对应此节点的某个子节点名
+            for oper in operator_list:
+                if (context.crt_params[0] == oper.name or context.crt_params[0] in oper.alias) and (
+                    oper.parent_class is None or oper.parent_class == operator.__class__
+                ):
+                    found = True
 
-        for command in command_list:
-            if command.metadata.name == context.command:
-                async for ret in self.ap.plugin_connector.execute_command(context):
-                    yield ret
-                break
-        else:
-            yield command_context.CommandReturn(error=command_errors.CommandNotFoundError(context.command))
+                    context.crt_command = context.crt_params[0]
+                    context.crt_params = context.crt_params[1:]
+
+                    async for ret in self._execute(context, oper.children, oper):
+                        yield ret
+                    break
+
+        if not found:  # 如果下一个参数未在此节点的子节点中找到，则执行此节点或者报错
+            if operator is None:
+                yield entities.CommandReturn(error=errors.CommandNotFoundError(context.crt_params[0]))
+            else:
+                if operator.lowest_privilege > context.privilege:
+                    yield entities.CommandReturn(error=errors.CommandPrivilegeError(operator.name))
+                else:
+                    async for ret in operator.execute(context):
+                        yield ret
 
     async def execute(
         self,
         command_text: str,
-        query: pipeline_query.Query,
-        session: provider_session.Session,
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+        query: core_entities.Query,
+        session: core_entities.Session,
+    ) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         """执行命令"""
 
         privilege = 1
@@ -85,8 +99,8 @@ class CommandManager:
         if f'{query.launcher_type.value}_{query.launcher_id}' in self.ap.instance_config.data['admins']:
             privilege = 2
 
-        ctx = command_context.ExecuteContext(
-            query_id=query.query_id,
+        ctx = entities.ExecuteContext(
+            query=query,
             session=session,
             command_text=command_text,
             command='',
@@ -96,9 +110,5 @@ class CommandManager:
             privilege=privilege,
         )
 
-        ctx.command = ctx.params[0]
-
-        ctx.shift()
-
         async for ret in self._execute(ctx, self.cmd_list):
             yield ret

pkg/command/entities.py

@@ -0,0 +1,74 @@
+from __future__ import annotations
+
+import typing
+
+import pydantic.v1 as pydantic
+
+from ..core import entities as core_entities
+from . import errors
+from ..platform.types import message as platform_message
+
+
+class CommandReturn(pydantic.BaseModel):
+    """命令返回值"""
+
+    text: typing.Optional[str] = None
+    """文本
+    """
+
+    image: typing.Optional[platform_message.Image] = None
+    """弃用"""
+
+    image_url: typing.Optional[str] = None
+    """图片链接
+    """
+
+    error: typing.Optional[errors.CommandError] = None
+    """错误
+    """
+
+    class Config:
+        arbitrary_types_allowed = True
+
+
+class ExecuteContext(pydantic.BaseModel):
+    """单次命令执行上下文"""
+
+    query: core_entities.Query
+    """本次消息的请求对象"""
+
+    session: core_entities.Session
+    """本次消息所属的会话对象"""
+
+    command_text: str
+    """命令完整文本"""
+
+    command: str
+    """命令名称"""
+
+    crt_command: str
+    """当前命令
+    
+    多级命令中crt_command为当前命令，command为根命令。
+    例如：!plugin on Webwlkr
+    处理到plugin时，command为plugin，crt_command为plugin
+    处理到on时，command为plugin，crt_command为on
+    """
+
+    params: list[str]
+    """命令参数
+    
+    整个命令以空格分割后的参数列表
+    """
+
+    crt_params: list[str]
+    """当前命令参数
+
+    多级命令中crt_params为当前命令参数，params为根命令参数。
+    例如：!plugin on Webwlkr
+    处理到plugin时，params为['on', 'Webwlkr']，crt_params为['on', 'Webwlkr']
+    处理到on时，params为['on', 'Webwlkr']，crt_params为['Webwlkr']
+    """
+
+    privilege: int
+    """发起人权限"""

pkg/command/errors.py

@@ -0,0 +1,26 @@
+class CommandError(Exception):
+    def __init__(self, message: str = None):
+        self.message = message
+
+    def __str__(self):
+        return self.message
+
+
+class CommandNotFoundError(CommandError):
+    def __init__(self, message: str = None):
+        super().__init__('未知命令: ' + message)
+
+
+class CommandPrivilegeError(CommandError):
+    def __init__(self, message: str = None):
+        super().__init__('权限不足: ' + message)
+
+
+class ParamNotEnoughError(CommandError):
+    def __init__(self, message: str = None):
+        super().__init__('参数不足: ' + message)
+
+
+class CommandOperationError(CommandError):
+    def __init__(self, message: str = None):
+        super().__init__('操作失败: ' + message)

pkg/command/operator.py

@@ -4,7 +4,7 @@ import typing
 import abc
 
 from ..core import app
-from langbot_plugin.api.entities.builtin.command import context as command_context
+from . import entities
 
 
 preregistered_operators: list[typing.Type[CommandOperator]] = []
@@ -95,18 +95,16 @@ class CommandOperator(metaclass=abc.ABCMeta):
         pass
 
     @abc.abstractmethod
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         """实现此方法以执行命令
 
         支持多次yield以返回多个结果。
         例如：一个安装插件的命令，可能会有下载、解压、安装等多个步骤，每个步骤都可以返回一个结果。
 
         Args:
-            context (command_context.ExecuteContext): 命令执行上下文
+            context (entities.ExecuteContext): 命令执行上下文
 
         Yields:
-            command_context.CommandReturn: 命令返回封装
+            entities.CommandReturn: 命令返回封装
         """
         pass

pkg/command/operators/cmd.py

@@ -2,17 +2,14 @@ from __future__ import annotations
 
 import typing
 
-from .. import operator
-from langbot_plugin.api.entities.builtin.command import context as command_context, errors as command_errors
+from .. import operator, entities, errors
 
 
 @operator.operator_class(name='cmd', help='显示命令列表', usage='!cmd\n!cmd <命令名称>')
 class CmdOperator(operator.CommandOperator):
     """命令列表"""
 
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         """执行"""
         if len(context.crt_params) == 0:
             reply_str = '当前所有命令: \n\n'
@@ -23,7 +20,7 @@ class CmdOperator(operator.CommandOperator):
 
             reply_str += '\n使用 !cmd <命令名称> 查看命令的详细帮助'
 
-            yield command_context.CommandReturn(text=reply_str.strip())
+            yield entities.CommandReturn(text=reply_str.strip())
 
         else:
             cmd_name = context.crt_params[0]
@@ -36,9 +33,9 @@ class CmdOperator(operator.CommandOperator):
                     break
 
             if cmd is None:
-                yield command_context.CommandReturn(error=command_errors.CommandNotFoundError(cmd_name))
+                yield entities.CommandReturn(error=errors.CommandNotFoundError(cmd_name))
             else:
                 reply_str = f'{cmd.name}: {cmd.help}\n\n'
                 reply_str += f'使用方法: \n{cmd.usage}'
 
-                yield command_context.CommandReturn(text=reply_str.strip())
+                yield entities.CommandReturn(text=reply_str.strip())

pkg/command/operators/delc.py

@@ -2,26 +2,23 @@ from __future__ import annotations
 
 import typing
 
-from .. import operator
-from langbot_plugin.api.entities.builtin.command import context as command_context, errors as command_errors
+from .. import operator, entities, errors
 
 
 @operator.operator_class(name='del', help='删除当前会话的历史记录', usage='!del <序号>\n!del all')
 class DelOperator(operator.CommandOperator):
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         if context.session.conversations:
             delete_index = 0
             if len(context.crt_params) > 0:
                 try:
                     delete_index = int(context.crt_params[0])
                 except Exception:
-                    yield command_context.CommandReturn(error=command_errors.CommandOperationError('索引必须是整数'))
+                    yield entities.CommandReturn(error=errors.CommandOperationError('索引必须是整数'))
                     return
 
             if delete_index < 0 or delete_index >= len(context.session.conversations):
-                yield command_context.CommandReturn(error=command_errors.CommandOperationError('索引超出范围'))
+                yield entities.CommandReturn(error=errors.CommandOperationError('索引超出范围'))
                 return
 
             # 倒序
@@ -32,17 +29,15 @@ class DelOperator(operator.CommandOperator):
 
             del context.session.conversations[to_delete_index]
 
-            yield command_context.CommandReturn(text=f'已删除对话: {delete_index}')
+            yield entities.CommandReturn(text=f'已删除对话: {delete_index}')
         else:
-            yield command_context.CommandReturn(error=command_errors.CommandOperationError('当前没有对话'))
+            yield entities.CommandReturn(error=errors.CommandOperationError('当前没有对话'))
 
 
 @operator.operator_class(name='all', help='删除此会话的所有历史记录', parent_class=DelOperator)
 class DelAllOperator(operator.CommandOperator):
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         context.session.conversations = []
         context.session.using_conversation = None
 
-        yield command_context.CommandReturn(text='已删除所有对话')
+        yield entities.CommandReturn(text='已删除所有对话')

pkg/command/operators/func.py

@@ -1,20 +1,19 @@
 from __future__ import annotations
 from typing import AsyncGenerator
 
-from .. import operator
-from langbot_plugin.api.entities.builtin.command import context as command_context
+from .. import operator, entities
 
 
 @operator.operator_class(name='func', help='查看所有已注册的内容函数', usage='!func')
 class FuncOperator(operator.CommandOperator):
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> AsyncGenerator[entities.CommandReturn, None]:
         reply_str = '当前已启用的内容函数: \n\n'
 
         index = 1
 
-        all_functions = await self.ap.tool_mgr.get_all_tools()
+        all_functions = await self.ap.tool_mgr.get_all_functions(
+            plugin_enabled=True,
+        )
 
         for func in all_functions:
             reply_str += '{}. {}:\n{}\n\n'.format(
@@ -24,4 +23,4 @@ class FuncOperator(operator.CommandOperator):
             )
             index += 1
 
-        yield command_context.CommandReturn(text=reply_str)
+        yield entities.CommandReturn(text=reply_str)

pkg/command/operators/help.py

@@ -2,17 +2,14 @@ from __future__ import annotations
 
 import typing
 
-from .. import operator
-from langbot_plugin.api.entities.builtin.command import context as command_context
+from .. import operator, entities
 
 
 @operator.operator_class(name='help', help='显示帮助', usage='!help\n!help <命令名称>')
 class HelpOperator(operator.CommandOperator):
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         help = 'LangBot - 大语言模型原生即时通信机器人平台\n链接：https://langbot.app'
 
         help += '\n发送命令 !cmd 可查看命令列表'
 
-        yield command_context.CommandReturn(text=help)
+        yield entities.CommandReturn(text=help)

pkg/command/operators/last.py

@@ -3,31 +3,26 @@ from __future__ import annotations
 import typing
 
 
-from .. import operator
-from langbot_plugin.api.entities.builtin.command import context as command_context, errors as command_errors
+from .. import operator, entities, errors
 
 
 @operator.operator_class(name='last', help='切换到前一个对话', usage='!last')
 class LastOperator(operator.CommandOperator):
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         if context.session.conversations:
             # 找到当前会话的上一个会话
             for index in range(len(context.session.conversations) - 1, -1, -1):
                 if context.session.conversations[index] == context.session.using_conversation:
                     if index == 0:
-                        yield command_context.CommandReturn(
-                            error=command_errors.CommandOperationError('已经是第一个对话了')
-                        )
+                        yield entities.CommandReturn(error=errors.CommandOperationError('已经是第一个对话了'))
                         return
                     else:
                         context.session.using_conversation = context.session.conversations[index - 1]
                         time_str = context.session.using_conversation.create_time.strftime('%Y-%m-%d %H:%M:%S')
 
-                        yield command_context.CommandReturn(
+                        yield entities.CommandReturn(
                             text=f'已切换到上一个对话: {index} {time_str}: {context.session.using_conversation.messages[0].readable_str()}'
                         )
                         return
         else:
-            yield command_context.CommandReturn(error=command_errors.CommandOperationError('当前没有对话'))
+            yield entities.CommandReturn(error=errors.CommandOperationError('当前没有对话'))

pkg/command/operators/list.py

@@ -2,22 +2,19 @@ from __future__ import annotations
 
 import typing
 
-from .. import operator
-from langbot_plugin.api.entities.builtin.command import context as command_context, errors as command_errors
+from .. import operator, entities, errors
 
 
 @operator.operator_class(name='list', help='列出此会话中的所有历史对话', usage='!list\n!list <页码>')
 class ListOperator(operator.CommandOperator):
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         page = 0
 
         if len(context.crt_params) > 0:
             try:
                 page = int(context.crt_params[0] - 1)
             except Exception:
-                yield command_context.CommandReturn(error=command_errors.CommandOperationError('页码应为整数'))
+                yield entities.CommandReturn(error=errors.CommandOperationError('页码应为整数'))
                 return
 
         record_per_page = 10
@@ -48,4 +45,4 @@ class ListOperator(operator.CommandOperator):
             else:
                 content += f'\n当前会话: {using_conv_index} {context.session.using_conversation.create_time.strftime("%Y-%m-%d %H:%M:%S")}: {context.session.using_conversation.messages[0].readable_str() if len(context.session.using_conversation.messages) > 0 else "无内容"}'
 
-        yield command_context.CommandReturn(text=f'第 {page + 1} 页 (时间倒序):\n{content}')
+        yield entities.CommandReturn(text=f'第 {page + 1} 页 (时间倒序):\n{content}')

pkg/command/operators/next.py

@@ -2,31 +2,26 @@ from __future__ import annotations
 
 import typing
 
-from .. import operator
-from langbot_plugin.api.entities.builtin.command import context as command_context, errors as command_errors
+from .. import operator, entities, errors
 
 
 @operator.operator_class(name='next', help='切换到后一个对话', usage='!next')
 class NextOperator(operator.CommandOperator):
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         if context.session.conversations:
             # 找到当前会话的下一个会话
             for index in range(len(context.session.conversations)):
                 if context.session.conversations[index] == context.session.using_conversation:
                     if index == len(context.session.conversations) - 1:
-                        yield command_context.CommandReturn(
-                            error=command_errors.CommandOperationError('已经是最后一个对话了')
-                        )
+                        yield entities.CommandReturn(error=errors.CommandOperationError('已经是最后一个对话了'))
                         return
                     else:
                         context.session.using_conversation = context.session.conversations[index + 1]
                         time_str = context.session.using_conversation.create_time.strftime('%Y-%m-%d %H:%M:%S')
 
-                        yield command_context.CommandReturn(
+                        yield entities.CommandReturn(
                             text=f'已切换到后一个对话: {index} {time_str}: {context.session.using_conversation.messages[0].content}'
                         )
                         return
         else:
-            yield command_context.CommandReturn(error=command_errors.CommandOperationError('当前没有对话'))
+            yield entities.CommandReturn(error=errors.CommandOperationError('当前没有对话'))

pkg/command/operators/plugin.py

@@ -2,8 +2,7 @@ from __future__ import annotations
 import typing
 import traceback
 
-from .. import operator
-from langbot_plugin.api.entities.builtin.command import context as command_context, errors as command_errors
+from .. import operator, entities, errors
 
 
 @operator.operator_class(
@@ -12,9 +11,7 @@ from langbot_plugin.api.entities.builtin.command import context as command_conte
     usage='!plugin\n!plugin get <插件仓库地址>\n!plugin update\n!plugin del <插件名>\n!plugin on <插件名>\n!plugin off <插件名>',
 )
 class PluginOperator(operator.CommandOperator):
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         plugin_list = self.ap.plugin_mgr.plugins()
         reply_str = '所有插件({}):\n'.format(len(plugin_list))
         idx = 0
@@ -30,36 +27,32 @@ class PluginOperator(operator.CommandOperator):
 
             idx += 1
 
-        yield command_context.CommandReturn(text=reply_str)
+        yield entities.CommandReturn(text=reply_str)
 
 
 @operator.operator_class(name='get', help='安装插件', privilege=2, parent_class=PluginOperator)
 class PluginGetOperator(operator.CommandOperator):
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         if len(context.crt_params) == 0:
-            yield command_context.CommandReturn(error=command_errors.ParamNotEnoughError('请提供插件仓库地址'))
+            yield entities.CommandReturn(error=errors.ParamNotEnoughError('请提供插件仓库地址'))
         else:
             repo = context.crt_params[0]
 
-            yield command_context.CommandReturn(text='正在安装插件...')
+            yield entities.CommandReturn(text='正在安装插件...')
 
             try:
                 await self.ap.plugin_mgr.install_plugin(repo)
-                yield command_context.CommandReturn(text='插件安装成功，请重启程序以加载插件')
+                yield entities.CommandReturn(text='插件安装成功，请重启程序以加载插件')
             except Exception as e:
                 traceback.print_exc()
-                yield command_context.CommandReturn(error=command_errors.CommandError('插件安装失败: ' + str(e)))
+                yield entities.CommandReturn(error=errors.CommandError('插件安装失败: ' + str(e)))
 
 
 @operator.operator_class(name='update', help='更新插件', privilege=2, parent_class=PluginOperator)
 class PluginUpdateOperator(operator.CommandOperator):
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         if len(context.crt_params) == 0:
-            yield command_context.CommandReturn(error=command_errors.ParamNotEnoughError('请提供插件名称'))
+            yield entities.CommandReturn(error=errors.ParamNotEnoughError('请提供插件名称'))
         else:
             plugin_name = context.crt_params[0]
 
@@ -67,26 +60,24 @@ class PluginUpdateOperator(operator.CommandOperator):
                 plugin_container = self.ap.plugin_mgr.get_plugin_by_name(plugin_name)
 
                 if plugin_container is not None:
-                    yield command_context.CommandReturn(text='正在更新插件...')
+                    yield entities.CommandReturn(text='正在更新插件...')
                     await self.ap.plugin_mgr.update_plugin(plugin_name)
-                    yield command_context.CommandReturn(text='插件更新成功，请重启程序以加载插件')
+                    yield entities.CommandReturn(text='插件更新成功，请重启程序以加载插件')
                 else:
-                    yield command_context.CommandReturn(error=command_errors.CommandError('插件更新失败: 未找到插件'))
+                    yield entities.CommandReturn(error=errors.CommandError('插件更新失败: 未找到插件'))
             except Exception as e:
                 traceback.print_exc()
-                yield command_context.CommandReturn(error=command_errors.CommandError('插件更新失败: ' + str(e)))
+                yield entities.CommandReturn(error=errors.CommandError('插件更新失败: ' + str(e)))
 
 
 @operator.operator_class(name='all', help='更新所有插件', privilege=2, parent_class=PluginUpdateOperator)
 class PluginUpdateAllOperator(operator.CommandOperator):
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         try:
             plugins = [p.plugin_name for p in self.ap.plugin_mgr.plugins()]
 
             if plugins:
-                yield command_context.CommandReturn(text='正在更新插件...')
+                yield entities.CommandReturn(text='正在更新插件...')
                 updated = []
                 try:
                     for plugin_name in plugins:
@@ -94,22 +85,20 @@ class PluginUpdateAllOperator(operator.CommandOperator):
                         updated.append(plugin_name)
                 except Exception as e:
                     traceback.print_exc()
-                    yield command_context.CommandReturn(error=command_errors.CommandError('插件更新失败: ' + str(e)))
-                yield command_context.CommandReturn(text='已更新插件: {}'.format(', '.join(updated)))
+                    yield entities.CommandReturn(error=errors.CommandError('插件更新失败: ' + str(e)))
+                yield entities.CommandReturn(text='已更新插件: {}'.format(', '.join(updated)))
             else:
-                yield command_context.CommandReturn(text='没有可更新的插件')
+                yield entities.CommandReturn(text='没有可更新的插件')
         except Exception as e:
             traceback.print_exc()
-            yield command_context.CommandReturn(error=command_errors.CommandError('插件更新失败: ' + str(e)))
+            yield entities.CommandReturn(error=errors.CommandError('插件更新失败: ' + str(e)))
 
 
 @operator.operator_class(name='del', help='删除插件', privilege=2, parent_class=PluginOperator)
 class PluginDelOperator(operator.CommandOperator):
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         if len(context.crt_params) == 0:
-            yield command_context.CommandReturn(error=command_errors.ParamNotEnoughError('请提供插件名称'))
+            yield entities.CommandReturn(error=errors.ParamNotEnoughError('请提供插件名称'))
         else:
             plugin_name = context.crt_params[0]
 
@@ -117,55 +106,51 @@ class PluginDelOperator(operator.CommandOperator):
                 plugin_container = self.ap.plugin_mgr.get_plugin_by_name(plugin_name)
 
                 if plugin_container is not None:
-                    yield command_context.CommandReturn(text='正在删除插件...')
+                    yield entities.CommandReturn(text='正在删除插件...')
                     await self.ap.plugin_mgr.uninstall_plugin(plugin_name)
-                    yield command_context.CommandReturn(text='插件删除成功，请重启程序以加载插件')
+                    yield entities.CommandReturn(text='插件删除成功，请重启程序以加载插件')
                 else:
-                    yield command_context.CommandReturn(error=command_errors.CommandError('插件删除失败: 未找到插件'))
+                    yield entities.CommandReturn(error=errors.CommandError('插件删除失败: 未找到插件'))
             except Exception as e:
                 traceback.print_exc()
-                yield command_context.CommandReturn(error=command_errors.CommandError('插件删除失败: ' + str(e)))
+                yield entities.CommandReturn(error=errors.CommandError('插件删除失败: ' + str(e)))
 
 
 @operator.operator_class(name='on', help='启用插件', privilege=2, parent_class=PluginOperator)
 class PluginEnableOperator(operator.CommandOperator):
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         if len(context.crt_params) == 0:
-            yield command_context.CommandReturn(error=command_errors.ParamNotEnoughError('请提供插件名称'))
+            yield entities.CommandReturn(error=errors.ParamNotEnoughError('请提供插件名称'))
         else:
             plugin_name = context.crt_params[0]
 
             try:
                 if await self.ap.plugin_mgr.update_plugin_switch(plugin_name, True):
-                    yield command_context.CommandReturn(text='已启用插件: {}'.format(plugin_name))
+                    yield entities.CommandReturn(text='已启用插件: {}'.format(plugin_name))
                 else:
-                    yield command_context.CommandReturn(
-                        error=command_errors.CommandError('插件状态修改失败: 未找到插件 {}'.format(plugin_name))
+                    yield entities.CommandReturn(
+                        error=errors.CommandError('插件状态修改失败: 未找到插件 {}'.format(plugin_name))
                     )
             except Exception as e:
                 traceback.print_exc()
-                yield command_context.CommandReturn(error=command_errors.CommandError('插件状态修改失败: ' + str(e)))
+                yield entities.CommandReturn(error=errors.CommandError('插件状态修改失败: ' + str(e)))
 
 
 @operator.operator_class(name='off', help='禁用插件', privilege=2, parent_class=PluginOperator)
 class PluginDisableOperator(operator.CommandOperator):
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         if len(context.crt_params) == 0:
-            yield command_context.CommandReturn(error=command_errors.ParamNotEnoughError('请提供插件名称'))
+            yield entities.CommandReturn(error=errors.ParamNotEnoughError('请提供插件名称'))
         else:
             plugin_name = context.crt_params[0]
 
             try:
                 if await self.ap.plugin_mgr.update_plugin_switch(plugin_name, False):
-                    yield command_context.CommandReturn(text='已禁用插件: {}'.format(plugin_name))
+                    yield entities.CommandReturn(text='已禁用插件: {}'.format(plugin_name))
                 else:
-                    yield command_context.CommandReturn(
-                        error=command_errors.CommandError('插件状态修改失败: 未找到插件 {}'.format(plugin_name))
+                    yield entities.CommandReturn(
+                        error=errors.CommandError('插件状态修改失败: 未找到插件 {}'.format(plugin_name))
                     )
             except Exception as e:
                 traceback.print_exc()
-                yield command_context.CommandReturn(error=command_errors.CommandError('插件状态修改失败: ' + str(e)))
+                yield entities.CommandReturn(error=errors.CommandError('插件状态修改失败: ' + str(e)))

pkg/command/operators/prompt.py

@@ -2,22 +2,19 @@ from __future__ import annotations
 
 import typing
 
-from .. import operator
-from langbot_plugin.api.entities.builtin.command import context as command_context, errors as command_errors
+from .. import operator, entities, errors
 
 
 @operator.operator_class(name='prompt', help='查看当前对话的前文', usage='!prompt')
 class PromptOperator(operator.CommandOperator):
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         """执行"""
         if context.session.using_conversation is None:
-            yield command_context.CommandReturn(error=command_errors.CommandOperationError('当前没有对话'))
+            yield entities.CommandReturn(error=errors.CommandOperationError('当前没有对话'))
         else:
             reply_str = '当前对话所有内容:\n\n'
 
             for msg in context.session.using_conversation.messages:
                 reply_str += f'{msg.role}: {msg.content}\n'
 
-            yield command_context.CommandReturn(text=reply_str)
+            yield entities.CommandReturn(text=reply_str)

pkg/command/operators/resend.py

@@ -2,18 +2,15 @@ from __future__ import annotations
 
 import typing
 
-from .. import operator
-from langbot_plugin.api.entities.builtin.command import context as command_context, errors as command_errors
+from .. import operator, entities, errors
 
 
 @operator.operator_class(name='resend', help='重发当前会话的最后一条消息', usage='!resend')
 class ResendOperator(operator.CommandOperator):
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         # 回滚到最后一条用户message前
         if context.session.using_conversation is None:
-            yield command_context.CommandReturn(error=command_errors.CommandError('当前没有对话'))
+            yield entities.CommandReturn(error=errors.CommandError('当前没有对话'))
         else:
             conv_msg = context.session.using_conversation.messages
 
@@ -26,4 +23,4 @@ class ResendOperator(operator.CommandOperator):
                 conv_msg.pop()
 
             # 不重发了，提示用户已删除就行了
-            yield command_context.CommandReturn(text='已删除最后一次请求记录')
+            yield entities.CommandReturn(text='已删除最后一次请求记录')

pkg/command/operators/reset.py

@@ -2,16 +2,13 @@ from __future__ import annotations
 
 import typing
 
-from .. import operator
-from langbot_plugin.api.entities.builtin.command import context as command_context
+from .. import operator, entities
 
 
 @operator.operator_class(name='reset', help='重置当前会话', usage='!reset')
 class ResetOperator(operator.CommandOperator):
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         """执行"""
         context.session.using_conversation = None
 
-        yield command_context.CommandReturn(text='已重置当前会话')
+        yield entities.CommandReturn(text='已重置当前会话')

pkg/command/operators/update.py

@@ -0,0 +1,11 @@
+from __future__ import annotations
+
+import typing
+
+from .. import operator, entities
+
+
+@operator.operator_class(name='update', help='更新程序', usage='!update', privilege=2)
+class UpdateCommand(operator.CommandOperator):
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
+        yield entities.CommandReturn(text='不再支持通过命令更新，请查看 LangBot 文档。')

pkg/command/operators/version.py

@@ -2,15 +2,12 @@ from __future__ import annotations
 
 import typing
 
-from .. import operator
-from langbot_plugin.api.entities.builtin.command import context as command_context
+from .. import operator, entities
 
 
 @operator.operator_class(name='version', help='显示版本信息', usage='!version')
 class VersionCommand(operator.CommandOperator):
-    async def execute(
-        self, context: command_context.ExecuteContext
-    ) -> typing.AsyncGenerator[command_context.CommandReturn, None]:
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         reply_str = f'当前版本: \n{self.ap.ver_mgr.get_current_version()}'
 
         try:
@@ -19,4 +16,4 @@ class VersionCommand(operator.CommandOperator):
         except Exception:
             pass
 
-        yield command_context.CommandReturn(text=reply_str.strip())
+        yield entities.CommandReturn(text=reply_str.strip())

pkg/core/app.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import logging
 import asyncio
 import traceback
+import sys
 import os
 
 from ..platform import botmgr as im_mgr
@@ -11,7 +12,7 @@ from ..provider.modelmgr import modelmgr as llm_model_mgr
 from ..provider.tools import toolmgr as llm_tool_mgr
 from ..config import manager as config_mgr
 from ..command import cmdmgr
-from ..plugin import connector as plugin_connector
+from ..plugin import manager as plugin_mgr
 from ..pipeline import pool
 from ..pipeline import controller, pipelinemgr
 from ..utils import version as version_mgr, proxy as proxy_mgr, announce as announce_mgr
@@ -74,7 +75,7 @@ class Application:
 
     # =========================
 
-    plugin_connector: plugin_connector.PluginRuntimeConnector = None
+    plugin_mgr: plugin_mgr.PluginManager = None
 
     query_pool: pool.QueryPool = None
 
@@ -116,7 +117,7 @@ class Application:
 
     async def run(self):
         try:
-            await self.plugin_connector.initialize_plugins()
+            await self.plugin_mgr.initialize_plugins()
 
             # 后续可能会允许动态重启其他任务
             # 故为了防止程序在非 Ctrl-C 情况下退出，这里创建一个不会结束的协程
@@ -156,9 +157,6 @@ class Application:
             self.logger.error(f'应用运行致命异常: {e}')
             self.logger.debug(f'Traceback: {traceback.format_exc()}')
 
-    def dispose(self):
-        self.plugin_connector.dispose()
-
     async def print_web_access_info(self):
         """打印访问 webui 的提示"""
 
@@ -185,3 +183,59 @@ class Application:
 """.strip()
         for line in tips.split('\n'):
             self.logger.info(line)
+
+    async def reload(
+        self,
+        scope: core_entities.LifecycleControlScope,
+    ):
+        match scope:
+            case core_entities.LifecycleControlScope.PLATFORM.value:
+                self.logger.info('执行热重载 scope=' + scope)
+                await self.platform_mgr.shutdown()
+
+                self.platform_mgr = im_mgr.PlatformManager(self)
+
+                await self.platform_mgr.initialize()
+
+                self.task_mgr.create_task(
+                    self.platform_mgr.run(),
+                    name='platform-manager',
+                    scopes=[
+                        core_entities.LifecycleControlScope.APPLICATION,
+                        core_entities.LifecycleControlScope.PLATFORM,
+                    ],
+                )
+            case core_entities.LifecycleControlScope.PLUGIN.value:
+                self.logger.info('执行热重载 scope=' + scope)
+                await self.plugin_mgr.destroy_plugins()
+
+                # 删除 sys.module 中所有的 plugins/* 下的模块
+                for mod in list(sys.modules.keys()):
+                    if mod.startswith('plugins.'):
+                        del sys.modules[mod]
+
+                self.plugin_mgr = plugin_mgr.PluginManager(self)
+                await self.plugin_mgr.initialize()
+
+                await self.plugin_mgr.initialize_plugins()
+
+                await self.plugin_mgr.load_plugins()
+                await self.plugin_mgr.initialize_plugins()
+            case core_entities.LifecycleControlScope.PROVIDER.value:
+                self.logger.info('执行热重载 scope=' + scope)
+
+                await self.tool_mgr.shutdown()
+
+                llm_model_mgr_inst = llm_model_mgr.ModelManager(self)
+                await llm_model_mgr_inst.initialize()
+                self.model_mgr = llm_model_mgr_inst
+
+                llm_session_mgr_inst = llm_session_mgr.SessionManager(self)
+                await llm_session_mgr_inst.initialize()
+                self.sess_mgr = llm_session_mgr_inst
+
+                llm_tool_mgr_inst = llm_tool_mgr.ToolManager(self)
+                await llm_tool_mgr_inst.initialize()
+                self.tool_mgr = llm_tool_mgr_inst
+            case _:
+                pass

pkg/core/boot.py

@@ -51,8 +51,8 @@ async def main(loop: asyncio.AbstractEventLoop):
         import signal
 
         def signal_handler(sig, frame):
-            app_inst.dispose()
             print('[Signal] 程序退出.')
+            # ap.shutdown()
             os._exit(0)
 
         signal.signal(signal.SIGINT, signal_handler)

pkg/core/entities.py

@@ -1,6 +1,18 @@
 from __future__ import annotations
 
 import enum
+import typing
+import datetime
+import asyncio
+
+import pydantic.v1 as pydantic
+
+from ..provider import entities as llm_entities
+from ..provider.modelmgr import requester
+from ..provider.tools import entities as tools_entities
+from ..platform import adapter as msadapter
+from ..platform.types import message as platform_message
+from ..platform.types import events as platform_events
 
 
 class LifecycleControlScope(enum.Enum):
@@ -8,3 +20,157 @@ class LifecycleControlScope(enum.Enum):
     PLATFORM = 'platform'
     PLUGIN = 'plugin'
     PROVIDER = 'provider'
+
+
+class LauncherTypes(enum.Enum):
+    """一个请求的发起者类型"""
+
+    PERSON = 'person'
+    """私聊"""
+
+    GROUP = 'group'
+    """群聊"""
+
+
+class Query(pydantic.BaseModel):
+    """一次请求的信息封装"""
+
+    query_id: int
+    """请求ID，添加进请求池时生成"""
+
+    launcher_type: LauncherTypes
+    """会话类型，platform处理阶段设置"""
+
+    launcher_id: typing.Union[int, str]
+    """会话ID，platform处理阶段设置"""
+
+    sender_id: typing.Union[int, str]
+    """发送者ID，platform处理阶段设置"""
+
+    message_event: platform_events.MessageEvent
+    """事件，platform收到的原始事件"""
+
+    message_chain: platform_message.MessageChain
+    """消息链，platform收到的原始消息链"""
+
+    bot_uuid: typing.Optional[str] = None
+    """机器人UUID。"""
+
+    pipeline_uuid: typing.Optional[str] = None
+    """流水线UUID。"""
+
+    pipeline_config: typing.Optional[dict[str, typing.Any]] = None
+    """流水线配置，由 Pipeline 在运行开始时设置。"""
+
+    adapter: msadapter.MessagePlatformAdapter
+    """消息平台适配器对象，单个app中可能启用了多个消息平台适配器，此对象表明发起此query的适配器"""
+
+    session: typing.Optional[Session] = None
+    """会话对象，由前置处理器阶段设置"""
+
+    messages: typing.Optional[list[llm_entities.Message]] = []
+    """历史消息列表，由前置处理器阶段设置"""
+
+    prompt: typing.Optional[llm_entities.Prompt] = None
+    """情景预设内容，由前置处理器阶段设置"""
+
+    user_message: typing.Optional[llm_entities.Message] = None
+    """此次请求的用户消息对象，由前置处理器阶段设置"""
+
+    variables: typing.Optional[dict[str, typing.Any]] = None
+    """变量，由前置处理器阶段设置。在prompt中嵌入或由 Runner 传递到 LLMOps 平台。"""
+
+    use_llm_model: typing.Optional[requester.RuntimeLLMModel] = None
+    """使用的对话模型，由前置处理器阶段设置"""
+
+    use_funcs: typing.Optional[list[tools_entities.LLMFunction]] = None
+    """使用的函数，由前置处理器阶段设置"""
+
+    resp_messages: (
+        typing.Optional[list[llm_entities.Message]] | typing.Optional[list[platform_message.MessageChain]]
+    ) = []
+    """由Process阶段生成的回复消息对象列表"""
+
+    resp_message_chain: typing.Optional[list[platform_message.MessageChain]] = None
+    """回复消息链，从resp_messages包装而得"""
+
+    # ======= 内部保留 =======
+    current_stage: typing.Optional['pkg.pipeline.pipelinemgr.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"""
+
+    prompt: llm_entities.Prompt
+
+    messages: list[llm_entities.Message]
+
+    create_time: typing.Optional[datetime.datetime] = pydantic.Field(default_factory=datetime.datetime.now)
+
+    update_time: typing.Optional[datetime.datetime] = pydantic.Field(default_factory=datetime.datetime.now)
+
+    use_llm_model: typing.Optional[requester.RuntimeLLMModel] = None
+
+    use_funcs: typing.Optional[list[tools_entities.LLMFunction]]
+
+    pipeline_uuid: str
+    """流水线UUID。"""
+
+    bot_uuid: str
+    """机器人UUID。"""
+
+    uuid: typing.Optional[str] = None
+    """该对话的 uuid，在创建时不会自动生成。而是当使用 Dify API 等由外部管理对话信息的服务时，用于绑定外部的会话。具体如何使用，取决于 Runner。"""
+
+    class Config:
+        arbitrary_types_allowed = True
+
+
+class Session(pydantic.BaseModel):
+    """会话，一个 Session 对应一个 {launcher_type.value}_{launcher_id}"""
+
+    launcher_type: LauncherTypes
+
+    launcher_id: typing.Union[int, str]
+
+    sender_id: typing.Optional[typing.Union[int, str]] = 0
+
+    use_prompt_name: typing.Optional[str] = 'default'
+
+    using_conversation: typing.Optional[Conversation] = None
+
+    conversations: typing.Optional[list[Conversation]] = pydantic.Field(default_factory=list)
+
+    create_time: typing.Optional[datetime.datetime] = pydantic.Field(default_factory=datetime.datetime.now)
+
+    update_time: typing.Optional[datetime.datetime] = pydantic.Field(default_factory=datetime.datetime.now)
+
+    semaphore: typing.Optional[asyncio.Semaphore] = None
+    """当前会话的信号量，用于限制并发"""
+
+    class Config:
+        arbitrary_types_allowed = True

pkg/core/stages/build_app.py

@@ -1,11 +1,10 @@
 from __future__ import annotations
 
-import asyncio
 
 from .. import stage, app
 from ...utils import version, proxy, announce
 from ...pipeline import pool, controller, pipelinemgr
-from ...plugin import connector as plugin_connector
+from ...plugin import manager as plugin_mgr
 from ...command import cmdmgr
 from ...provider.session import sessionmgr as llm_session_mgr
 from ...provider.modelmgr import modelmgr as llm_model_mgr
@@ -60,13 +59,10 @@ class BuildAppStage(stage.BootingStage):
         ap.persistence_mgr = persistence_mgr_inst
         await persistence_mgr_inst.initialize()
 
-        async def runtime_disconnect_callback(connector: plugin_connector.PluginRuntimeConnector) -> None:
-            await asyncio.sleep(3)
-            await plugin_connector_inst.initialize()
-
-        plugin_connector_inst = plugin_connector.PluginRuntimeConnector(ap, runtime_disconnect_callback)
-        await plugin_connector_inst.initialize()
-        ap.plugin_connector = plugin_connector_inst
+        plugin_mgr_inst = plugin_mgr.PluginManager(ap)
+        await plugin_mgr_inst.initialize()
+        ap.plugin_mgr = plugin_mgr_inst
+        await plugin_mgr_inst.load_plugins()
 
         cmd_mgr_inst = cmdmgr.CommandManager(ap)
         await cmd_mgr_inst.initialize()

pkg/core/stages/genkeys.py

@@ -15,3 +15,10 @@ class GenKeysStage(stage.BootingStage):
         if not ap.instance_config.data['system']['jwt']['secret']:
             ap.instance_config.data['system']['jwt']['secret'] = secrets.token_hex(16)
             await ap.instance_config.dump_config()
+
+        if 'recovery_key' not in ap.instance_config.data['system']:
+            ap.instance_config.data['system']['recovery_key'] = ''
+
+        if not ap.instance_config.data['system']['recovery_key']:
+            ap.instance_config.data['system']['recovery_key'] = secrets.token_hex(3).upper()
+            await ap.instance_config.dump_config()

pkg/entity/persistence/bstorage.py

@@ -1,22 +0,0 @@
-import sqlalchemy
-
-from .base import Base
-
-
-class BinaryStorage(Base):
-    """Current for plugin use only"""
-
-    __tablename__ = 'binary_storages'
-
-    unique_key = sqlalchemy.Column(sqlalchemy.String(255), primary_key=True)
-    key = sqlalchemy.Column(sqlalchemy.String(255), nullable=False)
-    owner_type = sqlalchemy.Column(sqlalchemy.String(255), nullable=False)
-    owner = sqlalchemy.Column(sqlalchemy.String(255), nullable=False)
-    value = sqlalchemy.Column(sqlalchemy.LargeBinary, nullable=False)
-    created_at = sqlalchemy.Column(sqlalchemy.DateTime, nullable=False, server_default=sqlalchemy.func.now())
-    updated_at = sqlalchemy.Column(
-        sqlalchemy.DateTime,
-        nullable=False,
-        server_default=sqlalchemy.func.now(),
-        onupdate=sqlalchemy.func.now(),
-    )

pkg/entity/persistence/plugin.py

@@ -13,8 +13,6 @@ class PluginSetting(Base):
     enabled = sqlalchemy.Column(sqlalchemy.Boolean, nullable=False, default=True)
     priority = sqlalchemy.Column(sqlalchemy.Integer, nullable=False, default=0)
     config = sqlalchemy.Column(sqlalchemy.JSON, nullable=False, default=dict)
-    install_source = sqlalchemy.Column(sqlalchemy.String(255), nullable=False, default='github')
-    install_info = sqlalchemy.Column(sqlalchemy.JSON, nullable=False, default=dict)
     created_at = sqlalchemy.Column(sqlalchemy.DateTime, nullable=False, server_default=sqlalchemy.func.now())
     updated_at = sqlalchemy.Column(
         sqlalchemy.DateTime,

pkg/persistence/mgr.py

@@ -44,38 +44,6 @@ class PersistenceManager:
 
         await self.create_tables()
 
-        # run migrations
-        database_version = await self.execute_async(
-            sqlalchemy.select(metadata.Metadata).where(metadata.Metadata.key == 'database_version')
-        )
-
-        database_version = int(database_version.fetchone()[1])
-        required_database_version = constants.required_database_version
-
-        if database_version < required_database_version:
-            migrations = migration.preregistered_db_migrations
-            migrations.sort(key=lambda x: x.number)
-
-            last_migration_number = database_version
-
-            for migration_cls in migrations:
-                migration_instance = migration_cls(self.ap)
-
-                if (
-                    migration_instance.number > database_version
-                    and migration_instance.number <= required_database_version
-                ):
-                    await migration_instance.upgrade()
-                    await self.execute_async(
-                        sqlalchemy.update(metadata.Metadata)
-                        .where(metadata.Metadata.key == 'database_version')
-                        .values({'value': str(migration_instance.number)})
-                    )
-                    last_migration_number = migration_instance.number
-                    self.ap.logger.info(f'Migration {migration_instance.number} completed.')
-
-            self.ap.logger.info(f'Successfully upgraded database to version {last_migration_number}.')
-
     async def create_tables(self):
         # create tables
         async with self.get_db_engine().connect() as conn:
@@ -119,6 +87,38 @@ class PersistenceManager:
 
         # =================================
 
+        # run migrations
+        database_version = await self.execute_async(
+            sqlalchemy.select(metadata.Metadata).where(metadata.Metadata.key == 'database_version')
+        )
+
+        database_version = int(database_version.fetchone()[1])
+        required_database_version = constants.required_database_version
+
+        if database_version < required_database_version:
+            migrations = migration.preregistered_db_migrations
+            migrations.sort(key=lambda x: x.number)
+
+            last_migration_number = database_version
+
+            for migration_cls in migrations:
+                migration_instance = migration_cls(self.ap)
+
+                if (
+                    migration_instance.number > database_version
+                    and migration_instance.number <= required_database_version
+                ):
+                    await migration_instance.upgrade()
+                    await self.execute_async(
+                        sqlalchemy.update(metadata.Metadata)
+                        .where(metadata.Metadata.key == 'database_version')
+                        .values({'value': str(migration_instance.number)})
+                    )
+                    last_migration_number = migration_instance.number
+                    self.ap.logger.info(f'Migration {migration_instance.number} completed.')
+
+            self.ap.logger.info(f'Successfully upgraded database to version {last_migration_number}.')
+
     async def execute_async(self, *args, **kwargs) -> sqlalchemy.engine.cursor.CursorResult:
         async with self.get_db_engine().connect() as conn:
             result = await conn.execute(*args, **kwargs)
@@ -128,13 +128,10 @@ class PersistenceManager:
     def get_db_engine(self) -> sqlalchemy_asyncio.AsyncEngine:
         return self.db.get_engine()
 
-    def serialize_model(
-        self, model: typing.Type[sqlalchemy.Base], data: sqlalchemy.Base, masked_columns: list[str] = []
-    ) -> dict:
+    def serialize_model(self, model: typing.Type[sqlalchemy.Base], data: sqlalchemy.Base) -> dict:
         return {
             column.name: getattr(data, column.name)
             if not isinstance(getattr(data, column.name), (datetime.datetime))
             else getattr(data, column.name).isoformat()
             for column in model.__table__.columns
-            if column.name not in masked_columns
         }

pkg/persistence/migrations/dbm004_plugin_config.py

@@ -1,20 +0,0 @@
-from .. import migration
-
-
-@migration.migration_class(4)
-class DBMigratePluginConfig(migration.DBMigration):
-    """插件配置"""
-
-    async def upgrade(self):
-        """升级"""
-
-        if 'plugin' not in self.ap.instance_config.data:
-            self.ap.instance_config.data['plugin'] = {
-                'runtime_ws_url': 'ws://localhost:5400/control/ws',
-            }
-
-            await self.ap.instance_config.dump_config()
-
-    async def downgrade(self):
-        """降级"""
-        pass

pkg/persistence/migrations/dbm005_plugin_install_source.py

@@ -1,25 +0,0 @@
-import sqlalchemy
-from .. import migration
-
-
-@migration.migration_class(5)
-class DBMigratePluginInstallSource(migration.DBMigration):
-    """插件安装来源"""
-
-    async def upgrade(self):
-        """升级"""
-        # add new column install_source, use default value 'github', via alter table
-        await self.ap.persistence_mgr.execute_async(
-            sqlalchemy.text(
-                "ALTER TABLE plugin_settings ADD COLUMN install_source VARCHAR(255) NOT NULL DEFAULT 'github'"
-            )
-        )
-
-        # add new column install_info, use default value {}, via alter table
-        await self.ap.persistence_mgr.execute_async(
-            sqlalchemy.text("ALTER TABLE plugin_settings ADD COLUMN install_info JSON NOT NULL DEFAULT '{}'")
-        )
-
-    async def downgrade(self):
-        """降级"""
-        pass

pkg/pipeline/bansess/bansess.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from .. import stage, entities
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+from ...core import entities as core_entities
 
 
 @stage.stage_class('BanSessionCheckStage')
@@ -14,7 +14,7 @@ class BanSessionCheckStage(stage.PipelineStage):
     async def initialize(self, pipeline_config: dict):
         pass
 
-    async def process(self, query: pipeline_query.Query, stage_inst_name: str) -> entities.StageProcessResult:
+    async def process(self, query: core_entities.Query, stage_inst_name: str) -> entities.StageProcessResult:
         found = False
 
         mode = query.pipeline_config['trigger']['access-control']['mode']

pkg/pipeline/cntfilter/cntfilter.py

@@ -3,11 +3,12 @@ from __future__ import annotations
 from ...core import app
 
 from .. import stage, entities
+from ...core import entities as core_entities
 from . import filter as filter_model, entities as filter_entities
-from langbot_plugin.api.entities.builtin.provider import message as provider_message
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
+from ...provider import entities as llm_entities
+from ...platform.types import message as platform_message
 from ...utils import importutil
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+
 from . import filters
 
 importutil.import_modules_in_pkg(filters)
@@ -57,7 +58,7 @@ class ContentFilterStage(stage.PipelineStage):
     async def _pre_process(
         self,
         message: str,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
     ) -> entities.StageProcessResult:
         """请求llm前处理消息
         只要有一个不通过就不放行，只放行 PASS 的消息
@@ -66,7 +67,7 @@ class ContentFilterStage(stage.PipelineStage):
         if query.pipeline_config['safety']['content-filter']['scope'] == 'output-msg':
             return entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)
         if not message.strip():
-            return entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)
+            return entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)    
         else:
             for filter in self.filter_chain:
                 if filter_entities.EnableStage.PRE in filter.enable_stages:
@@ -85,14 +86,14 @@ class ContentFilterStage(stage.PipelineStage):
                     elif result.level == filter_entities.ResultLevel.PASS:  # 传到下一个
                         message = result.replacement
 
-            query.message_chain = platform_message.MessageChain([platform_message.Plain(text=message)])
+            query.message_chain = platform_message.MessageChain(platform_message.Plain(message))
 
             return entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)
 
     async def _post_process(
         self,
         message: str,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
     ) -> entities.StageProcessResult:
         """请求llm后处理响应
         只要是 PASS 或者 MASKED 的就通过此 filter，将其 replacement 设置为message，进入下一个 filter
@@ -122,7 +123,7 @@ class ContentFilterStage(stage.PipelineStage):
 
             return entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)
 
-    async def process(self, query: pipeline_query.Query, stage_inst_name: str) -> entities.StageProcessResult:
+    async def process(self, query: core_entities.Query, stage_inst_name: str) -> entities.StageProcessResult:
         """处理"""
         if stage_inst_name == 'PreContentFilterStage':
             contain_non_text = False
@@ -141,7 +142,7 @@ class ContentFilterStage(stage.PipelineStage):
             return await self._pre_process(str(query.message_chain).strip(), query)
         elif stage_inst_name == 'PostContentFilterStage':
             # 仅处理 query.resp_messages[-1].content 是 str 的情况
-            if isinstance(query.resp_messages[-1], provider_message.Message) and isinstance(
+            if isinstance(query.resp_messages[-1], llm_entities.Message) and isinstance(
                 query.resp_messages[-1].content, str
             ):
                 return await self._post_process(query.resp_messages[-1].content, query)

pkg/pipeline/cntfilter/entities.py

@@ -1,6 +1,6 @@
 import enum
 
-import pydantic
+import pydantic.v1 as pydantic
 
 
 class ResultLevel(enum.Enum):

pkg/pipeline/cntfilter/filter.py

@@ -3,9 +3,9 @@ from __future__ import annotations
 import abc
 import typing
 
-from ...core import app
+from ...core import app, entities as core_entities
 from . import entities
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+
 
 preregistered_filters: list[typing.Type[ContentFilter]] = []
 
@@ -60,7 +60,7 @@ class ContentFilter(metaclass=abc.ABCMeta):
         pass
 
     @abc.abstractmethod
-    async def process(self, query: pipeline_query.Query, message: str = None, image_url=None) -> entities.FilterResult:
+    async def process(self, query: core_entities.Query, message: str = None, image_url=None) -> entities.FilterResult:
         """处理消息
 
         分为前后阶段，具体取决于 enable_stages 的值。

pkg/pipeline/cntfilter/filters/baiduexamine.py

@@ -4,7 +4,8 @@ import aiohttp
 
 from .. import entities
 from .. import filter as filter_model
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+from ....core import entities as core_entities
+
 
 BAIDU_EXAMINE_URL = 'https://aip.baidubce.com/rest/2.0/solution/v1/text_censor/v2/user_defined?access_token={}'
 BAIDU_EXAMINE_TOKEN_URL = 'https://aip.baidubce.com/oauth/2.0/token'
@@ -26,7 +27,7 @@ class BaiduCloudExamine(filter_model.ContentFilter):
             ) as resp:
                 return (await resp.json())['access_token']
 
-    async def process(self, query: pipeline_query.Query, message: str) -> entities.FilterResult:
+    async def process(self, query: core_entities.Query, message: str) -> entities.FilterResult:
         async with aiohttp.ClientSession() as session:
             async with session.post(
                 BAIDU_EXAMINE_URL.format(await self._get_token()),

pkg/pipeline/cntfilter/filters/banwords.py

@@ -3,7 +3,7 @@ import re
 
 from .. import filter as filter_model
 from .. import entities
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+from ....core import entities as core_entities
 
 
 @filter_model.filter_class('ban-word-filter')
@@ -13,7 +13,7 @@ class BanWordFilter(filter_model.ContentFilter):
     async def initialize(self):
         pass
 
-    async def process(self, query: pipeline_query.Query, message: str) -> entities.FilterResult:
+    async def process(self, query: core_entities.Query, message: str) -> entities.FilterResult:
         found = False
 
         for word in self.ap.sensitive_meta.data['words']:

pkg/pipeline/cntfilter/filters/cntignore.py

@@ -3,7 +3,7 @@ import re
 
 from .. import entities
 from .. import filter as filter_model
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+from ....core import entities as core_entities
 
 
 @filter_model.filter_class('content-ignore')
@@ -16,7 +16,7 @@ class ContentIgnore(filter_model.ContentFilter):
             entities.EnableStage.PRE,
         ]
 
-    async def process(self, query: pipeline_query.Query, message: str) -> entities.FilterResult:
+    async def process(self, query: core_entities.Query, message: str) -> entities.FilterResult:
         if 'prefix' in query.pipeline_config['trigger']['ignore-rules']:
             for rule in query.pipeline_config['trigger']['ignore-rules']['prefix']:
                 if message.startswith(rule):

pkg/pipeline/controller.py

@@ -3,10 +3,7 @@ from __future__ import annotations
 import asyncio
 import traceback
 
-from ..core import app
-from ..core import entities as core_entities
-
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+from ..core import app, entities
 
 
 class Controller:
@@ -25,19 +22,19 @@ class Controller:
         """事件处理循环"""
         try:
             while True:
-                selected_query: pipeline_query.Query = None
+                selected_query: entities.Query = None
 
                 # 取请求
                 async with self.ap.query_pool:
-                    queries: list[pipeline_query.Query] = self.ap.query_pool.queries
+                    queries: list[entities.Query] = self.ap.query_pool.queries
 
                     for query in queries:
                         session = await self.ap.sess_mgr.get_session(query)
                         self.ap.logger.debug(f'Checking query {query} session {session}')
 
-                        if not session._semaphore.locked():
+                        if not session.semaphore.locked():
                             selected_query = query
-                            await session._semaphore.acquire()
+                            await session.semaphore.acquire()
 
                             break
 
@@ -49,7 +46,7 @@ class Controller:
 
                 if selected_query:
 
-                    async def _process_query(selected_query: pipeline_query.Query):
+                    async def _process_query(selected_query: entities.Query):
                         async with self.semaphore:  # 总并发上限
                             # find pipeline
                             # Here firstly find the bot, then find the pipeline, in case the bot adapter's config is not the latest one.
@@ -62,7 +59,7 @@ class Controller:
                                     await pipeline.run(selected_query)
 
                         async with self.ap.query_pool:
-                            (await self.ap.sess_mgr.get_session(selected_query))._semaphore.release()
+                            (await self.ap.sess_mgr.get_session(selected_query)).semaphore.release()
                             # 通知其他协程，有新的请求可以处理了
                             self.ap.query_pool.condition.notify_all()
 
@@ -71,8 +68,8 @@ class Controller:
                         kind='query',
                         name=f'query-{selected_query.query_id}',
                         scopes=[
-                            core_entities.LifecycleControlScope.APPLICATION,
-                            core_entities.LifecycleControlScope.PLATFORM,
+                            entities.LifecycleControlScope.APPLICATION,
+                            entities.LifecycleControlScope.PLATFORM,
                         ],
                     )
 

pkg/pipeline/entities.py

@@ -3,10 +3,10 @@ from __future__ import annotations
 import enum
 import typing
 
-import pydantic
+import pydantic.v1 as pydantic
+from ..platform.types import message as platform_message
 
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
+from ..core import entities
 
 
 class ResultType(enum.Enum):
@@ -20,7 +20,7 @@ class ResultType(enum.Enum):
 class StageProcessResult(pydantic.BaseModel):
     result_type: ResultType
 
-    new_query: pipeline_query.Query
+    new_query: entities.Query
 
     user_notice: typing.Optional[
         typing.Union[

pkg/pipeline/longtext/longtext.py

@@ -5,9 +5,10 @@ import traceback
 
 from . import strategy
 from .. import stage, entities
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
+from ...core import entities as core_entities
+from ...platform.types import message as platform_message
 from ...utils import importutil
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+
 from . import strategies
 
 importutil.import_modules_in_pkg(strategies)
@@ -66,7 +67,7 @@ class LongTextProcessStage(stage.PipelineStage):
 
         await self.strategy_impl.initialize()
 
-    async def process(self, query: pipeline_query.Query, stage_inst_name: str) -> entities.StageProcessResult:
+    async def process(self, query: core_entities.Query, stage_inst_name: str) -> entities.StageProcessResult:
         # 检查是否包含非 Plain 组件
         contains_non_plain = False
 

pkg/pipeline/longtext/strategies/forward.py

@@ -3,9 +3,9 @@ from __future__ import annotations
 
 
 from .. import strategy as strategy_model
+from ....core import entities as core_entities
+from ....platform.types import message as platform_message
 
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
 
 ForwardMessageDiaplay = platform_message.ForwardMessageDiaplay
 Forward = platform_message.Forward
@@ -13,7 +13,7 @@ Forward = platform_message.Forward
 
 @strategy_model.strategy_class('forward')
 class ForwardComponentStrategy(strategy_model.LongTextStrategy):
-    async def process(self, message: str, query: pipeline_query.Query) -> list[platform_message.MessageComponent]:
+    async def process(self, message: str, query: core_entities.Query) -> list[platform_message.MessageComponent]:
         display = ForwardMessageDiaplay(
             title='群聊的聊天记录',
             brief='[聊天记录]',

pkg/pipeline/longtext/strategies/image.py

@@ -8,10 +8,10 @@ import re
 from PIL import Image, ImageDraw, ImageFont
 
 import functools
+from ....platform.types import message as platform_message
 
 from .. import strategy as strategy_model
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
+from ....core import entities as core_entities
 
 
 @strategy_model.strategy_class('image')
@@ -27,7 +27,7 @@ class Text2ImageStrategy(strategy_model.LongTextStrategy):
             encoding='utf-8',
         )
 
-    async def process(self, message: str, query: pipeline_query.Query) -> list[platform_message.MessageComponent]:
+    async def process(self, message: str, query: core_entities.Query) -> list[platform_message.MessageComponent]:
         img_path = self.text_to_image(
             text_str=message,
             save_as='temp/{}.png'.format(int(time.time())),
@@ -131,7 +131,7 @@ class Text2ImageStrategy(strategy_model.LongTextStrategy):
         text_str: str,
         save_as='temp.png',
         width=800,
-        query: pipeline_query.Query = None,
+        query: core_entities.Query = None,
     ):
         text_str = text_str.replace('\t', '    ')
 

pkg/pipeline/longtext/strategy.py

@@ -4,9 +4,8 @@ import typing
 
 
 from ...core import app
-
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+from ...core import entities as core_entities
+from ...platform.types import message as platform_message
 
 
 preregistered_strategies: list[typing.Type[LongTextStrategy]] = []
@@ -50,7 +49,7 @@ class LongTextStrategy(metaclass=abc.ABCMeta):
         pass
 
     @abc.abstractmethod
-    async def process(self, message: str, query: pipeline_query.Query) -> list[platform_message.MessageComponent]:
+    async def process(self, message: str, query: core_entities.Query) -> list[platform_message.MessageComponent]:
         """处理长文本
 
         在 platform.json 中配置 long-text-process 字段，只要 文本长度超过了 threshold 就会调用此方法

pkg/pipeline/msgtrun/msgtrun.py

@@ -1,9 +1,10 @@
 from __future__ import annotations
 
 from .. import stage, entities
+from ...core import entities as core_entities
 from . import truncator
 from ...utils import importutil
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+
 from . import truncators
 
 importutil.import_modules_in_pkg(truncators)
@@ -28,7 +29,7 @@ class ConversationMessageTruncator(stage.PipelineStage):
         else:
             raise ValueError(f'未知的截断器: {use_method}')
 
-    async def process(self, query: pipeline_query.Query, stage_inst_name: str) -> entities.StageProcessResult:
+    async def process(self, query: core_entities.Query, stage_inst_name: str) -> entities.StageProcessResult:
         """处理"""
         query = await self.trun.truncate(query)
 

pkg/pipeline/msgtrun/truncator.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 import typing
 import abc
 
-from ...core import app
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+from ...core import entities as core_entities, app
+
 
 preregistered_truncators: list[typing.Type[Truncator]] = []
 
@@ -47,7 +47,7 @@ class Truncator(abc.ABC):
         pass
 
     @abc.abstractmethod
-    async def truncate(self, query: pipeline_query.Query) -> pipeline_query.Query:
+    async def truncate(self, query: core_entities.Query) -> core_entities.Query:
         """截断
 
         一般只需要操作query.messages，也可以扩展操作query.prompt, query.user_message。

pkg/pipeline/msgtrun/truncators/round.py

@@ -1,14 +1,14 @@
 from __future__ import annotations
 
 from .. import truncator
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+from ....core import entities as core_entities
 
 
 @truncator.truncator_class('round')
 class RoundTruncator(truncator.Truncator):
     """前文回合数阶段器"""
 
-    async def truncate(self, query: pipeline_query.Query) -> pipeline_query.Query:
+    async def truncate(self, query: core_entities.Query) -> core_entities.Query:
         """截断"""
         max_round = query.pipeline_config['ai']['local-agent']['max-round']
 

pkg/pipeline/pipelinemgr.py

@@ -5,18 +5,14 @@ import traceback
 
 import sqlalchemy
 
-from ..core import app
+from ..core import app, entities
 from . import entities as pipeline_entities
 from ..entity.persistence import pipeline as persistence_pipeline
 from . import stage
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.entities.builtin.platform.events as platform_events
-import langbot_plugin.api.entities.events as events
+from ..platform.types import message as platform_message, events as platform_events
+from ..plugin import events
 from ..utils import importutil
 
-import langbot_plugin.api.entities.builtin.provider.session as provider_session
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
-
 from . import (
     resprule,
     bansess,
@@ -79,17 +75,17 @@ class RuntimePipeline:
         self.pipeline_entity = pipeline_entity
         self.stage_containers = stage_containers
 
-    async def run(self, query: pipeline_query.Query):
+    async def run(self, query: entities.Query):
         query.pipeline_config = self.pipeline_entity.config
         await self.process_query(query)
 
-    async def _check_output(self, query: pipeline_query.Query, result: pipeline_entities.StageProcessResult):
+    async def _check_output(self, query: entities.Query, result: pipeline_entities.StageProcessResult):
         """检查输出"""
         if result.user_notice:
             # 处理str类型
 
             if isinstance(result.user_notice, str):
-                result.user_notice = platform_message.MessageChain([platform_message.Plain(text=result.user_notice)])
+                result.user_notice = platform_message.MessageChain(platform_message.Plain(result.user_notice))
             elif isinstance(result.user_notice, list):
                 result.user_notice = platform_message.MessageChain(*result.user_notice)
 
@@ -113,7 +109,7 @@ class RuntimePipeline:
     async def _execute_from_stage(
         self,
         stage_index: int,
-        query: pipeline_query.Query,
+        query: entities.Query,
     ):
         """从指定阶段开始执行，实现了责任链模式和基于生成器的阶段分叉功能。
 
@@ -140,7 +136,7 @@ class RuntimePipeline:
         while i < len(self.stage_containers):
             stage_container = self.stage_containers[i]
 
-            query.current_stage_name = stage_container.inst_name  # 标记到 Query 对象里
+            query.current_stage = stage_container  # 标记到 Query 对象里
 
             result = stage_container.inst.process(query, stage_container.inst_name)
 
@@ -173,26 +169,26 @@ class RuntimePipeline:
 
             i += 1
 
-    async def process_query(self, query: pipeline_query.Query):
+    async def process_query(self, query: entities.Query):
         """处理请求"""
         try:
             # ======== 触发 MessageReceived 事件 ========
             event_type = (
                 events.PersonMessageReceived
-                if query.launcher_type == provider_session.LauncherTypes.PERSON
+                if query.launcher_type == entities.LauncherTypes.PERSON
                 else events.GroupMessageReceived
             )
 
-            event_obj = event_type(
-                query=query,
-                launcher_type=query.launcher_type.value,
-                launcher_id=query.launcher_id,
-                sender_id=query.sender_id,
-                message_chain=query.message_chain,
+            event_ctx = await self.ap.plugin_mgr.emit_event(
+                event=event_type(
+                    launcher_type=query.launcher_type.value,
+                    launcher_id=query.launcher_id,
+                    sender_id=query.sender_id,
+                    message_chain=query.message_chain,
+                    query=query,
+                )
             )
 
-            event_ctx = await self.ap.plugin_connector.emit_event(event_obj)
-
             if event_ctx.is_prevented_default():
                 return
 
@@ -200,12 +196,11 @@ class RuntimePipeline:
 
             await self._execute_from_stage(0, query)
         except Exception as e:
-            inst_name = query.current_stage_name if query.current_stage_name else 'unknown'
+            inst_name = query.current_stage.inst_name if query.current_stage else 'unknown'
             self.ap.logger.error(f'处理请求时出错 query_id={query.query_id} stage={inst_name} : {e}')
             self.ap.logger.error(f'Traceback: {traceback.format_exc()}')
         finally:
             self.ap.logger.debug(f'Query {query} processed')
-            del self.ap.query_pool.cached_queries[query.query_id]
 
 
 class PipelineManager:

pkg/pipeline/pool.py

@@ -3,11 +3,10 @@ from __future__ import annotations
 import asyncio
 import typing
 
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.entities.builtin.platform.events as platform_events
-import langbot_plugin.api.entities.builtin.provider.session as provider_session
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
-import langbot_plugin.api.definition.abstract.platform.adapter as abstract_platform_adapter
+from ..core import entities
+from ..platform import adapter as msadapter
+from ..platform.types import message as platform_message
+from ..platform.types import events as platform_events
 
 
 class QueryPool:
@@ -17,10 +16,7 @@ class QueryPool:
 
     pool_lock: asyncio.Lock
 
-    queries: list[pipeline_query.Query]
-
-    cached_queries: dict[int, pipeline_query.Query]
-    """Cached queries, used for plugin backward api call, will be removed after the query completely processed"""
+    queries: list[entities.Query]
 
     condition: asyncio.Condition
 
@@ -28,38 +24,34 @@ class QueryPool:
         self.query_id_counter = 0
         self.pool_lock = asyncio.Lock()
         self.queries = []
-        self.cached_queries = {}
         self.condition = asyncio.Condition(self.pool_lock)
 
     async def add_query(
         self,
         bot_uuid: str,
-        launcher_type: provider_session.LauncherTypes,
+        launcher_type: entities.LauncherTypes,
         launcher_id: typing.Union[int, str],
         sender_id: typing.Union[int, str],
         message_event: platform_events.MessageEvent,
         message_chain: platform_message.MessageChain,
-        adapter: abstract_platform_adapter.AbstractMessagePlatformAdapter,
+        adapter: msadapter.MessagePlatformAdapter,
         pipeline_uuid: typing.Optional[str] = None,
-    ) -> pipeline_query.Query:
+    ) -> entities.Query:
         async with self.condition:
-            query_id = self.query_id_counter
-            query = pipeline_query.Query(
+            query = entities.Query(
                 bot_uuid=bot_uuid,
-                query_id=query_id,
+                query_id=self.query_id_counter,
                 launcher_type=launcher_type,
                 launcher_id=launcher_id,
                 sender_id=sender_id,
                 message_event=message_event,
                 message_chain=message_chain,
-                variables={},
                 resp_messages=[],
                 resp_message_chain=[],
                 adapter=adapter,
                 pipeline_uuid=pipeline_uuid,
             )
             self.queries.append(query)
-            self.cached_queries[query_id] = query
             self.query_id_counter += 1
             self.condition.notify_all()
 

pkg/pipeline/preproc/preproc.py

@@ -3,10 +3,10 @@ from __future__ import annotations
 import datetime
 
 from .. import stage, entities
-from langbot_plugin.api.entities.builtin.provider import message as provider_message
-import langbot_plugin.api.entities.events as events
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+from ...core import entities as core_entities
+from ...provider import entities as llm_entities
+from ...plugin import events
+from ...platform.types import message as platform_message
 
 
 @stage.stage_class('PreProcessor')
@@ -26,7 +26,7 @@ class PreProcessor(stage.PipelineStage):
 
     async def process(
         self,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
         stage_inst_name: str,
     ) -> entities.StageProcessResult:
         """处理"""
@@ -49,31 +49,31 @@ class PreProcessor(stage.PipelineStage):
             query.bot_uuid,
         )
 
+        conversation.use_llm_model = llm_model
+
         # 设置query
         query.session = session
         query.prompt = conversation.prompt.copy()
         query.messages = conversation.messages.copy()
 
-        query.use_llm_model_uuid = llm_model.model_entity.uuid
+        query.use_llm_model = llm_model
 
         if selected_runner == 'local-agent':
-            query.use_funcs = []
+            query.use_funcs = (
+                conversation.use_funcs if query.use_llm_model.model_entity.abilities.__contains__('func_call') else None
+            )
 
-            if llm_model.model_entity.abilities.__contains__('func_call'):
-                query.use_funcs = await self.ap.tool_mgr.get_all_tools()
-
-        variables = {
+        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())
             ),
         }
-        query.variables.update(variables)
 
         # Check if this model supports vision, if not, remove all images
         # TODO this checking should be performed in runner, and in this stage, the image should be reserved
-        if selected_runner == 'local-agent' and not llm_model.model_entity.abilities.__contains__('vision'):
+        if selected_runner == 'local-agent' and not query.use_llm_model.model_entity.abilities.__contains__('vision'):
             for msg in query.messages:
                 if isinstance(msg.content, list):
                     for me in msg.content:
@@ -87,35 +87,39 @@ class PreProcessor(stage.PipelineStage):
 
         for me in query.message_chain:
             if isinstance(me, platform_message.Plain):
-                content_list.append(provider_message.ContentElement.from_text(me.text))
+                content_list.append(llm_entities.ContentElement.from_text(me.text))
                 plain_text += me.text
             elif isinstance(me, platform_message.Image):
-                if selected_runner != 'local-agent' or llm_model.model_entity.abilities.__contains__('vision'):
+                if selected_runner != 'local-agent' or query.use_llm_model.model_entity.abilities.__contains__(
+                    'vision'
+                ):
                     if me.base64 is not None:
-                        content_list.append(provider_message.ContentElement.from_image_base64(me.base64))
+                        content_list.append(llm_entities.ContentElement.from_image_base64(me.base64))
             elif isinstance(me, platform_message.Quote) and qoute_msg:
                 for msg in me.origin:
                     if isinstance(msg, platform_message.Plain):
-                        content_list.append(provider_message.ContentElement.from_text(msg.text))
+                        content_list.append(llm_entities.ContentElement.from_text(msg.text))
                     elif isinstance(msg, platform_message.Image):
-                        if selected_runner != 'local-agent' or llm_model.model_entity.abilities.__contains__('vision'):
+                        if selected_runner != 'local-agent' or query.use_llm_model.model_entity.abilities.__contains__(
+                            'vision'
+                        ):
                             if msg.base64 is not None:
-                                content_list.append(provider_message.ContentElement.from_image_base64(msg.base64))
+                                content_list.append(llm_entities.ContentElement.from_image_base64(msg.base64))
 
         query.variables['user_message_text'] = plain_text
 
-        query.user_message = provider_message.Message(role='user', content=content_list)
+        query.user_message = llm_entities.Message(role='user', content=content_list)
         # =========== 触发事件 PromptPreProcessing
 
-        event = events.PromptPreProcessing(
-            session_name=f'{query.session.launcher_type.value}_{query.session.launcher_id}',
-            default_prompt=query.prompt.messages,
-            prompt=query.messages,
-            query=query,
+        event_ctx = await self.ap.plugin_mgr.emit_event(
+            event=events.PromptPreProcessing(
+                session_name=f'{query.session.launcher_type.value}_{query.session.launcher_id}',
+                default_prompt=query.prompt.messages,
+                prompt=query.messages,
+                query=query,
+            )
         )
 
-        event_ctx = await self.ap.plugin_connector.emit_event(event)
-
         query.prompt.messages = event_ctx.event.default_prompt
         query.messages = event_ctx.event.prompt
 

pkg/pipeline/process/handler.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 import abc
 
 from ...core import app
+from ...core import entities as core_entities
 from .. import entities
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 class MessageHandler(metaclass=abc.ABCMeta):
@@ -19,7 +19,7 @@ class MessageHandler(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     async def handle(
         self,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
     ) -> entities.StageProcessResult:
         raise NotImplementedError
 

pkg/pipeline/process/handlers/chat.py

@@ -6,15 +6,13 @@ import traceback
 
 from .. import handler
 from ... import entities
+from ....core import entities as core_entities
 from ....provider import runner as runner_module
+from ....plugin import events
 
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.entities.events as events
+from ....platform.types import message as platform_message
 from ....utils import importutil
 from ....provider import runners
-import langbot_plugin.api.entities.builtin.provider.session as provider_session
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
-
 
 importutil.import_modules_in_pkg(runners)
 
@@ -22,7 +20,7 @@ importutil.import_modules_in_pkg(runners)
 class ChatMessageHandler(handler.MessageHandler):
     async def handle(
         self,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
     ) -> typing.AsyncGenerator[entities.StageProcessResult, None]:
         """处理"""
         # 调API
@@ -31,20 +29,20 @@ class ChatMessageHandler(handler.MessageHandler):
         # 触发插件事件
         event_class = (
             events.PersonNormalMessageReceived
-            if query.launcher_type == provider_session.LauncherTypes.PERSON
+            if query.launcher_type == core_entities.LauncherTypes.PERSON
             else events.GroupNormalMessageReceived
         )
 
-        event = event_class(
-            launcher_type=query.launcher_type.value,
-            launcher_id=query.launcher_id,
-            sender_id=query.sender_id,
-            text_message=str(query.message_chain),
-            query=query,
+        event_ctx = await self.ap.plugin_mgr.emit_event(
+            event=event_class(
+                launcher_type=query.launcher_type.value,
+                launcher_id=query.launcher_id,
+                sender_id=query.sender_id,
+                text_message=str(query.message_chain),
+                query=query,
+            )
         )
 
-        event_ctx = await self.ap.plugin_connector.emit_event(event)
-
         if event_ctx.is_prevented_default():
             if event_ctx.event.reply is not None:
                 mc = platform_message.MessageChain(event_ctx.event.reply)

pkg/pipeline/process/handlers/command.py

@@ -4,17 +4,16 @@ import typing
 
 from .. import handler
 from ... import entities
-import langbot_plugin.api.entities.builtin.provider.message as provider_message
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.entities.builtin.provider.session as provider_session
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
-import langbot_plugin.api.entities.events as events
+from ....core import entities as core_entities
+from ....provider import entities as llm_entities
+from ....plugin import events
+from ....platform.types import message as platform_message
 
 
 class CommandHandler(handler.MessageHandler):
     async def handle(
         self,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
     ) -> typing.AsyncGenerator[entities.StageProcessResult, None]:
         """处理"""
 
@@ -29,23 +28,23 @@ class CommandHandler(handler.MessageHandler):
 
         event_class = (
             events.PersonCommandSent
-            if query.launcher_type == provider_session.LauncherTypes.PERSON
+            if query.launcher_type == core_entities.LauncherTypes.PERSON
             else events.GroupCommandSent
         )
 
-        event = event_class(
-            launcher_type=query.launcher_type.value,
-            launcher_id=query.launcher_id,
-            sender_id=query.sender_id,
-            command=spt[0],
-            params=spt[1:] if len(spt) > 1 else [],
-            text_message=str(query.message_chain),
-            is_admin=(privilege == 2),
-            query=query,
+        event_ctx = await self.ap.plugin_mgr.emit_event(
+            event=event_class(
+                launcher_type=query.launcher_type.value,
+                launcher_id=query.launcher_id,
+                sender_id=query.sender_id,
+                command=spt[0],
+                params=spt[1:] if len(spt) > 1 else [],
+                text_message=str(query.message_chain),
+                is_admin=(privilege == 2),
+                query=query,
+            )
         )
 
-        event_ctx = await self.ap.plugin_connector.emit_event(event)
-
         if event_ctx.is_prevented_default():
             if event_ctx.event.reply is not None:
                 mc = platform_message.MessageChain(event_ctx.event.reply)
@@ -65,7 +64,7 @@ class CommandHandler(handler.MessageHandler):
             async for ret in self.ap.cmd_mgr.execute(command_text=command_text, query=query, session=session):
                 if ret.error is not None:
                     query.resp_messages.append(
-                        provider_message.Message(
+                        llm_entities.Message(
                             role='command',
                             content=str(ret.error),
                         )
@@ -75,16 +74,16 @@ class CommandHandler(handler.MessageHandler):
 
                     yield entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)
                 elif ret.text is not None or ret.image_url is not None:
-                    content: list[provider_message.ContentElement] = []
+                    content: list[llm_entities.ContentElement] = []
 
                     if ret.text is not None:
-                        content.append(provider_message.ContentElement.from_text(ret.text))
+                        content.append(llm_entities.ContentElement.from_text(ret.text))
 
                     if ret.image_url is not None:
-                        content.append(provider_message.ContentElement.from_image_url(ret.image_url))
+                        content.append(llm_entities.ContentElement.from_image_url(ret.image_url))
 
                     query.resp_messages.append(
-                        provider_message.Message(
+                        llm_entities.Message(
                             role='command',
                             content=content,
                         )

pkg/pipeline/process/process.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
+from ...core import entities as core_entities
 from . import handler
 from .handlers import chat, command
 from .. import entities
 from .. import stage
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 @stage.stage_class('MessageProcessor')
@@ -30,7 +30,7 @@ class Processor(stage.PipelineStage):
 
     async def process(
         self,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
         stage_inst_name: str,
     ) -> entities.StageProcessResult:
         """处理"""

pkg/pipeline/ratelimit/algo.py

@@ -2,8 +2,7 @@ from __future__ import annotations
 import abc
 import typing
 
-from ...core import app
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+from ...core import app, entities as core_entities
 
 
 preregistered_algos: list[typing.Type[ReteLimitAlgo]] = []
@@ -34,7 +33,7 @@ class ReteLimitAlgo(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     async def require_access(
         self,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
         launcher_type: str,
         launcher_id: typing.Union[int, str],
     ) -> bool:
@@ -54,7 +53,7 @@ class ReteLimitAlgo(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     async def release_access(
         self,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
         launcher_type: str,
         launcher_id: typing.Union[int, str],
     ):

pkg/pipeline/ratelimit/algos/fixedwin.py

@@ -3,7 +3,7 @@ import asyncio
 import time
 import typing
 from .. import algo
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+from ....core import entities as core_entities
 
 
 # 固定窗口算法
@@ -32,7 +32,7 @@ class FixedWindowAlgo(algo.ReteLimitAlgo):
 
     async def require_access(
         self,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
         launcher_type: str,
         launcher_id: typing.Union[int, str],
     ) -> bool:
@@ -91,7 +91,7 @@ class FixedWindowAlgo(algo.ReteLimitAlgo):
 
     async def release_access(
         self,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
         launcher_type: str,
         launcher_id: typing.Union[int, str],
     ):

pkg/pipeline/ratelimit/ratelimit.py

@@ -4,10 +4,9 @@ import typing
 
 from .. import entities, stage
 from . import algo
+from ...core import entities as core_entities
 from ...utils import importutil
 
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
-
 from . import algos
 
 importutil.import_modules_in_pkg(algos)
@@ -40,7 +39,7 @@ class RateLimit(stage.PipelineStage):
 
     async def process(
         self,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
         stage_inst_name: str,
     ) -> typing.Union[
         entities.StageProcessResult,

pkg/pipeline/respback/respback.py

@@ -4,18 +4,18 @@ import random
 import asyncio
 
 
-import langbot_plugin.api.entities.builtin.platform.events as platform_events
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
+from ...platform.types import events as platform_events
+from ...platform.types import message as platform_message
 
 from .. import stage, entities
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+from ...core import entities as core_entities
 
 
 @stage.stage_class('SendResponseBackStage')
 class SendResponseBackStage(stage.PipelineStage):
     """发送响应消息"""
 
-    async def process(self, query: pipeline_query.Query, stage_inst_name: str) -> entities.StageProcessResult:
+    async def process(self, query: core_entities.Query, stage_inst_name: str) -> entities.StageProcessResult:
         """处理"""
 
         random_range = (

pkg/pipeline/resprule/entities.py

@@ -1,6 +1,6 @@
-import pydantic
+import pydantic.v1 as pydantic
 
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
+from ...platform.types import message as platform_message
 
 
 class RuleJudgeResult(pydantic.BaseModel):

pkg/pipeline/resprule/resprule.py

@@ -4,10 +4,9 @@ from __future__ import annotations
 from . import rule
 
 from .. import stage, entities
+from ...core import entities as core_entities
 from ...utils import importutil
 
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
-
 from . import rules
 
 importutil.import_modules_in_pkg(rules)
@@ -33,7 +32,7 @@ class GroupRespondRuleCheckStage(stage.PipelineStage):
             await rule_inst.initialize()
             self.rule_matchers.append(rule_inst)
 
-    async def process(self, query: pipeline_query.Query, stage_inst_name: str) -> entities.StageProcessResult:
+    async def process(self, query: core_entities.Query, stage_inst_name: str) -> entities.StageProcessResult:
         if query.launcher_type.value != 'group':  # 只处理群消息
             return entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)
 

pkg/pipeline/resprule/rule.py

@@ -2,11 +2,10 @@ from __future__ import annotations
 import abc
 import typing
 
-from ...core import app
+from ...core import app, entities as core_entities
 from . import entities
 
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+from ...platform.types import message as platform_message
 
 
 preregisetered_rules: list[typing.Type[GroupRespondRule]] = []
@@ -40,7 +39,7 @@ class GroupRespondRule(metaclass=abc.ABCMeta):
         message_text: str,
         message_chain: platform_message.MessageChain,
         rule_dict: dict,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
     ) -> entities.RuleJudgeResult:
         """判断消息是否匹配规则"""
         raise NotImplementedError

pkg/pipeline/resprule/rules/atbot.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 
 from .. import rule as rule_model
 from .. import entities
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+from ....core import entities as core_entities
+from ....platform.types import message as platform_message
 
 
 @rule_model.rule_class('at-bot')
@@ -14,7 +14,7 @@ class AtBotRule(rule_model.GroupRespondRule):
         message_text: str,
         message_chain: platform_message.MessageChain,
         rule_dict: dict,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
     ) -> entities.RuleJudgeResult:
         if message_chain.has(platform_message.At(query.adapter.bot_account_id)) and rule_dict['at']:
             message_chain.remove(platform_message.At(query.adapter.bot_account_id))

pkg/pipeline/resprule/rules/prefix.py

@@ -1,7 +1,7 @@
 from .. import rule as rule_model
 from .. import entities
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+from ....core import entities as core_entities
+from ....platform.types import message as platform_message
 
 
 @rule_model.rule_class('prefix')
@@ -11,7 +11,7 @@ class PrefixRule(rule_model.GroupRespondRule):
         message_text: str,
         message_chain: platform_message.MessageChain,
         rule_dict: dict,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
     ) -> entities.RuleJudgeResult:
         prefixes = rule_dict['prefix']
 

pkg/pipeline/resprule/rules/random.py

@@ -3,8 +3,8 @@ import random
 
 from .. import rule as rule_model
 from .. import entities
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+from ....core import entities as core_entities
+from ....platform.types import message as platform_message
 
 
 @rule_model.rule_class('random')
@@ -14,7 +14,7 @@ class RandomRespRule(rule_model.GroupRespondRule):
         message_text: str,
         message_chain: platform_message.MessageChain,
         rule_dict: dict,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
     ) -> entities.RuleJudgeResult:
         random_rate = rule_dict['random']
 

pkg/pipeline/resprule/rules/regexp.py

@@ -3,8 +3,8 @@ import re
 
 from .. import rule as rule_model
 from .. import entities
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
+from ....core import entities as core_entities
+from ....platform.types import message as platform_message
 
 
 @rule_model.rule_class('regexp')
@@ -14,7 +14,7 @@ class RegExpRule(rule_model.GroupRespondRule):
         message_text: str,
         message_chain: platform_message.MessageChain,
         rule_dict: dict,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
     ) -> entities.RuleJudgeResult:
         regexps = rule_dict['regexp']
 

pkg/pipeline/stage.py

@@ -3,9 +3,8 @@ from __future__ import annotations
 import abc
 import typing
 
-from ..core import app
+from ..core import app, entities as core_entities
 from . import entities
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
 
 
 preregistered_stages: dict[str, type[PipelineStage]] = {}
@@ -34,7 +33,7 @@ class PipelineStage(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     async def process(
         self,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
         stage_inst_name: str,
     ) -> typing.Union[
         entities.StageProcessResult,

pkg/pipeline/wrapper/wrapper.py

@@ -2,12 +2,12 @@ from __future__ import annotations
 
 import typing
 
+
+from ...core import entities as core_entities
 from .. import entities
 from .. import stage
-
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
-import langbot_plugin.api.entities.events as events
+from ...plugin import events
+from ...platform.types import message as platform_message
 
 
 @stage.stage_class('ResponseWrapper')
@@ -25,7 +25,7 @@ class ResponseWrapper(stage.PipelineStage):
 
     async def process(
         self,
-        query: pipeline_query.Query,
+        query: core_entities.Query,
         stage_inst_name: str,
     ) -> typing.AsyncGenerator[entities.StageProcessResult, None]:
         """处理"""
@@ -58,22 +58,21 @@ class ResponseWrapper(stage.PipelineStage):
                         reply_text = str(result.get_content_platform_message_chain())
 
                         # ============= 触发插件事件 ===============
-                        event = events.NormalMessageResponded(
-                            launcher_type=query.launcher_type.value,
-                            launcher_id=query.launcher_id,
-                            sender_id=query.sender_id,
-                            session=session,
-                            prefix='',
-                            response_text=reply_text,
-                            finish_reason='stop',
-                            funcs_called=[fc.function.name for fc in result.tool_calls]
-                            if result.tool_calls is not None
-                            else [],
-                            query=query,
+                        event_ctx = await self.ap.plugin_mgr.emit_event(
+                            event=events.NormalMessageResponded(
+                                launcher_type=query.launcher_type.value,
+                                launcher_id=query.launcher_id,
+                                sender_id=query.sender_id,
+                                session=session,
+                                prefix='',
+                                response_text=reply_text,
+                                finish_reason='stop',
+                                funcs_called=[fc.function.name for fc in result.tool_calls]
+                                if result.tool_calls is not None
+                                else [],
+                                query=query,
+                            )
                         )
-
-                        event_ctx = await self.ap.plugin_connector.emit_event(event)
-
                         if event_ctx.is_prevented_default():
                             yield entities.StageProcessResult(
                                 result_type=entities.ResultType.INTERRUPT,
@@ -97,26 +96,26 @@ class ResponseWrapper(stage.PipelineStage):
                         reply_text = f'调用函数 {".".join(function_names)}...'
 
                         query.resp_message_chain.append(
-                            platform_message.MessageChain([platform_message.Plain(text=reply_text)])
+                            platform_message.MessageChain([platform_message.Plain(reply_text)])
                         )
 
                         if query.pipeline_config['output']['misc']['track-function-calls']:
-                            event = events.NormalMessageResponded(
-                                launcher_type=query.launcher_type.value,
-                                launcher_id=query.launcher_id,
-                                sender_id=query.sender_id,
-                                session=session,
-                                prefix='',
-                                response_text=reply_text,
-                                finish_reason='stop',
-                                funcs_called=[fc.function.name for fc in result.tool_calls]
-                                if result.tool_calls is not None
-                                else [],
-                                query=query,
+                            event_ctx = await self.ap.plugin_mgr.emit_event(
+                                event=events.NormalMessageResponded(
+                                    launcher_type=query.launcher_type.value,
+                                    launcher_id=query.launcher_id,
+                                    sender_id=query.sender_id,
+                                    session=session,
+                                    prefix='',
+                                    response_text=reply_text,
+                                    finish_reason='stop',
+                                    funcs_called=[fc.function.name for fc in result.tool_calls]
+                                    if result.tool_calls is not None
+                                    else [],
+                                    query=query,
+                                )
                             )
 
-                            event_ctx = await self.ap.plugin_connector.emit_event(event)
-
                             if event_ctx.is_prevented_default():
                                 yield entities.StageProcessResult(
                                     result_type=entities.ResultType.INTERRUPT,
@@ -125,12 +124,12 @@ class ResponseWrapper(stage.PipelineStage):
                             else:
                                 if event_ctx.event.reply is not None:
                                     query.resp_message_chain.append(
-                                        platform_message.MessageChain(text=event_ctx.event.reply)
+                                        platform_message.MessageChain(event_ctx.event.reply)
                                     )
 
                                 else:
                                     query.resp_message_chain.append(
-                                        platform_message.MessageChain([platform_message.Plain(text=reply_text)])
+                                        platform_message.MessageChain([platform_message.Plain(reply_text)])
                                     )
 
                                 yield entities.StageProcessResult(

pkg/platform/adapter.py

@@ -0,0 +1,160 @@
+from __future__ import annotations
+
+# MessageSource的适配器
+import typing
+import abc
+
+
+from ..core import app
+from .types import message as platform_message
+from .types import events as platform_events
+from .logger import EventLogger
+
+
+class MessagePlatformAdapter(metaclass=abc.ABCMeta):
+    """消息平台适配器基类"""
+
+    name: str
+
+    bot_account_id: int
+    """机器人账号ID，需要在初始化时设置"""
+
+    config: dict
+
+    ap: app.Application
+
+    logger: EventLogger
+
+    def __init__(self, config: dict, ap: app.Application, logger: EventLogger):
+        """初始化适配器
+
+        Args:
+            config (dict): 对应的配置
+            ap (app.Application): 应用上下文
+        """
+        self.config = config
+        self.ap = ap
+        self.logger = logger
+
+    async def send_message(self, target_type: str, target_id: str, message: platform_message.MessageChain):
+        """主动发送消息
+
+        Args:
+            target_type (str): 目标类型，`person`或`group`
+            target_id (str): 目标ID
+            message (platform.types.MessageChain): 消息链
+        """
+        raise NotImplementedError
+
+    async def reply_message(
+        self,
+        message_source: platform_events.MessageEvent,
+        message: platform_message.MessageChain,
+        quote_origin: bool = False,
+    ):
+        """回复消息
+
+        Args:
+            message_source (platform.types.MessageEvent): 消息源事件
+            message (platform.types.MessageChain): 消息链
+            quote_origin (bool, optional): 是否引用原消息. Defaults to False.
+        """
+        raise NotImplementedError
+
+    async def is_muted(self, group_id: int) -> bool:
+        """获取账号是否在指定群被禁言"""
+        raise NotImplementedError
+
+    def register_listener(
+        self,
+        event_type: typing.Type[platform_message.Event],
+        callback: typing.Callable[[platform_message.Event, MessagePlatformAdapter], None],
+    ):
+        """注册事件监听器
+
+        Args:
+            event_type (typing.Type[platform.types.Event]): 事件类型
+            callback (typing.Callable[[platform.types.Event], None]): 回调函数，接收一个参数，为事件
+        """
+        raise NotImplementedError
+
+    def unregister_listener(
+        self,
+        event_type: typing.Type[platform_message.Event],
+        callback: typing.Callable[[platform_message.Event, MessagePlatformAdapter], None],
+    ):
+        """注销事件监听器
+
+        Args:
+            event_type (typing.Type[platform.types.Event]): 事件类型
+            callback (typing.Callable[[platform.types.Event], None]): 回调函数，接收一个参数，为事件
+        """
+        raise NotImplementedError
+
+    async def run_async(self):
+        """异步运行"""
+        raise NotImplementedError
+
+    async def kill(self) -> bool:
+        """关闭适配器
+
+        Returns:
+            bool: 是否成功关闭，热重载时若此函数返回False则不会重载MessageSource底层
+        """
+        raise NotImplementedError
+
+
+class MessageConverter:
+    """消息链转换器基类"""
+
+    @staticmethod
+    def yiri2target(message_chain: platform_message.MessageChain):
+        """将源平台消息链转换为目标平台消息链
+
+        Args:
+            message_chain (platform.types.MessageChain): 源平台消息链
+
+        Returns:
+            typing.Any: 目标平台消息链
+        """
+        raise NotImplementedError
+
+    @staticmethod
+    def target2yiri(message_chain: typing.Any) -> platform_message.MessageChain:
+        """将目标平台消息链转换为源平台消息链
+
+        Args:
+            message_chain (typing.Any): 目标平台消息链
+
+        Returns:
+            platform.types.MessageChain: 源平台消息链
+        """
+        raise NotImplementedError
+
+
+class EventConverter:
+    """事件转换器基类"""
+
+    @staticmethod
+    def yiri2target(event: typing.Type[platform_message.Event]):
+        """将源平台事件转换为目标平台事件
+
+        Args:
+            event (typing.Type[platform.types.Event]): 源平台事件
+
+        Returns:
+            typing.Any: 目标平台事件
+        """
+        raise NotImplementedError
+
+    @staticmethod
+    def target2yiri(event: typing.Any) -> platform_message.Event:
+        """将目标平台事件的调用参数转换为源平台的事件参数对象
+
+        Args:
+            event (typing.Any): 目标平台事件
+
+        Returns:
+            typing.Type[platform.types.Event]: 源平台事件
+        """
+        raise NotImplementedError

pkg/platform/adapter.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: ComponentTemplate
+metadata:
+  name: MessagePlatformAdapter
+  label:
+    en_US: Message Platform Adapter
+    zh_Hans: 消息平台适配器模板类
+spec:
+  type:
+    - python
+execution:
+  python:
+    path: ./adapter.py
+    attr: MessagePlatformAdapter

pkg/platform/botmgr.py

@@ -1,10 +1,15 @@
 from __future__ import annotations
 
+import sys
 import asyncio
 import traceback
 import sqlalchemy
 
+#     FriendMessage, Image, MessageChain, Plain
+from . import adapter as msadapter
+
 from ..core import app, entities as core_entities, taskmgr
+from .types import events as platform_events, message as platform_message
 
 from ..discover import engine
 
@@ -14,10 +19,10 @@ from ..entity.errors import platform as platform_errors
 
 from .logger import EventLogger
 
-import langbot_plugin.api.entities.builtin.provider.session as provider_session
-import langbot_plugin.api.entities.builtin.platform.events as platform_events
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.definition.abstract.platform.adapter as abstract_platform_adapter
+# 处理 3.4 移除了 YiriMirai 之后，插件的兼容性问题
+from . import types as mirai
+
+sys.modules['mirai'] = mirai
 
 
 class RuntimeBot:
@@ -29,7 +34,7 @@ class RuntimeBot:
 
     enable: bool
 
-    adapter: abstract_platform_adapter.AbstractMessagePlatformAdapter
+    adapter: msadapter.MessagePlatformAdapter
 
     task_wrapper: taskmgr.TaskWrapper
 
@@ -41,7 +46,7 @@ class RuntimeBot:
         self,
         ap: app.Application,
         bot_entity: persistence_bot.Bot,
-        adapter: abstract_platform_adapter.AbstractMessagePlatformAdapter,
+        adapter: msadapter.MessagePlatformAdapter,
         logger: EventLogger,
     ):
         self.ap = ap
@@ -54,7 +59,7 @@ class RuntimeBot:
     async def initialize(self):
         async def on_friend_message(
             event: platform_events.FriendMessage,
-            adapter: abstract_platform_adapter.AbstractMessagePlatformAdapter,
+            adapter: msadapter.MessagePlatformAdapter,
         ):
             image_components = [
                 component for component in event.message_chain if isinstance(component, platform_message.Image)
@@ -68,7 +73,7 @@ class RuntimeBot:
 
             await self.ap.query_pool.add_query(
                 bot_uuid=self.bot_entity.uuid,
-                launcher_type=provider_session.LauncherTypes.PERSON,
+                launcher_type=core_entities.LauncherTypes.PERSON,
                 launcher_id=event.sender.id,
                 sender_id=event.sender.id,
                 message_event=event,
@@ -79,7 +84,7 @@ class RuntimeBot:
 
         async def on_group_message(
             event: platform_events.GroupMessage,
-            adapter: abstract_platform_adapter.AbstractMessagePlatformAdapter,
+            adapter: msadapter.MessagePlatformAdapter,
         ):
             image_components = [
                 component for component in event.message_chain if isinstance(component, platform_message.Image)
@@ -93,7 +98,7 @@ class RuntimeBot:
 
             await self.ap.query_pool.add_query(
                 bot_uuid=self.bot_entity.uuid,
-                launcher_type=provider_session.LauncherTypes.GROUP,
+                launcher_type=core_entities.LauncherTypes.GROUP,
                 launcher_id=event.group.id,
                 sender_id=event.sender.id,
                 message_event=event,
@@ -146,7 +151,7 @@ class PlatformManager:
 
     adapter_components: list[engine.Component]
 
-    adapter_dict: dict[str, type[abstract_platform_adapter.AbstractMessagePlatformAdapter]]
+    adapter_dict: dict[str, type[msadapter.MessagePlatformAdapter]]
 
     def __init__(self, ap: app.Application = None):
         self.ap = ap
@@ -156,7 +161,7 @@ class PlatformManager:
 
     async def initialize(self):
         self.adapter_components = self.ap.discover.get_components_by_kind('MessagePlatformAdapter')
-        adapter_dict: dict[str, type[abstract_platform_adapter.AbstractMessagePlatformAdapter]] = {}
+        adapter_dict: dict[str, type[msadapter.MessagePlatformAdapter]] = {}
         for component in self.adapter_components:
             adapter_dict[component.metadata.name] = component.get_python_component_class()
         self.adapter_dict = adapter_dict
@@ -167,10 +172,9 @@ class PlatformManager:
         webchat_logger = EventLogger(name='webchat-adapter', ap=self.ap)
         webchat_adapter_inst = webchat_adapter_class(
             {},
+            self.ap,
             webchat_logger,
-            ap=self.ap,
         )
-        webchat_adapter_inst.ap = self.ap
 
         self.webchat_proxy_bot = RuntimeBot(
             ap=self.ap,
@@ -189,7 +193,7 @@ class PlatformManager:
 
         await self.load_bots_from_db()
 
-    def get_running_adapters(self) -> list[abstract_platform_adapter.AbstractMessagePlatformAdapter]:
+    def get_running_adapters(self) -> list[msadapter.MessagePlatformAdapter]:
         return [bot.adapter for bot in self.bots if bot.enable]
 
     async def load_bots_from_db(self):
@@ -227,6 +231,7 @@ class PlatformManager:
 
         adapter_inst = self.adapter_dict[bot_entity.adapter](
             bot_entity.adapter_config,
+            self.ap,
             logger,
         )
 
@@ -269,6 +274,43 @@ class PlatformManager:
                 return component
         return None
 
+    async def write_back_config(
+        self,
+        adapter_name: str,
+        adapter_inst: msadapter.MessagePlatformAdapter,
+        config: dict,
+    ):
+        # index = -2
+
+        # for i, adapter in enumerate(self.adapters):
+        #     if adapter == adapter_inst:
+        #         index = i
+        #         break
+
+        # if index == -2:
+        #     raise Exception('平台适配器未找到')
+
+        # # 只修改启用的适配器
+        # real_index = -1
+
+        # for i, adapter in enumerate(self.ap.platform_cfg.data['platform-adapters']):
+        #     if adapter['enable']:
+        #         index -= 1
+        #         if index == -1:
+        #             real_index = i
+        #             break
+
+        # new_cfg = {
+        #     'adapter': adapter_name,
+        #     'enable': True,
+        #     **config
+        # }
+        # self.ap.platform_cfg.data['platform-adapters'][real_index] = new_cfg
+        # await self.ap.platform_cfg.dump_config()
+
+        # TODO implement this
+        pass
+
     async def run(self):
         # This method will only be called when the application launching
         await self.webchat_proxy_bot.run()

pkg/platform/logger.py

@@ -9,8 +9,7 @@ import traceback
 import uuid
 
 from ..core import app
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.definition.abstract.platform.event_logger as abstract_platform_event_logger
+from .types import message as platform_message
 
 
 class EventLogLevel(enum.Enum):
@@ -56,7 +55,7 @@ MAX_LOG_COUNT = 200
 DELETE_COUNT_PER_TIME = 50
 
 
-class EventLogger(abstract_platform_event_logger.AbstractEventLogger):
+class EventLogger:
     """used for logging bot events"""
 
     ap: app.Application

pkg/platform/sources/aiocqhttp.py

@@ -5,17 +5,18 @@ import traceback
 import datetime
 
 import aiocqhttp
-import pydantic
 
-import langbot_plugin.api.definition.abstract.platform.adapter as abstract_platform_adapter
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.entities.builtin.platform.events as platform_events
-import langbot_plugin.api.entities.builtin.platform.entities as platform_entities
+from .. import adapter
+from ...core import app
+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 langbot_plugin.api.definition.abstract.platform.event_logger as abstract_platform_logger
+from ..logger import EventLogger
 
 
-class AiocqhttpMessageConverter(abstract_platform_adapter.AbstractMessageConverter):
+class AiocqhttpMessageConverter(adapter.MessageConverter):
+
     @staticmethod
     async def yiri2target(
         message_chain: platform_message.MessageChain,
@@ -70,13 +71,15 @@ class AiocqhttpMessageConverter(abstract_platform_adapter.AbstractMessageConvert
                 elif msg.face_type=='dice':
                     msg_list.append(aiocqhttp.MessageSegment.dice())
 
+
             else:
                 msg_list.append(aiocqhttp.MessageSegment.text(str(msg)))
 
         return msg_list, msg_id, msg_time
 
     @staticmethod
-    async def target2yiri(message: str, message_id: int = -1, bot=None):
+    async def target2yiri(message: str, message_id: int = -1,bot=None):
+        print(message)
         message = aiocqhttp.Message(message)
 
         def get_face_name(face_id):
@@ -116,28 +119,30 @@ class AiocqhttpMessageConverter(abstract_platform_adapter.AbstractMessageConvert
             return face_code_dict.get(face_id,'')
 
         async def process_message_data(msg_data, reply_list):
-            if msg_data['type'] == 'image':
-                image_base64, image_format = await image.qq_image_url_to_base64(msg_data['data']['url'])
-                reply_list.append(platform_message.Image(base64=f'data:image/{image_format};base64,{image_base64}'))
+            if msg_data["type"] == "image":
+                image_base64, image_format = await image.qq_image_url_to_base64(msg_data["data"]['url'])
+                reply_list.append(
+                    platform_message.Image(base64=f'data:image/{image_format};base64,{image_base64}'))
 
-            elif msg_data['type'] == 'text':
-                reply_list.append(platform_message.Plain(text=msg_data['data']['text']))
+            elif msg_data["type"] == "text":
+                reply_list.append(platform_message.Plain(text=msg_data["data"]["text"]))
 
-            elif msg_data['type'] == 'forward':  # 这里来应该传入转发消息组，暂时传入qoute
-                for forward_msg_datas in msg_data['data']['content']:
-                    for forward_msg_data in forward_msg_datas['message']:
+            elif msg_data["type"] == "forward":  # 这里来应该传入转发消息组，暂时传入qoute
+                for forward_msg_datas in msg_data["data"]["content"]:
+                    for forward_msg_data in forward_msg_datas["message"]:
                         await process_message_data(forward_msg_data, reply_list)
 
-            elif msg_data['type'] == 'at':
-                if msg_data['data']['qq'] == 'all':
+            elif msg_data["type"] == "at":
+                if msg_data["data"]['qq'] == 'all':
                     reply_list.append(platform_message.AtAll())
                 else:
                     reply_list.append(
                         platform_message.At(
-                            target=msg_data['data']['qq'],
+                            target=msg_data["data"]['qq'],
                         )
                     )
 
+
         yiri_msg_list = []
 
         yiri_msg_list.append(platform_message.Source(id=message_id, time=datetime.datetime.now()))
@@ -173,15 +178,14 @@ class AiocqhttpMessageConverter(abstract_platform_adapter.AbstractMessageConvert
                 #     await process_message_data(msg_data, yiri_msg_list)
                 pass
 
-            elif msg.type == 'reply':  # 此处处理引用消息传入Qoute
-                msg_datas = await bot.get_msg(message_id=msg.data['id'])
 
-                for msg_data in msg_datas['message']:
+            elif msg.type == 'reply':  # 此处处理引用消息传入Qoute
+                msg_datas = await bot.get_msg(message_id=msg.data["id"])
+
+                for msg_data in msg_datas["message"]:
                     await process_message_data(msg_data, reply_list)
 
-                reply_msg = platform_message.Quote(
-                    message_id=msg.data['id'], sender_id=msg_datas['user_id'], origin=reply_list
-                )
+                reply_msg = platform_message.Quote(message_id=msg.data["id"],sender_id=msg_datas["user_id"],origin=reply_list)
                 yiri_msg_list.append(reply_msg)
 
             elif msg.type == 'file':
@@ -190,7 +194,6 @@ class AiocqhttpMessageConverter(abstract_platform_adapter.AbstractMessageConvert
                 file_data = await bot.get_file(file_id=file_id)
                 file_name = file_data.get('file_name')
                 file_path = file_data.get('file')
-                _ = file_path
                 file_url = file_data.get('file_url')
                 file_size = file_data.get('file_size')
                 yiri_msg_list.append(platform_message.File(id=file_id, name=file_name,url=file_url,size=file_size))
@@ -207,19 +210,32 @@ class AiocqhttpMessageConverter(abstract_platform_adapter.AbstractMessageConvert
                 face_id = msg.data['result']
                 yiri_msg_list.append(platform_message.Face(face_type='dice',face_id=int(face_id),face_name='骰子'))
 
+
+
+
+
+
+
+
+
         chain = platform_message.MessageChain(yiri_msg_list)
 
         return chain
 
 
-class AiocqhttpEventConverter(abstract_platform_adapter.AbstractEventConverter):
+
+
+
+
+class AiocqhttpEventConverter(adapter.EventConverter):
     @staticmethod
     async def yiri2target(event: platform_events.MessageEvent, bot_account_id: int):
         return event.source_platform_object
 
     @staticmethod
-    async def target2yiri(event: aiocqhttp.Event, bot=None):
-        yiri_chain = await AiocqhttpMessageConverter.target2yiri(event.message, event.message_id, bot)
+    async def target2yiri(event: aiocqhttp.Event,bot=None):
+        yiri_chain = await AiocqhttpMessageConverter.target2yiri(event.message, event.message_id,bot)
+
 
 
         if event.message_type == 'group':
@@ -263,19 +279,23 @@ class AiocqhttpEventConverter(abstract_platform_adapter.AbstractEventConverter):
             )
 
 
-class AiocqhttpAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
-    bot: aiocqhttp.CQHttp = pydantic.Field(exclude=True, default_factory=aiocqhttp.CQHttp)
+class AiocqhttpAdapter(adapter.MessagePlatformAdapter):
+    bot: aiocqhttp.CQHttp
+
+    bot_account_id: int
 
     message_converter: AiocqhttpMessageConverter = AiocqhttpMessageConverter()
     event_converter: AiocqhttpEventConverter = AiocqhttpEventConverter()
 
+    config: dict
+
+    ap: app.Application
+
     on_websocket_connection_event_cache: typing.List[typing.Callable[[aiocqhttp.Event], None]] = []
 
-    def __init__(self, config: dict, logger: abstract_platform_logger.AbstractEventLogger):
-        super().__init__(
-            config=config,
-            logger=logger,
-        )
+    def __init__(self, config: dict, ap: app.Application, logger: EventLogger):
+        self.config = config
+        self.logger = logger
 
         async def shutdown_trigger_placeholder():
             while True:
@@ -283,6 +303,7 @@ class AiocqhttpAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter)
 
         self.config['shutdown_trigger'] = shutdown_trigger_placeholder
 
+        self.ap = ap
         self.on_websocket_connection_event_cache = []
 
         if 'access-token' in config:
@@ -295,6 +316,7 @@ class AiocqhttpAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter)
         aiocq_msg = (await AiocqhttpMessageConverter.yiri2target(message))[0]
 
         if target_type == 'group':
+
             await self.bot.send_group_msg(group_id=int(target_id), message=aiocq_msg)
         elif target_type == 'person':
             await self.bot.send_private_msg(user_id=int(target_id), message=aiocq_msg)
@@ -318,14 +340,12 @@ class AiocqhttpAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter)
     def register_listener(
         self,
         event_type: typing.Type[platform_events.Event],
-        callback: typing.Callable[
-            [platform_events.Event, abstract_platform_adapter.AbstractMessagePlatformAdapter], None
-        ],
+        callback: typing.Callable[[platform_events.Event, adapter.MessagePlatformAdapter], None],
     ):
         async def on_message(event: aiocqhttp.Event):
             self.bot_account_id = event.self_id
             try:
-                return await callback(await self.event_converter.target2yiri(event, self.bot), self)
+                return await callback(await self.event_converter.target2yiri(event,self.bot), self)
             except Exception:
                 await self.logger.error(f'Error in on_message: {traceback.format_exc()}')
                 traceback.print_exc()
@@ -351,9 +371,7 @@ class AiocqhttpAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter)
     def unregister_listener(
         self,
         event_type: typing.Type[platform_events.Event],
-        callback: typing.Callable[
-            [platform_events.Event, abstract_platform_adapter.AbstractMessagePlatformAdapter], None
-        ],
+        callback: typing.Callable[[platform_events.Event, adapter.MessagePlatformAdapter], None],
     ):
         return super().unregister_listener(event_type, callback)
 

pkg/platform/sources/dingtalk.py

@@ -1,16 +1,18 @@
 import traceback
 import typing
 from libs.dingtalk_api.dingtalkevent import DingTalkEvent
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.definition.abstract.platform.adapter as abstract_platform_adapter
-import langbot_plugin.api.entities.builtin.platform.events as platform_events
-import langbot_plugin.api.entities.builtin.platform.entities as platform_entities
+from pkg.platform.types import message as platform_message
+from pkg.platform.adapter import MessagePlatformAdapter
+from .. import adapter
+from ...core import app
+from ..types import events as platform_events
+from ..types import entities as platform_entities
 from libs.dingtalk_api.api import DingTalkClient
 import datetime
 from ..logger import EventLogger
 
 
-class DingTalkMessageConverter(abstract_platform_adapter.AbstractMessageConverter):
+class DingTalkMessageConverter(adapter.MessageConverter):
     @staticmethod
     async def yiri2target(message_chain: platform_message.MessageChain):
         content = ''
@@ -46,7 +48,7 @@ class DingTalkMessageConverter(abstract_platform_adapter.AbstractMessageConverte
         return chain
 
 
-class DingTalkEventConverter(abstract_platform_adapter.AbstractEventConverter):
+class DingTalkEventConverter(adapter.EventConverter):
     @staticmethod
     async def yiri2target(event: platform_events.MessageEvent):
         return event.source_platform_object
@@ -90,15 +92,17 @@ class DingTalkEventConverter(abstract_platform_adapter.AbstractEventConverter):
             )
 
 
-class DingTalkAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
+class DingTalkAdapter(adapter.MessagePlatformAdapter):
     bot: DingTalkClient
+    ap: app.Application
     bot_account_id: str
     message_converter: DingTalkMessageConverter = DingTalkMessageConverter()
     event_converter: DingTalkEventConverter = DingTalkEventConverter()
     config: dict
 
-    def __init__(self, config: dict, logger: EventLogger):
+    def __init__(self, config: dict, ap: app.Application, logger: EventLogger):
         self.config = config
+        self.ap = ap
         self.logger = logger
         required_keys = [
             'client_id',
@@ -112,6 +116,15 @@ class DingTalkAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
 
         self.bot_account_id = self.config['robot_name']
 
+        self.bot = DingTalkClient(
+            client_id=config['client_id'],
+            client_secret=config['client_secret'],
+            robot_name=config['robot_name'],
+            robot_code=config['robot_code'],
+            markdown_card=config['markdown_card'],
+            logger=self.logger,
+        )
+
     async def reply_message(
         self,
         message_source: platform_events.MessageEvent,
@@ -136,9 +149,7 @@ class DingTalkAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
     def register_listener(
         self,
         event_type: typing.Type[platform_events.Event],
-        callback: typing.Callable[
-            [platform_events.Event, abstract_platform_adapter.AbstractMessagePlatformAdapter], None
-        ],
+        callback: typing.Callable[[platform_events.Event, adapter.MessagePlatformAdapter], None],
     ):
         async def on_message(event: DingTalkEvent):
             try:
@@ -155,15 +166,6 @@ class DingTalkAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
             self.bot.on_message('GroupMessage')(on_message)
 
     async def run_async(self):
-        config = self.config
-        self.bot = DingTalkClient(
-            client_id=config['client_id'],
-            client_secret=config['client_secret'],
-            robot_name=config['robot_name'],
-            robot_code=config['robot_code'],
-            markdown_card=config['markdown_card'],
-            logger=self.logger,
-        )
         await self.bot.start()
 
     async def kill(self) -> bool:
@@ -172,8 +174,6 @@ class DingTalkAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
     async def unregister_listener(
         self,
         event_type: type,
-        callback: typing.Callable[
-            [platform_events.Event, abstract_platform_adapter.AbstractMessagePlatformAdapter], None
-        ],
+        callback: typing.Callable[[platform_events.Event, MessagePlatformAdapter], None],
     ):
         return super().unregister_listener(event_type, callback)

pkg/platform/sources/discord.py

@@ -8,18 +8,595 @@ import base64
 import uuid
 import os
 import datetime
+import io
+import asyncio
+from enum import Enum
 
 import aiohttp
-import pydantic
 
-import langbot_plugin.api.definition.abstract.platform.adapter as abstract_platform_adapter
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.entities.builtin.platform.events as platform_events
-import langbot_plugin.api.entities.builtin.platform.entities as platform_entities
-import langbot_plugin.api.definition.abstract.platform.event_logger as abstract_platform_logger
+from .. import adapter
+from ...core import app
+from ..logger import EventLogger
+from ..types import message as platform_message
+from ..types import events as platform_events
+from ..types import entities as platform_entities
+
+# 语音功能相关异常定义
+class VoiceConnectionError(Exception):
+    """语音连接基础异常"""
+    def __init__(self, message: str, error_code: str = None, guild_id: int = None):
+        super().__init__(message)
+        self.error_code = error_code
+        self.guild_id = guild_id
+        self.timestamp = datetime.datetime.now()
 
 
-class DiscordMessageConverter(abstract_platform_adapter.AbstractMessageConverter):
+class VoicePermissionError(VoiceConnectionError):
+    """语音权限异常"""
+    def __init__(self, message: str, missing_permissions: list = None, user_id: int = None, channel_id: int = None):
+        super().__init__(message, "PERMISSION_ERROR")
+        self.missing_permissions = missing_permissions or []
+        self.user_id = user_id
+        self.channel_id = channel_id
+
+
+class VoiceNetworkError(VoiceConnectionError):
+    """语音网络异常"""
+    def __init__(self, message: str, retry_count: int = 0):
+        super().__init__(message, "NETWORK_ERROR")
+        self.retry_count = retry_count
+        self.last_attempt = datetime.datetime.now()
+
+
+class VoiceConnectionStatus(Enum):
+    """语音连接状态枚举"""
+    IDLE = "idle"
+    CONNECTING = "connecting"
+    CONNECTED = "connected"
+    PLAYING = "playing"
+    RECONNECTING = "reconnecting"
+    FAILED = "failed"
+
+
+class VoiceConnectionInfo:
+    """
+    语音连接信息类
+    
+    用于存储和管理单个语音连接的详细信息，包括连接状态、时间戳、
+    频道信息等。提供连接信息的标准化数据结构。
+    
+    @author: @ydzat
+    @version: 1.0
+    @since: 2025-07-04
+    """
+    
+    def __init__(self, guild_id: int, channel_id: int, channel_name: str = None):
+        """
+        初始化语音连接信息
+        
+        @author: @ydzat
+        
+        Args:
+            guild_id (int): 服务器ID
+            channel_id (int): 语音频道ID
+            channel_name (str, optional): 语音频道名称
+        """
+        self.guild_id = guild_id
+        self.channel_id = channel_id
+        self.channel_name = channel_name or f"Channel-{channel_id}"
+        self.connected = False
+        self.connection_time: datetime.datetime = None
+        self.last_activity = datetime.datetime.now()
+        self.status = VoiceConnectionStatus.IDLE
+        self.user_count = 0
+        self.latency = 0.0
+        self.connection_health = "unknown"
+        self.voice_client = None
+        
+    def update_status(self, status: VoiceConnectionStatus):
+        """
+        更新连接状态
+        
+        @author: @ydzat
+        
+        Args:
+            status (VoiceConnectionStatus): 新的连接状态
+        """
+        self.status = status
+        self.last_activity = datetime.datetime.now()
+        
+        if status == VoiceConnectionStatus.CONNECTED:
+            self.connected = True
+            if self.connection_time is None:
+                self.connection_time = datetime.datetime.now()
+        elif status in [VoiceConnectionStatus.IDLE, VoiceConnectionStatus.FAILED]:
+            self.connected = False
+            self.connection_time = None
+            self.voice_client = None
+    
+    def to_dict(self) -> dict:
+        """
+        转换为字典格式
+        
+        @author: @ydzat
+        
+        Returns:
+            dict: 连接信息的字典表示
+        """
+        return {
+            "guild_id": self.guild_id,
+            "channel_id": self.channel_id,
+            "channel_name": self.channel_name,
+            "connected": self.connected,
+            "connection_time": self.connection_time.isoformat() if self.connection_time else None,
+            "last_activity": self.last_activity.isoformat(),
+            "status": self.status.value,
+            "user_count": self.user_count,
+            "latency": self.latency,
+            "connection_health": self.connection_health
+        }
+
+
+class VoiceConnectionManager:
+    """
+    语音连接管理器
+    
+    负责管理多个服务器的语音连接，提供连接建立、断开、状态查询等功能。
+    采用单例模式确保全局只有一个连接管理器实例。
+    
+    @author: @ydzat
+    @version: 1.0
+    @since: 2025-07-04
+    """
+    
+    def __init__(self, bot: discord.Client, logger: EventLogger):
+        """
+        初始化语音连接管理器
+        
+        @author: @ydzat
+        
+        Args:
+            bot (discord.Client): Discord 客户端实例
+            logger (EventLogger): 事件日志记录器
+        """
+        self.bot = bot
+        self.logger = logger
+        self.connections: typing.Dict[int, VoiceConnectionInfo] = {}
+        self._connection_lock = asyncio.Lock()
+        self._cleanup_task = None
+        self._monitoring_enabled = True
+        
+    async def join_voice_channel(self, guild_id: int, channel_id: int, 
+                                user_id: int = None) -> discord.VoiceClient:
+        """
+        加入语音频道
+        
+        验证用户权限和频道状态后，建立到指定语音频道的连接。
+        支持连接复用和自动重连机制。
+        
+        @author: @ydzat
+        
+        Args:
+            guild_id (int): 服务器ID
+            channel_id (int): 语音频道ID
+            user_id (int, optional): 请求用户ID，用于权限验证
+            
+        Returns:
+            discord.VoiceClient: 语音客户端实例
+            
+        Raises:
+            VoicePermissionError: 权限不足时抛出
+            VoiceNetworkError: 网络连接失败时抛出
+            VoiceConnectionError: 其他连接错误时抛出
+        """
+        async with self._connection_lock:
+            try:
+                # 获取服务器和频道对象
+                guild = self.bot.get_guild(guild_id)
+                if not guild:
+                    raise VoiceConnectionError(
+                        f"无法找到服务器 {guild_id}",
+                        "GUILD_NOT_FOUND",
+                        guild_id
+                    )
+                
+                channel = guild.get_channel(channel_id)
+                if not channel or not isinstance(channel, discord.VoiceChannel):
+                    raise VoiceConnectionError(
+                        f"无法找到语音频道 {channel_id}",
+                        "CHANNEL_NOT_FOUND",
+                        guild_id
+                    )
+                
+                # 验证用户是否在语音频道中（如果提供了用户ID）
+                if user_id:
+                    await self._validate_user_in_channel(guild, channel, user_id)
+                
+                # 验证机器人权限
+                await self._validate_bot_permissions(channel)
+                
+                # 检查是否已有连接
+                if guild_id in self.connections:
+                    existing_conn = self.connections[guild_id]
+                    if existing_conn.connected and existing_conn.voice_client:
+                        if existing_conn.channel_id == channel_id:
+                            # 已连接到相同频道，返回现有连接
+                            await self.logger.info(f"复用现有语音连接: {guild.name} -> {channel.name}")
+                            return existing_conn.voice_client
+                        else:
+                            # 连接到不同频道，先断开旧连接
+                            await self._disconnect_internal(guild_id)
+                
+                # 建立新连接
+                voice_client = await channel.connect()
+                
+                # 更新连接信息
+                conn_info = VoiceConnectionInfo(guild_id, channel_id, channel.name)
+                conn_info.voice_client = voice_client
+                conn_info.update_status(VoiceConnectionStatus.CONNECTED)
+                conn_info.user_count = len(channel.members)
+                self.connections[guild_id] = conn_info
+                
+                await self.logger.info(f"成功连接到语音频道: {guild.name} -> {channel.name}")
+                return voice_client
+                
+            except discord.ClientException as e:
+                raise VoiceNetworkError(f"Discord 客户端错误: {str(e)}")
+            except discord.opus.OpusNotLoaded as e:
+                raise VoiceConnectionError(f"Opus 编码器未加载: {str(e)}", "OPUS_NOT_LOADED", guild_id)
+            except Exception as e:
+                await self.logger.error(f"连接语音频道时发生未知错误: {str(e)}")
+                raise VoiceConnectionError(f"连接失败: {str(e)}", "UNKNOWN_ERROR", guild_id)
+    
+    async def leave_voice_channel(self, guild_id: int) -> bool:
+        """
+        离开语音频道
+        
+        断开指定服务器的语音连接，清理相关资源和状态信息。
+        确保音频播放停止后再断开连接。
+        
+        @author: @ydzat
+        
+        Args:
+            guild_id (int): 服务器ID
+            
+        Returns:
+            bool: 断开是否成功
+        """
+        async with self._connection_lock:
+            return await self._disconnect_internal(guild_id)
+    
+    async def _disconnect_internal(self, guild_id: int) -> bool:
+        """
+        内部断开连接方法
+        
+        @author: @ydzat
+        
+        Args:
+            guild_id (int): 服务器ID
+            
+        Returns:
+            bool: 断开是否成功
+        """
+        if guild_id not in self.connections:
+            return True
+        
+        conn_info = self.connections[guild_id]
+        
+        try:
+            if conn_info.voice_client and conn_info.voice_client.is_connected():
+                # 停止当前播放
+                if conn_info.voice_client.is_playing():
+                    conn_info.voice_client.stop()
+                
+                # 等待播放完全停止
+                await asyncio.sleep(0.1)
+                
+                # 断开连接
+                await conn_info.voice_client.disconnect()
+                
+            conn_info.update_status(VoiceConnectionStatus.IDLE)
+            del self.connections[guild_id]
+            
+            await self.logger.info(f"已断开语音连接: Guild {guild_id}")
+            return True
+            
+        except Exception as e:
+            await self.logger.error(f"断开语音连接时发生错误: {str(e)}")
+            # 即使出错也要清理连接记录
+            conn_info.update_status(VoiceConnectionStatus.FAILED)
+            if guild_id in self.connections:
+                del self.connections[guild_id]
+            return False
+    
+    async def get_voice_client(self, guild_id: int) -> typing.Optional[discord.VoiceClient]:
+        """
+        获取语音客户端
+        
+        返回指定服务器的语音客户端实例，如果未连接则返回 None。
+        会验证连接的有效性，自动清理无效连接。
+        
+        @author: @ydzat
+        
+        Args:
+            guild_id (int): 服务器ID
+            
+        Returns:
+            Optional[discord.VoiceClient]: 语音客户端实例或 None
+        """
+        if guild_id not in self.connections:
+            return None
+        
+        conn_info = self.connections[guild_id]
+        
+        # 验证连接是否仍然有效
+        if conn_info.voice_client and not conn_info.voice_client.is_connected():
+            # 连接已失效，清理状态
+            await self._disconnect_internal(guild_id)
+            return None
+        
+        return conn_info.voice_client if conn_info.connected else None
+    
+    async def is_connected_to_voice(self, guild_id: int) -> bool:
+        """
+        检查是否连接到语音频道
+        
+        @author: @ydzat
+        
+        Args:
+            guild_id (int): 服务器ID
+            
+        Returns:
+            bool: 是否已连接
+        """
+        if guild_id not in self.connections:
+            return False
+        
+        conn_info = self.connections[guild_id]
+        
+        # 检查实际连接状态
+        if conn_info.voice_client and not conn_info.voice_client.is_connected():
+            # 连接已失效，清理状态
+            await self._disconnect_internal(guild_id)
+            return False
+        
+        return conn_info.connected
+    
+    async def get_connection_status(self, guild_id: int) -> typing.Optional[dict]:
+        """
+        获取连接状态信息
+        
+        @author: @ydzat
+        
+        Args:
+            guild_id (int): 服务器ID
+            
+        Returns:
+            Optional[dict]: 连接状态信息字典或 None
+        """
+        if guild_id not in self.connections:
+            return None
+        
+        conn_info = self.connections[guild_id]
+        
+        # 更新实时信息
+        if conn_info.voice_client and conn_info.voice_client.is_connected():
+            conn_info.latency = conn_info.voice_client.latency * 1000  # 转换为毫秒
+            conn_info.connection_health = "good" if conn_info.latency < 100 else "poor"
+            
+            # 更新频道用户数
+            guild = self.bot.get_guild(guild_id)
+            if guild:
+                channel = guild.get_channel(conn_info.channel_id)
+                if channel and isinstance(channel, discord.VoiceChannel):
+                    conn_info.user_count = len(channel.members)
+        
+        return conn_info.to_dict()
+    
+    async def list_active_connections(self) -> typing.List[dict]:
+        """
+        列出所有活跃连接
+        
+        @author: @ydzat
+        
+        Returns:
+            List[dict]: 活跃连接列表
+        """
+        active_connections = []
+        
+        for guild_id, conn_info in self.connections.items():
+            if conn_info.connected:
+                status = await self.get_connection_status(guild_id)
+                if status:
+                    active_connections.append(status)
+        
+        return active_connections
+    
+    async def get_voice_channel_info(self, guild_id: int, channel_id: int) -> typing.Optional[dict]:
+        """
+        获取语音频道信息
+        
+        @author: @ydzat
+        
+        Args:
+            guild_id (int): 服务器ID
+            channel_id (int): 频道ID
+            
+        Returns:
+            Optional[dict]: 频道信息字典或 None
+        """
+        guild = self.bot.get_guild(guild_id)
+        if not guild:
+            return None
+        
+        channel = guild.get_channel(channel_id)
+        if not channel or not isinstance(channel, discord.VoiceChannel):
+            return None
+        
+        # 获取用户信息
+        users = []
+        for member in channel.members:
+            users.append({
+                "id": member.id,
+                "name": member.display_name,
+                "status": str(member.status),
+                "is_bot": member.bot
+            })
+        
+        # 获取权限信息
+        bot_member = guild.me
+        permissions = channel.permissions_for(bot_member)
+        
+        return {
+            "channel_id": channel_id,
+            "channel_name": channel.name,
+            "guild_id": guild_id,
+            "guild_name": guild.name,
+            "user_limit": channel.user_limit,
+            "current_users": users,
+            "user_count": len(users),
+            "bitrate": channel.bitrate,
+            "permissions": {
+                "connect": permissions.connect,
+                "speak": permissions.speak,
+                "use_voice_activation": permissions.use_voice_activation,
+                "priority_speaker": permissions.priority_speaker
+            }
+        }
+    
+    async def _validate_user_in_channel(self, guild: discord.Guild, 
+                                       channel: discord.VoiceChannel, user_id: int):
+        """
+        验证用户是否在语音频道中
+        
+        @author: @ydzat
+        
+        Args:
+            guild: Discord 服务器对象
+            channel: 语音频道对象
+            user_id: 用户ID
+            
+        Raises:
+            VoicePermissionError: 用户不在频道中时抛出
+        """
+        member = guild.get_member(user_id)
+        if not member:
+            raise VoicePermissionError(
+                f"无法找到用户 {user_id}",
+                ["member_not_found"],
+                user_id,
+                channel.id
+            )
+        
+        if not member.voice or member.voice.channel != channel:
+            raise VoicePermissionError(
+                f"用户 {member.display_name} 不在语音频道 {channel.name} 中",
+                ["user_not_in_channel"],
+                user_id,
+                channel.id
+            )
+    
+    async def _validate_bot_permissions(self, channel: discord.VoiceChannel):
+        """
+        验证机器人权限
+        
+        @author: @ydzat
+        
+        Args:
+            channel: 语音频道对象
+            
+        Raises:
+            VoicePermissionError: 权限不足时抛出
+        """
+        bot_member = channel.guild.me
+        permissions = channel.permissions_for(bot_member)
+        
+        missing_permissions = []
+        
+        if not permissions.connect:
+            missing_permissions.append("connect")
+        if not permissions.speak:
+            missing_permissions.append("speak")
+        
+        if missing_permissions:
+            raise VoicePermissionError(
+                f"机器人在频道 {channel.name} 中缺少权限: {', '.join(missing_permissions)}",
+                missing_permissions,
+                channel_id=channel.id
+            )
+    
+    async def cleanup_inactive_connections(self):
+        """
+        清理无效连接
+        
+        定期检查并清理已断开或无效的语音连接，释放资源。
+        
+        @author: @ydzat
+        """
+        cleanup_guilds = []
+        
+        for guild_id, conn_info in self.connections.items():
+            if not conn_info.voice_client or not conn_info.voice_client.is_connected():
+                cleanup_guilds.append(guild_id)
+        
+        for guild_id in cleanup_guilds:
+            await self._disconnect_internal(guild_id)
+        
+        if cleanup_guilds:
+            await self.logger.info(f"清理了 {len(cleanup_guilds)} 个无效的语音连接")
+    
+    async def start_monitoring(self):
+        """
+        开始连接监控
+        
+        @author: @ydzat
+        """
+        if self._cleanup_task is None and self._monitoring_enabled:
+            self._cleanup_task = asyncio.create_task(self._monitoring_loop())
+    
+    async def stop_monitoring(self):
+        """
+        停止连接监控
+        
+        @author: @ydzat
+        """
+        self._monitoring_enabled = False
+        if self._cleanup_task:
+            self._cleanup_task.cancel()
+            try:
+                await self._cleanup_task
+            except asyncio.CancelledError:
+                pass
+            self._cleanup_task = None
+    
+    async def _monitoring_loop(self):
+        """
+        监控循环
+        
+        @author: @ydzat
+        """
+        try:
+            while self._monitoring_enabled:
+                await asyncio.sleep(60)  # 每分钟检查一次
+                await self.cleanup_inactive_connections()
+        except asyncio.CancelledError:
+            pass
+    
+    async def disconnect_all(self):
+        """
+        断开所有连接
+        
+        @author: @ydzat
+        """
+        async with self._connection_lock:
+            guild_ids = list(self.connections.keys())
+            for guild_id in guild_ids:
+                await self._disconnect_internal(guild_id)
+        
+        await self.stop_monitoring()
+
+
+class DiscordMessageConverter(adapter.MessageConverter):
     @staticmethod
     async def yiri2target(
         message_chain: platform_message.MessageChain,
@@ -35,28 +612,88 @@ class DiscordMessageConverter(abstract_platform_adapter.AbstractMessageConverter
         for ele in message_chain:
             if isinstance(ele, platform_message.Image):
                 image_bytes = None
+                filename = f'{uuid.uuid4()}.png'  # 默认文件名
 
                 if ele.base64:
-                    image_bytes = base64.b64decode(ele.base64)
+                    # 处理base64编码的图片
+                    if ele.base64.startswith('data:'):
+                        # 从data URL中提取文件类型
+                        data_header = ele.base64.split(',')[0]
+                        if 'jpeg' in data_header or 'jpg' in data_header:
+                            filename = f'{uuid.uuid4()}.jpg'
+                        elif 'gif' in data_header:
+                            filename = f'{uuid.uuid4()}.gif'
+                        elif 'webp' in data_header:
+                            filename = f'{uuid.uuid4()}.webp'
+                        # 去掉data:image/xxx;base64,前缀
+                        base64_data = ele.base64.split(',')[1]
+                    else:
+                        base64_data = ele.base64
+                    image_bytes = base64.b64decode(base64_data)
                 elif ele.url:
+                    # 从URL下载图片
                     async with aiohttp.ClientSession() as session:
                         async with session.get(ele.url) as response:
                             image_bytes = await response.read()
+                            # 从URL或Content-Type推断文件类型
+                            content_type = response.headers.get('Content-Type', '')
+                            if 'jpeg' in content_type or 'jpg' in content_type:
+                                filename = f'{uuid.uuid4()}.jpg'
+                            elif 'gif' in content_type:
+                                filename = f'{uuid.uuid4()}.gif'
+                            elif 'webp' in content_type:
+                                filename = f'{uuid.uuid4()}.webp'
+                            elif ele.url.lower().endswith(('.jpg', '.jpeg')):
+                                filename = f'{uuid.uuid4()}.jpg'
+                            elif ele.url.lower().endswith('.gif'):
+                                filename = f'{uuid.uuid4()}.gif'
+                            elif ele.url.lower().endswith('.webp'):
+                                filename = f'{uuid.uuid4()}.webp'
                 elif ele.path:
-                    with open(ele.path, 'rb') as f:
-                        image_bytes = f.read()
+                    # 从文件路径读取图片
+                    # 确保路径没有空字节
+                    clean_path = ele.path.replace('\x00', '')
+                    clean_path = os.path.abspath(clean_path)
+                    
+                    if not os.path.exists(clean_path):
+                        continue  # 跳过不存在的文件
+                    
+                    try:
+                        with open(clean_path, 'rb') as f:
+                            image_bytes = f.read()
+                        # 从文件路径获取文件名，保持原始扩展名
+                        original_filename = os.path.basename(clean_path)
+                        if original_filename and '.' in original_filename:
+                            # 保持原始文件名的扩展名
+                            ext = original_filename.split('.')[-1].lower()
+                            filename = f'{uuid.uuid4()}.{ext}'
+                        else:
+                            # 如果没有扩展名，尝试从文件内容检测
+                            if image_bytes.startswith(b'\xff\xd8\xff'):
+                                filename = f'{uuid.uuid4()}.jpg'
+                            elif image_bytes.startswith(b'GIF'):
+                                filename = f'{uuid.uuid4()}.gif'
+                            elif image_bytes.startswith(b'RIFF') and b'WEBP' in image_bytes[:20]:
+                                filename = f'{uuid.uuid4()}.webp'
+                            # 默认保持PNG
+                    except Exception as e:
+                        print(f"Error reading image file {clean_path}: {e}")
+                        continue  # 跳过读取失败的文件
 
-                image_files.append(discord.File(fp=image_bytes, filename=f'{uuid.uuid4()}.png'))
+                if image_bytes:
+                    # 使用BytesIO创建文件对象，避免路径问题
+                    import io
+                    image_files.append(discord.File(fp=io.BytesIO(image_bytes), filename=filename))
             elif isinstance(ele, platform_message.Plain):
                 text_string += ele.text
             elif isinstance(ele, platform_message.Forward):
                 for node in ele.node_list:
                     (
-                        text_string,
-                        image_files,
+                        node_text,
+                        node_images,
                     ) = await DiscordMessageConverter.yiri2target(node.message_chain)
-                    text_string += text_string
-                    image_files.extend(image_files)
+                    text_string += node_text
+                    image_files.extend(node_images)
 
         return text_string, image_files
 
@@ -112,7 +749,7 @@ class DiscordMessageConverter(abstract_platform_adapter.AbstractMessageConverter
         return platform_message.MessageChain(element_list)
 
 
-class DiscordEventConverter(abstract_platform_adapter.AbstractEventConverter):
+class DiscordEventConverter(adapter.EventConverter):
     @staticmethod
     async def yiri2target(event: platform_events.Event) -> discord.Message:
         pass
@@ -154,21 +791,32 @@ class DiscordEventConverter(abstract_platform_adapter.AbstractEventConverter):
             )
 
 
-class DiscordAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
-    bot: discord.Client = pydantic.Field(exclude=True)
+class DiscordAdapter(adapter.MessagePlatformAdapter):
+    bot: discord.Client
+
+    bot_account_id: str  # 用于在流水线中识别at是否是本bot，直接以bot_name作为标识
+
+    config: dict
+
+    ap: app.Application
 
     message_converter: DiscordMessageConverter = DiscordMessageConverter()
     event_converter: DiscordEventConverter = DiscordEventConverter()
 
     listeners: typing.Dict[
         typing.Type[platform_events.Event],
-        typing.Callable[[platform_events.Event, abstract_platform_adapter.AbstractMessagePlatformAdapter], None],
+        typing.Callable[[platform_events.Event, adapter.MessagePlatformAdapter], None],
     ] = {}
 
-    def __init__(self, config: dict, logger: abstract_platform_logger.AbstractEventLogger):
-        bot_account_id = config['client_id']
+    def __init__(self, config: dict, ap: app.Application, logger: EventLogger):
+        self.config = config
+        self.ap = ap
+        self.logger = logger
 
-        listeners = {}
+        self.bot_account_id = self.config['client_id']
+        
+        # 初始化语音连接管理器
+        self.voice_manager: VoiceConnectionManager = None
 
         adapter_self = self
 
@@ -188,18 +836,193 @@ class DiscordAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
         if os.getenv('http_proxy'):
             args['proxy'] = os.getenv('http_proxy')
 
-        bot = MyClient(intents=intents, **args)
-
-        super().__init__(
-            config=config,
-            logger=logger,
-            bot_account_id=bot_account_id,
-            listeners=listeners,
-            bot=bot,
-        )
+        self.bot = MyClient(intents=intents, **args)
+    
+    # Voice functionality methods
+    async def join_voice_channel(self, guild_id: int, channel_id: int, 
+                                user_id: int = None) -> discord.VoiceClient:
+        """
+        加入语音频道
+        
+        为指定服务器的语音频道建立连接，支持用户权限验证和连接复用。
+        
+        @author: @ydzat
+        @version: 1.0
+        @since: 2025-07-04
+        
+        Args:
+            guild_id (int): Discord 服务器ID
+            channel_id (int): 语音频道ID
+            user_id (int, optional): 请求用户ID，用于权限验证
+            
+        Returns:
+            discord.VoiceClient: 语音客户端实例
+            
+        Raises:
+            VoicePermissionError: 权限不足
+            VoiceNetworkError: 网络连接失败
+            VoiceConnectionError: 其他连接错误
+        """
+        if not self.voice_manager:
+            raise VoiceConnectionError("语音管理器未初始化", "MANAGER_NOT_READY")
+        
+        return await self.voice_manager.join_voice_channel(guild_id, channel_id, user_id)
+    
+    async def leave_voice_channel(self, guild_id: int) -> bool:
+        """
+        离开语音频道
+        
+        断开指定服务器的语音连接，清理相关资源。
+        
+        @author: @ydzat
+        @version: 1.0
+        @since: 2025-07-04
+        
+        Args:
+            guild_id (int): Discord 服务器ID
+            
+        Returns:
+            bool: 是否成功断开连接
+        """
+        if not self.voice_manager:
+            return False
+        
+        return await self.voice_manager.leave_voice_channel(guild_id)
+    
+    async def get_voice_client(self, guild_id: int) -> typing.Optional[discord.VoiceClient]:
+        """
+        获取语音客户端
+        
+        返回指定服务器的语音客户端实例，用于音频播放控制。
+        
+        @author: @ydzat
+        @version: 1.0
+        @since: 2025-07-04
+        
+        Args:
+            guild_id (int): Discord 服务器ID
+            
+        Returns:
+            Optional[discord.VoiceClient]: 语音客户端实例或 None
+        """
+        if not self.voice_manager:
+            return None
+        
+        return await self.voice_manager.get_voice_client(guild_id)
+    
+    async def is_connected_to_voice(self, guild_id: int) -> bool:
+        """
+        检查语音连接状态
+        
+        @author: @ydzat
+        @version: 1.0
+        @since: 2025-07-04
+        
+        Args:
+            guild_id (int): Discord 服务器ID
+            
+        Returns:
+            bool: 是否已连接到语音频道
+        """
+        if not self.voice_manager:
+            return False
+        
+        return await self.voice_manager.is_connected_to_voice(guild_id)
+    
+    async def get_voice_connection_status(self, guild_id: int) -> typing.Optional[dict]:
+        """
+        获取语音连接详细状态
+        
+        返回包含连接时间、延迟、用户数等详细信息的状态字典。
+        
+        @author: @ydzat
+        @version: 1.0
+        @since: 2025-07-04
+        
+        Args:
+            guild_id (int): Discord 服务器ID
+            
+        Returns:
+            Optional[dict]: 连接状态信息或 None
+        """
+        if not self.voice_manager:
+            return None
+        
+        return await self.voice_manager.get_connection_status(guild_id)
+    
+    async def list_active_voice_connections(self) -> typing.List[dict]:
+        """
+        列出所有活跃的语音连接
+        
+        @author: @ydzat
+        @version: 1.0
+        @since: 2025-07-04
+        
+        Returns:
+            List[dict]: 活跃语音连接列表
+        """
+        if not self.voice_manager:
+            return []
+        
+        return await self.voice_manager.list_active_connections()
+    
+    async def get_voice_channel_info(self, guild_id: int, channel_id: int) -> typing.Optional[dict]:
+        """
+        获取语音频道详细信息
+        
+        包括频道名称、用户列表、权限信息等。
+        
+        @author: @ydzat
+        @version: 1.0
+        @since: 2025-07-04
+        
+        Args:
+            guild_id (int): Discord 服务器ID
+            channel_id (int): 语音频道ID
+            
+        Returns:
+            Optional[dict]: 频道信息字典或 None
+        """
+        if not self.voice_manager:
+            return None
+        
+        return await self.voice_manager.get_voice_channel_info(guild_id, channel_id)
+    
+    async def cleanup_voice_connections(self):
+        """
+        清理无效的语音连接
+        
+        手动触发语音连接清理，移除已断开或无效的连接。
+        
+        @author: @ydzat
+        @version: 1.0
+        @since: 2025-07-04
+        """
+        if self.voice_manager:
+            await self.voice_manager.cleanup_inactive_connections()
 
     async def send_message(self, target_type: str, target_id: str, message: platform_message.MessageChain):
-        pass
+        msg_to_send, image_files = await self.message_converter.yiri2target(message)
+        
+        try:
+            # 获取频道对象
+            channel = self.bot.get_channel(int(target_id))
+            if channel is None:
+                # 如果本地缓存中没有，尝试从API获取
+                channel = await self.bot.fetch_channel(int(target_id))
+            
+            args = {
+                'content': msg_to_send,
+            }
+            
+            if len(image_files) > 0:
+                args['files'] = image_files
+            
+            await channel.send(**args)
+            
+        except Exception as e:
+            await self.logger.error(f"Discord send_message failed: {e}")
+            raise e
 
     async def reply_message(
         self,
@@ -231,25 +1054,44 @@ class DiscordAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
     def register_listener(
         self,
         event_type: typing.Type[platform_events.Event],
-        callback: typing.Callable[
-            [platform_events.Event, abstract_platform_adapter.AbstractMessagePlatformAdapter], None
-        ],
+        callback: typing.Callable[[platform_events.Event, adapter.MessagePlatformAdapter], None],
     ):
         self.listeners[event_type] = callback
 
     def unregister_listener(
         self,
         event_type: typing.Type[platform_events.Event],
-        callback: typing.Callable[
-            [platform_events.Event, abstract_platform_adapter.AbstractMessagePlatformAdapter], None
-        ],
+        callback: typing.Callable[[platform_events.Event, adapter.MessagePlatformAdapter], None],
     ):
         self.listeners.pop(event_type)
 
     async def run_async(self):
+        """
+        启动 Discord 适配器
+        
+        初始化语音管理器并启动 Discord 客户端连接。
+        
+        @author: @ydzat (修改)
+        """
         async with self.bot:
+            # 初始化语音管理器
+            self.voice_manager = VoiceConnectionManager(self.bot, self.logger)
+            await self.voice_manager.start_monitoring()
+            
+            await self.logger.info("Discord 适配器语音功能已启用")
             await self.bot.start(self.config['token'], reconnect=True)
 
     async def kill(self) -> bool:
+        """
+        关闭 Discord 适配器
+        
+        清理语音连接并关闭 Discord 客户端。
+        
+        @author: @ydzat (修改)
+        """
+        if self.voice_manager:
+            await self.voice_manager.disconnect_all()
+        
         await self.bot.close()
         return True
+

pkg/platform/sources/gewechat.py

@@ -11,19 +11,19 @@ import threading
 import quart
 import aiohttp
 
-import langbot_plugin.api.definition.abstract.platform.adapter as abstract_platform_adapter
-from ....core import app
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.entities.builtin.platform.events as platform_events
-import langbot_plugin.api.entities.builtin.platform.entities as platform_entities
-from ....utils import image
+from .. import adapter
+from ...core import app
+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
 from typing import Optional, Tuple
 from functools import partial
-from ...logger import EventLogger
+from ..logger import EventLogger
 
 
-class GewechatMessageConverter(abstract_platform_adapter.AbstractMessageConverter):
+class GewechatMessageConverter(adapter.MessageConverter):
     def __init__(self, config: dict):
         self.config = config
 
@@ -398,7 +398,7 @@ class GewechatMessageConverter(abstract_platform_adapter.AbstractMessageConverte
         return from_user_name.endswith('@chatroom')
 
 
-class GewechatEventConverter(abstract_platform_adapter.AbstractEventConverter):
+class GewechatEventConverter(adapter.EventConverter):
     def __init__(self, config: dict):
         self.config = config
         self.message_converter = GewechatMessageConverter(config)
@@ -458,7 +458,7 @@ class GewechatEventConverter(abstract_platform_adapter.AbstractEventConverter):
             )
 
 
-class GeWeChatAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
+class GeWeChatAdapter(adapter.MessagePlatformAdapter):
     name: str = 'gewechat'  # 定义适配器名称
 
     bot: gewechat_client.GewechatClient
@@ -475,7 +475,7 @@ class GeWeChatAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
 
     listeners: typing.Dict[
         typing.Type[platform_events.Event],
-        typing.Callable[[platform_events.Event, abstract_platform_adapter.AbstractMessagePlatformAdapter], None],
+        typing.Callable[[platform_events.Event, adapter.MessagePlatformAdapter], None],
     ] = {}
 
     def __init__(self, config: dict, ap: app.Application, logger: EventLogger):
@@ -491,7 +491,7 @@ class GeWeChatAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
         async def gewechat_callback():
             data = await quart.request.json
             # print(json.dumps(data, indent=4, ensure_ascii=False))
-            await self.logger.debug(f'Gewechat callback event: {data}')
+            self.ap.logger.debug(f'Gewechat callback event: {data}')
 
             if 'data' in data:
                 data['Data'] = data['data']
@@ -601,7 +601,7 @@ class GeWeChatAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
             if handler := handler_map.get(msg['type']):
                 handler(msg)
             else:
-                await self.logger.warning(f'未处理的消息类型: {msg["type"]}')
+                self.ap.logger.warning(f'未处理的消息类型: {msg["type"]}')
                 continue
 
     async def send_message(self, target_type: str, target_id: str, message: platform_message.MessageChain):
@@ -625,18 +625,14 @@ class GeWeChatAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
     def register_listener(
         self,
         event_type: typing.Type[platform_events.Event],
-        callback: typing.Callable[
-            [platform_events.Event, abstract_platform_adapter.AbstractMessagePlatformAdapter], None
-        ],
+        callback: typing.Callable[[platform_events.Event, adapter.MessagePlatformAdapter], None],
     ):
         self.listeners[event_type] = callback
 
     def unregister_listener(
         self,
         event_type: typing.Type[platform_events.Event],
-        callback: typing.Callable[
-            [platform_events.Event, abstract_platform_adapter.AbstractMessagePlatformAdapter], None
-        ],
+        callback: typing.Callable[[platform_events.Event, adapter.MessagePlatformAdapter], None],
     ):
         pass
 
@@ -660,7 +656,9 @@ class GeWeChatAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
 
             self.config['app_id'] = app_id
 
-            print(f'Gewechat 登录成功，app_id: {app_id}')
+            self.ap.logger.info(f'Gewechat 登录成功，app_id: {app_id}')
+
+            self.ap.platform_mgr.write_back_config('gewechat', self, self.config)
 
             # 获取 nickname
             profile = self.bot.get_profile(self.config['app_id'])

pkg/platform/sources/lark.py

@@ -17,13 +17,13 @@ import aiohttp
 import lark_oapi.ws.exception
 import quart
 from lark_oapi.api.im.v1 import *
-import pydantic
 
-import langbot_plugin.api.definition.abstract.platform.adapter as abstract_platform_adapter
-import langbot_plugin.api.entities.builtin.platform.message as platform_message
-import langbot_plugin.api.entities.builtin.platform.events as platform_events
-import langbot_plugin.api.entities.builtin.platform.entities as platform_entities
-import langbot_plugin.api.definition.abstract.platform.event_logger as abstract_platform_logger
+from .. import adapter
+from ...core import app
+from ..types import message as platform_message
+from ..types import events as platform_events
+from ..types import entities as platform_entities
+from ..logger import EventLogger
 
 
 class AESCipher(object):
@@ -52,7 +52,7 @@ class AESCipher(object):
         return self.decrypt(enc).decode('utf8')
 
 
-class LarkMessageConverter(abstract_platform_adapter.AbstractMessageConverter):
+class LarkMessageConverter(adapter.MessageConverter):
     @staticmethod
     async def yiri2target(
         message_chain: platform_message.MessageChain, api_client: lark_oapi.Client
@@ -276,7 +276,7 @@ class LarkMessageConverter(abstract_platform_adapter.AbstractMessageConverter):
         return platform_message.MessageChain(lb_msg_list)
 
 
-class LarkEventConverter(abstract_platform_adapter.AbstractEventConverter):
+class LarkEventConverter(adapter.EventConverter):
     @staticmethod
     async def yiri2target(
         event: platform_events.MessageEvent,
@@ -320,28 +320,39 @@ class LarkEventConverter(abstract_platform_adapter.AbstractEventConverter):
             )
 
 
-class LarkAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
-    bot: lark_oapi.ws.Client = pydantic.Field(exclude=True)
-    api_client: lark_oapi.Client = pydantic.Field(exclude=True)
+class LarkAdapter(adapter.MessagePlatformAdapter):
+    bot: lark_oapi.ws.Client
+    api_client: lark_oapi.Client
+
+    bot_account_id: str  # 用于在流水线中识别at是否是本bot，直接以bot_name作为标识
+    lark_tenant_key: str  # 飞书企业key
 
     message_converter: LarkMessageConverter = LarkMessageConverter()
     event_converter: LarkEventConverter = LarkEventConverter()
 
     listeners: typing.Dict[
         typing.Type[platform_events.Event],
-        typing.Callable[[platform_events.Event, abstract_platform_adapter.AbstractMessagePlatformAdapter], None],
+        typing.Callable[[platform_events.Event, adapter.MessagePlatformAdapter], None],
     ]
 
-    quart_app: quart.Quart = pydantic.Field(exclude=True)
+    config: dict
+    quart_app: quart.Quart
+    ap: app.Application
 
-    def __init__(self, config: dict, logger: abstract_platform_logger.AbstractEventLogger):
-        quart_app = quart.Quart(__name__)
+    def __init__(self, config: dict, ap: app.Application, logger: EventLogger):
+        self.config = config
+        self.ap = ap
+        self.logger = logger
+        self.quart_app = quart.Quart(__name__)
+        self.listeners = {}
 
-        @quart_app.route('/lark/callback', methods=['POST'])
+        @self.quart_app.route('/lark/callback', methods=['POST'])
         async def lark_callback():
             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'])
@@ -367,15 +378,15 @@ class LarkAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
                 if 'im.message.receive_v1' == type:
                     try:
                         event = await self.event_converter.target2yiri(p2v1, self.api_client)
-                    except Exception:
-                        await self.logger.error(f'Error in lark callback: {traceback.format_exc()}')
+                    except Exception as e:
+                        await self.logger.error(f"Error in lark callback: {traceback.format_exc()}")
 
                     if event.__class__ in self.listeners:
                         await self.listeners[event.__class__](event, self)
 
                 return {'code': 200, 'message': 'ok'}
-            except Exception:
-                await self.logger.error(f'Error in lark callback: {traceback.format_exc()}')
+            except Exception as e:
+                await self.logger.error(f"Error in lark callback: {traceback.format_exc()}")
                 return {'code': 500, 'message': 'error'}
 
         async def on_message(event: lark_oapi.im.v1.P2ImMessageReceiveV1):
@@ -390,20 +401,10 @@ class LarkAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
             lark_oapi.EventDispatcherHandler.builder('', '').register_p2_im_message_receive_v1(sync_on_message).build()
         )
 
-        bot_account_id = config['bot_name']
+        self.bot_account_id = config['bot_name']
 
-        bot = lark_oapi.ws.Client(config['app_id'], config['app_secret'], event_handler=event_handler)
-        api_client = lark_oapi.Client.builder().app_id(config['app_id']).app_secret(config['app_secret']).build()
-
-        super().__init__(
-            config=config,
-            logger=logger,
-            listeners={},
-            quart_app=quart_app,
-            bot=bot,
-            api_client=api_client,
-            bot_account_id=bot_account_id,
-        )
+        self.bot = lark_oapi.ws.Client(config['app_id'], config['app_secret'], event_handler=event_handler)
+        self.api_client = lark_oapi.Client.builder().app_id(config['app_id']).app_secret(config['app_secret']).build()
 
     async def send_message(self, target_type: str, target_id: str, message: platform_message.MessageChain):
         pass
@@ -452,18 +453,14 @@ class LarkAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
     def register_listener(
         self,
         event_type: typing.Type[platform_events.Event],
-        callback: typing.Callable[
-            [platform_events.Event, abstract_platform_adapter.AbstractMessagePlatformAdapter], None
-        ],
+        callback: typing.Callable[[platform_events.Event, adapter.MessagePlatformAdapter], None],
     ):
         self.listeners[event_type] = callback
 
     def unregister_listener(
         self,
         event_type: typing.Type[platform_events.Event],
-        callback: typing.Callable[
-            [platform_events.Event, abstract_platform_adapter.AbstractMessagePlatformAdapter], None
-        ],
+        callback: typing.Callable[[platform_events.Event, adapter.MessagePlatformAdapter], None],
     ):
         self.listeners.pop(event_type)