chore(core.agent): add missing type annotations

Author: Dt8333

astrbot/core/agent/handoff.py

@@ -1,4 +1,4 @@
-from typing import Generic
+from typing import Any, Generic
 from .tool import FunctionTool
 from .agent import Agent
 from .run_context import TContext
@@ -8,8 +8,11 @@ class HandoffTool(FunctionTool, Generic[TContext]):
     """Handoff tool for delegating tasks to another agent."""
 
     def __init__(
-        self, agent: Agent[TContext], parameters: dict | None = None, **kwargs
-    ):
+        self,
+        agent: Agent[TContext],
+        parameters: dict | None = None,
+        **kwargs: Any,  # noqa: ANN401
+    ) -> None:
         self.agent = agent
         super().__init__(
             name=f"transfer_to_{agent.name}",

astrbot/core/agent/hooks.py

@@ -8,20 +8,20 @@
 
 @dataclass
 class BaseAgentRunHooks(Generic[TContext]):
-    async def on_agent_begin(self, run_context: ContextWrapper[TContext]): ...
+    async def on_agent_begin(self, run_context: ContextWrapper[TContext]) -> None: ...
     async def on_tool_start(
         self,
         run_context: ContextWrapper[TContext],
         tool: FunctionTool,
         tool_args: dict | None,
-    ): ...
+    ) -> None: ...
     async def on_tool_end(
         self,
         run_context: ContextWrapper[TContext],
         tool: FunctionTool,
         tool_args: dict | None,
         tool_result: mcp.types.CallToolResult | None,
-    ): ...
+    ) -> None: ...
     async def on_agent_done(
         self, run_context: ContextWrapper[TContext], llm_response: LLMResponse
-    ): ...
+    ) -> None: ...

astrbot/core/agent/mcp_client.py

@@ -93,7 +93,7 @@ async def _quick_test_mcp_connection(config: dict) -> tuple[bool, str]:
 
 
 class MCPClient:
-    def __init__(self):
+    def __init__(self) -> None:
         # Initialize session and client objects
         self.session: mcp.ClientSession | None = None
         self.exit_stack = AsyncExitStack()
@@ -104,7 +104,7 @@ def __init__(self):
         self.server_errlogs: list[str] = []
         self.running_event = asyncio.Event()
 
-    async def connect_to_server(self, mcp_server_config: dict, name: str):
+    async def connect_to_server(self, mcp_server_config: dict, name: str) -> None:
         """连接到 MCP 服务器
 
         如果 `url` 参数存在：
@@ -117,7 +117,7 @@ async def connect_to_server(self, mcp_server_config: dict, name: str):
         """
         cfg = _prepare_config(mcp_server_config.copy())
 
-        def logging_callback(msg: str):
+        def logging_callback(msg: str) -> None:
             # 处理 MCP 服务的错误日志
             print(f"MCP Server {name} Error: {msg}")
             self.server_errlogs.append(msg)
@@ -187,7 +187,7 @@ def logging_callback(msg: str):
                 **cfg,
             )
 
-            def callback(msg: str):
+            def callback(msg: str) -> None:
                 # 处理 MCP 服务的错误日志
                 self.server_errlogs.append(msg)
 
@@ -217,7 +217,7 @@ async def list_tools_and_save(self) -> mcp.ListToolsResult:
         self.tools = response.tools
         return response
 
-    async def cleanup(self):
+    async def cleanup(self) -> None:
         """Clean up resources"""
         await self.exit_stack.aclose()
         self.running_event.set()  # Set the running event to indicate cleanup is done

astrbot/core/agent/runners/base.py

@@ -26,7 +26,7 @@ async def reset(
         run_context: ContextWrapper[TContext],
         tool_executor: BaseFunctionToolExecutor[TContext],
         agent_hooks: BaseAgentRunHooks[TContext],
-        **kwargs: T.Any,
+        **kwargs: T.Any,  # noqa: ANN401
     ) -> None:
         """
         Reset the agent to its initial state.

astrbot/core/agent/runners/tool_loop_agent_runner.py

@@ -69,7 +69,7 @@ async def _iter_llm_responses(self) -> T.AsyncGenerator[LLMResponse, None]:
             yield await self.provider.text_chat(**self.req.__dict__)
 
     @override
-    async def step(self):
+    async def step(self) -> T.AsyncGenerator[AgentResponse, None]:
         """
         Process a single step of the agent.
         This method should return the result of the step.

