feat: 新增统一命名功能，自动替换prompt内唯一标识符，优化prompt效果

src/heart_flow/observation.py

@@ -58,7 +58,8 @@ class ChattingObservation(Observation):
                             for msg in mid_memory_by_id["messages"]:
                                 msg_str += f"{msg['detailed_plain_text']}"
                             time_diff = int((datetime.now().timestamp() - mid_memory_by_id["created_at"]) / 60)
-                            mid_memory_str += f"距离现在{time_diff}分钟前：\n{msg_str}\n"
+                            # mid_memory_str += f"距离现在{time_diff}分钟前：\n{msg_str}\n"
+                            mid_memory_str += f"{msg_str}\n"
                 except Exception as e:
                     logger.error(f"获取mid_memory_id失败: {e}")
                     traceback.print_exc()

src/heart_flow/sub_heartflow.py

@@ -3,8 +3,9 @@ import asyncio
 from src.plugins.moods.moods import MoodManager
 from src.plugins.models.utils_model import LLM_request
 from src.plugins.config.config import global_config
-import re
 import time
+from src.plugins.chat.message import UserInfo
+from src.plugins.chat.utils import parse_text_timestamps
 
 # from src.plugins.schedule.schedule_generator import bot_schedule
 # from src.plugins.memory_system.Hippocampus import HippocampusManager
@@ -37,11 +38,11 @@ def init_prompt():
     prompt += "{prompt_personality}\n"
     prompt += "刚刚你的想法是{current_thinking_info}。可以适当转换话题\n"
     prompt += "-----------------------------------\n"
-    prompt += "现在你正在上网，和qq群里的网友们聊天，群里正在聊的话题是：{chat_observe_info}\n"
+    prompt += "现在是{time_now}，你正在上网，和qq群里的网友们聊天，群里正在聊的话题是：\n{chat_observe_info}\n"
     prompt += "你现在{mood_info}\n"
     prompt += "你注意到{sender_name}刚刚说：{message_txt}\n"
     prompt += "现在你接下去继续思考，产生新的想法，不要分点输出，输出连贯的内心独白"
-    prompt += "思考时可以想想如何对群聊内容进行回复。回复的要求是：平淡一些，简短一些，说中文，尽量不要说你说过的话\n"
+    prompt += "思考时可以想想如何对群聊内容进行回复。回复的要求是：平淡一些，简短一些，说中文，尽量不要说你说过的话。如果你要回复，最好只回复一个人的一个话题\n"
     prompt += "请注意不要输出多余内容(包括前后缀，冒号和引号，括号， 表情，等)，不要带有括号和动作描写"
     prompt += "记得结合上述的消息，生成内心想法，文字不要浮夸，注意你就是{bot_name}，{bot_name}指的就是你。"
     Prompt(prompt, "sub_heartflow_prompt_before")
@@ -49,7 +50,7 @@ def init_prompt():
     # prompt += f"你现在正在做的事情是：{schedule_info}\n"
     prompt += "{extra_info}\n"
     prompt += "{prompt_personality}\n"
-    prompt += "现在你正在上网，和qq群里的网友们聊天，群里正在聊的话题是：{chat_observe_info}\n"
+    prompt += "现在是{time_now}，你正在上网，和qq群里的网友们聊天，群里正在聊的话题是：\n{chat_observe_info}\n"
     prompt += "刚刚你的想法是{current_thinking_info}。"
     prompt += "你现在看到了网友们发的新消息:{message_new_info}\n"
     prompt += "你刚刚回复了群友们:{reply_info}"
@@ -154,7 +155,7 @@ class SubHeartflow:
         await observation.observe()
 
     async def do_thinking_before_reply(
-        self, message_txt: str, sender_name: str, chat_stream: ChatStream, extra_info: str, obs_id: int = None
+        self, message_txt: str, sender_info: UserInfo, chat_stream: ChatStream, extra_info: str, obs_id: int = None
     ):
         current_thinking_info = self.current_mind
         mood_info = self.current_state.mood
@@ -207,8 +208,10 @@ class SubHeartflow:
         #     f"根据你和说话者{sender_name}的关系和态度进行回复，明确你的立场和情感。"
         # )
         relation_prompt_all = (await global_prompt_manager.get_prompt_async("relationship_prompt")).format(
-            relation_prompt, sender_name
+            relation_prompt, sender_info.user_nickname
         )
