diff --git a/src/chat/focus_chat/planners/actions/no_reply_action.py b/src/chat/focus_chat/planners/actions/no_reply_action.py index 120ebe981..bf6f33a5d 100644 --- a/src/chat/focus_chat/planners/actions/no_reply_action.py +++ b/src/chat/focus_chat/planners/actions/no_reply_action.py @@ -22,12 +22,11 @@ class NoReplyAction(BaseAction): """ action_name = "no_reply" - action_description = "不回复" + action_description = "暂时不回复消息" action_parameters = {} action_require = [ - "话题无关/无聊/不感兴趣/不懂", - "聊天记录中最新一条消息是你自己发的且无人回应你", "你连续发送了太多消息，且无人回复", + "想要休息一下", ] default = True diff --git a/src/chat/focus_chat/planners/actions/no_reply_complex_action.py b/src/chat/focus_chat/planners/actions/no_reply_complex_action.py new file mode 100644 index 000000000..120ebe981 --- /dev/null +++ b/src/chat/focus_chat/planners/actions/no_reply_complex_action.py @@ -0,0 +1,134 @@ +import asyncio +import traceback +from src.common.logger_manager import get_logger +from src.chat.utils.timer_calculator import Timer +from src.chat.focus_chat.planners.actions.base_action import BaseAction, register_action +from typing import Tuple, List +from src.chat.heart_flow.observation.observation import Observation +from src.chat.heart_flow.observation.chatting_observation import ChattingObservation +from src.chat.focus_chat.hfc_utils import parse_thinking_id_to_timestamp + +logger = get_logger("action_taken") + +# 常量定义 +WAITING_TIME_THRESHOLD = 1200 # 等待新消息时间阈值，单位秒 + + +@register_action +class NoReplyAction(BaseAction): + """不回复动作处理类 + + 处理决定不回复的动作。 + """ + + action_name = "no_reply" + action_description = "不回复" + action_parameters = {} + action_require = [ + "话题无关/无聊/不感兴趣/不懂", + "聊天记录中最新一条消息是你自己发的且无人回应你", + "你连续发送了太多消息，且无人回复", + ] + default = True + + def __init__( + self, + action_data: dict, + reasoning: str, + cycle_timers: dict, + thinking_id: str, + observations: List[Observation], + log_prefix: str, + shutting_down: bool = False, + **kwargs, + ): + """初始化不回复动作处理器 + + Args: + action_name: 动作名称 + action_data: 动作数据 + reasoning: 执行该动作的理由 + cycle_timers: 计时器字典 + thinking_id: 思考ID + observations: 观察列表 + log_prefix: 日志前缀 + shutting_down: 是否正在关闭 + """ + super().__init__(action_data, reasoning, cycle_timers, thinking_id) + self.observations = observations + self.log_prefix = log_prefix + self._shutting_down = shutting_down + + async def handle_action(self) -> Tuple[bool, str]: + """ + 处理不回复的情况 + + 工作流程： + 1. 等待新消息、超时或关闭信号 + 2. 根据等待结果更新连续不回复计数 + 3. 如果达到阈值，触发回调 + + Returns: + Tuple[bool, str]: (是否执行成功, 空字符串) + """ + logger.info(f"{self.log_prefix} 决定不回复: {self.reasoning}") + + observation = self.observations[0] if self.observations else None + + try: + with Timer("等待新消息", self.cycle_timers): + # 等待新消息、超时或关闭信号，并获取结果 + await self._wait_for_new_message(observation, self.thinking_id, self.log_prefix) + + return True, "" # 不回复动作没有回复文本 + + except asyncio.CancelledError: + logger.info(f"{self.log_prefix} 处理 'no_reply' 时等待被中断 (CancelledError)") + raise + except Exception as e: # 捕获调用管理器或其他地方可能发生的错误 + logger.error(f"{self.log_prefix} 处理 'no_reply' 时发生错误: {e}") + logger.error(traceback.format_exc()) + return False, "" + + async def _wait_for_new_message(self, observation: ChattingObservation, thinking_id: str, log_prefix: str) -> bool: + """ + 等待新消息 或 检测到关闭信号 + + 参数: + observation: 观察实例 + thinking_id: 思考ID + log_prefix: 日志前缀 + + 返回: + bool: 是否检测到新消息 (如果因关闭信号退出则返回 False) + """ + wait_start_time = asyncio.get_event_loop().time() + while True: + # --- 在每次循环开始时检查关闭标志 --- + if self._shutting_down: + logger.info(f"{log_prefix} 等待新消息时检测到关闭信号，中断等待。") + return False # 表示因为关闭而退出 + # ----------------------------------- + + thinking_id_timestamp = parse_thinking_id_to_timestamp(thinking_id) + + # 检查新消息 + if await observation.has_new_messages_since(thinking_id_timestamp): + logger.info(f"{log_prefix} 检测到新消息") + return True + + # 检查超时 (放在检查新消息和关闭之后) + if asyncio.get_event_loop().time() - wait_start_time > WAITING_TIME_THRESHOLD: + logger.warning(f"{log_prefix} 等待新消息超时({WAITING_TIME_THRESHOLD}秒)") + return False + + try: + # 短暂休眠，让其他任务有机会运行，并能更快响应取消或关闭 + await asyncio.sleep(0.5) # 缩短休眠时间 + except asyncio.CancelledError: + # 如果在休眠时被取消，再次检查关闭标志 + # 如果是正常关闭，则不需要警告 + if not self._shutting_down: + logger.warning(f"{log_prefix} _wait_for_new_message 的休眠被意外取消") + # 无论如何，重新抛出异常，让上层处理 + raise diff --git a/src/chat/focus_chat/planners/actions/reply_action.py b/src/chat/focus_chat/planners/actions/reply_action.py index 349038dc8..21b342855 100644 --- a/src/chat/focus_chat/planners/actions/reply_action.py +++ b/src/chat/focus_chat/planners/actions/reply_action.py @@ -4,11 +4,10 @@ from src.common.logger_manager import get_logger from src.chat.focus_chat.planners.actions.base_action import BaseAction, register_action from typing import Tuple, List from src.chat.heart_flow.observation.observation import Observation -from src.chat.focus_chat.expressors.default_expressor import DefaultExpressor +from src.chat.focus_chat.replyer.default_replyer import DefaultReplyer from src.chat.message_receive.chat_stream import ChatStream from src.chat.heart_flow.observation.chatting_observation import ChattingObservation from src.chat.focus_chat.hfc_utils import create_empty_anchor_message -from src.config.config import global_config logger = get_logger("action_taken") @@ -21,21 +20,13 @@ class ReplyAction(BaseAction): """ action_name: str = "reply" - action_description: str = "表达想法，可以只包含文本、表情或两者都有" + action_description: str = "当你想要参与回复或者聊天" action_parameters: dict[str:str] = { - "text": "你想要表达的内容（可选）", - "emojis": "描述当前使用表情包的场景，一段话描述（可选）", - "target": "你想要回复的原始文本内容（非必须，仅文本，不包含发送者)（可选）", + "target": "如果你要明确回复特定某人的某句话，请在target参数中中指定那句话的原始文本（非必须，仅文本，不包含发送者)（可选）", } action_require: list[str] = [ - "有实质性内容需要表达", - "有人提到你，但你还没有回应他", - "在合适的时候添加表情（不要总是添加），表情描述要详细，描述当前场景，一段话描述", - "如果你有明确的,要回复特定某人的某句话，或者你想回复较早的消息，请在target中指定那句话的原始文本", - "一次只回复一个人，一次只回复一个话题,突出重点", - "如果是自己发的消息想继续，需自然衔接", - "避免重复或评价自己的发言,不要和自己聊天", - f"注意你的回复要求：{global_config.expression.expression_style}", + "你想要闲聊或者随便附和", + "有人提到你", ] associated_types: list[str] = ["text", "emoji"] @@ -49,9 +40,9 @@ class ReplyAction(BaseAction): cycle_timers: dict, thinking_id: str, observations: List[Observation], - expressor: DefaultExpressor, chat_stream: ChatStream, log_prefix: str, + replyer: DefaultReplyer, **kwargs, ): """初始化回复动作处理器 @@ -63,13 +54,13 @@ class ReplyAction(BaseAction): cycle_timers: 计时器字典 thinking_id: 思考ID observations: 观察列表 - expressor: 表达器 + replyer: 回复器 chat_stream: 聊天流 log_prefix: 日志前缀 """ super().__init__(action_data, reasoning, cycle_timers, thinking_id) self.observations = observations - self.expressor = expressor + self.replyer = replyer self.chat_stream = chat_stream self.log_prefix = log_prefix @@ -121,7 +112,7 @@ class ReplyAction(BaseAction): else: anchor_message.update_chat_stream(self.chat_stream) - success, reply_set = await self.expressor.deal_reply( + success, reply_set = await self.replyer.deal_reply( cycle_timers=cycle_timers, action_data=reply_data, anchor_message=anchor_message, diff --git a/src/chat/focus_chat/planners/actions/reply_complex_action.py b/src/chat/focus_chat/planners/actions/reply_complex_action.py new file mode 100644 index 000000000..aa8227997 --- /dev/null +++ b/src/chat/focus_chat/planners/actions/reply_complex_action.py @@ -0,0 +1,141 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +from src.common.logger_manager import get_logger +from src.chat.focus_chat.planners.actions.base_action import BaseAction, register_action +from typing import Tuple, List +from src.chat.heart_flow.observation.observation import Observation +from chat.focus_chat.replyer.default_expressor import DefaultExpressor +from src.chat.message_receive.chat_stream import ChatStream +from src.chat.heart_flow.observation.chatting_observation import ChattingObservation +from src.chat.focus_chat.hfc_utils import create_empty_anchor_message +from src.config.config import global_config + +logger = get_logger("action_taken") + + +@register_action +class ReplyAction(BaseAction): + """回复动作处理类 + + 处理构建和发送消息回复的动作。 + """ + + action_name: str = "reply" + action_description: str = "表达想法，可以只包含文本、表情或两者都有" + action_parameters: dict[str:str] = { + "text": "你想要表达的内容（可选）", + "emojis": "描述当前使用表情包的场景，一段话描述（可选）", + "target": "你想要回复的原始文本内容（非必须，仅文本，不包含发送者)（可选）", + } + action_require: list[str] = [ + "有实质性内容需要表达", + "有人提到你，但你还没有回应他", + "在合适的时候添加表情（不要总是添加），表情描述要详细，描述当前场景，一段话描述", + "如果你有明确的,要回复特定某人的某句话，或者你想回复较早的消息，请在target中指定那句话的原始文本", + "一次只回复一个人，一次只回复一个话题,突出重点", + "如果是自己发的消息想继续，需自然衔接", + "避免重复或评价自己的发言,不要和自己聊天", + f"注意你的回复要求：{global_config.expression.expression_style}", + ] + + associated_types: list[str] = ["text", "emoji"] + + default = True + + def __init__( + self, + action_data: dict, + reasoning: str, + cycle_timers: dict, + thinking_id: str, + observations: List[Observation], + expressor: DefaultExpressor, + chat_stream: ChatStream, + log_prefix: str, + **kwargs, + ): + """初始化回复动作处理器 + + Args: + action_name: 动作名称 + action_data: 动作数据，包含 message, emojis, target 等 + reasoning: 执行该动作的理由 + cycle_timers: 计时器字典 + thinking_id: 思考ID + observations: 观察列表 + expressor: 表达器 + chat_stream: 聊天流 + log_prefix: 日志前缀 + """ + super().__init__(action_data, reasoning, cycle_timers, thinking_id) + self.observations = observations + self.expressor = expressor + self.chat_stream = chat_stream + self.log_prefix = log_prefix + + async def handle_action(self) -> Tuple[bool, str]: + """ + 处理回复动作 + + Returns: + Tuple[bool, str]: (是否执行成功, 回复文本) + """ + # 注意: 此处可能会使用不同的expressor实现根据任务类型切换不同的回复策略 + return await self._handle_reply( + reasoning=self.reasoning, + reply_data=self.action_data, + cycle_timers=self.cycle_timers, + thinking_id=self.thinking_id, + ) + + async def _handle_reply( + self, reasoning: str, reply_data: dict, cycle_timers: dict, thinking_id: str + ) -> tuple[bool, str]: + """ + 处理统一的回复动作 - 可包含文本和表情，顺序任意 + + reply_data格式: + { + "text": "你好啊" # 文本内容列表（可选） + "target": "锚定消息", # 锚定消息的文本内容 + "emojis": "微笑" # 表情关键词列表（可选） + } + """ + logger.info(f"{self.log_prefix} 决定回复: {self.reasoning}") + + # 从聊天观察获取锚定消息 + chatting_observation: ChattingObservation = next( + obs for obs in self.observations if isinstance(obs, ChattingObservation) + ) + if reply_data.get("target"): + anchor_message = chatting_observation.search_message_by_text(reply_data["target"]) + else: + anchor_message = None + + # 如果没有找到锚点消息，创建一个占位符 + if not anchor_message: + logger.info(f"{self.log_prefix} 未找到锚点消息，创建占位符") + anchor_message = await create_empty_anchor_message( + self.chat_stream.platform, self.chat_stream.group_info, self.chat_stream + ) + else: + anchor_message.update_chat_stream(self.chat_stream) + + success, reply_set = await self.expressor.deal_reply( + cycle_timers=cycle_timers, + action_data=reply_data, + anchor_message=anchor_message, + reasoning=reasoning, + thinking_id=thinking_id, + ) + + reply_text = "" + for reply in reply_set: + type = reply[0] + data = reply[1] + if type == "text": + reply_text += data + elif type == "emoji": + reply_text += data + + return success, reply_text diff --git a/src/plugins/test_plugin/actions/mute_action.py b/src/plugins/test_plugin/actions/mute_action.py index 5bae71e01..4069bf8a6 100644 --- a/src/plugins/test_plugin/actions/mute_action.py +++ b/src/plugins/test_plugin/actions/mute_action.py @@ -10,20 +10,19 @@ class MuteAction(PluginAction): """群聊禁言动作处理类""" action_name = "mute_action" - action_description = "如果某人违反了公序良俗，或者别人戳你太多，或者某人刷屏，一定要禁言某人，如果你很生气，可以禁言某人，可以自选禁言时长，视严重程度而定。" + action_description = "在特定情境下，对某人采取禁言，让他不能说话" action_parameters = { "target": "禁言对象，必填,输入你要禁言的对象的名字", "duration": "禁言时长，必填，输入你要禁言的时长（秒），单位为秒，必须为数字", "reason": "禁言理由，可选", } action_require = [ - "当有人违反了公序良俗时使用", + "当有人违反了公序良俗的内容", "当有人刷屏时使用", + "当有人发了擦边，或者色情内容时使用", "当有人要求禁言自己时使用", - "当有人戳你两次以上时，防止刷屏，禁言他，必须牢记", - "当你想回避某个话题时使用", ] - default = False # 默认动作，是否手动添加到使用集 + default = True # 默认动作，是否手动添加到使用集 associated_types = ["command", "text"] # associated_types = ["text"]