diff --git a/README.md b/README.md index e5a3d1306..656f536ad 100644 --- a/README.md +++ b/README.md @@ -91,9 +91,9 @@ - 项目处于活跃开发阶段，功能和API可能随时调整 ### 💬交流群（开发和建议相关讨论）不一定有空回复，会优先写文档和代码 +- [一群](https://qm.qq.com/q/VQ3XZrWgMs) 766798517 +- [二群](https://qm.qq.com/q/RzmCiRtHEW) 571780722 - [五群](https://qm.qq.com/q/JxvHZnxyec) 1022489779 -- [一群](https://qm.qq.com/q/VQ3XZrWgMs) 766798517 【已满】 -- [二群](https://qm.qq.com/q/RzmCiRtHEW) 571780722【已满】 - [三群](https://qm.qq.com/q/wlH5eT8OmQ) 1035228475【已满】 - [四群](https://qm.qq.com/q/wlH5eT8OmQ) 729957033【已满】 diff --git a/src/do_tool/not_used/change_mood.py b/src/do_tool/not_used/change_mood.py index 7176cb3db..f41206cb7 100644 --- a/src/do_tool/not_used/change_mood.py +++ b/src/do_tool/not_used/change_mood.py @@ -2,7 +2,6 @@ from src.do_tool.tool_can_use.base_tool import BaseTool from src.config.config import global_config from src.common.logger import get_module_logger from src.plugins.moods.moods import MoodManager -from src.plugins.chat_module.think_flow_chat.think_flow_generator import ResponseGenerator from typing import Dict, Any @@ -38,13 +37,14 @@ class ChangeMoodTool(BaseTool): message_processed_plain_text = function_args.get("text") mood_manager = MoodManager.get_instance() - gpt = ResponseGenerator() + # gpt = ResponseGenerator() if response_set is None: response_set = ["你还没有回复"] ori_response = ",".join(response_set) - _stance, emotion = await gpt._get_emotion_tags(ori_response, message_processed_plain_text) + # _stance, emotion = await gpt._get_emotion_tags(ori_response, message_processed_plain_text) + emotion = "平静" mood_manager.update_mood_from_emotion(emotion, global_config.mood_intensity_factor) return {"name": "change_mood", "content": f"你的心情刚刚变化了，现在的心情是: {emotion}"} except Exception as e: diff --git a/src/do_tool/not_used/change_relationship.py b/src/do_tool/not_used/change_relationship.py index f46fd6528..68dd0e67a 100644 --- a/src/do_tool/not_used/change_relationship.py +++ b/src/do_tool/not_used/change_relationship.py @@ -1,9 +1,6 @@ -# from src.plugins.person_info.relationship_manager import relationship_manager from typing import Dict, Any - from src.common.logger import get_module_logger from src.do_tool.tool_can_use.base_tool import BaseTool -# from src.plugins.chat_module.think_flow_chat.think_flow_generator import ResponseGenerator logger = get_module_logger("relationship_tool") diff --git a/src/plugins/chat/bot.py b/src/plugins/chat/bot.py index 9eab99c72..34d43e8da 100644 --- a/src/plugins/chat/bot.py +++ b/src/plugins/chat/bot.py @@ -6,7 +6,6 @@ from .chat_stream import chat_manager from ..chat_module.only_process.only_message_process import MessageProcessor from src.common.logger import get_module_logger, CHAT_STYLE_CONFIG, LogConfig -from ..chat_module.think_flow_chat.think_flow_chat import ThinkFlowChat from ..chat_module.reasoning_chat.reasoning_chat import ReasoningChat from ..chat_module.heartFC_chat.heartFC_processor import HeartFC_Processor from ..utils.prompt_builder import Prompt, global_prompt_manager @@ -29,7 +28,6 @@ class ChatBot: self._started = False self.mood_manager = MoodManager.get_instance() # 获取情绪管理器单例 self.mood_manager.start_mood_update() # 启动情绪更新 - self.think_flow_chat = ThinkFlowChat() self.reasoning_chat = ReasoningChat() self.heartFC_processor = HeartFC_Processor() # 新增 @@ -118,11 +116,9 @@ class ChatBot: else: if groupinfo.group_id in global_config.talk_allowed_groups: # logger.debug(f"开始群聊模式{str(message_data)[:50]}...") - if global_config.response_mode == "heart_FC": + if global_config.response_mode == "heart_flow": # logger.info(f"启动最新最好的思维流FC模式{str(message_data)[:50]}...") - await self.heartFC_processor.process_message(message_data) - elif global_config.response_mode == "reasoning": # logger.debug(f"开始推理模式{str(message_data)[:50]}...") await self.reasoning_chat.process_message(message_data) @@ -136,7 +132,7 @@ class ChatBot: # 私聊处理流程 # await self._handle_private_chat(message) if global_config.response_mode == "heart_flow": - await self.think_flow_chat.process_message(message_data) + await self.heartFC_processor.process_message(message_data) elif global_config.response_mode == "reasoning": await self.reasoning_chat.process_message(message_data) else: @@ -144,7 +140,7 @@ class ChatBot: else: # 群聊处理 if groupinfo.group_id in global_config.talk_allowed_groups: if global_config.response_mode == "heart_flow": - await self.think_flow_chat.process_message(message_data) + await self.heartFC_processor.process_message(message_data) elif global_config.response_mode == "reasoning": await self.reasoning_chat.process_message(message_data) else: diff --git a/src/plugins/chat_module/think_flow_chat/think_flow_chat.py b/src/plugins/chat_module/deprecate_think_flow_chat/think_flow_chat.py similarity index 100% rename from src/plugins/chat_module/think_flow_chat/think_flow_chat.py rename to src/plugins/chat_module/deprecate_think_flow_chat/think_flow_chat.py diff --git a/src/plugins/chat_module/think_flow_chat/think_flow_generator.py b/src/plugins/chat_module/deprecate_think_flow_chat/think_flow_generator.py similarity index 100% rename from src/plugins/chat_module/think_flow_chat/think_flow_generator.py rename to src/plugins/chat_module/deprecate_think_flow_chat/think_flow_generator.py diff --git a/src/plugins/chat_module/think_flow_chat/think_flow_prompt_builder.py b/src/plugins/chat_module/deprecate_think_flow_chat/think_flow_prompt_builder.py similarity index 100% rename from src/plugins/chat_module/think_flow_chat/think_flow_prompt_builder.py rename to src/plugins/chat_module/deprecate_think_flow_chat/think_flow_prompt_builder.py diff --git a/src/plugins/chat_module/heartFC_chat/pfchating.md b/src/plugins/chat_module/heartFC_chat/pfchating.md index 81aec4558..8c5619734 100644 --- a/src/plugins/chat_module/heartFC_chat/pfchating.md +++ b/src/plugins/chat_module/heartFC_chat/pfchating.md @@ -22,8 +22,8 @@ pfchating有以下几个组成部分： 5.planner怎么写？（好像可以先不加入这部分） BUG: -1.第一条激活消息没有被读取，进入pfc聊天委托时应该读取一下之前的上文 +1.第一条激活消息没有被读取，进入pfc聊天委托时应该读取一下之前的上文(fix) 2.复读，可能是planner还未校准好 3.planner还未个性化，需要加入bot个性信息，且获取的聊天内容有问题 4.心流好像过短，而且有时候没有等待更新 -5.表情包有可能会发两次 \ No newline at end of file +5.表情包有可能会发两次(fix) \ No newline at end of file diff --git a/template/bot_config_template.toml b/template/bot_config_template.toml index 69b9e888b..f0a52e766 100644 --- a/template/bot_config_template.toml +++ b/template/bot_config_template.toml @@ -1,5 +1,5 @@ [inner] -version = "1.3.0" +version = "1.3.1" #以下是给开发人员阅读的，一般用户不需要阅读 @@ -68,9 +68,8 @@ nonebot-qq="http://127.0.0.1:18002/api/message" [response] #群聊的回复策略 #reasoning：推理模式，麦麦会根据上下文进行推理，并给出回复 -#heart_flow：心流模式，麦麦会根据上下文产生想法，并给出回复（不推荐） -#heart_FC：结合了PFC模式和心流模式，麦麦会进行主动的观察和回复，并给出回复 -response_mode = "heart_FC" # 回复策略，可选值：heart_flow（心流），reasoning（推理），heart_FC（心流FC） +#heart_flow：结合了PFC模式和心流模式，麦麦会进行主动的观察和回复，并给出回复 +response_mode = "heart_flow" # 回复策略，可选值：heart_flow（心流），reasoning（推理) #推理回复参数 model_r1_probability = 0.7 # 麦麦回答时选择主要回复模型1 模型的概率