reywechat 1.0.40__py3-none-any.whl → 1.0.42__py3-none-any.whl

reywechat/rdb.py

@@ -19,7 +19,7 @@ from reykit.rwrap import wrap_thread
 
 from .rbase import BaseWeChat
 from .rreceive import WeChatMessage
-from .rsend import WeChatSendEnum, WeChatSendParameter
+from .rsend import WeChatSendTypeEnum, WeChatSendParameter
 from .rwechat import WeChat
 
 
@@ -931,22 +931,26 @@ class WeChatDatabase(BaseWeChat):
 
 
         # Define.
-        def sender_handler_update_send_status(sendparam: WeChatSendParameter) -> None:
+        def sender_handler_update_send_status(send_param: WeChatSendParameter) -> None:
             """
             Update field `status` of table `message_send`.
 
             Parameters
             ----------
-            sendparam : `WeChatSendParameter` instance.
+            send_param : `WeChatSendParameter` instance.
             """
 
+            # Check.
+            if send_param.status == send_param.StatusEnum.SENT:
+                throw(TypeError, send_param.send_id)
+
             # Handle parameter.
-            if sendparam.exc_reports == []:
+            if send_param.exc_reports == []:
                 status = 2
             else:
                 status = 3
             data = {
-                'send_id': sendparam.send_id,
+                'send_id': send_param.send_id,
                 'status': status,
                 'limit': 1
             }
@@ -1050,7 +1054,7 @@ class WeChatDatabase(BaseWeChat):
             # Send.
             for row in table:
                 send_id, type_, receive_id, parameter, file_id = row.values()
-                send_type = WeChatSendEnum(type_)
+                send_type = WeChatSendTypeEnum[type_]
                 parameter: dict = json_loads(parameter)
 
                 ## File.
@@ -1059,14 +1063,15 @@ class WeChatDatabase(BaseWeChat):
                     parameter['file_path'] = file_path
                     parameter['file_name'] = file_name
 
