chore: format code and remove redundant blank lines

This commit applies automated code formatting across the project. The changes primarily involve removing unnecessary blank lines and ensuring consistent code style, improving readability and maintainability without altering functionality.

src/chat/chat_loop/cycle_processor.py

@@ -32,7 +32,7 @@ class CycleProcessor:
             context: HFC聊天上下文对象，包含聊天流、能量值等信息
             response_handler: 响应处理器，负责生成和发送回复
             cycle_tracker: 循环跟踪器，负责记录和管理每次思考循环的信息
-        """    
+        """
         self.context = context
         self.response_handler = response_handler
         self.cycle_tracker = cycle_tracker
@@ -57,12 +57,12 @@ class CycleProcessor:
 
             # 存储reply action信息
         person_info_manager = get_person_info_manager()
-        
+
         # 获取 platform，如果不存在则从 chat_stream 获取，如果还是 None 则使用默认值
         platform = action_message.get("chat_info_platform")
         if platform is None:
             platform = getattr(self.context.chat_stream, "platform", "unknown")
-        
+
         person_id = person_info_manager.get_person_id(
             platform,
             action_message.get("user_id", ""),
@@ -94,8 +94,8 @@ class CycleProcessor:
         }
 
         return loop_info, reply_text, cycle_timers
-    
-    async def observe(self,interest_value:float = 0.0) -> bool:
+
+    async def observe(self, interest_value: float = 0.0) -> bool:
         """
         观察和处理单次思考循环的核心方法
 
@@ -114,7 +114,7 @@ class CycleProcessor:
         """
         action_type = "no_action"
         reply_text = ""  # 初始化reply_text变量，避免UnboundLocalError
-        
+
         # 使用sigmoid函数将interest_value转换为概率
         # 当interest_value为0时，概率接近0（使用Focus模式）
         # 当interest_value很高时，概率接近1（使用Normal模式）
@@ -127,16 +127,24 @@ class CycleProcessor:
             k = 2.0  # 控制曲线陡峭程度
             x0 = 1.0  # 控制曲线中心点
             return 1.0 / (1.0 + math.exp(-k * (interest_val - x0)))
-        
-        normal_mode_probability = calculate_normal_mode_probability(interest_value) * 0.5 / global_config.chat.get_current_talk_frequency(self.context.stream_id)
-        
+
+        normal_mode_probability = (
+            calculate_normal_mode_probability(interest_value)
+            * 0.5
+            / global_config.chat.get_current_talk_frequency(self.context.stream_id)
+        )
+
         # 根据概率决定使用哪种模式
         if random.random() < normal_mode_probability:
             mode = ChatMode.NORMAL
-            logger.info(f"{self.log_prefix} 基于兴趣值 {interest_value:.2f}，概率 {normal_mode_probability:.2f}，选择Normal planner模式")
+            logger.info(
+                f"{self.log_prefix} 基于兴趣值 {interest_value:.2f}，概率 {normal_mode_probability:.2f}，选择Normal planner模式"
+            )
         else:
             mode = ChatMode.FOCUS
-            logger.info(f"{self.log_prefix} 基于兴趣值 {interest_value:.2f}，概率 {normal_mode_probability:.2f}，选择Focus planner模式")
+            logger.info(
+                f"{self.log_prefix} 基于兴趣值 {interest_value:.2f}，概率 {normal_mode_probability:.2f}，选择Focus planner模式"
+            )
 
         cycle_timers, thinking_id = self.cycle_tracker.start_cycle()
         logger.info(f"{self.log_prefix} 开始第{self.context.cycle_counter}次思考")
@@ -165,12 +173,14 @@ class CycleProcessor:
             from src.plugin_system.core.event_manager import event_manager
             from src.plugin_system import EventType
 
-            result = await event_manager.trigger_event(EventType.ON_PLAN,plugin_name="SYSTEM", stream_id=self.context.chat_stream)
+            result = await event_manager.trigger_event(
+                EventType.ON_PLAN, plugin_name="SYSTEM", stream_id=self.context.chat_stream
+            )
             if not result.all_continue_process():
                 raise UserWarning(f"插件{result.get_summary().get('stopped_handlers', '')}于规划前中断了内容生成")
-            
+
             with Timer("规划器", cycle_timers):
