Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev

src/chat/utils/chat_message_builder.py

@@ -330,7 +330,7 @@ def _build_readable_messages_internal(
     pic_id_mapping: Optional[Dict[str, str]] = None,
     pic_counter: int = 1,
     show_pic: bool = True,
-    message_id_list: Optional[List[DatabaseMessages]] = None,
+    message_id_list: Optional[List[Tuple[str, DatabaseMessages]]] = None,
 ) -> Tuple[str, List[Tuple[float, str, str]], Dict[str, str], int]:
     # sourcery skip: use-getitem-for-re-match-groups
     """
@@ -638,7 +638,7 @@ def build_readable_messages(
     truncate: bool = False,
     show_actions: bool = False,
     show_pic: bool = True,
-    message_id_list: Optional[List[DatabaseMessages]] = None,
+    message_id_list: Optional[List[Tuple[str, DatabaseMessages]]] = None,
 ) -> str:  # sourcery skip: extract-method
     """
     将消息列表转换为可读的文本格式。

src/chat/utils/utils.py

@@ -1,6 +1,5 @@
 import random
 import re
-import string
 import time
 import jieba
 import json
@@ -8,7 +7,7 @@ import ast
 import numpy as np
 
 from collections import Counter
-from typing import Optional, Tuple, Dict, List, Any
+from typing import Optional, Tuple, Dict, List
 
 from src.common.logger import get_logger
 from src.common.data_models.database_data_model import DatabaseMessages
@@ -675,7 +674,7 @@ def get_chat_type_and_target_info(chat_id: str) -> Tuple[bool, Optional[Dict]]:
     return is_group_chat, chat_target_info
 
 
-def assign_message_ids(messages: List[DatabaseMessages]) -> List[DatabaseMessages]:
+def assign_message_ids(messages: List[DatabaseMessages]) -> List[Tuple[str, DatabaseMessages]]:
     """
     为消息列表中的每个消息分配唯一的简短随机ID