Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev

src/chat/focus_chat/planners/action_manager.py

@@ -149,8 +149,16 @@ class ActionManager:
                 normal_activation_type_attr = getattr(action_class, "normal_activation_type", "always")
 
                 # 处理枚举值，提取.value
-                focus_activation_type = focus_activation_type_attr.value if hasattr(focus_activation_type_attr, 'value') else str(focus_activation_type_attr)
-                normal_activation_type = normal_activation_type_attr.value if hasattr(normal_activation_type_attr, 'value') else str(normal_activation_type_attr)
+                focus_activation_type = (
+                    focus_activation_type_attr.value
+                    if hasattr(focus_activation_type_attr, "value")
+                    else str(focus_activation_type_attr)
+                )
+                normal_activation_type = (
+                    normal_activation_type_attr.value
+                    if hasattr(normal_activation_type_attr, "value")
+                    else str(normal_activation_type_attr)
+                )
 
                 # 其他属性
                 random_probability: float = getattr(action_class, "random_activation_probability", 0.3)
@@ -160,7 +168,7 @@ class ActionManager:
 
                 # 处理模式启用属性
                 mode_enable_attr = getattr(action_class, "mode_enable", "all")
-                mode_enable = mode_enable_attr.value if hasattr(mode_enable_attr, 'value') else str(mode_enable_attr)
+                mode_enable = mode_enable_attr.value if hasattr(mode_enable_attr, "value") else str(mode_enable_attr)
 
                 # 获取并行执行属性
                 parallel_action: bool = getattr(action_class, "parallel_action", False)
@@ -447,7 +455,7 @@ class ActionManager:
             Dict[str, ActionInfo]: 在指定模式下可用的动作集合
         """
         filtered_actions = {}
-        
+
         # print(self._using_actions)
 
         for action_name, action_info in self._using_actions.items():

src/chat/focus_chat/planners/modify_actions.py

@@ -6,7 +6,6 @@ from src.chat.heart_flow.observation.chatting_observation import ChattingObserva
 from src.chat.message_receive.chat_stream import get_chat_manager
 from src.config.config import global_config
 from src.llm_models.utils_model import LLMRequest
-from src.plugin_system.base.base_action import ActionActivationType
 import random
 import asyncio
 import hashlib

src/chat/normal_chat/normal_chat_action_modifier.py

@@ -1,7 +1,6 @@
 from typing import List, Any, Dict
 from src.common.logger import get_logger
 from src.chat.focus_chat.planners.action_manager import ActionManager
-from src.plugin_system.base.base_action import ActionActivationType, ChatMode
 from src.chat.utils.chat_message_builder import build_readable_messages, get_raw_msg_before_timestamp_with_chat
 from src.config.config import global_config
 import random