-                actions, _= await self.action_planner.plan(
+                actions, _ = await self.action_planner.plan(
                     mode=mode,
                     loop_start_time=loop_start_time,
                     available_actions=available_actions,
@@ -183,7 +193,7 @@ class CycleProcessor:
                     # 直接处理no_reply逻辑，不再通过动作系统
                     reason = action_info.get("reasoning", "选择不回复")
                     logger.info(f"{self.log_prefix} 选择不回复，原因: {reason}")
-                    
+
                     # 存储no_reply信息到数据库
                     await database_api.store_action_info(
                         chat_stream=self.context.chat_stream,
@@ -194,13 +204,8 @@ class CycleProcessor:
                         action_data={"reason": reason},
                         action_name="no_reply",
                     )
-                    
-                    return {
-                        "action_type": "no_reply",
-                        "success": True,
-                        "reply_text": "",
-                        "command": ""
-                    }
+
+                    return {"action_type": "no_reply", "success": True, "reply_text": "", "command": ""}
                 elif action_info["action_type"] != "reply":
                     # 执行普通动作
                     with Timer("动作执行", cycle_timers):
@@ -210,40 +215,32 @@ class CycleProcessor:
                             action_info["action_data"],
                             cycle_timers,
                             thinking_id,
-                            action_info["action_message"]
+                            action_info["action_message"],
                         )
                     return {
                         "action_type": action_info["action_type"],
                         "success": success,
                         "reply_text": reply_text,
-                        "command": command
+                        "command": command,
                     }
                 else:
                     try:
                         success, response_set, _ = await generator_api.generate_reply(
                             chat_stream=self.context.chat_stream,
-                            reply_message = action_info["action_message"],
+                            reply_message=action_info["action_message"],
                             available_actions=available_actions,
                             enable_tool=global_config.tool.enable_tool,
                             request_type="chat.replyer",
                             from_plugin=False,
-                        )     
+                        )
                         if not success or not response_set:
-                            logger.info(f"对 {action_info['action_message'].get('processed_plain_text')} 的回复生成失败")
-                            return {
-                                "action_type": "reply",
-                                "success": False,
-                                "reply_text": "",
-                                "loop_info": None
-                            }
+                            logger.info(
+                                f"对 {action_info['action_message'].get('processed_plain_text')} 的回复生成失败"
+                            )
+                            return {"action_type": "reply", "success": False, "reply_text": "", "loop_info": None}
                     except asyncio.CancelledError:
                         logger.debug(f"{self.log_prefix} 并行执行：回复生成任务已被取消")
-                        return {
-                            "action_type": "reply",
-                            "success": False,
-                            "reply_text": "",
-                            "loop_info": None
-                        }
+                        return {"action_type": "reply", "success": False, "reply_text": "", "loop_info": None}
 
                     loop_info, reply_text, cycle_timers_reply = await self._send_and_store_reply(
                         response_set,
@@ -253,12 +250,7 @@ class CycleProcessor:
                         thinking_id,
                         actions,
                     )
-                    return {
-                        "action_type": "reply",
-                        "success": True,
-                        "reply_text": reply_text,
-                        "loop_info": loop_info
-                    }
+                    return {"action_type": "reply", "success": True, "reply_text": reply_text, "loop_info": loop_info}
             except Exception as e:
                 logger.error(f"{self.log_prefix} 执行动作时出错: {e}")
                 logger.error(f"{self.log_prefix} 错误信息: {traceback.format_exc()}")
@@ -267,9 +259,9 @@ class CycleProcessor:
                     "success": False,
                     "reply_text": "",
                     "loop_info": None,
-                    "error": str(e)
+                    "error": str(e),
                 }
-            
+
         # 创建所有动作的后台任务
         action_tasks = [asyncio.create_task(execute_action(action)) for action in actions]
 
@@ -282,12 +274,12 @@ class CycleProcessor:
         action_success = False
         action_reply_text = ""
         action_command = ""
-        
+
         for i, result in enumerate(results):
             if isinstance(result, BaseException):
                 logger.error(f"{self.log_prefix} 动作执行异常: {result}")
                 continue
-            
+
             action_info = actions[i]
             if result["action_type"] != "reply":
                 action_success = result["success"]
