tools整合彻底完成

src/plugin_system/apis/__init__.py

@@ -17,6 +17,7 @@ from src.plugin_system.apis import (
     person_api,
     plugin_manage_api,
     send_api,
+    tool_api,
 )
 from .logging_api import get_logger
 from .plugin_register_api import register_plugin
@@ -36,4 +37,5 @@ __all__ = [
     "send_api",
     "get_logger",
     "register_plugin",
+    "tool_api",
 ]

src/plugin_system/apis/component_manage_api.py

@@ -5,6 +5,7 @@ from src.plugin_system.base.component_types import (
     EventHandlerInfo,
     PluginInfo,
     ComponentType,
+    ToolInfo,
 )
 
 
@@ -119,6 +120,21 @@ def get_registered_command_info(command_name: str) -> Optional[CommandInfo]:
     return component_registry.get_registered_command_info(command_name)
 
 
+def get_registered_tool_info(tool_name: str) -> Optional[ToolInfo]:
+    """
+    获取指定 Tool 的注册信息。
+
+    Args:
+        tool_name (str): Tool 名称。
+
+    Returns:
+        ToolInfo: Tool 信息对象，如果 Tool 不存在则返回 None。
+    """
+    from src.plugin_system.core.component_registry import component_registry
+
+    return component_registry.get_registered_tool_info(tool_name)
+
+
 # === EventHandler 特定查询方法 ===
 def get_registered_event_handler_info(
     event_handler_name: str,
@@ -191,6 +207,8 @@ def locally_enable_component(component_name: str, component_type: ComponentType,
             return global_announcement_manager.enable_specific_chat_action(stream_id, component_name)
         case ComponentType.COMMAND:
             return global_announcement_manager.enable_specific_chat_command(stream_id, component_name)
+        case ComponentType.TOOL:
+            return global_announcement_manager.enable_specific_chat_tool(stream_id, component_name)
         case ComponentType.EVENT_HANDLER:
             return global_announcement_manager.enable_specific_chat_event_handler(stream_id, component_name)
         case _:
@@ -216,11 +234,14 @@ def locally_disable_component(component_name: str, component_type: ComponentType
             return global_announcement_manager.disable_specific_chat_action(stream_id, component_name)
         case ComponentType.COMMAND:
             return global_announcement_manager.disable_specific_chat_command(stream_id, component_name)
+        case ComponentType.TOOL:
+            return global_announcement_manager.disable_specific_chat_tool(stream_id, component_name)
         case ComponentType.EVENT_HANDLER:
             return global_announcement_manager.disable_specific_chat_event_handler(stream_id, component_name)
         case _:
             raise ValueError(f"未知 component type: {component_type}")
 
+
 def get_locally_disabled_components(stream_id: str, component_type: ComponentType) -> list[str]:
     """
     获取指定消息流中禁用的组件列表。
@@ -239,7 +260,9 @@ def get_locally_disabled_components(stream_id: str, component_type: ComponentTyp
             return global_announcement_manager.get_disabled_chat_actions(stream_id)
         case ComponentType.COMMAND:
             return global_announcement_manager.get_disabled_chat_commands(stream_id)
+        case ComponentType.TOOL:
+            return global_announcement_manager.get_disabled_chat_tools(stream_id)
         case ComponentType.EVENT_HANDLER:
             return global_announcement_manager.get_disabled_chat_event_handlers(stream_id)
         case _:
-            raise ValueError(f"未知 component type: {component_type}")
+            raise ValueError(f"未知 component type: {component_type}")

src/plugin_system/apis/tool_api.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, Type
 from src.plugin_system.base.base_tool import BaseTool
 from src.plugin_system.base.component_types import ComponentType
 
@@ -6,20 +6,22 @@ from src.common.logger import get_logger
 
 logger = get_logger("tool_api")
 
+
 def get_tool_instance(tool_name: str) -> Optional[BaseTool]:
     """获取公开工具实例"""
     from src.plugin_system.core import component_registry
 
-    tool_class = component_registry.get_component_class(tool_name, ComponentType.TOOL)
-    if not tool_class:
-        return None
-        
-    return tool_class()
+    tool_class: Type[BaseTool] = component_registry.get_component_class(tool_name, ComponentType.TOOL)  # type: ignore
+    return tool_class() if tool_class else None
+
 
 def get_llm_available_tool_definitions():
-    from src.plugin_system.core import component_registry
+    """获取LLM可用的工具定义列表
     
+    Returns:
+        List[Tuple[str, Dict[str, Any]]]: 工具定义列表，为[("tool_name", 定义)]
+    """
+    from src.plugin_system.core import component_registry
+
     llm_available_tools = component_registry.get_llm_available_tools()
-    return [tool_class().get_tool_definition() for tool_class in llm_available_tools.values()]
-
-
+    return [(name, tool_class.get_tool_definition()) for name, tool_class in llm_available_tools.items()]