Merge branch 'FPC-test' of https://github.com/Dax233/MaiMBot into FPC-test
This commit is contained in:
@@ -178,11 +178,11 @@ class ActionPlanner:
|
|||||||
else:
|
else:
|
||||||
goal = str(goal_reason)
|
goal = str(goal_reason)
|
||||||
reasoning = "没有明确原因"
|
reasoning = "没有明确原因"
|
||||||
|
|
||||||
goal = str(goal) if goal is not None else "目标内容缺失"
|
goal = str(goal) if goal is not None else "目标内容缺失"
|
||||||
reasoning = str(reasoning) if reasoning is not None else "没有明确原因"
|
reasoning = str(reasoning) if reasoning is not None else "没有明确原因"
|
||||||
goals_str += f"- 目标:{goal}\n 原因:{reasoning}\n"
|
goals_str += f"- 目标:{goal}\n 原因:{reasoning}\n"
|
||||||
|
|
||||||
if not goals_str:
|
if not goals_str:
|
||||||
goals_str = "- 目前没有明确对话目标,请考虑设定一个。\n"
|
goals_str = "- 目前没有明确对话目标,请考虑设定一个。\n"
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -104,14 +104,13 @@ class ReplyGenerator:
|
|||||||
else:
|
else:
|
||||||
goal = str(goal_reason)
|
goal = str(goal_reason)
|
||||||
reasoning = "没有明确原因"
|
reasoning = "没有明确原因"
|
||||||
|
|
||||||
goal = str(goal) if goal is not None else "目标内容缺失"
|
goal = str(goal) if goal is not None else "目标内容缺失"
|
||||||
reasoning = str(reasoning) if reasoning is not None else "没有明确原因"
|
reasoning = str(reasoning) if reasoning is not None else "没有明确原因"
|
||||||
goals_str += f"- 目标:{goal}\n 原因:{reasoning}\n"
|
goals_str += f"- 目标:{goal}\n 原因:{reasoning}\n"
|
||||||
else:
|
else:
|
||||||
goals_str = "- 目前没有明确对话目标\n" # 简化无目标情况
|
goals_str = "- 目前没有明确对话目标\n" # 简化无目标情况
|
||||||
|
|
||||||
|
|
||||||
# 获取聊天历史记录 (chat_history_text)
|
# 获取聊天历史记录 (chat_history_text)
|
||||||
chat_history_text = observation_info.chat_history_str
|
chat_history_text = observation_info.chat_history_str
|
||||||
if observation_info.new_messages_count > 0 and observation_info.unprocessed_messages:
|
if observation_info.new_messages_count > 0 and observation_info.unprocessed_messages:
|
||||||
|
|||||||
Reference in New Issue
Block a user