Merge branch 'dev' into plugin

src/chat/express/exprssion_learner.py

@@ -122,7 +122,7 @@ class ExpressionLearner:
         min_len = min(len(s1), len(s2))
         if min_len < 5:
             return False
-        same = sum(a == b for a, b in zip(s1, s2))
+        same = sum(a == b for a, b in zip(s1, s2, strict=False))
         return same / min_len > 0.8
 
     async def learn_and_store_expression(self) -> Tuple[List[Tuple[str, str, str]], List[Tuple[str, str, str]]]:

src/chat/heart_flow/heartflow_message_processor.py

@@ -50,13 +50,12 @@ async def _calculate_interest(message: MessageRecv) -> Tuple[float, bool]:
     is_mentioned, _ = is_mentioned_bot_in_message(message)
     interested_rate = 0.0
 
-    if global_config.memory.enable_memory:
-        with Timer("记忆激活"):
-            interested_rate = await hippocampus_manager.get_activate_from_text(
-                message.processed_plain_text,
-                fast_retrieval=True,
-            )
-            logger.debug(f"记忆激活率: {interested_rate:.2f}")
+    with Timer("记忆激活"):
+        interested_rate = await hippocampus_manager.get_activate_from_text(
+            message.processed_plain_text,
+            fast_retrieval=False,
+        )
+        logger.debug(f"记忆激活率: {interested_rate:.2f}")
 
     text_len = len(message.processed_plain_text)
     # 根据文本长度调整兴趣度，长度越大兴趣度越高，但增长率递减，最低0.01，最高0.05
@@ -99,13 +98,15 @@ class HeartFCMessageReceiver:
             userinfo = message.message_info.user_info
             chat = message.chat_stream
 
+            # 2. 兴趣度计算与更新
+            interested_rate, is_mentioned = await _calculate_interest(message)
+            message.interest_value = interested_rate
+
             await self.storage.store_message(message, chat)
 
             subheartflow = await heartflow.get_or_create_subheartflow(chat.stream_id)
 
-            # 2. 兴趣度计算与更新
-            interested_rate, is_mentioned = await _calculate_interest(message)
-            subheartflow.add_message_to_normal_chat_cache(message, interested_rate, is_mentioned)  # type: ignore
+            subheartflow.add_message_to_normal_chat_cache(message, interested_rate, is_mentioned)
 
             chat_mood = mood_manager.get_mood_by_chat_id(subheartflow.chat_id)  # type: ignore
             asyncio.create_task(chat_mood.update_mood_by_message(message, interested_rate))

src/chat/knowledge/embedding_store.py

@@ -59,7 +59,7 @@ EMBEDDING_SIM_THRESHOLD = 0.99
 
 def cosine_similarity(a, b):
     # 计算余弦相似度
-    dot = sum(x * y for x, y in zip(a, b))
+    dot = sum(x * y for x, y in zip(a, b, strict=False))
     norm_a = math.sqrt(sum(x * x for x in a))
     norm_b = math.sqrt(sum(x * x for x in b))
     if norm_a == 0 or norm_b == 0:
@@ -285,7 +285,7 @@ class EmbeddingStore:
         distances = list(distances.flatten())
         result = [
             (self.idx2hash[str(int(idx))], float(sim))
-            for (idx, sim) in zip(indices, distances)
+            for (idx, sim) in zip(indices, distances, strict=False)
             if idx in range(len(self.idx2hash))
         ]
 

src/chat/memory_system/Hippocampus.py

@@ -811,7 +811,7 @@ class EntorhinalCortex:
         timestamps = sample_scheduler.get_timestamp_array()
         # 使用 translate_timestamp_to_human_readable 并指定 mode="normal"
         readable_timestamps = [translate_timestamp_to_human_readable(ts, mode="normal") for ts in timestamps]
-        for _, readable_timestamp in zip(timestamps, readable_timestamps):
+        for _, readable_timestamp in zip(timestamps, readable_timestamps, strict=False):
             logger.debug(f"回忆往事: {readable_timestamp}")
         chat_samples = []
         for timestamp in timestamps:

src/chat/message_receive/message.py

@@ -112,6 +112,7 @@ class MessageRecv(Message):
         self.is_mentioned = None
         self.priority_mode = "interest"
         self.priority_info = None
+        self.interest_value = None
 
     def update_chat_stream(self, chat_stream: "ChatStream"):
         self.chat_stream = chat_stream
@@ -336,6 +337,8 @@ class MessageSending(MessageProcessBase):
         # 用于显示发送内容与显示不一致的情况
         self.display_message = display_message
 
