chore(app): fix typing for most cases

fred913 · fred913 · commit 1d1d4d49f839 · 2025-03-19T19:48:53.000+08:00
diff --git a/app/agent/browser.py b/app/agent/browser.py
@@ -18,14 +18,16 @@ class BrowserAgent(ToolCallAgent):
     extract content, and perform other browser-based actions to accomplish tasks.
     """
 
-    name = "browser"
-    description = "A browser agent that can control a browser to accomplish tasks"
+    name: str = "browser"
+    description: str | None = (
+        "A browser agent that can control a browser to accomplish tasks"
+    )
 
-    system_prompt = SYSTEM_PROMPT
-    next_step_prompt = NEXT_STEP_PROMPT
+    system_prompt: str | None = SYSTEM_PROMPT
+    next_step_prompt: str | None = NEXT_STEP_PROMPT
 
-    max_observe = 10000
-    max_steps = 20
+    max_observe: int | None = 10000
+    max_steps: int = 20
 
     # Configure the available tools
     available_tools: ToolCollection = Field(
diff --git a/app/agent/manus.py b/app/agent/manus.py
@@ -20,14 +20,14 @@ class Manus(BrowserAgent):
     """
 
     name: str = "Manus"
-    description: str = (
+    description: str | None = (
         "A versatile agent that can solve various tasks using multiple tools"
     )
 
-    system_prompt: str = SYSTEM_PROMPT.format(directory=config.workspace_root)
-    next_step_prompt: str = NEXT_STEP_PROMPT
+    system_prompt: str | None = SYSTEM_PROMPT.format(directory=config.workspace_root)
+    next_step_prompt: str | None = NEXT_STEP_PROMPT
 
-    max_observe: int = 10000
+    max_observe: int | None = 10000
     max_steps: int = 20
 
     # Add general-purpose tools to the tool collection
diff --git a/app/agent/planning.py b/app/agent/planning.py
@@ -19,10 +19,10 @@ class PlanningAgent(ToolCallAgent):
     """
 
     name: str = "planning"
-    description: str = "An agent that creates and manages plans to solve tasks"
+    description: str | None = "An agent that creates and manages plans to solve tasks"
 
-    system_prompt: str = PLANNING_SYSTEM_PROMPT
-    next_step_prompt: str = NEXT_STEP_PROMPT
+    system_prompt: str | None = PLANNING_SYSTEM_PROMPT
+    next_step_prompt: str | None = NEXT_STEP_PROMPT
 
     available_tools: ToolCollection = Field(
         default_factory=lambda: ToolCollection(PlanningTool(), Terminate())
@@ -58,6 +58,7 @@ async def think(self) -> bool:
             if self.active_plan_id
             else self.next_step_prompt
         )
+        assert prompt is not None, "next_step_prompt is not set"
         self.messages.append(Message.user_message(prompt))
 
         # Get the current step index before thinking
@@ -210,6 +211,7 @@ async def create_initial_plan(self, request: str) -> None:
             )
         ]
         self.memory.add_messages(messages)
+        assert self.system_prompt is not None, "system_prompt is not set"
         response = await self.llm.ask_tool(
             messages=list(messages),
             system_msgs=[Message.system_message(self.system_prompt)],
diff --git a/app/agent/swe.py b/app/agent/swe.py
@@ -9,10 +9,10 @@ class SWEAgent(ToolCallAgent):
     """An agent that implements the SWEAgent paradigm for executing code and natural conversations."""
 
     name: str = "swe"
-    description: str = "an autonomous AI programmer that interacts directly with the computer to solve tasks."
+    description: str | None = "an autonomous AI programmer that interacts directly with the computer to solve tasks."
 
-    system_prompt: str = SYSTEM_PROMPT
-    next_step_prompt: str = NEXT_STEP_TEMPLATE
+    system_prompt: str | None = SYSTEM_PROMPT
+    next_step_prompt: str | None = NEXT_STEP_TEMPLATE
 
     available_tools: ToolCollection = ToolCollection(
         Bash(), StrReplaceEditor(), Terminate()
@@ -28,6 +28,7 @@ async def think(self) -> bool:
         """Process current state and decide next action"""
         # Update working directory
         self.working_dir = (await self.bash.execute("pwd")).output.strip()
+        assert self.next_step_prompt is not None, "next_step_prompt is not set"
         self.next_step_prompt = self.next_step_prompt.format(
             current_dir=self.working_dir
         )
diff --git a/app/agent/toolcall.py b/app/agent/toolcall.py
@@ -22,11 +22,11 @@
 class ToolCallAgent(ReActAgent):
     """Base agent class for handling tool/function calls with enhanced abstraction"""
 
-    name = "toolcall"
-    description = "an agent that can execute tool calls."
+    name: str = "toolcall"
+    description: str | None = "an agent that can execute tool calls."
 
-    system_prompt = SYSTEM_PROMPT
-    next_step_prompt = NEXT_STEP_PROMPT
+    system_prompt: str | None = SYSTEM_PROMPT
+    next_step_prompt: str | None = NEXT_STEP_PROMPT
 
     available_tools: ToolCollection = ToolCollection(
         CreateChatCompletion(), Terminate()
diff --git a/app/tool/base.py b/app/tool/base.py
@@ -7,7 +7,7 @@
 class BaseTool(ABC, BaseModel):
     name: str
     description: str
-    parameters: dict | None = None
+    parameters: dict = Field(default_factory=dict)
 
     class Config:
         arbitrary_types_allowed = True
diff --git a/app/tool/bash.py b/app/tool/bash.py
@@ -117,7 +117,7 @@ class Bash(BaseTool):
 
     name: str = "bash"
     description: str = _BASH_DESCRIPTION
-    parameters = {
+    parameters: dict = {
         "type": "object",
         "properties": {
             "command": {
diff --git a/app/tool/browser_use_tool.py b/app/tool/browser_use_tool.py
@@ -52,7 +52,7 @@
 class BrowserUseTool(BaseTool, Generic[Context]):
     name: str = "browser_use"
     description: str = _BROWSER_DESCRIPTION
-    parameters = {
+    parameters: dict = {
         "type": "object",
         "properties": {
             "action": {
diff --git a/app/tool/create_chat_completion.py b/app/tool/create_chat_completion.py
@@ -1,5 +1,5 @@
 from types import NoneType
-from typing import Any, Type, Union, get_args, get_origin
+from typing import Any, Type, Union, cast, get_args, get_origin
 
 from pydantic import BaseModel, Field
 
@@ -26,6 +26,7 @@ class CreateChatCompletion(BaseTool):
 
     def __init__(self, response_type: Type | None = str):
         """Initialize with a specific response type."""
+        cast(Any, super().__init__)()
         self.response_type = response_type
         self.parameters = self._build_parameters()
 
diff --git a/app/tool/file_saver.py b/app/tool/file_saver.py
@@ -16,7 +16,7 @@ class FileSaver(BaseTool):
 Use this tool when you need to save text, code, or generated content to a file on the local filesystem.
 The tool accepts content and a file path, and saves the content to that location.
 """
-    parameters = {
+    parameters: dict = {
         "type": "object",
         "properties": {
             "content": {
diff --git a/app/tool/planning.py b/app/tool/planning.py
@@ -19,7 +19,7 @@ class PlanningTool(BaseTool):
 
     name: str = "planning"
     description: str = _PLANNING_TOOL_DESCRIPTION
-    parameters = {
+    parameters: dict = {
         "type": "object",
         "properties": {
             "command": {
diff --git a/app/tool/python_execute.py b/app/tool/python_execute.py
@@ -10,7 +10,7 @@ class PythonExecute(BaseTool):
 
     name: str = "python_execute"
     description: str = "Executes Python code string. Note: Only print outputs are visible, function return values are not captured. Use print statements to see results."
-    parameters = {
+    parameters: dict = {
         "type": "object",
         "properties": {
             "code": {
diff --git a/app/tool/str_replace_editor.py b/app/tool/str_replace_editor.py
@@ -60,7 +60,7 @@ class StrReplaceEditor(BaseTool):
 
     name: str = "str_replace_editor"
     description: str = _STR_REPLACE_EDITOR_DESCRIPTION
-    parameters = {
+    parameters: dict = {
         "type": "object",
         "properties": {
             "command": {
diff --git a/app/tool/terminal.py b/app/tool/terminal.py
@@ -14,7 +14,7 @@ class Terminal(BaseTool):
 Commands will be executed in the current working directory.
 Note: You MUST append a `sleep 0.05` to the end of the command for commands that will complete in under 50ms, as this will circumvent a known issue with the terminal tool where it will sometimes not return the output when the command completes too quickly.
 """
-    parameters = {
+    parameters: dict = {
         "type": "object",
         "properties": {
             "command": {
diff --git a/app/tool/terminate.py b/app/tool/terminate.py
@@ -8,7 +8,7 @@
 class Terminate(BaseTool):
     name: str = "terminate"
     description: str = _TERMINATE_DESCRIPTION
-    parameters = {
+    parameters: dict = {
         "type": "object",
         "properties": {
             "status": {
diff --git a/app/tool/tool_collection.py b/app/tool/tool_collection.py
@@ -1,6 +1,6 @@
 """Collection classes for managing multiple tools."""
 
-from typing import Any, Type, TypeVar
+from typing import Any, Type, TypeVar, cast
 
 from app.exceptions import ToolError
 from app.tool.base import BaseTool, ToolFailure, ToolResult
@@ -45,10 +45,13 @@ async def execute_all(self) -> list[ToolResult]:
                 results.append(ToolFailure(error=e.message))
         return results
 
-    def get_tool(self, name: Type[T]) -> T:
-        res = self.tool_map.get(name.name)
-        assert res is not None, f"Tool {name.name} is not defined"
-        assert isinstance(res, name), f"Tool {name.name} is not an instance of {name}"
+    def get_tool(self, tool_type: Type[T]) -> T:
+        name: str = cast(Any, tool_type)().name
+        res = self.tool_map.get(name)
+        assert res is not None, f"Tool {name} is not defined"
+        assert isinstance(
+            res, tool_type
+        ), f"Tool {name} is not an instance of {tool_type.__name__}"
         return res
 
     def add_tool(self, tool: BaseTool):
diff --git a/app/tool/web_search.py b/app/tool/web_search.py
@@ -18,7 +18,7 @@ class WebSearch(BaseTool):
     description: str = """Perform a web search and return a list of relevant links.
     This function attempts to use the primary search engine API to get up-to-date results.
     If an error occurs, it falls back to an alternative search engine."""
-    parameters = {
+    parameters: dict = {
         "type": "object",
         "properties": {
             "query": {
