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

src/plugin_system/__init__.py

@@ -121,5 +121,5 @@ __all__ = [
     "DatabaseChatInfo",
     "TargetPersonInfo",
     "ActionPlannerInfo",
-    "LLMGenerationDataModel"
+    "LLMGenerationDataModel",
 ]

src/plugin_system/apis/frequency_api.py

@@ -7,22 +7,24 @@ logger = get_logger("frequency_api")
 def get_current_focus_value(chat_id: str) -> float:
     return frequency_control_manager.get_or_create_frequency_control(chat_id).get_final_focus_value()
 
+
 def get_current_talk_frequency(chat_id: str) -> float:
     return frequency_control_manager.get_or_create_frequency_control(chat_id).get_final_talk_frequency()
 
+
 def set_focus_value_adjust(chat_id: str, focus_value_adjust: float) -> None:
     frequency_control_manager.get_or_create_frequency_control(chat_id).focus_value_external_adjust = focus_value_adjust
-    
+
+
 def set_talk_frequency_adjust(chat_id: str, talk_frequency_adjust: float) -> None:
-    frequency_control_manager.get_or_create_frequency_control(chat_id).talk_frequency_external_adjust = talk_frequency_adjust
+    frequency_control_manager.get_or_create_frequency_control(
+        chat_id
+    ).talk_frequency_external_adjust = talk_frequency_adjust
+
 
 def get_focus_value_adjust(chat_id: str) -> float:
     return frequency_control_manager.get_or_create_frequency_control(chat_id).focus_value_external_adjust
-    
+
+
 def get_talk_frequency_adjust(chat_id: str) -> float:
     return frequency_control_manager.get_or_create_frequency_control(chat_id).talk_frequency_external_adjust
-
-
-
-
-

src/plugin_system/apis/llm_api.py

@@ -72,7 +72,9 @@ async def generate_with_model(
 
         llm_request = LLMRequest(model_set=model_config, request_type=request_type)
 
-        response, (reasoning_content, model_name, _) = await llm_request.generate_response_async(prompt, temperature=temperature, max_tokens=max_tokens)
+        response, (reasoning_content, model_name, _) = await llm_request.generate_response_async(
+            prompt, temperature=temperature, max_tokens=max_tokens
+        )
         return True, response, reasoning_content, model_name
 
     except Exception as e:
@@ -80,6 +82,7 @@ async def generate_with_model(
         logger.error(f"[LLMAPI] {error_msg}")
         return False, error_msg, "", ""
 
+
 async def generate_with_model_with_tools(
     prompt: str,
     model_config: TaskConfig,
@@ -109,10 +112,7 @@ async def generate_with_model_with_tools(
         llm_request = LLMRequest(model_set=model_config, request_type=request_type)
 
         response, (reasoning_content, model_name, tool_call) = await llm_request.generate_response_async(
-            prompt,
-            tools=tool_options,
-            temperature=temperature,
-            max_tokens=max_tokens
+            prompt, tools=tool_options, temperature=temperature, max_tokens=max_tokens
         )
         return True, response, reasoning_content, model_name, tool_call
 

src/plugin_system/apis/message_api.py

@@ -435,9 +435,7 @@ def build_readable_messages_to_str(
     Returns:
         格式化后的可读字符串
     """
-    return build_readable_messages(
-        messages, replace_bot_name, timestamp_mode, read_mark, truncate, show_actions
-    )
+    return build_readable_messages(messages, replace_bot_name, timestamp_mode, read_mark, truncate, show_actions)
 
 
 async def build_readable_messages_with_details(
@@ -491,8 +489,6 @@ def filter_mai_messages(messages: List[DatabaseMessages]) -> List[DatabaseMessag
     return [msg for msg in messages if msg.user_info.user_id != str(global_config.bot.qq_account)]
 
 
-
-
 def translate_pid_to_description(pid: str) -> str:
     image = Images.get_or_none(Images.image_id == pid)
     description = ""
@@ -500,4 +496,4 @@ def translate_pid_to_description(pid: str) -> str:
         description = image.description
     else:
         description = "[图片]"
-    return description
+    return description

src/plugin_system/apis/plugin_manage_api.py

@@ -34,7 +34,7 @@ def get_plugin_path(plugin_name: str) -> str:
 
     Returns:
         str: 插件目录的绝对路径。
-        
+
     Raises:
         ValueError: 如果插件不存在。
     """

src/plugin_system/apis/plugin_register_api.py

@@ -2,7 +2,7 @@ from pathlib import Path
 
 from src.common.logger import get_logger
 
-logger = get_logger("plugin_manager") # 复用plugin_manager名称
+logger = get_logger("plugin_manager")  # 复用plugin_manager名称
 
 
 def register_plugin(cls):

src/plugin_system/core/global_announcement_manager.py

@@ -88,7 +88,7 @@ class GlobalAnnouncementManager:
             return False
         self._user_disabled_tools[chat_id].append(tool_name)
         return True
-    
+
     def enable_specific_chat_tool(self, chat_id: str, tool_name: str) -> bool:
         """启用特定聊天的某个工具"""
         if chat_id in self._user_disabled_tools:
@@ -111,7 +111,7 @@ class GlobalAnnouncementManager:
     def get_disabled_chat_event_handlers(self, chat_id: str) -> List[str]:
         """获取特定聊天禁用的所有事件处理器"""
         return self._user_disabled_event_handlers.get(chat_id, []).copy()
-    
+
     def get_disabled_chat_tools(self, chat_id: str) -> List[str]:
         """获取特定聊天禁用的所有工具"""
         return self._user_disabled_tools.get(chat_id, []).copy()

src/plugin_system/core/plugin_manager.py

@@ -224,7 +224,7 @@ class PluginManager:
             list: 已注册的插件类名称列表。
         """
         return list(self.plugin_classes.keys())
-    
+
     def get_plugin_path(self, plugin_name: str) -> Optional[str]:
         """
         获取指定插件的路径。
@@ -401,9 +401,7 @@ class PluginManager:
                         command_components = [
                             c for c in plugin_info.components if c.component_type == ComponentType.COMMAND
                         ]
-                        tool_components = [
-                            c for c in plugin_info.components if c.component_type == ComponentType.TOOL
-                        ]
+                        tool_components = [c for c in plugin_info.components if c.component_type == ComponentType.TOOL]
                         event_handler_components = [
                             c for c in plugin_info.components if c.component_type == ComponentType.EVENT_HANDLER
                         ]

src/plugin_system/core/tool_use.py

@@ -149,10 +149,10 @@ class ToolExecutor:
         if not tool_calls:
             logger.debug(f"{self.log_prefix}无需执行工具")
             return [], []
-        
+
         # 提取tool_calls中的函数名称
         func_names = [call.func_name for call in tool_calls if call.func_name]
-        
+
         logger.info(f"{self.log_prefix}开始执行工具调用: {func_names}")
 
         # 执行每个工具调用
@@ -195,7 +195,9 @@ class ToolExecutor:
 
         return tool_results, used_tools
 
-    async def execute_tool_call(self, tool_call: ToolCall, tool_instance: Optional[BaseTool] = None) -> Optional[Dict[str, Any]]:
+    async def execute_tool_call(
+        self, tool_call: ToolCall, tool_instance: Optional[BaseTool] = None
+    ) -> Optional[Dict[str, Any]]:
         # sourcery skip: use-assigned-variable
         """执行单个工具调用