+        self.interest_value = 0.0
+
     def build_reply(self):
         """设置回复消息"""
         if self.reply:

src/chat/message_receive/storage.py

@@ -1,4 +1,5 @@
 import re
+import traceback
 from typing import Union
 
 from src.common.database.database_model import Messages, RecalledMessages, Images
@@ -35,11 +36,11 @@ class MessageStorage:
                     filtered_display_message = re.sub(pattern, "", display_message, flags=re.DOTALL)
                 else:
                     filtered_display_message = ""
-
+                interest_value = 0
                 reply_to = message.reply_to
             else:
                 filtered_display_message = ""
-
+                interest_value = message.interest_value
                 reply_to = ""
 
             chat_info_dict = chat_stream.to_dict()
@@ -79,9 +80,11 @@ class MessageStorage:
                 processed_plain_text=filtered_processed_plain_text,
                 display_message=filtered_display_message,
                 memorized_times=message.memorized_times,
+                interest_value=interest_value,
             )
         except Exception:
             logger.exception("存储消息失败")
+            traceback.print_exc()
 
     @staticmethod
     async def store_recalled_message(message_id: str, time: str, chat_stream: ChatStream) -> None:

src/chat/planner_actions/action_modifier.py

@@ -273,7 +273,7 @@ class ActionModifier:
                 task_results = await asyncio.gather(*tasks, return_exceptions=True)
 
                 # 处理结果并更新缓存
-                for action_name, result in zip(task_names, task_results):
+                for action_name, result in zip(task_names, task_results, strict=False):
                     if isinstance(result, Exception):
                         logger.error(f"{self.log_prefix}LLM判定action {action_name} 时出错: {result}")
                         results[action_name] = False

src/chat/planner_actions/planner.py

@@ -10,7 +10,12 @@ from src.llm_models.utils_model import LLMRequest
 from src.config.config import global_config
 from src.common.logger import get_logger
 from src.chat.utils.prompt_builder import Prompt, global_prompt_manager
-from src.chat.utils.chat_message_builder import build_readable_messages, get_raw_msg_before_timestamp_with_chat
+from src.chat.utils.chat_message_builder import (
+    build_readable_actions,
+    get_actions_by_timestamp_with_chat,
+    build_readable_messages,
+    get_raw_msg_before_timestamp_with_chat,
+)
 from src.chat.utils.utils import get_chat_type_and_target_info
 from src.chat.planner_actions.action_manager import ActionManager
 from src.chat.message_receive.chat_stream import get_chat_manager
@@ -30,9 +35,14 @@ def init_prompt():
 你现在需要根据聊天内容，选择的合适的action来参与聊天。
 {chat_context_description}，以下是具体的聊天内容：
 {chat_content_block}
+
+
 {moderation_prompt}
 
 现在请你根据{by_what}选择合适的action:
+你刚刚选择并执行过的action是：
+{actions_before_now_block}
+
 {no_action_block}
 {action_options_text}
 
@@ -226,6 +236,16 @@ class ActionPlanner:
                 show_actions=True,
             )
 
+            actions_before_now = get_actions_by_timestamp_with_chat(
+                chat_id=self.chat_id,
+                timestamp_end=time.time(),
+                limit=5,
+            )
+
+            actions_before_now_block = build_readable_actions(
+                actions=actions_before_now,
+            )
+
             self.last_obs_time_mark = time.time()
 
             if self.mode == ChatMode.FOCUS:
@@ -289,6 +309,7 @@ class ActionPlanner:
                 by_what=by_what,
                 chat_context_description=chat_context_description,
                 chat_content_block=chat_content_block,
+                actions_before_now_block=actions_before_now_block,
                 no_action_block=no_action_block,
                 action_options_text=action_options_block,
                 moderation_prompt=moderation_prompt_block,

src/chat/replyer/default_generator.py

