AstrBot 4.5.1__py3-none-any.whl → 4.5.3__py3-none-any.whl

astrbot/core/platform/sources/wecom/wecom_kf_message.py

@@ -1,5 +1,4 @@
-"""
-The MIT License (MIT)
+"""The MIT License (MIT)
 
 Copyright (c) 2014-2020 messense
 
@@ -23,13 +22,11 @@ SOFTWARE.
 """
 
 from optionaldict import optionaldict
-
 from wechatpy.client.api.base import BaseWeChatAPI
 
 
 class WeChatKFMessage(BaseWeChatAPI):
-    """
-    发送微信客服消息
+    """发送微信客服消息
 
     https://work.weixin.qq.com/api/doc/90000/90135/94677
 
@@ -46,8 +43,7 @@ class WeChatKFMessage(BaseWeChatAPI):
     """
 
     def send(self, user_id, open_kfid, msgid="", msg=None):
-        """
-        当微信客户处于“新接入待处理”或“由智能助手接待”状态下，可调用该接口给用户发送消息。
+        """当微信客户处于“新接入待处理”或“由智能助手接待”状态下，可调用该接口给用户发送消息。
         注意仅当微信客户在主动发送消息给客服后的48小时内，企业可发送消息给客户，最多可发送5条消息；若用户继续发送消息，企业可再次下发消息。
         支持发送消息类型：文本、图片、语音、视频、文件、图文、小程序、菜单消息、地理位置。
 
