ErisPulse-OneBot11Adapter 4.1.1__tar.gz → 4.1.2__tar.gz

{erispulse_onebot11adapter-4.1.1 → erispulse_onebot11adapter-4.1.2}/ErisPulse_OneBot11Adapter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse-OneBot11Adapter
-Version: 4.1.1
+Version: 4.1.2
 Summary: ErisPulse的OneBotV11协议适配模块，异步的OneBot触发器
 Author-email: wsu2059q <wsu2059@qq.com>
 License: MIT License

{erispulse_onebot11adapter-4.1.1 → erispulse_onebot11adapter-4.1.2}/OneBotAdapter/Core.py

@@ -169,10 +169,25 @@ class OneBotAdapter(BaseAdapter):
             """
             发送图片消息
 
-            :param file: [Union[str, bytes]] 图片文件路径或 URL
+            支持以下三种格式:
+            - bytes: 二进制数据，自动转换为 base64
+            - str (以 base64:// 开头): base64 编码字符串，直接透传
+            - str (其他): 视为文件路径，自动读取并转换为 base64
+
+            :param file: [Union[str, bytes]] 图片文件路径/URL/base64/二进制
             :param filename: [str] 文件名 (默认: "image.png")
             :return: [asyncio.Task] 发送任务
             """
+            import base64
+            import os
+
+            if isinstance(file, bytes):
+                file = "base64://" + base64.b64encode(file).decode("ascii")
+            elif isinstance(file, str) and not file.startswith("base64://"):
+                file_path = os.path.abspath(file)
+                with open(file_path, "rb") as f:
+                    file = "base64://" + base64.b64encode(f.read()).decode("ascii")
+
             return self.Raw_ob12(
                 [{"type": "image", "data": {"file": file, "file_name": filename}}]
             )
@@ -181,10 +196,25 @@ class OneBotAdapter(BaseAdapter):
             """
             发送语音消息
 
-            :param file: [Union[str, bytes]] 语音文件路径或 URL
+            支持以下三种格式:
+            - bytes: 二进制数据，自动转换为 base64
+            - str (以 base64:// 开头): base64 编码字符串，直接透传
+            - str (其他): 视为文件路径，自动读取并转换为 base64
+
+            :param file: [Union[str, bytes]] 语音文件路径/URL/base64/二进制
             :param filename: [str] 文件名 (默认: "voice.amr")
             :return: [asyncio.Task] 发送任务
             """
+            import base64
+            import os
+
+            if isinstance(file, bytes):
+                file = "base64://" + base64.b64encode(file).decode("ascii")
+            elif isinstance(file, str) and not file.startswith("base64://"):
+                file_path = os.path.abspath(file)
+                with open(file_path, "rb") as f:
+                    file = "base64://" + base64.b64encode(f.read()).decode("ascii")
+
             return self.Raw_ob12(
                 [{"type": "audio", "data": {"file": file, "file_name": filename}}]
             )
@@ -193,10 +223,25 @@ class OneBotAdapter(BaseAdapter):
             """
             发送视频消息
 
-            :param file: [Union[str, bytes]] 视频文件路径或 URL
+            支持以下三种格式:
+            - bytes: 二进制数据，自动转换为 base64
+            - str (以 base64:// 开头): base64 编码字符串，直接透传
+            - str (其他): 视为文件路径，自动读取并转换为 base64
+
+            :param file: [Union[str, bytes]] 视频文件路径/URL/base64/二进制
             :param filename: [str] 文件名 (默认: "video.mp4")
             :return: [asyncio.Task] 发送任务
             """
+            import base64
+            import os
+
+            if isinstance(file, bytes):
+                file = "base64://" + base64.b64encode(file).decode("ascii")
+            elif isinstance(file, str) and not file.startswith("base64://"):
+                file_path = os.path.abspath(file)
+                with open(file_path, "rb") as f:
+                    file = "base64://" + base64.b64encode(f.read()).decode("ascii")
+
             return self.Raw_ob12(
                 [{"type": "video", "data": {"file": file, "file_name": filename}}]
             )
@@ -214,10 +259,25 @@ class OneBotAdapter(BaseAdapter):
             """
             发送文件
 
-            :param file: [Union[str, bytes]] 文件路径或 URL
+            支持以下三种格式:
+            - bytes: 二进制数据，自动转换为 base64
+            - str (以 base64:// 开头): base64 编码字符串，直接透传
+            - str (其他): 视为文件路径，自动读取并转换为 base64
+
+            :param file: [Union[str, bytes]] 文件路径/URL/base64/二进制
             :param filename: [str] 文件名 (默认: "file.dat")
             :return: [asyncio.Task] 发送任务
             """
+            import base64
+            import os
+
+            if isinstance(file, bytes):
+                file = "base64://" + base64.b64encode(file).decode("ascii")
+            elif isinstance(file, str) and not file.startswith("base64://"):
+                file_path = os.path.abspath(file)
+                with open(file_path, "rb") as f:
+                    file = "base64://" + base64.b64encode(f.read()).decode("ascii")
+
             return self.Raw_ob12(
                 [{"type": "file", "data": {"file": file, "file_name": filename}}]
             )
@@ -980,7 +1040,9 @@ class OneBotAdapter(BaseAdapter):
             )
         finally:
             try:
-                await self.emit_meta("disconnect", self._get_bot_id(account_name) if account else "")
+                await self.emit_meta(
+                    "disconnect", self._get_bot_id(account_name) if account else ""
+                )
             except Exception:
                 pass
             self.connections.pop(account_name, None)
@@ -1052,7 +1114,9 @@ class OneBotAdapter(BaseAdapter):
 
         self.connections[account_name] = websocket
 
-        await self.emit_meta("connect", self._get_bot_id(account_name) if account else "")
+        await self.emit_meta(
+            "connect", self._get_bot_id(account_name) if account else ""
+        )
         if account and not self._get_bot_id(account_name):
             self._pending_connect_meta.add(account_name)
 
@@ -1066,7 +1130,9 @@ class OneBotAdapter(BaseAdapter):
             )
         finally:
             try:
-                await self.emit_meta("disconnect", self._get_bot_id(account_name) if account else "")
+                await self.emit_meta(
+                    "disconnect", self._get_bot_id(account_name) if account else ""
+                )
             except Exception:
                 pass
             if account_name in self.connections:

{erispulse_onebot11adapter-4.1.1 → erispulse_onebot11adapter-4.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse-OneBot11Adapter
-Version: 4.1.1
+Version: 4.1.2
 Summary: ErisPulse的OneBotV11协议适配模块，异步的OneBot触发器
 Author-email: wsu2059q <wsu2059@qq.com>
 License: MIT License

{erispulse_onebot11adapter-4.1.1 → erispulse_onebot11adapter-4.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ErisPulse-OneBot11Adapter"
-version = "4.1.1"
+version = "4.1.2"
 description = "ErisPulse的OneBotV11协议适配模块，异步的OneBot触发器"
 readme = "README.md"
 requires-python = ">=3.10"