@@ -327,7 +319,7 @@ class CycleProcessor:
                 },
             }
             reply_text = action_reply_text
-        
+
         if ENABLE_S4U:
             await stop_typing()
 
@@ -342,7 +334,7 @@ class CycleProcessor:
             self.context.no_reply_consecutive = 0
             logger.debug(f"{self.log_prefix} 执行了{action_type}动作，重置no_reply计数器")
             return True
-            
+
         if action_type == "no_reply":
             self.context.no_reply_consecutive += 1
             self.context.chat_instance._determine_form_type()

src/chat/chat_loop/cycle_tracker.py

@@ -91,25 +91,24 @@ class CycleTracker:
 
         # 获取动作类型，兼容新旧格式
         action_type = "未知动作"
-        if hasattr(self, '_current_cycle_detail') and self._current_cycle_detail:
+        if hasattr(self, "_current_cycle_detail") and self._current_cycle_detail:
             loop_plan_info = self._current_cycle_detail.loop_plan_info
             if isinstance(loop_plan_info, dict):
-                action_result = loop_plan_info.get('action_result', {})
+                action_result = loop_plan_info.get("action_result", {})
                 if isinstance(action_result, dict):
                     # 旧格式：action_result是字典
-                    action_type = action_result.get('action_type', '未知动作')
+                    action_type = action_result.get("action_type", "未知动作")
                 elif isinstance(action_result, list) and action_result:
                     # 新格式：action_result是actions列表
-                    action_type = action_result[0].get('action_type', '未知动作')
+                    action_type = action_result[0].get("action_type", "未知动作")
             elif isinstance(loop_plan_info, list) and loop_plan_info:
                 # 直接是actions列表的情况
-                action_type = loop_plan_info[0].get('action_type', '未知动作')
+                action_type = loop_plan_info[0].get("action_type", "未知动作")
 
         if self.context.current_cycle_detail.end_time and self.context.current_cycle_detail.start_time:
             duration = self.context.current_cycle_detail.end_time - self.context.current_cycle_detail.start_time
             logger.info(
                 f"{self.context.log_prefix} 第{self.context.current_cycle_detail.cycle_id}次思考,"
                 f"耗时: {duration:.1f}秒, "
-                f"选择动作: {action_type}"
-                + (f"\n详情: {'; '.join(timer_strings)}" if timer_strings else "")
+                f"选择动作: {action_type}" + (f"\n详情: {'; '.join(timer_strings)}" if timer_strings else "")
             )

src/chat/chat_loop/heartFC_chat.py

@@ -56,7 +56,7 @@ class HeartFChatting:
 
         self._loop_task: Optional[asyncio.Task] = None
         self._proactive_monitor_task: Optional[asyncio.Task] = None
-        
+
         # 记录最近3次的兴趣度
         self.recent_interest_records: deque = deque(maxlen=3)
         self._initialize_chat_mode()
@@ -183,7 +183,7 @@ class HeartFChatting:
                     event = ProactiveTriggerEvent(
                         source="silence_monitor",
                         reason=f"聊天已沉默 {formatted_time}",
-                        metadata={"silence_duration": silence_duration}
+                        metadata={"silence_duration": silence_duration},
                     )
                     await self.proactive_thinker.think(event)
                     self.context.last_message_time = current_time
@@ -205,21 +205,30 @@ class HeartFChatting:
         stream_parts = self.context.stream_id.split(":")
         current_chat_identifier = f"{stream_parts}:{stream_parts}" if len(stream_parts) >= 2 else self.context.stream_id
 
-        enable_list = getattr(global_config.chat, "proactive_thinking_enable_in_groups" if is_group_chat else "proactive_thinking_enable_in_private", [])
+        enable_list = getattr(
+            global_config.chat,
+            "proactive_thinking_enable_in_groups" if is_group_chat else "proactive_thinking_enable_in_private",
+            [],
+        )
         return not enable_list or current_chat_identifier in enable_list
 
     def _get_dynamic_thinking_interval(self) -> float:
         try:
             from src.utils.timing_utils import get_normal_distributed_interval
+
             base_interval = global_config.chat.proactive_thinking_interval
             delta_sigma = getattr(global_config.chat, "delta_sigma", 120)
 