@@ -127,7 +123,13 @@ class WeChatKFMessage(BaseWeChatAPI):
         )
 
     def send_msgmenu(
-        self, user_id, open_kfid, head_content, menu_list, tail_content, msgid=""
+        self,
+        user_id,
+        open_kfid,
+        head_content,
+        menu_list,
+        tail_content,
+        msgid="",
     ):
         return self.send(
             user_id,
@@ -144,7 +146,14 @@ class WeChatKFMessage(BaseWeChatAPI):
         )
 
     def send_location(
-        self, user_id, open_kfid, name, address, latitude, longitude, msgid=""
+        self,
+        user_id,
+        open_kfid,
+        name,
+        address,
+        latitude,
+        longitude,
+        msgid="",
     ):
         return self.send(
             user_id,
@@ -162,7 +171,14 @@ class WeChatKFMessage(BaseWeChatAPI):
         )
 
     def send_miniprogram(
-        self, user_id, open_kfid, appid, title, thumb_media_id, pagepath, msgid=""
+        self,
+        user_id,
+        open_kfid,
+        appid,
+        title,
+        thumb_media_id,
+        pagepath,
+        msgid="",
     ):
         return self.send(
             user_id,

astrbot/core/platform/sources/wecom_ai_bot/WXBizJsonMsgCrypt.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- encoding:utf-8 -*-
 
 """对企业微信发送给企业后台的消息加解密示例代码.
 @copyright: Copyright (c) 1998-2020 Tencent Inc.
@@ -7,15 +6,16 @@
 """
 # ------------------------------------------------------------------------
 
-import logging
 import base64
-import random
 import hashlib
-import time
+import json
+import logging
+import secrets
+import socket
 import struct
+import time
+
 from Crypto.Cipher import AES
-import socket
-import json
 
 from . import ierror
 
@@ -31,7 +31,7 @@ class FormatException(Exception):
 
 
 def throw_exception(message, exception_class=FormatException):
-    """my define raise exception function"""
+    """My define raise exception function"""
     raise exception_class(message)
 
 
@@ -136,9 +136,15 @@ class PKCS7Encoder:
         return decrypted[:-pad]
 
 
-class Prpcrypt(object):
+class Prpcrypt:
     """提供接收和推送给企业微信消息的加解密接口"""
 
+    # 16位随机字符串的范围常量
+    # randbelow(RANDOM_RANGE) 返回 [0, 8999999999999999]（两端都包含，即包含0和8999999999999999）
+    # 加上 MIN_RANDOM_VALUE 后得到 [1000000000000000, 9999999999999999]（两端都包含）即16位数字
+    MIN_RANDOM_VALUE = 1000000000000000  # 最小值: 1000000000000000 (16位)
+    RANDOM_RANGE = 9000000000000000  # 范围大小: 确保最大值为 9999999999999999 (16位)
+
     def __init__(self, key):
         # self.key = base64.b64decode(key+"=")
         self.key = key
@@ -207,10 +213,12 @@ class Prpcrypt(object):
         """随机生成16位字符串
         @return: 16位字符串
         """
-        return str(random.randint(1000000000000000, 9999999999999999)).encode()
+        return str(
+            secrets.randbelow(self.RANDOM_RANGE) + self.MIN_RANDOM_VALUE
+        ).encode()
 
 
-class WXBizJsonMsgCrypt(object):
+class WXBizJsonMsgCrypt:
     # 构造函数
     def __init__(self, sToken, sEncodingAESKey, sReceiveId):
         try:

astrbot/core/platform/sources/wecom_ai_bot/__init__.py

@@ -1,6 +1,4 @@
-"""
-企业微信智能机器人平台适配器包
-"""
+"""企业微信智能机器人平台适配器包"""
 
 from .wecomai_adapter import WecomAIBotAdapter
 from .wecomai_api import WecomAIBotAPIClient
@@ -9,9 +7,9 @@ from .wecomai_server import WecomAIBotServer
 from .wecomai_utils import WecomAIBotConstants
 
 __all__ = [
-    "WecomAIBotAdapter",
     "WecomAIBotAPIClient",
+    "WecomAIBotAdapter",
+    "WecomAIBotConstants",
     "WecomAIBotMessageEvent",
     "WecomAIBotServer",
-    "WecomAIBotConstants",
 ]

astrbot/core/platform/sources/wecom_ai_bot/ierror.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #########################################################################
 # Author: jonyqin
 # Created Time: Thu 11 Sep 2014 01:53:58 PM CST

astrbot/core/platform/sources/wecom_ai_bot/wecomai_adapter.py

@@ -1,38 +1,37 @@
-"""
-企业微信智能机器人平台适配器
+"""企业微信智能机器人平台适配器
 基于企业微信智能机器人 API 的消息平台适配器，支持 HTTP 回调
 参考webchat_adapter.py的队列机制，实现异步消息处理和流式响应
 """
 
-import time
 import asyncio
-import uuid
-import hashlib
 import base64
-from typing import Awaitable, Any, Dict, Optional, Callable
-
+import hashlib
+import time
+import uuid
+from collections.abc import Awaitable, Callable
+from typing import Any
 
+from astrbot.api import logger
+from astrbot.api.event import MessageChain
+from astrbot.api.message_components import At, Image, Plain
 from astrbot.api.platform import (
-    Platform,
     AstrBotMessage,
     MessageMember,
     MessageType,
+    Platform,
     PlatformMetadata,
 )
-from astrbot.api.event import MessageChain
-from astrbot.api.message_components import Plain, At, Image
-from astrbot.api import logger
 from astrbot.core.platform.astr_message_event import MessageSesion
-from ...register import register_platform_adapter
 
+from ...register import register_platform_adapter
 from .wecomai_api import (
     WecomAIBotAPIClient,
     WecomAIBotMessageParser,
     WecomAIBotStreamMessageBuilder,
 )
 from .wecomai_event import WecomAIBotMessageEvent
+from .wecomai_queue_mgr import WecomAIQueueMgr, wecomai_queue_mgr
 from .wecomai_server import WecomAIBotServer
-from .wecomai_queue_mgr import wecomai_queue_mgr, WecomAIQueueMgr
 from .wecomai_utils import (
     WecomAIBotConstants,
     format_session_id,
@@ -45,7 +44,9 @@ class WecomAIQueueListener:
     """企业微信智能机器人队列监听器，参考webchat的QueueListener设计"""
 
     def __init__(
-        self, queue_mgr: WecomAIQueueMgr, callback: Callable[[dict], Awaitable[None]]
+        self,
+        queue_mgr: WecomAIQueueMgr,
+        callback: Callable[[dict], Awaitable[None]],
     ) -> None:
         self.queue_mgr = queue_mgr
         self.callback = callback
@@ -90,13 +91,17 @@ class WecomAIQueueListener:
 
 
 @register_platform_adapter(
-    "wecom_ai_bot", "企业微信智能机器人适配器，支持 HTTP 回调接收消息"
+    "wecom_ai_bot",
+    "企业微信智能机器人适配器，支持 HTTP 回调接收消息",
 )
 class WecomAIBotAdapter(Platform):
     """企业微信智能机器人适配器"""
 
     def __init__(
-        self, platform_config: dict, platform_settings: dict, event_queue: asyncio.Queue
+        self,
+        platform_config: dict,
+        platform_settings: dict,
+        event_queue: asyncio.Queue,
     ) -> None:
         super().__init__(event_queue)
 
@@ -110,10 +115,12 @@ class WecomAIBotAdapter(Platform):
         self.host = self.config.get("callback_server_host", "0.0.0.0")
         self.bot_name = self.config.get("wecom_ai_bot_name", "")
         self.initial_respond_text = self.config.get(
-            "wecomaibot_init_respond_text", "💭 思考中..."
+            "wecomaibot_init_respond_text",
+            "💭 思考中...",
         )
         self.friend_message_welcome_text = self.config.get(
-            "wecomaibot_friend_message_welcome_text", ""
+            "wecomaibot_friend_message_welcome_text",
+            "",
         )
 
         # 平台元数据
@@ -139,7 +146,8 @@ class WecomAIBotAdapter(Platform):
 
         # 队列监听器
         self.queue_listener = WecomAIQueueListener(
-            wecomai_queue_mgr, self._handle_queued_message
+            wecomai_queue_mgr,
+            self._handle_queued_message,
         )
 
     async def _handle_queued_message(self, data: dict):
@@ -151,8 +159,10 @@ class WecomAIBotAdapter(Platform):
             logger.error(f"处理队列消息时发生异常: {e}")
 
     async def _process_message(
-        self, message_data: Dict[str, Any], callback_params: Dict[str, str]
-    ) -> Optional[str]:
+        self,
+        message_data: dict[str, Any],
+        callback_params: dict[str, str],
+    ) -> str | None:
         """处理接收到的消息
 
         Args:
@@ -161,6 +171,7 @@ class WecomAIBotAdapter(Platform):
 
         Returns:
             加密后的响应消息，无需响应时返回 None
+
         """
         msgtype = message_data.get("msgtype")
         if not msgtype:
@@ -173,15 +184,22 @@ class WecomAIBotAdapter(Platform):
                 # create a brand-new unique stream_id for this message session
                 stream_id = f"{session_id}_{generate_random_string(10)}"
                 await self._enqueue_message(
-                    message_data, callback_params, stream_id, session_id
+                    message_data,
+                    callback_params,
+                    stream_id,
+                    session_id,
                 )
                 wecomai_queue_mgr.set_pending_response(stream_id, callback_params)
 
                 resp = WecomAIBotStreamMessageBuilder.make_text_stream(
-                    stream_id, self.initial_respond_text, False
+                    stream_id,
+                    self.initial_respond_text,
+                    False,
                 )
                 return await self.api_client.encrypt_message(
-                    resp, callback_params["nonce"], callback_params["timestamp"]
+                    resp,
+                    callback_params["nonce"],
+                    callback_params["timestamp"],
                 )
             except Exception as e:
                 logger.error("处理消息时发生异常: %s", e)
@@ -194,7 +212,9 @@ class WecomAIBotAdapter(Platform):
 
                 # 返回结束标志，告诉微信服务器流已结束
                 end_message = WecomAIBotStreamMessageBuilder.make_text_stream(
-                    stream_id, "", True
+                    stream_id,
+                    "",
+                    True,
                 )
                 resp = await self.api_client.encrypt_message(
                     end_message,
@@ -205,7 +225,7 @@ class WecomAIBotAdapter(Platform):
             queue = wecomai_queue_mgr.get_or_create_back_queue(stream_id)
             if queue.empty():
                 logger.debug(
-                    f"No new messages in back queue for stream_id: {stream_id}"
+                    f"No new messages in back queue for stream_id: {stream_id}",
                 )
                 return None
 
@@ -227,7 +247,7 @@ class WecomAIBotAdapter(Platform):
                 else:
                     pass
             logger.debug(
-                f"Aggregated content: {latest_plain_content}, image: {len(image_base64)}, finish: {finish}"
+                f"Aggregated content: {latest_plain_content}, image: {len(image_base64)}, finish: {finish}",
             )
             if latest_plain_content or image_base64:
                 msg_items = []
@@ -240,12 +260,15 @@ class WecomAIBotAdapter(Platform):
                             {
                                 "msgtype": WecomAIBotConstants.MSG_TYPE_IMAGE,
                                 "image": {"base64": img_b64, "md5": img_md5},
-                            }
+                            },
                         )
                     image_base64 = []
 
                 plain_message = WecomAIBotStreamMessageBuilder.make_mixed_stream(
-                    stream_id, latest_plain_content, msg_items, finish
+                    stream_id,
+                    latest_plain_content,
+                    msg_items,
+                    finish,
                 )
                 encrypted_message = await self.api_client.encrypt_message(
                     plain_message,
@@ -254,7 +277,7 @@ class WecomAIBotAdapter(Platform):
                 )
                 if encrypted_message:
                     logger.debug(
-                        f"Stream message sent successfully, stream_id: {stream_id}"
+                        f"Stream message sent successfully, stream_id: {stream_id}",
                     )
                 else:
                     logger.error("消息加密失败")
@@ -266,7 +289,7 @@ class WecomAIBotAdapter(Platform):
                 # 用户进入会话，发送欢迎消息
                 try:
                     resp = WecomAIBotStreamMessageBuilder.make_text(
-                        self.friend_message_welcome_text
+                        self.friend_message_welcome_text,
                     )
                     return await self.api_client.encrypt_message(
                         resp,
@@ -276,17 +299,16 @@ class WecomAIBotAdapter(Platform):
                 except Exception as e:
                     logger.error("处理欢迎消息时发生异常: %s", e)
                     return None
-            pass
 
-    def _extract_session_id(self, message_data: Dict[str, Any]) -> str:
+    def _extract_session_id(self, message_data: dict[str, Any]) -> str:
         """从消息数据中提取会话ID"""
         user_id = message_data.get("from", {}).get("userid", "default_user")
         return format_session_id("wecomai", user_id)
 
     async def _enqueue_message(
         self,
-        message_data: Dict[str, Any],
-        callback_params: Dict[str, str],
+        message_data: dict[str, Any],
+        callback_params: dict[str, str],
         stream_id: str,
         session_id: str,
     ):
@@ -320,7 +342,7 @@ class WecomAIBotAdapter(Platform):
             content = WecomAIBotMessageParser.parse_text_message(message_data)
         elif msgtype == WecomAIBotConstants.MSG_TYPE_IMAGE:
             _img_url_to_process.append(
-                WecomAIBotMessageParser.parse_image_message(message_data)
+                WecomAIBotMessageParser.parse_image_message(message_data),
             )
         elif msgtype == WecomAIBotConstants.MSG_TYPE_MIXED:
             # 提取混合消息中的文本内容
@@ -390,7 +412,9 @@ class WecomAIBotAdapter(Platform):
         return abm
 
     async def send_by_session(
-        self, session: MessageSesion, message_chain: MessageChain
+        self,
+        session: MessageSesion,
+        message_chain: MessageChain,
     ):
         """通过会话发送消息"""
         # 企业微信智能机器人主要通过回调响应，这里记录日志