astrbot/core/agent/tool.py

@@ -2,6 +2,8 @@
 from deprecated import deprecated
 from typing import Literal, Any
 
+from collections.abc import Iterator
+
 from collections.abc import Awaitable, Callable
 from .mcp_client import MCPClient
 
@@ -32,7 +34,7 @@ class FunctionTool:
     mcp_client: MCPClient | None = None
     """MCP 客户端，当 origin 为 mcp 时有效"""
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"FuncTool(name={self.name}, parameters={self.parameters}, description={self.description}, active={self.active}, origin={self.origin})"
 
     def __dict__(self) -> dict[str, Any]:
@@ -53,14 +55,14 @@ class ToolSet:
     This class provides methods to add, remove, and retrieve tools, as well as
     convert the tools to different API formats (OpenAI, Anthropic, Google GenAI)."""
 
-    def __init__(self, tools: list[FunctionTool] | None = None):
+    def __init__(self, tools: list[FunctionTool] | None = None) -> None:
         self.tools: list[FunctionTool] = tools or []
 
     def empty(self) -> bool:
         """Check if the tool set is empty."""
         return len(self.tools) == 0
 
-    def add_tool(self, tool: FunctionTool):
+    def add_tool(self, tool: FunctionTool) -> None:
         """Add a tool to the set."""
         # 检查是否已存在同名工具
         for i, existing_tool in enumerate(self.tools):
@@ -69,7 +71,7 @@ def add_tool(self, tool: FunctionTool):
                 return
         self.tools.append(tool)
 
-    def remove_tool(self, name: str):
+    def remove_tool(self, name: str) -> None:
         """Remove a tool by its name."""
         self.tools = [tool for tool in self.tools if tool.name != name]
 
@@ -87,7 +89,7 @@ def add_func(
         func_args: list,
         desc: str,
         handler: Callable[..., Awaitable[Any]],
-    ):
+    ) -> None:
         """Add a function tool to the set."""
         params = {
             "type": "object",  # hard-coded here
@@ -107,7 +109,7 @@ def add_func(
         self.add_tool(_func)
 
     @deprecated(reason="Use remove_tool() instead", version="4.0.0")
-    def remove_func(self, name: str):
+    def remove_func(self, name: str) -> None:
         """Remove a function tool by its name."""
         self.remove_tool(name)
 
@@ -238,32 +240,34 @@ def convert_schema(schema: dict) -> dict:
         return declarations
 
     @deprecated(reason="Use openai_schema() instead", version="4.0.0")
-    def get_func_desc_openai_style(self, omit_empty_parameter_field: bool = False):
+    def get_func_desc_openai_style(
+        self, omit_empty_parameter_field: bool = False
+    ) -> list[dict]:
         return self.openai_schema(omit_empty_parameter_field)
 
     @deprecated(reason="Use anthropic_schema() instead", version="4.0.0")
-    def get_func_desc_anthropic_style(self):
+    def get_func_desc_anthropic_style(self) -> list[dict]:
         return self.anthropic_schema()
 
     @deprecated(reason="Use google_schema() instead", version="4.0.0")
-    def get_func_desc_google_genai_style(self):
+    def get_func_desc_google_genai_style(self) -> dict:
         return self.google_schema()
 
     def names(self) -> list[str]:
         """获取所有工具的名称列表"""
         return [tool.name for tool in self.tools]
 
-    def __len__(self):
+    def __len__(self) -> int:
         return len(self.tools)
 
-    def __bool__(self):
+    def __bool__(self) -> bool:
         return len(self.tools) > 0
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator:
         return iter(self.tools)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"ToolSet(tools={self.tools})"
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f"ToolSet(tools={self.tools})"

astrbot/core/agent/tool_executor.py

@@ -9,5 +9,8 @@
 class BaseFunctionToolExecutor(Generic[TContext]):
     @classmethod
     async def execute(
-        cls, tool: FunctionTool, run_context: ContextWrapper[TContext], **tool_args
+        cls,
+        tool: FunctionTool,
+        run_context: ContextWrapper[TContext],
+        **tool_args: Any,  # noqa: ANN401
     ) -> AsyncGenerator[Any | mcp.types.CallToolResult, None]: ...