+        
+        sender_name_sign = f"<{chat_stream.platform}:{sender_info.user_id}:{sender_info.user_nickname}:{sender_info.user_cardname}>"
 
         # prompt = ""
         # # prompt += f"麦麦的总体想法是：{self.main_heartflow_info}\n\n"
@@ -226,18 +229,24 @@ class SubHeartflow:
         # prompt += "请注意不要输出多余内容(包括前后缀，冒号和引号，括号， 表情，等)，不要带有括号和动作描写"
         # prompt += f"记得结合上述的消息，生成内心想法，文字不要浮夸，注意你就是{self.bot_name}，{self.bot_name}指的就是你。"
 
+        time_now = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+        
         prompt = (await global_prompt_manager.get_prompt_async("sub_heartflow_prompt_before")).format(
             extra_info_prompt,
             # prompt_schedule,
             relation_prompt_all,
             prompt_personality,
             current_thinking_info,
+            time_now,
             chat_observe_info,
             mood_info,
-            sender_name,
+            sender_name_sign,
             message_txt,
             self.bot_name,
         )
+        
+        prompt = await relationship_manager.convert_all_person_sign_to_person_name(prompt)
+        prompt = parse_text_timestamps(prompt, mode="lite")
 
         try:
             response, reasoning_content = await self.llm_model.generate_response_async(prompt)
@@ -285,16 +294,22 @@ class SubHeartflow:
 
         message_new_info = chat_talking_prompt
         reply_info = reply_content
+        
+        time_now = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
 
         prompt = (await global_prompt_manager.get_prompt_async("sub_heartflow_prompt_after")).format(
             extra_info_prompt,
             prompt_personality,
+            time_now,
             chat_observe_info,
             current_thinking_info,
             message_new_info,
             reply_info,
             mood_info,
         )
+        
+        prompt = await relationship_manager.convert_all_person_sign_to_person_name(prompt)
+        prompt = parse_text_timestamps(prompt, mode="lite")
 
         try:
             response, reasoning_content = await self.llm_model.generate_response_async(prompt)
@@ -308,48 +323,6 @@ class SubHeartflow:
 
         self.last_reply_time = time.time()
 
-    async def judge_willing(self):
-        # 开始构建prompt
-        prompt_personality = "你"
-        # person
-        individuality = Individuality.get_instance()
-
-        personality_core = individuality.personality.personality_core
-        prompt_personality += personality_core
-
-        personality_sides = individuality.personality.personality_sides
-        random.shuffle(personality_sides)
-        prompt_personality += f",{personality_sides[0]}"
-
-        identity_detail = individuality.identity.identity_detail
-        random.shuffle(identity_detail)
-        prompt_personality += f",{identity_detail[0]}"
-
-        # print("麦麦闹情绪了1")
-        current_thinking_info = self.current_mind
-        mood_info = self.current_state.mood
-        # print("麦麦闹情绪了2")
-        prompt = ""
-        prompt += f"{prompt_personality}\n"
-        prompt += "现在你正在上网，和qq群里的网友们聊天"
-        prompt += f"你现在的想法是{current_thinking_info}。"
-        prompt += f"你现在{mood_info}。"
-        prompt += "现在请你思考，你想不想发言或者回复，请你输出一个数字，1-10，1表示非常不想，10表示非常想。"
-        prompt += "请你用<>包裹你的回复意愿，输出<1>表示不想回复，输出<10>表示非常想回复。请你考虑，你完全可以不回复"
-        try:
-            response, reasoning_content = await self.llm_model.generate_response_async(prompt)
-            # 解析willing值
-            willing_match = re.search(r"<(\d+)>", response)
-        except Exception as e:
-            logger.error(f"意愿判断获取失败: {e}")
-            willing_match = None
-        if willing_match:
-            self.current_state.willing = int(willing_match.group(1))
-        else:
-            self.current_state.willing = 0
-
-        return self.current_state.willing
-
     def update_current_mind(self, response):
         self.past_mind.append(self.current_mind)
         self.current_mind = response