@@ -957,7 +957,7 @@ def weighted_sample_no_replacement(items, weights, k) -> list:
         2. 不会重复选中同一个元素
     """
     selected = []
-    pool = list(zip(items, weights))
+    pool = list(zip(items, weights, strict=False))
     for _ in range(min(k, len(pool))):
         total = sum(w for _, w in pool)
         r = random.uniform(0, total)

src/chat/utils/chat_message_builder.py

@@ -78,6 +78,60 @@ def get_raw_msg_by_timestamp_with_chat_users(
     return find_messages(message_filter=filter_query, sort=sort_order, limit=limit, limit_mode=limit_mode)
 
 
+def get_actions_by_timestamp_with_chat(
+    chat_id: str,
+    timestamp_start: float = 0,
+    timestamp_end: float = time.time(),
+    limit: int = 0,
+    limit_mode: str = "latest",
+) -> List[Dict[str, Any]]:
+    """获取在特定聊天从指定时间戳到指定时间戳的动作记录，按时间升序排序，返回动作记录列表"""
+    query = ActionRecords.select().where(
+        (ActionRecords.chat_id == chat_id)
+        & (ActionRecords.time > timestamp_start)
+        & (ActionRecords.time < timestamp_end)
+    )
+
+    if limit > 0:
+        if limit_mode == "latest":
+            query = query.order_by(ActionRecords.time.desc()).limit(limit)
+            # 获取后需要反转列表，以保持最终输出为时间升序
+            actions = list(query)
+            return [action.__data__ for action in reversed(actions)]
+        else:  # earliest
+            query = query.order_by(ActionRecords.time.asc()).limit(limit)
+    else:
+        query = query.order_by(ActionRecords.time.asc())
+
+    actions = list(query)
+    return [action.__data__ for action in actions]
+
+
+def get_actions_by_timestamp_with_chat_inclusive(
+    chat_id: str, timestamp_start: float, timestamp_end: float, limit: int = 0, limit_mode: str = "latest"
+) -> List[Dict[str, Any]]:
+    """获取在特定聊天从指定时间戳到指定时间戳的动作记录（包含边界），按时间升序排序，返回动作记录列表"""
+    query = ActionRecords.select().where(
+        (ActionRecords.chat_id == chat_id)
+        & (ActionRecords.time >= timestamp_start)
+        & (ActionRecords.time <= timestamp_end)
+    )
+
+    if limit > 0:
+        if limit_mode == "latest":
+            query = query.order_by(ActionRecords.time.desc()).limit(limit)
+            # 获取后需要反转列表，以保持最终输出为时间升序
+            actions = list(query)
+            return [action.__data__ for action in reversed(actions)]
+        else:  # earliest
+            query = query.order_by(ActionRecords.time.asc()).limit(limit)
+    else:
+        query = query.order_by(ActionRecords.time.asc())
+
+    actions = list(query)
+    return [action.__data__ for action in actions]
+
+
 def get_raw_msg_by_timestamp_random(
     timestamp_start: float, timestamp_end: float, limit: int = 0, limit_mode: str = "latest"
 ) -> List[Dict[str, Any]]:
@@ -502,6 +556,45 @@ def build_pic_mapping_info(pic_id_mapping: Dict[str, str]) -> str:
     return "\n".join(mapping_lines)
 
 
+def build_readable_actions(actions: List[Dict[str, Any]]) -> str:
+    """
+    将动作列表转换为可读的文本格式。
+    格式: 在（）分钟前，你使用了(action_name)，具体内容是：（action_prompt_display）
+
+    Args:
+        actions: 动作记录字典列表。
+
+    Returns:
+        格式化的动作字符串。
+    """
+    if not actions:
+        return ""
+
+    output_lines = []
+    current_time = time.time()
+
+    # The get functions return actions sorted ascending by time. Let's reverse it to show newest first.
+    # sorted_actions = sorted(actions, key=lambda x: x.get("time", 0), reverse=True)
+
+    for action in actions:
+        action_time = action.get("time", current_time)
+        action_name = action.get("action_name", "未知动作")
+        action_prompt_display = action.get("action_prompt_display", "无具体内容")
+
+        time_diff_seconds = current_time - action_time
+
+        if time_diff_seconds < 60:
+            time_ago_str = f"在{int(time_diff_seconds)}秒前"
+        else:
+            time_diff_minutes = round(time_diff_seconds / 60)
+            time_ago_str = f"在{int(time_diff_minutes)}分钟前"
+
+        line = f"{time_ago_str}，你使用了“{action_name}”，具体内容是：“{action_prompt_display}”"
+        output_lines.append(line)
+
+    return "\n".join(output_lines)
+
+
 async def build_readable_messages_with_list(
     messages: List[Dict[str, Any]],
     replace_bot_name: bool = True,

src/chat/utils/typo_generator.py

@@ -363,7 +363,7 @@ class ChineseTypoGenerator:
             else:
                 # 处理多字词的单字替换
                 word_result = []
-                for _, (char, py) in enumerate(zip(word, word_pinyin)):
+                for _, (char, py) in enumerate(zip(word, word_pinyin, strict=False)):
                     # 词中的字替换概率降低
                     word_error_rate = self.error_rate * (0.7 ** (len(word) - 1))