🤖 自动格式化代码 [skip ci]
This commit is contained in:
@@ -721,7 +721,7 @@ class HeartFChatting:
|
|||||||
relation_info = ""
|
relation_info = ""
|
||||||
selected_expressions = []
|
selected_expressions = []
|
||||||
structured_info = ""
|
structured_info = ""
|
||||||
|
|
||||||
for info in all_post_plan_info:
|
for info in all_post_plan_info:
|
||||||
if isinstance(info, RelationInfo):
|
if isinstance(info, RelationInfo):
|
||||||
relation_info = info.get_processed_info()
|
relation_info = info.get_processed_info()
|
||||||
@@ -729,25 +729,24 @@ class HeartFChatting:
|
|||||||
selected_expressions = info.get_expressions_for_action_data()
|
selected_expressions = info.get_expressions_for_action_data()
|
||||||
elif isinstance(info, StructuredInfo):
|
elif isinstance(info, StructuredInfo):
|
||||||
structured_info = info.get_processed_info()
|
structured_info = info.get_processed_info()
|
||||||
|
|
||||||
if relation_info:
|
if relation_info:
|
||||||
updated_action_data["relation_info_block"] = relation_info
|
updated_action_data["relation_info_block"] = relation_info
|
||||||
|
|
||||||
if selected_expressions:
|
if selected_expressions:
|
||||||
updated_action_data["selected_expressions"] = selected_expressions
|
updated_action_data["selected_expressions"] = selected_expressions
|
||||||
|
|
||||||
if structured_info:
|
if structured_info:
|
||||||
updated_action_data["structured_info"] = structured_info
|
updated_action_data["structured_info"] = structured_info
|
||||||
|
|
||||||
#特殊处理running_memorys
|
# 特殊处理running_memorys
|
||||||
if running_memorys:
|
if running_memorys:
|
||||||
memory_str = "以下是当前在聊天中,你回忆起的记忆:\n"
|
memory_str = "以下是当前在聊天中,你回忆起的记忆:\n"
|
||||||
for running_memory in running_memorys:
|
for running_memory in running_memorys:
|
||||||
memory_str += f"{running_memory['content']}\n"
|
memory_str += f"{running_memory['content']}\n"
|
||||||
updated_action_data["memory_block"] = memory_str
|
updated_action_data["memory_block"] = memory_str
|
||||||
logger.info(f"{self.log_prefix} 添加了 {len(running_memorys)} 个激活的记忆到action_data")
|
logger.info(f"{self.log_prefix} 添加了 {len(running_memorys)} 个激活的记忆到action_data")
|
||||||
|
|
||||||
|
|
||||||
if all_post_plan_info or running_memorys:
|
if all_post_plan_info or running_memorys:
|
||||||
logger.info(
|
logger.info(
|
||||||
f"{self.log_prefix} 后期处理完成,产生了 {len(all_post_plan_info)} 个信息项和 {len(running_memorys)} 个记忆"
|
f"{self.log_prefix} 后期处理完成,产生了 {len(all_post_plan_info)} 个信息项和 {len(running_memorys)} 个记忆"
|
||||||
|
|||||||
@@ -7,8 +7,6 @@ from src.config.config import global_config
|
|||||||
from src.chat.focus_chat.info.info_base import InfoBase
|
from src.chat.focus_chat.info.info_base import InfoBase
|
||||||
from src.chat.focus_chat.info.obs_info import ObsInfo
|
from src.chat.focus_chat.info.obs_info import ObsInfo
|
||||||
from src.chat.focus_chat.info.action_info import ActionInfo
|
from src.chat.focus_chat.info.action_info import ActionInfo
|
||||||
from src.chat.focus_chat.info.structured_info import StructuredInfo
|
|
||||||
from src.chat.focus_chat.info.relation_info import RelationInfo
|
|
||||||
from src.common.logger import get_logger
|
from src.common.logger import get_logger
|
||||||
from src.chat.utils.prompt_builder import Prompt, global_prompt_manager
|
from src.chat.utils.prompt_builder import Prompt, global_prompt_manager
|
||||||
from src.chat.focus_chat.planners.action_manager import ActionManager
|
from src.chat.focus_chat.planners.action_manager import ActionManager
|
||||||
@@ -236,7 +234,6 @@ class ActionPlanner(BasePlanner):
|
|||||||
if key not in ["action", "reasoning"]:
|
if key not in ["action", "reasoning"]:
|
||||||
action_data[key] = value
|
action_data[key] = value
|
||||||
|
|
||||||
|
|
||||||
action_data["loop_start_time"] = loop_start_time
|
action_data["loop_start_time"] = loop_start_time
|
||||||
|
|
||||||
memory_str = ""
|
memory_str = ""
|
||||||
|
|||||||
@@ -285,7 +285,7 @@ class DefaultReplyer:
|
|||||||
relation_info_block = reply_data.get("relation_info_block", "")
|
relation_info_block = reply_data.get("relation_info_block", "")
|
||||||
reply_to = reply_data.get("reply_to", "none")
|
reply_to = reply_data.get("reply_to", "none")
|
||||||
memory_block = reply_data.get("memory_block", "")
|
memory_block = reply_data.get("memory_block", "")
|
||||||
|
|
||||||
# 优先使用 extra_info_block,没有则用 extra_info
|
# 优先使用 extra_info_block,没有则用 extra_info
|
||||||
extra_info_block = reply_data.get("extra_info_block", "") or reply_data.get("extra_info", "")
|
extra_info_block = reply_data.get("extra_info_block", "") or reply_data.get("extra_info", "")
|
||||||
|
|
||||||
@@ -353,7 +353,7 @@ class DefaultReplyer:
|
|||||||
extra_info_block = f"以下是你在回复时需要参考的信息,现在请你阅读以下内容,进行决策\n{extra_info_block}\n以上是你在回复时需要参考的信息,现在请你阅读以下内容,进行决策"
|
extra_info_block = f"以下是你在回复时需要参考的信息,现在请你阅读以下内容,进行决策\n{extra_info_block}\n以上是你在回复时需要参考的信息,现在请你阅读以下内容,进行决策"
|
||||||
else:
|
else:
|
||||||
extra_info_block = ""
|
extra_info_block = ""
|
||||||
|
|
||||||
# 关键词检测与反应
|
# 关键词检测与反应
|
||||||
keywords_reaction_prompt = ""
|
keywords_reaction_prompt = ""
|
||||||
try:
|
try:
|
||||||
|
|||||||
Reference in New Issue
Block a user