From f0bf6fe83f9a65880cc251a0312d44b06c660b90 Mon Sep 17 00:00:00 2001 From: FuyukiVila <1642421711@qq.com> Date: Thu, 27 Mar 2025 01:04:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86prompt=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=98=B5=E7=A7=B0=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/think_flow_demo/heartflow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/think_flow_demo/heartflow.py b/src/think_flow_demo/heartflow.py index 1079483de..a77e8485b 100644 --- a/src/think_flow_demo/heartflow.py +++ b/src/think_flow_demo/heartflow.py @@ -97,7 +97,7 @@ class Heartflow: prompt = "" prompt += f"{personality_info}\n" prompt += f"现在{global_config.BOT_NICKNAME}的想法是：{self.current_mind}\n" - prompt += f"现在麦麦在qq群里进行聊天，聊天的话题如下：{minds_str}\n" + prompt += f"现在{global_config.BOT_NICKNAME}在qq群里进行聊天，聊天的话题如下：{minds_str}\n" prompt += f"你现在{mood_info}\n" prompt += '''现在请你总结这些聊天内容，注意关注聊天内容对原有的想法的影响，输出连贯的内心独白 不要太长，但是记得结合上述的消息，要记得你的人设，关注新内容:''' From a3811675cbfa28bef42ca2374150643ac838b7a9 Mon Sep 17 00:00:00 2001 From: AL76 <735756072@qq.com> Date: Thu, 27 Mar 2025 01:50:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=90=8C=E6=AD=A5=E5=BF=83=E6=B5=81?= =?UTF-8?q?=E4=B8=8E=E6=9C=AC=E4=BD=93=E4=BD=BF=E7=94=A8=E7=9A=84prompt?= =?UTF-8?q?=EF=BC=8C=E4=BF=9D=E6=8C=81=E4=BA=BA=E8=AE=BE=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/think_flow_demo/current_mind.py | 13 ++++++------- src/think_flow_demo/personality_info.txt | 2 ++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/think_flow_demo/current_mind.py b/src/think_flow_demo/current_mind.py index f15b036c3..32d77ef7a 100644 --- a/src/think_flow_demo/current_mind.py +++ b/src/think_flow_demo/current_mind.py @@ -2,7 +2,7 @@ from .outer_world import outer_world import asyncio from src.plugins.moods.moods import MoodManager from src.plugins.models.utils_model import LLM_request -from src.plugins.chat.config import global_config +from src.plugins.chat.config import global_config, BotConfig import re import time from src.plugins.schedule.schedule_generator import bot_schedule @@ -36,6 +36,8 @@ class SubHeartflow: if not self.current_mind: self.current_mind = "你什么也没想" + + self.personality_info = " ".join(BotConfig.PROMPT_PERSONALITY) def assign_observe(self,stream_id): self.outer_world = outer_world.get_world_by_stream_id(stream_id) @@ -56,7 +58,6 @@ class SubHeartflow: print("麦麦小脑袋转起来了") self.current_state.update_current_state_info() - personality_info = open("src/think_flow_demo/personality_info.txt", "r", encoding="utf-8").read() current_thinking_info = self.current_mind mood_info = self.current_state.mood related_memory_info = '' @@ -66,7 +67,7 @@ class SubHeartflow: prompt = "" prompt += f"你刚刚在做的事情是：{schedule_info}\n" # prompt += f"麦麦的总体想法是：{self.main_heartflow_info}\n\n" - prompt += f"{personality_info}\n" + prompt += f"{self.personality_info}\n" prompt += f"现在你正在上网，和qq群里的网友们聊天，群里正在聊的话题是：{message_stream_info}\n" prompt += f"你想起来{related_memory_info}。" prompt += f"刚刚你的想法是{current_thinking_info}。" @@ -84,7 +85,6 @@ class SubHeartflow: # print("麦麦脑袋转起来了") self.current_state.update_current_state_info() - personality_info = open("src/think_flow_demo/personality_info.txt", "r", encoding="utf-8").read() current_thinking_info = self.current_mind mood_info = self.current_state.mood related_memory_info = 'memory' @@ -93,7 +93,7 @@ class SubHeartflow: reply_info = reply_content prompt = "" - prompt += f"{personality_info}\n" + prompt += f"{self.personality_info}\n" prompt += f"现在你正在上网，和qq群里的网友们聊天，群里正在聊的话题是：{message_stream_info}\n" prompt += f"你想起来{related_memory_info}。" prompt += f"刚刚你的想法是{current_thinking_info}。" @@ -114,12 +114,11 @@ class SubHeartflow: async def judge_willing(self): # print("麦麦闹情绪了1") - personality_info = open("src/think_flow_demo/personality_info.txt", "r", encoding="utf-8").read() current_thinking_info = self.current_mind mood_info = self.current_state.mood # print("麦麦闹情绪了2") prompt = "" - prompt += f"{personality_info}\n" + prompt += f"{self.personality_info}\n" prompt += "现在你正在上网，和qq群里的网友们聊天" prompt += f"你现在的想法是{current_thinking_info}。" prompt += f"你现在{mood_info}。" diff --git a/src/think_flow_demo/personality_info.txt b/src/think_flow_demo/personality_info.txt index a95988190..d7b9e4ecf 100644 --- a/src/think_flow_demo/personality_info.txt +++ b/src/think_flow_demo/personality_info.txt @@ -1 +1,3 @@ +// 为了解决issue-589，已经将心流引用的内容改为了bot_config.toml中的prompt_personality +// 请移步配置文件进行更改 你叫麦麦，你19岁，是一个大二的女大学生，你有一头黑色短发，你会刷贴吧 \ No newline at end of file From 3b23be001ea6de73eb39357d08a1d1810f8ac4a1 Mon Sep 17 00:00:00 2001 From: AL76 <735756072@qq.com> Date: Thu, 27 Mar 2025 02:04:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=90=8C=E6=AD=A5=E5=BF=83=E6=B5=81?= =?UTF-8?q?=E4=B8=8E=E6=9C=AC=E4=BD=93=E4=BD=BF=E7=94=A8=E7=9A=84prompt?= =?UTF-8?q?=EF=BC=8C=E4=BF=9D=E6=8C=81=E4=BA=BA=E8=AE=BE=E4=B8=80=E8=87=B4?= =?UTF-8?q?=EF=BC=88=E5=88=9A=E5=88=9A=E5=B0=91=E6=94=B9=E4=BA=86=E4=B8=AA?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/think_flow_demo/heartflow.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/think_flow_demo/heartflow.py b/src/think_flow_demo/heartflow.py index a77e8485b..dcdbe508c 100644 --- a/src/think_flow_demo/heartflow.py +++ b/src/think_flow_demo/heartflow.py @@ -1,7 +1,7 @@ from .current_mind import SubHeartflow from src.plugins.moods.moods import MoodManager from src.plugins.models.utils_model import LLM_request -from src.plugins.chat.config import global_config +from src.plugins.chat.config import global_config, BotConfig from src.plugins.schedule.schedule_generator import bot_schedule import asyncio from src.common.logger import get_module_logger, LogConfig, HEARTFLOW_STYLE_CONFIG # noqa: E402 @@ -46,7 +46,7 @@ class Heartflow: logger.info("麦麦大脑袋转起来了") self.current_state.update_current_state_info() - personality_info = open("src/think_flow_demo/personality_info.txt", "r", encoding="utf-8").read() + personality_info = " ".join(BotConfig.PROMPT_PERSONALITY) current_thinking_info = self.current_mind mood_info = self.current_state.mood related_memory_info = 'memory' @@ -91,7 +91,7 @@ class Heartflow: return await self.minds_summary(sub_minds) async def minds_summary(self,minds_str): - personality_info = open("src/think_flow_demo/personality_info.txt", "r", encoding="utf-8").read() + personality_info = " ".join(BotConfig.PROMPT_PERSONALITY) mood_info = self.current_state.mood prompt = ""