-            if base_interval <= 0: base_interval = abs(base_interval)
-            if delta_sigma < 0: delta_sigma = abs(delta_sigma)
+            if base_interval <= 0:
+                base_interval = abs(base_interval)
+            if delta_sigma < 0:
+                delta_sigma = abs(delta_sigma)
+
+            if base_interval == 0 and delta_sigma == 0:
+                return 300
+            if delta_sigma == 0:
+                return base_interval
 
-            if base_interval == 0 and delta_sigma == 0: return 300
-            if delta_sigma == 0: return base_interval
-            
             sigma_percentage = delta_sigma / base_interval if base_interval > 0 else delta_sigma / 1000
             return get_normal_distributed_interval(base_interval, sigma_percentage, 1, 86400, use_3sigma_rule=True)
 
@@ -335,29 +344,30 @@ class HeartFChatting:
 
             # 根据聊天模式处理新消息
             # 统一使用 _should_process_messages 判断是否应该处理
-            should_process,interest_value = await self._should_process_messages(recent_messages)
+            should_process, interest_value = await self._should_process_messages(recent_messages)
             if should_process:
                 self.context.last_read_time = time.time()
-                await self.cycle_processor.observe(interest_value = interest_value)
+                await self.cycle_processor.observe(interest_value=interest_value)
             else:
                 # Normal模式：消息数量不足，等待
                 await asyncio.sleep(0.5)
                 return True
-        
+
             if not await self._should_process_messages(recent_messages):
                 return has_new_messages
-                
+
             # 处理新消息
             for message in recent_messages:
-                await self.cycle_processor.observe(interest_value = interest_value)
-                    
+                await self.cycle_processor.observe(interest_value=interest_value)
+
             # 如果成功观察，增加能量值并重置累积兴趣值
             if has_new_messages:
                 self.context.energy_value += 1 / global_config.chat.focus_value
                 # 重置累积兴趣值，因为消息已经被成功处理
                 self.context.breaking_accumulated_interest = 0.0
-                logger.info(f"{self.context.log_prefix} 能量值增加，当前能量值：{self.context.energy_value:.1f}，重置累积兴趣值")
-                  
+                logger.info(
+                    f"{self.context.log_prefix} 能量值增加，当前能量值：{self.context.energy_value:.1f}，重置累积兴趣值"
+                )
 
         # 更新上一帧的睡眠状态
         self.context.was_sleeping = is_sleeping
@@ -378,7 +388,6 @@ class HeartFChatting:
 
         return has_new_messages
 
-
     def _handle_wakeup_messages(self, messages):
         """
         处理休眠状态下的消息，累积唤醒度
@@ -421,7 +430,7 @@ class HeartFChatting:
             logger.info(f"{self.context.log_prefix} breaking模式已禁用，使用waiting形式")
             self.context.focus_energy = 1
             return "waiting"
-            
+
         # 如果连续no_reply次数少于3次，使用waiting形式
         if self.context.no_reply_consecutive <= 3:
             self.context.focus_energy = 1
@@ -429,12 +438,14 @@ class HeartFChatting:
         else:
             # 使用累积兴趣值而不是最近3次的记录
             total_interest = self.context.breaking_accumulated_interest
-          
+
             # 计算调整后的阈值
             adjusted_threshold = 1 / global_config.chat.get_current_talk_frequency(self.context.stream_id)
-            
-            logger.info(f"{self.context.log_prefix} 累积兴趣值: {total_interest:.2f}, 调整后阈值: {adjusted_threshold:.2f}")
-        
+
+            logger.info(
+                f"{self.context.log_prefix} 累积兴趣值: {total_interest:.2f}, 调整后阈值: {adjusted_threshold:.2f}"
+            )
+
             # 如果累积兴趣值小于阈值，进入breaking形式
             if total_interest < adjusted_threshold:
                 logger.info(f"{self.context.log_prefix} 累积兴趣度不足，进入breaking形式")
@@ -445,7 +456,7 @@ class HeartFChatting:
                 self.context.focus_energy = 1
                 return "waiting"
 
-    async def _should_process_messages(self, new_message: List[Dict[str, Any]]) -> tuple[bool,float]:
+    async def _should_process_messages(self, new_message: List[Dict[str, Any]]) -> tuple[bool, float]:
         """
         统一判断是否应该处理消息的函数
         根据当前循环模式和消息内容决定是否继续处理
