Merge branch 'main-fix' into relationship

This commit is contained in:
meng_xi_pan
2025-03-27 07:36:01 +08:00
3 changed files with 12 additions and 11 deletions

View File

@@ -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
@@ -37,6 +37,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)
self.observe_chat_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}"

View File

@@ -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,13 +91,13 @@ 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 = ""
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 += '''现在请你总结这些聊天内容,注意关注聊天内容对原有的想法的影响,输出连贯的内心独白
不要太长,但是记得结合上述的消息,要记得你的人设,关注新内容:'''

View File

@@ -1 +1,3 @@
// 为了解决issue-589已经将心流引用的内容改为了bot_config.toml中的prompt_personality
// 请移步配置文件进行更改
你叫麦麦你19岁是一个大二的女大学生你有一头黑色短发你会刷贴吧