-                sendparam = WeChatSendParameter(
+                send_param = WeChatSendParameter(
                     self.wechat.sender,
                     send_type,
                     receive_id,
                     send_id,
                     **parameter
                 )
-                self.wechat.sender.queue.put(sendparam)
+                send_param.status = send_param.StatusEnum.WAIT
+                self.wechat.sender.queue.put(send_param)
 
             # Commit.
             conn.commit()
@@ -1141,96 +1146,21 @@ class WeChatDatabase(BaseWeChat):
         return judge
 
 
-    @overload
-    def send(
-        self,
-        send_type: Literal[WeChatSendEnum.SEND_TEXT],
-        receive_id: str,
-        *,
-        text: str
-    ) -> None: ...
-
-    @overload
-    def send(
-        self,
-        send_type: Literal[WeChatSendEnum.SEND_TEXT_AT],
-        receive_id: str,
-        *,
-        user_id: str | list[str] | Literal['notify@all'],
-        text: str
-    ) -> None: ...
-
-    @overload
-    def send(
-        self,
-        send_type: Literal[WeChatSendEnum.SEND_FILE, WeChatSendEnum.SEND_IMAGE, WeChatSendEnum.SEND_EMOTION],
-        receive_id: str,
-        *,
-        file_path: str,
-        file_name: str | None = None
-    ) -> None: ...
-
-    @overload
-    def send(
-        self,
-        send_type: Literal[WeChatSendEnum.SEND_PAT],
-        receive_id: str,
-        *,
-        user_id: str
-    ) -> None: ...
-
-    @overload
-    def send(
-        self,
-        send_type: Literal[WeChatSendEnum.SEND_PUBLIC],
-        receive_id: str,
-        *,
-        page_url: str,
-        title: str,
-        text: str | None = None,
-        image_url: str | None = None,
-        public_name: str | None = None,
-        public_id: str | None = None
-    ) -> None: ...
-
-    @overload
-    def send(
-        self,
-        send_type: Literal[WeChatSendEnum.SEND_FORWARD],
-        receive_id: str,
-        *,
-        message_id: str
-    ) -> None: ...
-
-    def send(
-        self,
-        send_type: WeChatSendEnum,
-        receive_id: str | None = None,
-        **params: Any
-    ) -> None:
+    def _insert_send(self, send_param: WeChatSendParameter) -> None:
         """
         Insert into `wechat.message_send` table of database, wait send.
 
         Parameters
         ----------
-        send_type : Send type.
-            - `Literal[WeChatSendEnum.SEND_TEXT]`: Send text message, use `WeChatClient.send_text`: method.
-            - `Literal[WeChatSendEnum.SEND_TEXT_AT]`: Send text message with `@`, use `WeChatClient.send_text_at`: method.
-            - `Literal[WeChatSendEnum.SEND_FILE]`: Send file message, use `WeChatClient.send_file`: method.
-            - `Literal[WeChatSendEnum.SEND_IMAGE]`: Send image message, use `WeChatClient.send_image`: method.
-            - `Literal[WeChatSendEnum.SEND_EMOTION]`: Send emotion message, use `WeChatClient.send_emotion`: method.
-            - `Literal[WeChatSendEnum.SEND_PAT]`: Send pat message, use `WeChatClient.send_pat`: method.
-            - `Literal[WeChatSendEnum.SEND_PUBLIC]`: Send public account message, use `WeChatClient.send_public`: method.
-            - `Literal[WeChatSendEnum.SEND_FORWARD]`: Forward message, use `WeChatClient.send_forward`: method.
-        receive_id : User ID or chat room ID of receive message.
-        params : Send parameters.
+        send_param : `WeChatSendParameter` instance.
         """
 
         # Handle parameter.
+        params = send_param.params.copy()
         data = {
             'status': 0,
-            'type': send_type,
-            'receive_id': receive_id,
+            'type': send_param.send_type,
+            'receive_id': send_param.receive_id,
             'parameter': params
         }
 

reywechat/rlog.py

@@ -185,27 +185,27 @@ class WeChatLog(BaseWeChat):
 
     def log_send(
         self,
-        sendparam: WeChatSendParameter
+        send_param: WeChatSendParameter
     ) -> None:
         """
         Log send message.
 
         Parameters
         ----------
-        sendparam : `WeChatSendParameter` instance.
+        send_param : `WeChatSendParameter` instance.
         """
 
         # Generate record.
-        content_print = 'SEND    | %-20s' % sendparam.receive_id
+        content_print = 'SEND    | %-20s' % send_param.receive_id
         content_file = 'SEND    | %s' % {
-            'receive_id': sendparam.receive_id,
-            **sendparam.params
+            'receive_id': send_param.receive_id,
+            **send_param.params
         }
-        if sendparam.exc_reports == []:
+        if send_param.exc_reports == []:
             level = self.rrlog.INFO
         else:
             level = self.rrlog.ERROR
-            exc_report = '\n'.join(sendparam.exc_reports)
+            exc_report = '\n'.join(send_param.exc_reports)
             content_print = '%s\n%s' % (content_print, exc_report)
             content_file = '%s\n%s' % (content_file, exc_report)
 

reywechat/rreceive.py

@@ -26,7 +26,7 @@ from reykit.rtime import sleep, wait
 from reykit.rwrap import wrap_thread, wrap_exc
 
 from .rbase import BaseWeChat, WeChatTriggerError
-from .rsend import WeChatSendEnum
+from .rsend import WeChatSendTypeEnum
 from .rwechat import WeChat
 
 
@@ -66,7 +66,7 @@ class WeChatMessage(BaseWeChat):
     WeChat message type.
     """
 
-    SendEnum = WeChatSendEnum
+    TypeEnum = WeChatSendTypeEnum
 
 
     def __init__(
@@ -935,7 +935,7 @@ class WeChatMessage(BaseWeChat):
     @overload
     def reply(
         self,
-        send_type: Literal[WeChatSendEnum.SEND_TEXT],
+        send_type: Literal[WeChatSendTypeEnum.TEXT],
         *,
         text: str
     ) -> None: ...
@@ -943,7 +943,7 @@ class WeChatMessage(BaseWeChat):
     @overload
     def reply(
         self,
-        send_type: Literal[WeChatSendEnum.SEND_TEXT_AT],
+        send_type: Literal[WeChatSendTypeEnum.TEXT_AT],
         *,
         user_id: str | list[str] | Literal['notify@all'],
         text: str
@@ -952,7 +952,7 @@ class WeChatMessage(BaseWeChat):
     @overload
     def reply(
         self,
-        send_type: Literal[WeChatSendEnum.SEND_FILE, WeChatSendEnum.SEND_IMAGE, WeChatSendEnum.SEND_EMOTION],
+        send_type: Literal[WeChatSendTypeEnum.FILE, WeChatSendTypeEnum.IMAGE, WeChatSendTypeEnum.EMOTION],
         *,
         path: str,
         file_name: str | None = None
@@ -961,7 +961,7 @@ class WeChatMessage(BaseWeChat):
     @overload
     def reply(
         self,
-        send_type: Literal[WeChatSendEnum.SEND_PAT],
+        send_type: Literal[WeChatSendTypeEnum.PAT],
         *,
         user_id: str
     ) -> None: ...
@@ -969,7 +969,7 @@ class WeChatMessage(BaseWeChat):
     @overload
     def reply(
         self,
-        send_type: Literal[WeChatSendEnum.SEND_PUBLIC],
+        send_type: Literal[WeChatSendTypeEnum.PUBLIC],
         *,
         page_url: str,
         title: str,
@@ -982,14 +982,14 @@ class WeChatMessage(BaseWeChat):
     @overload
     def reply(
         self,
-        send_type: Literal[WeChatSendEnum.SEND_FORWARD],
+        send_type: Literal[WeChatSendTypeEnum.FORWARD],
         *,
         message_id: str
     ) -> None: ...
 
     def reply(
         self,
-        send_type: WeChatSendEnum,
+        send_type: WeChatSendTypeEnum,
         **params: Any
     ) -> None:
         """
@@ -998,18 +998,15 @@ class WeChatMessage(BaseWeChat):
         Parameters
         ----------
         send_type : Send type.
-            - `Literal[WeChatSendEnum.SEND_TEXT]`: Send text message, use `WeChatClient.send_text`: method.
-            - `Literal[WeChatSendEnum.SEND_TEXT_AT]`: Send text message with `@`, use `WeChatClient.send_text_at`: method.
-            - `Literal[WeChatSendEnum.SEND_FILE]`: Send file message, use `WeChatClient.send_file`: method.
-            - `Literal[WeChatSendEnum.SEND_IMAGE]`: Send image message, use `WeChatClient.send_image`: method.
-            - `Literal[WeChatSendEnum.SEND_EMOTION]`: Send emotion message, use `WeChatClient.send_emotion`: method.
-            - `Literal[WeChatSendEnum.SEND_PAT]`: Send pat message, use `WeChatClient.send_pat`: method.
-            - `Literal[WeChatSendEnum.SEND_PUBLIC]`: Send public account message, use `WeChatClient.send_public`: method.
-            - `Literal[WeChatSendEnum.SEND_FORWARD]`: Forward message, use `WeChatClient.send_forward`: method.
+            - `Literal[WeChatSendTypeEnum.TEXT]`: Send text message, use `WeChatClient.send_text`: method.
+            - `Literal[WeChatSendTypeEnum.TEXT_AT]`: Send text message with `@`, use `WeChatClient.send_text_at`: method.
+            - `Literal[WeChatSendTypeEnum.FILE]`: Send file message, use `WeChatClient.send_file`: method.
+            - `Literal[WeChatSendTypeEnum.IMAGE]`: Send image message, use `WeChatClient.send_image`: method.
+            - `Literal[WeChatSendTypeEnum.EMOTION]`: Send emotion message, use `WeChatClient.send_emotion`: method.
+            - `Literal[WeChatSendTypeEnum.PAT]`: Send pat message, use `WeChatClient.send_pat`: method.
+            - `Literal[WeChatSendTypeEnum.PUBLIC]`: Send public account message, use `WeChatClient.send_public`: method.
+            - `Literal[WeChatSendTypeEnum.FORWARD]`: Forward message, use `WeChatClient.send_forward`: method.
         params : Send parameters.
-            - `Callable`: Use execute return value.
-            - `Any`: Use this value.
-                `Key 'file_name'`: Given file name.
         """
 
         # Check.
@@ -1036,7 +1033,7 @@ class WechatReceiver(BaseWeChat):
     WeChat receiver type.
     """
 
-    SendEnum = WeChatSendEnum
+    TypeEnum = WeChatSendTypeEnum
 
 
     def __init__(

reywechat/rschedule.py

@@ -15,7 +15,7 @@ from collections.abc import Callable
 from reykit.rschedule import Schedule
 
 from .rbase import BaseWeChat
-from .rsend import WeChatSendEnum
+from .rsend import WeChatSendTypeEnum
 from .rwechat import WeChat
 
 
@@ -24,7 +24,7 @@ class WeChatSchedule(BaseWeChat):
     WeChat schedule type.
     """
 
-    SendEnum = WeChatSendEnum
+    TypeEnum = WeChatSendTypeEnum
 
 
     def __init__(

reywechat/rsend.py

@@ -17,6 +17,7 @@ from functools import wraps as functools_wraps
 from queue import Queue
 from re import escape as re_escape
 from reykit.rbase import throw, catch_exc
+from reykit.ros import File
 from reykit.rre import sub
 from reykit.rtime import sleep
 from reykit.rwrap import wrap_thread, wrap_exc
@@ -26,36 +27,52 @@ from .rwechat import WeChat
 
 
 __all__ = (
-    'WeChatSendEnum',
+    'WeChatSendTypeEnum',
     'WeChatSendParameter',
     'WeChatSender'
 )
 
 
-class WeChatSendEnum(BaseWeChat, IntEnum):
+class WeChatSendTypeEnum(BaseWeChat, IntEnum):
     """
-    WeChat send enumeration type.
+    WeChat send type enumeration type.
 
     Attributes
     ----------
-    SEND_TEXT : Send text message.
-    SEND_TEXT_AT : Send text message with @.
-    SEND_FILE : Send file message.
-    SEND_IMAGE : Send image message.
-    SEND_EMOTION : Send emotion message.
-    SEND_PAT : Send pat message.
-    SEND_PUBLIC : Send public account message.
-    SEND_FORWARD : Forward message.
+    TEXT : Send text message.
+    TEXT_AT : Send text message with @.
+    FILE : Send file message.
+    IMAGE : Send image message.
+    EMOTION : Send emotion message.
+    PAT : Send pat message.
+    PUBLIC : Send public account message.
+    FORWARD : Forward message.
     """
 
-    SEND_TEXT = 0
-    SEND_TEXT_AT = 1
-    SEND_FILE = 2
-    SEND_IMAGE = 3
-    SEND_EMOTION = 4
-    SEND_PAT = 5
-    SEND_PUBLIC = 6
-    SEND_FORWARD = 7
+    TEXT = 0
+    TEXT_AT = 1
+    FILE = 2
+    IMAGE = 3
+    EMOTION = 4
+    PAT = 5
+    PUBLIC = 6
+    FORWARD = 7
+
+
+class WeChatSendStatusEnum(BaseWeChat, IntEnum):
+    """
+    WeChat send status enumeration type.
+
+    Attributes
+    ----------
+    INIT : After initialization, before inserting into database queue.
+    WAIT : After get from database queue, before sending.
+    SENT : After sending.
+    """
+
+    INIT = 0
+    WAIT = 1
+    SENT = 2
 
 
 class WeChatSendParameter(BaseWeChat):
@@ -63,16 +80,17 @@ class WeChatSendParameter(BaseWeChat):
     WeChat send parameters type.
     """
 
-    SendEnum = WeChatSendEnum
+    TypeEnum = WeChatSendTypeEnum
+    StatusEnum = WeChatSendStatusEnum
 
 
     @overload
     def __init__(
         self,
         sender: WeChatSender,
-        send_type: Literal[WeChatSendEnum.SEND_TEXT],
+        send_type: Literal[WeChatSendTypeEnum.TEXT],
         receive_id: str,
-        send_id: int,
+        send_id: int | None = None,
         *,
         text: str
     ) -> None: ...
@@ -81,9 +99,9 @@ class WeChatSendParameter(BaseWeChat):
     def __init__(
         self,
         sender: WeChatSender,
-        send_type: Literal[WeChatSendEnum.SEND_TEXT_AT],
+        send_type: Literal[WeChatSendTypeEnum.TEXT_AT],
         receive_id: str,
-        send_id: int,
+        send_id: int | None = None,
         *,
         user_id: str | list[str] | Literal['notify@all'],
         text: str
@@ -93,9 +111,9 @@ class WeChatSendParameter(BaseWeChat):
     def __init__(
         self,
         sender: WeChatSender,
-        send_type: Literal[WeChatSendEnum.SEND_FILE, WeChatSendEnum.SEND_IMAGE, WeChatSendEnum.SEND_EMOTION],
+        send_type: Literal[WeChatSendTypeEnum.FILE, WeChatSendTypeEnum.IMAGE, WeChatSendTypeEnum.EMOTION],
         receive_id: str,
-        send_id: int,
+        send_id: int | None = None,
         *,
         file_path: str,
         file_name: str
@@ -105,9 +123,9 @@ class WeChatSendParameter(BaseWeChat):
     def __init__(
         self,
         sender: WeChatSender,
-        send_type: Literal[WeChatSendEnum.SEND_PAT],
+        send_type: Literal[WeChatSendTypeEnum.PAT],
         receive_id: str,
-        send_id: int,
+        send_id: int | None = None,
         *,
         user_id: str
     ) -> None: ...
@@ -116,9 +134,9 @@ class WeChatSendParameter(BaseWeChat):
     def __init__(
         self,
         sender: WeChatSender,
-        send_type: Literal[WeChatSendEnum.SEND_PUBLIC],
+        send_type: Literal[WeChatSendTypeEnum.PUBLIC],
         receive_id: str,
-        send_id: int,
+        send_id: int | None = None,
         *,
         page_url: str,
         title: str,
@@ -132,9 +150,9 @@ class WeChatSendParameter(BaseWeChat):
     def __init__(
         self,
         sender: WeChatSender,
-        send_type: Literal[WeChatSendEnum.SEND_FORWARD],
+        send_type: Literal[WeChatSendTypeEnum.FORWARD],
         receive_id: str,
-        send_id: int,
+        send_id: int | None = None,
         *,
         message_id: str
     ) -> None: ...
@@ -142,9 +160,9 @@ class WeChatSendParameter(BaseWeChat):
     def __init__(
         self,
         sender: WeChatSender,
-        send_type: WeChatSendEnum,
+        send_type: WeChatSendTypeEnum,
         receive_id: str,
-        send_id: int,
+        send_id: int | None = None,
         **params: Any
     ) -> None:
         """
@@ -154,16 +172,17 @@ class WeChatSendParameter(BaseWeChat):
         ----------
         sender : `WeChatSender` instance.
         send_type : Send type.
-            - `Literal[WeChatSendEnum.SEND_TEXT]`: Send text message, use `WeChatClient.send_text`: method.
-            - `Literal[WeChatSendEnum.SEND_TEXT_AT]`: Send text message with `@`, use `WeChatClient.send_text_at`: method.
-            - `Literal[WeChatSendEnum.SEND_FILE]`: Send file message, use `WeChatClient.send_file`: method.
-            - `Literal[WeChatSendEnum.SEND_IMAGE]`: Send image message, use `WeChatClient.send_image`: method.
-            - `Literal[WeChatSendEnum.SEND_EMOTION]`: Send emotion message, use `WeChatClient.send_emotion`: method.
-            - `Literal[WeChatSendEnum.SEND_PAT]`: Send pat message, use `WeChatClient.send_pat`: method.
-            - `Literal[WeChatSendEnum.SEND_PUBLIC]`: Send public account message, use `WeChatClient.send_public`: method.
-            - `Literal[WeChatSendEnum.SEND_FORWARD]`: Forward message, use `WeChatClient.send_forward`: method.
+            - `Literal[WeChatSendTypeEnum.TEXT]`: Send text message, use `WeChatClient.send_text`: method.
+            - `Literal[WeChatSendTypeEnum.TEXT_AT]`: Send text message with `@`, use `WeChatClient.send_text_at`: method.
+            - `Literal[WeChatSendTypeEnum.FILE]`: Send file message, use `WeChatClient.send_file`: method.
+            - `Literal[WeChatSendTypeEnum.IMAGE]`: Send image message, use `WeChatClient.send_image`: method.
+            - `Literal[WeChatSendTypeEnum.EMOTION]`: Send emotion message, use `WeChatClient.send_emotion`: method.
+            - `Literal[WeChatSendTypeEnum.PAT]`: Send pat message, use `WeChatClient.send_pat`: method.
+            - `Literal[WeChatSendTypeEnum.PUBLIC]`: Send public account message, use `WeChatClient.send_public`: method.
+            - `Literal[WeChatSendTypeEnum.FORWARD]`: Forward message, use `WeChatClient.send_forward`: method.
         receive_id : User ID or chat room ID of receive message.
         send_id : Send ID of database.
+            - `None`: Not inserted into database.
         params : Send parameters.
         """
 
@@ -174,7 +193,7 @@ class WeChatSendParameter(BaseWeChat):
         self.send_id = send_id
         self.params = params
         self.exc_reports: list[str] = []
-        self.sent: bool = False
+        self.status: WeChatSendStatusEnum
 
 
 class WeChatSender(BaseWeChat):
@@ -183,10 +202,10 @@ class WeChatSender(BaseWeChat):
 
     Attribute
     ---------
-    WeChatSendEnum : Send type enumeration.
+    WeChatSendTypeEnum : Send type enumeration.
     """
 
-    SendEnum = WeChatSendEnum
+    TypeEnum = WeChatSendTypeEnum
 
 
     def __init__(self, wechat: WeChat) -> None:
@@ -215,20 +234,6 @@ class WeChatSender(BaseWeChat):
         """
 
 
-        # Define.
-        def handle_handler_exception(exc_report, *_) -> None:
-            """
-            Handle Handler exception.
-
-            Parameters
-            ----------
-            exc_report : Exception report text.
-            """
-
-            # Save.
-            sendparam.exc_reports.append(exc_report)
-
-
         # Loop.
         while True:
             match self.started:
@@ -242,16 +247,17 @@ class WeChatSender(BaseWeChat):
                 case None:
                     break
 
-            sendparam = self.queue.get()
+            send_param = self.queue.get()
+            handle_handler_exception = lambda exc_report, *_: send_param.exc_reports.append(exc_report)
 
             ## Handler.
             for handler in self.handlers:
                 handler = wrap_exc(handler, handler=handle_handler_exception)
-                handler(sendparam)
+                handler(send_param)
 
             ## Send.
             try:
-                self.__send(sendparam)
+                self.__send(send_param)
 
             ## Exception.
             except:
@@ -260,94 +266,94 @@ class WeChatSender(BaseWeChat):
                 exc_report, *_ = catch_exc()
 
                 # Save.
-                sendparam.exc_reports.append(exc_report)
+                send_param.exc_reports.append(exc_report)
 
-            sendparam.sent = True
+            send_param.status = send_param.StatusEnum.SENT
 
             ## Handler.
             for handler in self.handlers:
                 handler = wrap_exc(handler, handler=handle_handler_exception)
-                handler(sendparam)
+                handler(send_param)
 
             ## Log.
-            self.wechat.log.log_send(sendparam)
+            self.wechat.log.log_send(send_param)
 
 
     def __send(
         self,
-        sendparam: WeChatSendParameter
+        send_param: WeChatSendParameter
     ) -> None:
         """
         Send message.
 
         Parameters
         ----------
-        sendparam : `WeChatSendParameter` instance.
+        send_param : `WeChatSendParameter` instance.
         """
 
         # Send.
-        match sendparam.send_type:
+        match send_param.send_type:
 
             ## Text.
-            case WeChatSendEnum.SEND_TEXT:
+            case WeChatSendTypeEnum.TEXT:
                 self.wechat.client.send_text(
-                    sendparam.receive_id,
-                    sendparam.params['text']
+                    send_param.receive_id,
+                    send_param.params['text']
                 )
 
             ## Text with '@'.
-            case WeChatSendEnum.SEND_TEXT_AT:
+            case WeChatSendTypeEnum.TEXT_AT:
                 self.wechat.client.send_text_at(
-                    sendparam.receive_id,
-                    sendparam.params['user_id'],
-                    sendparam.params['text']
+                    send_param.receive_id,
+                    send_param.params['user_id'],
+                    send_param.params['text']
                 )
 
             ## File.
-            case WeChatSendEnum.SEND_FILE:
+            case WeChatSendTypeEnum.FILE:
                 self.wechat.client.send_file(
-                    sendparam.receive_id,
-                    sendparam.params['file_path']
+                    send_param.receive_id,
+                    send_param.params['file_path']
                 )
 
             ## Image.
-            case WeChatSendEnum.SEND_IMAGE:
+            case WeChatSendTypeEnum.IMAGE:
                 self.wechat.client.send_image(
-                    sendparam.receive_id,
-                    sendparam.params['file_path']
+                    send_param.receive_id,
+                    send_param.params['file_path']
                 )
 
             ## Emotion.
-            case WeChatSendEnum.SEND_EMOTION:
+            case WeChatSendTypeEnum.EMOTION:
                 self.wechat.client.send_emotion(
-                    sendparam.receive_id,
-                    sendparam.params['file_path']
+                    send_param.receive_id,
+                    send_param.params['file_path']
                 )
 
             ## Pat.
-            case WeChatSendEnum.SEND_PAT:
+            case WeChatSendTypeEnum.PAT:
                 self.wechat.client.send_pat(
-                    sendparam.receive_id,
-                    sendparam.params['user_id']
+                    send_param.receive_id,
+                    send_param.params['user_id']
                 )
 
             ## Public account.
-            case WeChatSendEnum.SEND_PUBLIC:
+            case WeChatSendTypeEnum.PUBLIC:
                 self.wechat.client.send_public(
-                    sendparam.receive_id,
-                    sendparam.params['page_url'],
-                    sendparam.params['title'],
-                    sendparam.params['text'],
-                    sendparam.params['image_url'],
-                    sendparam.params['public_name'],
-                    sendparam.params['public_id']
+                    send_param.receive_id,
+                    send_param.params['page_url'],
+                    send_param.params['title'],
+                    send_param.params['text'],
+                    send_param.params['image_url'],
+                    send_param.params['public_name'],
+                    send_param.params['public_id']
                 )
 
             ## Forward.
-            case WeChatSendEnum.SEND_FORWARD:
+            case WeChatSendTypeEnum.FORWARD:
                 self.wechat.client.send_forward(
-                    sendparam.receive_id,
-                    sendparam.params['message_id']
+                    send_param.receive_id,
+                    send_param.params['message_id']
                 )
 
             ## Throw exception.
@@ -355,12 +361,120 @@ class WeChatSender(BaseWeChat):
                 throw(ValueError, send_type)
 
 
+    @overload
+    def send(
+        self,
+        send_type: Literal[WeChatSendTypeEnum.TEXT],
+        receive_id: str,
+        *,
+        text: str
+    ) -> None: ...
+
+    @overload
+    def send(
+        self,
+        send_type: Literal[WeChatSendTypeEnum.TEXT_AT],
+        receive_id: str,
+        *,
+        user_id: str | list[str] | Literal['notify@all'],
+        text: str
+    ) -> None: ...
+
+    @overload
+    def send(
+        self,
+        send_type: Literal[WeChatSendTypeEnum.FILE, WeChatSendTypeEnum.IMAGE, WeChatSendTypeEnum.EMOTION],
+        receive_id: str,
+        *,
+        file_path: str,
+        file_name: str | None = None
+    ) -> None: ...
+
+    @overload
+    def send(
+        self,
+        send_type: Literal[WeChatSendTypeEnum.PAT],
+        receive_id: str,
+        *,
+        user_id: str
+    ) -> None: ...
+
+    @overload
+    def send(
+        self,
+        send_type: Literal[WeChatSendTypeEnum.PUBLIC],
+        receive_id: str,
+        *,
+        page_url: str,
+        title: str,
+        text: str | None = None,
+        image_url: str | None = None,
+        public_name: str | None = None,
+        public_id: str | None = None
+    ) -> None: ...
+
+    @overload
+    def send(
+        self,
+        send_type: Literal[WeChatSendTypeEnum.FORWARD],
+        receive_id: str,
+        *,
+        message_id: str
+    ) -> None: ...
+
+    def send(
+        self,
+        send_type: WeChatSendTypeEnum,
+        receive_id: str | None = None,
+        **params: Any
+    ) -> None:
+        """
+        Insert into `wechat.message_send` table of database, wait send.
+
+        Parameters
+        ----------
+        send_type : Send type.
+            - `Literal[WeChatSendTypeEnum.TEXT]`: Send text message, use `WeChatClient.send_text`: method.
+            - `Literal[WeChatSendTypeEnum.TEXT_AT]`: Send text message with `@`, use `WeChatClient.send_text_at`: method.
+            - `Literal[WeChatSendTypeEnum.FILE]`: Send file message, use `WeChatClient.send_file`: method.
+            - `Literal[WeChatSendTypeEnum.IMAGE]`: Send image message, use `WeChatClient.send_image`: method.
+            - `Literal[WeChatSendTypeEnum.EMOTION]`: Send emotion message, use `WeChatClient.send_emotion`: method.
+            - `Literal[WeChatSendTypeEnum.PAT]`: Send pat message, use `WeChatClient.send_pat`: method.
+            - `Literal[WeChatSendTypeEnum.PUBLIC]`: Send public account message, use `WeChatClient.send_public`: method.
+            - `Literal[WeChatSendTypeEnum.FORWARD]`: Forward message, use `WeChatClient.send_forward`: method.
+        receive_id : User ID or chat room ID of receive message.
+        params : Send parameters.
+        """
+
+        # Handle parameter.
+        send_param = WeChatSendParameter(
+            self,
+            WeChatSendTypeEnum[send_type],
+            receive_id,
+            **params
+        )
+        send_param.status = send_param.StatusEnum.INIT
+        handle_handler_exception = lambda exc_report, *_: send_param.exc_reports.append(exc_report)
+
+        # Handler.
+        for handler in self.handlers:
+            handler = wrap_exc(handler, handler=handle_handler_exception)
+            handler(send_param)
+
+        # Insert.
+        self.wechat.database._insert_send(send_param)
+
+
     def add_handler(
         self,
         handler: Callable[[WeChatSendParameter], Any]
     ) -> None:
         """
         Add send handler function.
+        Call at the after initialization, before inserting into database queue.
+        Call at the after get from database queue, before sending.
+        Call at the after sending.
+        Can be use `WeChatSendParameter.status` judge status.
 
         Parameters
         ----------
@@ -475,7 +589,7 @@ class WeChatSender(BaseWeChat):
                     )
                     for receive_id in receive_ids:
                         self.send(
-                            WeChatSendEnum.SEND_TEXT,
+                            WeChatSendTypeEnum.TEXT,
                             receive_id,
                             text=text
                         )

reywechat/rwechat.py

@@ -103,13 +103,12 @@ class WeChat(BaseWeChat):
 
         ## Send.
         self.send_add_handler = self.sender.add_handler
-        self.send = self.database.send
+        self.send = self.sender.send
         self.send_start = self.sender.start
         self.send_stop = self.sender.stop
         self.wrap_try_send = self.sender.wrap_try_send
 
         ## Database.
-        self.send = self.sender.send = self.database.send
         self.database_build = self.database.build
 
         ## Schedule.

{reywechat-1.0.40.dist-info → reywechat-1.0.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reywechat
-Version: 1.0.40
+Version: 1.0.42
 Summary: WeChat method set.
 Project-URL: homepage, https://github.com/reyxbo/reywechat/
 Author-email: Rey <reyxbo@163.com>

reywechat-1.0.42.dist-info/RECORD

@@ -0,0 +1,17 @@
+reywechat/__init__.py,sha256=BL4PUpTguszJ612qsZf4-sOXxRIsiYRQ_m__FGMd1RQ,513
+reywechat/rall.py,sha256=zEW-mLL2uP8aT2_foCMFGmMi_3RCrGl8qutnSVkmY1E,397
+reywechat/rbase.py,sha256=0NunIUIXra2ML2N6odwMk5oENTE0r6VSBHWXUvgI-lc,1124
+reywechat/rcache.py,sha256=Hh_HE-t_KUMlrz4gEFPh1AjmhnrSgH520IFJPumWb7A,908
+reywechat/rclient.py,sha256=MEvQB3pHb5ORukKbKntalRtFcKIOP9BGtDsMt5ihQfM,22524
+reywechat/rdb.py,sha256=x7wTvE7G4-FJQkZbPHiV4jSchki7RlJFnQPtGzqi4CI,39703
+reywechat/rlog.py,sha256=IJL2WquiOYfB9iEai9xjojkuxPxiRHkdzZ5vCeaSA98,5261
+reywechat/rreceive.py,sha256=40l3n_d1BcT2EhxIYOlOnzrSQkJ8WDI_qPvJcU7CSQU,35018
+reywechat/rschedule.py,sha256=X9kreXdClTeItJHmNPJNqb_lct-BiLCyusMQxsj5hWU,1865
+reywechat/rsend.py,sha256=0rAxVj895QrSxkziT3rqiQBKnOiDv8VFcIaCwoTPxb4,17644
+reywechat/rtrigger.py,sha256=n8kUNovh62r7crlXrp33uaKvbILT-wcfvUqeyGt7YhM,4956
+reywechat/rwechat.py,sha256=OcElINAi9jM-eDb_OTtseBW3kyG_3jD4V4QmltR6MeE,4874
+reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
+reywechat-1.0.42.dist-info/METADATA,sha256=w-XwNxmNdI9E-iJb0WAG7UHeDkZWaK_GNmGPDZRxtGo,1551
+reywechat-1.0.42.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.42.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.42.dist-info/RECORD,,

reywechat-1.0.40.dist-info/RECORD

@@ -1,17 +0,0 @@
-reywechat/__init__.py,sha256=BL4PUpTguszJ612qsZf4-sOXxRIsiYRQ_m__FGMd1RQ,513
-reywechat/rall.py,sha256=zEW-mLL2uP8aT2_foCMFGmMi_3RCrGl8qutnSVkmY1E,397
-reywechat/rbase.py,sha256=0NunIUIXra2ML2N6odwMk5oENTE0r6VSBHWXUvgI-lc,1124
-reywechat/rcache.py,sha256=Hh_HE-t_KUMlrz4gEFPh1AjmhnrSgH520IFJPumWb7A,908
-reywechat/rclient.py,sha256=MEvQB3pHb5ORukKbKntalRtFcKIOP9BGtDsMt5ihQfM,22524
-reywechat/rdb.py,sha256=ETy7EZFDBK6nUmtJFNV6kSfSKMnMiLBO771RA89jVqY,41912
-reywechat/rlog.py,sha256=x4WFLNoeKqGjPVoI81ZZNEd9ctdYToSg5hEFuESmCQY,5254
-reywechat/rreceive.py,sha256=RkUwPsWz6k_Ua3ovrbXRMVajeNOJQqvpPXz_CvJyUPQ,35162
-reywechat/rschedule.py,sha256=bZEEZV3K4zrJvupe1Eq6kGR7kunbVq5dfGnqFKYF3JI,1857
-reywechat/rsend.py,sha256=UmdKCOb1cPKEmBPHt9htjxB8fPyi5jW5pGwpRQIZdKA,13720
-reywechat/rtrigger.py,sha256=n8kUNovh62r7crlXrp33uaKvbILT-wcfvUqeyGt7YhM,4956
-reywechat/rwechat.py,sha256=xkHQUUXDEqq4Q_DHF6vc3Dd33A8oOCkKyJN7v7p2leM,4935
-reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.40.dist-info/METADATA,sha256=5MJCWQ_8cNLimLjDz3zhGJvWaredMvtBtAFiJWF50ok,1551
-reywechat-1.0.40.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.40.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.40.dist-info/RECORD,,