修复代码格式和文件名大小写问题
This commit is contained in:
@@ -22,14 +22,15 @@ from .wakeup_manager import WakeUpManager
|
||||
|
||||
logger = get_logger("hfc")
|
||||
|
||||
|
||||
class HeartFChatting:
|
||||
def __init__(self, chat_id: str):
|
||||
"""
|
||||
初始化心跳聊天管理器
|
||||
|
||||
|
||||
Args:
|
||||
chat_id: 聊天ID标识符
|
||||
|
||||
|
||||
功能说明:
|
||||
- 创建聊天上下文和所有子管理器
|
||||
- 初始化循环跟踪器、响应处理器、循环处理器等核心组件
|
||||
@@ -37,7 +38,7 @@ class HeartFChatting:
|
||||
- 初始化聊天模式并记录初始化完成日志
|
||||
"""
|
||||
self.context = HfcContext(chat_id)
|
||||
|
||||
|
||||
self.cycle_tracker = CycleTracker(self.context)
|
||||
self.response_handler = ResponseHandler(self.context)
|
||||
self.cycle_processor = CycleProcessor(self.context, self.response_handler, self.cycle_tracker)
|
||||
@@ -45,20 +46,20 @@ class HeartFChatting:
|
||||
self.proactive_thinker = ProactiveThinker(self.context, self.cycle_processor)
|
||||
self.normal_mode_handler = NormalModeHandler(self.context, self.cycle_processor)
|
||||
self.wakeup_manager = WakeUpManager(self.context)
|
||||
|
||||
|
||||
# 将唤醒度管理器设置到上下文中
|
||||
self.context.wakeup_manager = self.wakeup_manager
|
||||
self.context.energy_manager = self.energy_manager
|
||||
|
||||
|
||||
self._loop_task: Optional[asyncio.Task] = None
|
||||
|
||||
|
||||
self._initialize_chat_mode()
|
||||
logger.info(f"{self.context.log_prefix} HeartFChatting 初始化完成")
|
||||
|
||||
def _initialize_chat_mode(self):
|
||||
"""
|
||||
初始化聊天模式
|
||||
|
||||
|
||||
功能说明:
|
||||
- 检测是否为群聊环境
|
||||
- 根据全局配置设置强制聊天模式
|
||||
@@ -78,7 +79,7 @@ class HeartFChatting:
|
||||
async def start(self):
|
||||
"""
|
||||
启动心跳聊天系统
|
||||
|
||||
|
||||
功能说明:
|
||||
- 检查是否已经在运行,避免重复启动
|
||||
- 初始化关系构建器和表达学习器
|
||||
@@ -89,14 +90,14 @@ class HeartFChatting:
|
||||
if self.context.running:
|
||||
return
|
||||
self.context.running = True
|
||||
|
||||
|
||||
self.context.relationship_builder = relationship_builder_manager.get_or_create_builder(self.context.stream_id)
|
||||
self.context.expression_learner = expression_learner_manager.get_expression_learner(self.context.stream_id)
|
||||
|
||||
await self.energy_manager.start()
|
||||
await self.proactive_thinker.start()
|
||||
await self.wakeup_manager.start()
|
||||
|
||||
|
||||
self._loop_task = asyncio.create_task(self._main_chat_loop())
|
||||
self._loop_task.add_done_callback(self._handle_loop_completion)
|
||||
logger.info(f"{self.context.log_prefix} HeartFChatting 启动完成")
|
||||
@@ -104,7 +105,7 @@ class HeartFChatting:
|
||||
async def stop(self):
|
||||
"""
|
||||
停止心跳聊天系统
|
||||
|
||||
|
||||
功能说明:
|
||||
- 检查是否正在运行,避免重复停止
|
||||
- 设置运行状态为False
|
||||
@@ -115,11 +116,11 @@ class HeartFChatting:
|
||||
if not self.context.running:
|
||||
return
|
||||
self.context.running = False
|
||||
|
||||
|
||||
await self.energy_manager.stop()
|
||||
await self.proactive_thinker.stop()
|
||||
await self.wakeup_manager.stop()
|
||||
|
||||
|
||||
if self._loop_task and not self._loop_task.done():
|
||||
self._loop_task.cancel()
|
||||
await asyncio.sleep(0)
|
||||
@@ -128,10 +129,10 @@ class HeartFChatting:
|
||||
def _handle_loop_completion(self, task: asyncio.Task):
|
||||
"""
|
||||
处理主循环任务完成
|
||||
|
||||
|
||||
Args:
|
||||
task: 完成的异步任务对象
|
||||
|
||||
|
||||
功能说明:
|
||||
- 处理任务异常完成的情况
|
||||
- 区分正常停止和异常终止
|
||||
@@ -150,7 +151,7 @@ class HeartFChatting:
|
||||
async def _main_chat_loop(self):
|
||||
"""
|
||||
主聊天循环
|
||||
|
||||
|
||||
功能说明:
|
||||
- 持续运行聊天处理循环
|
||||
- 只有在有新消息时才进行思考循环
|
||||
@@ -161,7 +162,7 @@ class HeartFChatting:
|
||||
try:
|
||||
while self.context.running:
|
||||
has_new_messages = await self._loop_body()
|
||||
|
||||
|
||||
if has_new_messages:
|
||||
# 有新消息时,继续快速检查是否还有更多消息
|
||||
await asyncio.sleep(1)
|
||||
@@ -170,7 +171,7 @@ class HeartFChatting:
|
||||
# 这里只是为了定期检查系统状态,不进行思考循环
|
||||
# 真正的新消息响应依赖于消息到达时的通知
|
||||
await asyncio.sleep(1.0)
|
||||
|
||||
|
||||
except asyncio.CancelledError:
|
||||
logger.info(f"{self.context.log_prefix} 麦麦已关闭聊天")
|
||||
except Exception:
|
||||
@@ -183,10 +184,10 @@ class HeartFChatting:
|
||||
async def _loop_body(self) -> bool:
|
||||
"""
|
||||
单次循环体处理
|
||||
|
||||
|
||||
Returns:
|
||||
bool: 是否处理了新消息
|
||||
|
||||
|
||||
功能说明:
|
||||
- 检查是否处于睡眠模式,如果是则处理唤醒度逻辑
|
||||
- 获取最近的新消息(过滤机器人自己的消息和命令)
|
||||
@@ -204,7 +205,7 @@ class HeartFChatting:
|
||||
|
||||
# 核心修复:在睡眠模式(包括失眠)下获取消息时,不过滤命令消息,以确保@消息能被接收
|
||||
filter_command_flag = not (is_sleeping or is_in_insomnia)
|
||||
|
||||
|
||||
recent_messages = message_api.get_messages_by_time_in_chat(
|
||||
chat_id=self.context.stream_id,
|
||||
start_time=self.context.last_read_time,
|
||||
@@ -214,25 +215,25 @@ class HeartFChatting:
|
||||
filter_mai=True,
|
||||
filter_command=filter_command_flag,
|
||||
)
|
||||
|
||||
|
||||
has_new_messages = bool(recent_messages)
|
||||
|
||||
|
||||
# 只有在有新消息时才进行思考循环处理
|
||||
if has_new_messages:
|
||||
self.context.last_message_time = time.time()
|
||||
self.context.last_read_time = time.time()
|
||||
|
||||
|
||||
# 处理唤醒度逻辑
|
||||
if current_sleep_state in [SleepState.SLEEPING, SleepState.PREPARING_SLEEP, SleepState.INSOMNIA]:
|
||||
self._handle_wakeup_messages(recent_messages)
|
||||
|
||||
|
||||
# 再次获取最新状态,因为 handle_wakeup 可能导致状态变为 WOKEN_UP
|
||||
current_sleep_state = schedule_manager.get_current_sleep_state()
|
||||
|
||||
|
||||
if current_sleep_state == SleepState.SLEEPING:
|
||||
# 只有在纯粹的 SLEEPING 状态下才跳过消息处理
|
||||
return has_new_messages
|
||||
|
||||
|
||||
if current_sleep_state == SleepState.WOKEN_UP:
|
||||
logger.info(f"{self.context.log_prefix} 从睡眠中被唤醒,将处理积压的消息。")
|
||||
|
||||
@@ -254,25 +255,27 @@ class HeartFChatting:
|
||||
|
||||
# 更新上一帧的睡眠状态
|
||||
self.context.was_sleeping = is_sleeping
|
||||
|
||||
|
||||
# --- 重新入睡逻辑 ---
|
||||
# 如果被吵醒了,并且在一定时间内没有新消息,则尝试重新入睡
|
||||
if schedule_manager.get_current_sleep_state() == SleepState.WOKEN_UP and not has_new_messages:
|
||||
re_sleep_delay = global_config.sleep_system.re_sleep_delay_minutes * 60
|
||||
# 使用 last_message_time 来判断空闲时间
|
||||
if time.time() - self.context.last_message_time > re_sleep_delay:
|
||||
logger.info(f"{self.context.log_prefix} 已被唤醒且超过 {re_sleep_delay / 60} 分钟无新消息,尝试重新入睡。")
|
||||
logger.info(
|
||||
f"{self.context.log_prefix} 已被唤醒且超过 {re_sleep_delay / 60} 分钟无新消息,尝试重新入睡。"
|
||||
)
|
||||
schedule_manager.reset_sleep_state_after_wakeup()
|
||||
|
||||
|
||||
# 保存HFC上下文状态
|
||||
self.context.save_context_state()
|
||||
|
||||
|
||||
return has_new_messages
|
||||
|
||||
def _check_focus_exit(self):
|
||||
"""
|
||||
检查是否应该退出FOCUS模式
|
||||
|
||||
|
||||
功能说明:
|
||||
- 区分私聊和群聊环境
|
||||
- 在强制私聊focus模式下,能量值低于1时重置为5但不退出
|
||||
@@ -297,10 +300,10 @@ class HeartFChatting:
|
||||
def _check_focus_entry(self, new_message_count: int):
|
||||
"""
|
||||
检查是否应该进入FOCUS模式
|
||||
|
||||
|
||||
Args:
|
||||
new_message_count: 新消息数量
|
||||
|
||||
|
||||
功能说明:
|
||||
- 区分私聊和群聊环境
|
||||
- 强制私聊focus模式:直接进入FOCUS模式并设置能量值为10
|
||||
@@ -318,47 +321,51 @@ class HeartFChatting:
|
||||
|
||||
if is_group_chat and global_config.chat.group_chat_mode == "normal":
|
||||
return
|
||||
|
||||
|
||||
if global_config.chat.focus_value != 0: # 如果专注值配置不为0(启用自动专注)
|
||||
if new_message_count > 3 / pow(global_config.chat.focus_value, 0.5): # 如果新消息数超过阈值(基于专注值计算)
|
||||
if new_message_count > 3 / pow(
|
||||
global_config.chat.focus_value, 0.5
|
||||
): # 如果新消息数超过阈值(基于专注值计算)
|
||||
self.context.loop_mode = ChatMode.FOCUS # 进入专注模式
|
||||
self.context.energy_value = 10 + (new_message_count / (3 / pow(global_config.chat.focus_value, 0.5))) * 10 # 根据消息数量计算能量值
|
||||
self.context.energy_value = (
|
||||
10 + (new_message_count / (3 / pow(global_config.chat.focus_value, 0.5))) * 10
|
||||
) # 根据消息数量计算能量值
|
||||
return # 返回,不再检查其他条件
|
||||
|
||||
if self.context.energy_value >= 30: # 如果能量值达到或超过30
|
||||
self.context.loop_mode = ChatMode.FOCUS # 进入专注模式
|
||||
|
||||
|
||||
def _handle_wakeup_messages(self, messages):
|
||||
"""
|
||||
处理休眠状态下的消息,累积唤醒度
|
||||
|
||||
Args:
|
||||
messages: 消息列表
|
||||
|
||||
功能说明:
|
||||
- 区分私聊和群聊消息
|
||||
- 检查群聊消息是否艾特了机器人
|
||||
- 调用唤醒度管理器累积唤醒度
|
||||
- 如果达到阈值则唤醒并进入愤怒状态
|
||||
"""
|
||||
if not self.wakeup_manager:
|
||||
return
|
||||
|
||||
is_private_chat = self.context.chat_stream.group_info is None if self.context.chat_stream else False
|
||||
|
||||
for message in messages:
|
||||
is_mentioned = False
|
||||
|
||||
# 检查群聊消息是否艾特了机器人
|
||||
if not is_private_chat:
|
||||
# 最终修复:直接使用消息对象中由上游处理好的 is_mention 字段。
|
||||
# 该字段在 message.py 的 MessageRecv._process_single_segment 中被设置。
|
||||
if message.get("is_mentioned"):
|
||||
is_mentioned = True
|
||||
|
||||
# 累积唤醒度
|
||||
woke_up = self.wakeup_manager.add_wakeup_value(is_private_chat, is_mentioned)
|
||||
|
||||
if woke_up:
|
||||
logger.info(f"{self.context.log_prefix} 被消息吵醒,进入愤怒状态!")
|
||||
break
|
||||
"""
|
||||
处理休眠状态下的消息,累积唤醒度
|
||||
|
||||
Args:
|
||||
messages: 消息列表
|
||||
|
||||
功能说明:
|
||||
- 区分私聊和群聊消息
|
||||
- 检查群聊消息是否艾特了机器人
|
||||
- 调用唤醒度管理器累积唤醒度
|
||||
- 如果达到阈值则唤醒并进入愤怒状态
|
||||
"""
|
||||
if not self.wakeup_manager:
|
||||
return
|
||||
|
||||
is_private_chat = self.context.chat_stream.group_info is None if self.context.chat_stream else False
|
||||
|
||||
for message in messages:
|
||||
is_mentioned = False
|
||||
|
||||
# 检查群聊消息是否艾特了机器人
|
||||
if not is_private_chat:
|
||||
# 最终修复:直接使用消息对象中由上游处理好的 is_mention 字段。
|
||||
# 该字段在 message.py 的 MessageRecv._process_single_segment 中被设置。
|
||||
if message.get("is_mentioned"):
|
||||
is_mentioned = True
|
||||
|
||||
# 累积唤醒度
|
||||
woke_up = self.wakeup_manager.add_wakeup_value(is_private_chat, is_mentioned)
|
||||
|
||||
if woke_up:
|
||||
logger.info(f"{self.context.log_prefix} 被消息吵醒,进入愤怒状态!")
|
||||
break
|
||||
|
||||
Reference in New Issue
Block a user