@@ -459,37 +470,39 @@ class HeartFChatting:
 
         modified_exit_count_threshold = self.context.focus_energy * 0.5 / talk_frequency
         modified_exit_interest_threshold = 1.5 / talk_frequency
-        
+
         # 计算当前批次消息的兴趣值
         batch_interest = 0.0
         for msg_dict in new_message:
             interest_value = msg_dict.get("interest_value", 0.0)
             if msg_dict.get("processed_plain_text", ""):
                 batch_interest += interest_value
-        
+
         # 在breaking形式下累积所有消息的兴趣值
         if new_message_count > 0:
             self.context.breaking_accumulated_interest += batch_interest
             total_interest = self.context.breaking_accumulated_interest
         else:
             total_interest = self.context.breaking_accumulated_interest
-        
+
         if new_message_count >= modified_exit_count_threshold:
             # 记录兴趣度到列表
             self.recent_interest_records.append(total_interest)
             # 重置累积兴趣值，因为已经达到了消息数量阈值
             self.context.breaking_accumulated_interest = 0.0
-            
+
             logger.info(
                 f"{self.context.log_prefix} 累计消息数量达到{new_message_count}条(>{modified_exit_count_threshold:.1f})，结束等待，累积兴趣值: {total_interest:.2f}"
             )
-            return True,total_interest/new_message_count
+            return True, total_interest / new_message_count
 
         # 检查累计兴趣值
         if new_message_count > 0:
             # 只在兴趣值变化时输出log
             if not hasattr(self, "_last_accumulated_interest") or total_interest != self._last_accumulated_interest:
-                logger.info(f"{self.context.log_prefix} breaking形式当前累积兴趣值: {total_interest:.2f}, 专注度: {global_config.chat.focus_value:.1f}")
+                logger.info(
+                    f"{self.context.log_prefix} breaking形式当前累积兴趣值: {total_interest:.2f}, 专注度: {global_config.chat.focus_value:.1f}"
+                )
                 self._last_accumulated_interest = total_interest
             if total_interest >= modified_exit_interest_threshold:
                 # 记录兴趣度到列表
@@ -499,13 +512,16 @@ class HeartFChatting:
                 logger.info(
                     f"{self.context.log_prefix} 累计兴趣值达到{total_interest:.2f}(>{modified_exit_interest_threshold:.1f})，结束等待"
                 )
-                return True,total_interest/new_message_count
-            
+                return True, total_interest / new_message_count
+
         # 每10秒输出一次等待状态
-        if int(time.time() - self.context.last_read_time) > 0 and int(time.time() - self.context.last_read_time) % 10 == 0:
+        if (
+            int(time.time() - self.context.last_read_time) > 0
+            and int(time.time() - self.context.last_read_time) % 10 == 0
+        ):
             logger.info(
                 f"{self.context.log_prefix} 已等待{time.time() - self.context.last_read_time:.0f}秒，累计{new_message_count}条消息，累积兴趣{total_interest:.1f}，继续等待..."
             )
             await asyncio.sleep(0.5)
-        
-        return False,0.0
+
+        return False, 0.0

src/chat/chat_loop/hfc_context.py

@@ -44,13 +44,13 @@ class HfcContext:
 
         self.energy_value = self.chat_stream.energy_value
         self.sleep_pressure = self.chat_stream.sleep_pressure
-        self.was_sleeping = False # 用于检测睡眠状态的切换
-        
+        self.was_sleeping = False  # 用于检测睡眠状态的切换
+
         self.last_message_time = time.time()
         self.last_read_time = time.time() - 10
-        
+
         # 从聊天流恢复breaking累积兴趣值
-        self.breaking_accumulated_interest = getattr(self.chat_stream, 'breaking_accumulated_interest', 0.0)
+        self.breaking_accumulated_interest = getattr(self.chat_stream, "breaking_accumulated_interest", 0.0)
 
         self.action_manager = ActionManager()
 
@@ -79,4 +79,4 @@ class HfcContext:
             self.chat_stream.sleep_pressure = self.sleep_pressure
             self.chat_stream.focus_energy = self.focus_energy
             self.chat_stream.no_reply_consecutive = self.no_reply_consecutive
-            self.chat_stream.breaking_accumulated_interest = self.breaking_accumulated_interest
+            self.chat_stream.breaking_accumulated_interest = self.breaking_accumulated_interest

src/chat/chat_loop/hfc_utils.py

@@ -122,6 +122,7 @@ class CycleDetail:
         self.loop_plan_info = loop_info["loop_plan_info"]
         self.loop_action_info = loop_info["loop_action_info"]
 
+
 async def send_typing():
     """
     发送打字状态指示

src/chat/chat_loop/proactive/events.py

@@ -1,11 +1,13 @@
 from dataclasses import dataclass, field
 from typing import Optional, Dict, Any
 
+
 @dataclass
 class ProactiveTriggerEvent:
     """
     主动思考触发事件的数据类
     """
+
     source: str  # 触发源的标识，例如 "silence_monitor", "insomnia_manager"
     reason: str  # 触发的具体原因，例如 "聊天已沉默10分钟", "深夜emo"
-    metadata: Optional[Dict[str, Any]] = field(default_factory=dict)  # 可选的元数据，用于传递额外信息
+    metadata: Optional[Dict[str, Any]] = field(default_factory=dict)  # 可选的元数据，用于传递额外信息

src/chat/chat_loop/proactive/proactive_thinker.py

@@ -37,8 +37,10 @@ class ProactiveThinker:
         Args:
             trigger_event: 描述触发上下文的事件对象
         """
-        logger.info(f"{self.context.log_prefix} 接收到主动思考事件: "
-                    f"来源='{trigger_event.source}', 原因='{trigger_event.reason}'")
+        logger.info(
+            f"{self.context.log_prefix} 接收到主动思考事件: "
+            f"来源='{trigger_event.source}', 原因='{trigger_event.reason}'"
+        )
 
         try:
             # 1. 根据事件类型执行前置操作
@@ -63,6 +65,7 @@ class ProactiveThinker:
 
         try:
             from src.mood.mood_manager import mood_manager
+
             mood_obj = mood_manager.get_mood_by_chat_id(self.context.stream_id)
             new_mood = None
 
@@ -76,8 +79,10 @@ class ProactiveThinker:
             if new_mood:
                 mood_obj.mood_state = new_mood
                 mood_obj.last_change_time = time.time()
-                logger.info(f"{self.context.log_prefix} 因 '{trigger_event.reason}'，"
-                            f"情绪状态被强制更新为: {mood_obj.mood_state}")
+                logger.info(
+                    f"{self.context.log_prefix} 因 '{trigger_event.reason}'，"
+                    f"情绪状态被强制更新为: {mood_obj.mood_state}"
+                )
 
         except Exception as e:
             logger.error(f"{self.context.log_prefix} 设置失眠情绪时出错: {e}")
@@ -91,19 +96,17 @@ class ProactiveThinker:
         """
         try:
             # 直接调用 planner 的 PROACTIVE 模式
-            actions, target_message = await self.cycle_processor.action_planner.plan(
-                mode=ChatMode.PROACTIVE
-            )
-            
+            actions, target_message = await self.cycle_processor.action_planner.plan(mode=ChatMode.PROACTIVE)
+
             # 获取第一个规划出的动作作为主要决策
             action_result = actions[0] if actions else {}
 
             # 如果决策不是 do_nothing，则执行
             if action_result and action_result.get("action_type") != "do_nothing":
-
                 # 在主动思考时，如果 target_message 为 None，则默认选取最新 message 作为 target_message
                 if target_message is None and self.context.chat_stream and self.context.chat_stream.context:
                     from src.chat.message_receive.message import MessageRecv
+
                     latest_message = self.context.chat_stream.context.get_last_message()
                     if isinstance(latest_message, MessageRecv):
                         user_info = latest_message.message_info.user_info

src/chat/chat_loop/response_handler.py

@@ -157,7 +157,7 @@ class ResponseHandler:
                 await send_api.text_to_stream(
                     text=data,
                     stream_id=self.context.stream_id,
-                    reply_to_message = message_data,
+                    reply_to_message=message_data,
                     set_reply=need_reply,
                     typing=False,
                 )