优化 OpenManus 代码，1. 在异常处理系统中添加了OpenManusError基类和多个具体异常类型；2. 优化了配置管理，包括添加环境变量支持和配置验证功能；3. 重构了BaseAgent类，将状态管理和内存管理功能迁移到独立组件；4. 实现了ToolRegistry和ToolExecutor，支持工具的动态注册和异步执行；5. 优化了工具执行的并发控制和性能监控；6. 完善了提示词模板系统，支持多语言和版本控制。这些改进提高了代码的可维护性、可扩展性和性能。

Author: tinninhi

.gitignore

@@ -48,6 +48,9 @@ coverage.xml
 *.cover
 *.py,cover
 .hypothesis/
+
+# Configuration files
+config/config.toml
 .pytest_cache/
 cover/
 

app/agent/base.py

@@ -1,12 +1,13 @@
 from abc import ABC, abstractmethod
-from contextlib import asynccontextmanager
 from typing import List, Literal, Optional
 
 from pydantic import BaseModel, Field, model_validator
 
 from app.llm import LLM
 from app.logger import logger
-from app.schema import AgentState, Memory, Message
+from app.schema import Message
+from .components.state_manager import StateManager, AgentState
+from .components.memory_manager import MemoryManager
 
 
 class BaseAgent(BaseModel, ABC):
@@ -30,16 +31,14 @@ class BaseAgent(BaseModel, ABC):
 
     # Dependencies
     llm: LLM = Field(default_factory=LLM, description="Language model instance")
-    memory: Memory = Field(default_factory=Memory, description="Agent's memory store")
-    state: AgentState = Field(
-        default=AgentState.IDLE, description="Current agent state"
-    )
+    memory: MemoryManager = Field(default_factory=MemoryManager, description="Agent's memory store")
+    state_manager: StateManager = Field(default_factory=StateManager, description="Agent's state manager")
 
     # Execution control
     max_steps: int = Field(default=10, description="Maximum steps before termination")
     current_step: int = Field(default=0, description="Current step in execution")
 
-    duplicate_threshold: int = 2
+
 
     class Config:
         arbitrary_types_allowed = True
@@ -50,35 +49,21 @@ def initialize_agent(self) -> "BaseAgent":
         """Initialize agent with default settings if not provided."""
         if self.llm is None or not isinstance(self.llm, LLM):
             self.llm = LLM(config_name=self.name.lower())
-        if not isinstance(self.memory, Memory):
-            self.memory = Memory()
+        if not isinstance(self.memory, MemoryManager):
+            self.memory = MemoryManager()
+        if not isinstance(self.state_manager, StateManager):
+            self.state_manager = StateManager()
         return self
 
-    @asynccontextmanager
-    async def state_context(self, new_state: AgentState):
-        """Context manager for safe agent state transitions.
-
-        Args:
-            new_state: The state to transition to during the context.
-
-        Yields:
-            None: Allows execution within the new state.
+    @property
+    def state(self) -> AgentState:
+        """Get the current agent state."""
+        return self.state_manager.state
 
-        Raises:
-            ValueError: If the new_state is invalid.
-        """
-        if not isinstance(new_state, AgentState):
-            raise ValueError(f"Invalid state: {new_state}")
-
-        previous_state = self.state
-        self.state = new_state
-        try:
-            yield
-        except Exception as e:
-            self.state = AgentState.ERROR  # Transition to ERROR on failure
-            raise e
-        finally:
-            self.state = previous_state  # Revert to previous state
+    @state.setter
+    def state(self, new_state: AgentState):
+        """Set the agent state."""
+        self.state_manager.state = new_state
 
     def update_memory(
         self,
@@ -129,7 +114,7 @@ async def run(self, request: Optional[str] = None) -> str:
             self.update_memory("user", request)
 
         results: List[str] = []
-        async with self.state_context(AgentState.RUNNING):
+        async with self.state_manager.state_context(AgentState.RUNNING):
             while (
                 self.current_step < self.max_steps and self.state != AgentState.FINISHED
             ):
@@ -162,24 +147,6 @@ def handle_stuck_state(self):
         self.next_step_prompt = f"{stuck_prompt}\n{self.next_step_prompt}"
         logger.warning(f"Agent detected stuck state. Added prompt: {stuck_prompt}")
 
-    def is_stuck(self) -> bool:
-        """Check if the agent is stuck in a loop by detecting duplicate content"""
-        if len(self.memory.messages) < 2:
-            return False
-
-        last_message = self.memory.messages[-1]
-        if not last_message.content:
-            return False
-
-        # Count identical content occurrences
-        duplicate_count = sum(
-            1
-            for msg in reversed(self.memory.messages[:-1])
-            if msg.role == "assistant" and msg.content == last_message.content
-        )
-
-        return duplicate_count >= self.duplicate_threshold
-
     @property
     def messages(self) -> List[Message]:
         """Retrieve a list of messages from the agent's memory."""
@@ -189,3 +156,7 @@ def messages(self) -> List[Message]:
     def messages(self, value: List[Message]):
         """Set the list of messages in the agent's memory."""
         self.memory.messages = value
+
+    def is_stuck(self) -> bool:
+        """Check if the agent is stuck in a loop by detecting duplicate content."""
+        return self.memory.is_stuck()

app/agent/components/__init__.py

@@ -0,0 +1 @@
+# Components module for agent functionality

app/agent/components/memory_manager.py

@@ -0,0 +1,83 @@
+from typing import List, Optional
+from pydantic import BaseModel
+from app.schema import Message
+from loguru import logger
+
+class MemoryManager(BaseModel):
+    """Manages agent memory operations and message history.
+    
+    Provides functionality for storing, retrieving, and managing messages
+    in the agent's memory with built-in duplicate detection.
+    """
+    
+    messages: List[Message] = []
+    duplicate_threshold: int = 2
+    
+    def add_message(self, message: Message) -> None:
+        """Add a message to memory with logging.
+        
+        Args:
+            message: The message to add to memory.
+        """
+        self.messages.append(message)
+        logger.debug(f"Added {message.role} message to memory")
+    
+    def get_last_message(self) -> Optional[Message]:
+        """Retrieve the most recent message from memory.
+        
+        Returns:
+            The last message if memory is not empty, None otherwise.
+        """
+        return self.messages[-1] if self.messages else None
+    
+    def clear(self) -> None:
+        """Clear all messages from memory."""
+        self.messages.clear()
+        logger.debug("Cleared memory")
+    
+    def is_stuck(self) -> bool:
+        """Check if the agent is stuck in a loop by detecting duplicate content.
+        
+        Returns:
+            bool: True if duplicate content threshold is reached, False otherwise.
+        """
+        if len(self.messages) < 2:
+            return False
+            
+        last_message = self.get_last_message()
+        if not last_message or not last_message.content:
+            return False
+            
+        # Count identical content occurrences
+        duplicate_count = sum(
+            1
+            for msg in reversed(self.messages[:-1])
+            if msg.role == "assistant" and msg.content == last_message.content
+        )
+        
+        return duplicate_count >= self.duplicate_threshold
+    
+    def get_context_window(self, window_size: int = 5) -> List[Message]:
+        """Get the most recent messages within a context window.
+        
+        Args:
+            window_size: Number of recent messages to include.
+            
+        Returns:
+            List of most recent messages up to window_size.
+        """
+        return self.messages[-window_size:] if len(self.messages) > window_size else self.messages.copy()
+    
+    def search_messages(self, query: str) -> List[Message]:
+        """Search messages containing the query string.
+        
+        Args:
+            query: String to search for in message content.
+            
+        Returns:
+            List of messages containing the query string.
+        """
+        return [msg for msg in self.messages if query.lower() in msg.content.lower()]
+    
+    class Config:
+        arbitrary_types_allowed = True

app/agent/components/state_manager.py

@@ -0,0 +1,90 @@
+from enum import Enum
+from contextlib import asynccontextmanager
+from typing import Optional
+from loguru import logger
+
+class AgentState(Enum):
+    """Enumeration of possible agent states."""
+    IDLE = "idle"
+    RUNNING = "running"
+    FINISHED = "finished"
+    ERROR = "error"
+    PAUSED = "paused"
+
+class StateManager:
+    """Manages agent state transitions and state-related operations.
+    
+    Provides a clean interface for state management with safety checks
+    and logging of state transitions.
+    """
+    
+    def __init__(self):
+        self._state = AgentState.IDLE
+        self._previous_state: Optional[AgentState] = None
+    
+    @property
+    def state(self) -> AgentState:
+        """Get the current agent state."""
+        return self._state
+    
+    @state.setter
+    def state(self, new_state: AgentState):
+        """Set the agent state with validation and logging."""
+        if not isinstance(new_state, AgentState):
+            raise ValueError(f"Invalid state: {new_state}")
+        
+        if new_state != self._state:
+            logger.debug(f"State transition: {self._state.value} -> {new_state.value}")
+            self._previous_state = self._state
+            self._state = new_state
+    
+    @asynccontextmanager
+    async def state_context(self, new_state: AgentState):
+        """Context manager for temporary state transitions.
+        
+        Args:
+            new_state: The state to transition to during the context.
+            
+        Yields:
+            None: Allows execution within the new state.
+            
+        Raises:
+            ValueError: If the new_state is invalid.
+        """
+        if not isinstance(new_state, AgentState):
+            raise ValueError(f"Invalid state: {new_state}")
+        
+        previous_state = self._state
+        self.state = new_state
+        try:
+            yield
+        except Exception as e:
+            self.state = AgentState.ERROR
+            raise e
+        finally:
+            self.state = previous_state
+    
+    def can_transition_to(self, target_state: AgentState) -> bool:
+        """Check if transitioning to the target state is valid.
+        
+        Args:
+            target_state: The state to check transition possibility.
+            
+        Returns:
+            bool: True if the transition is valid, False otherwise.
+        """
+        # Define valid state transitions
+        valid_transitions = {
+            AgentState.IDLE: [AgentState.RUNNING],
+            AgentState.RUNNING: [AgentState.FINISHED, AgentState.PAUSED, AgentState.ERROR],
+            AgentState.PAUSED: [AgentState.RUNNING, AgentState.FINISHED],
+            AgentState.ERROR: [AgentState.IDLE],
+            AgentState.FINISHED: [AgentState.IDLE]
+        }
+        
+        return target_state in valid_transitions.get(self._state, [])
+    
+    def reset(self):
+        """Reset the state manager to initial state."""
+        self._state = AgentState.IDLE
+        self._previous_state = None

app/agent/manus.py

@@ -32,3 +32,13 @@ class Manus(ToolCallAgent):
             PythonExecute(), GoogleSearch(), BrowserUseTool(), FileSaver(), Terminate()
         )
     )
+
+    def __init__(self, **data):
+        super().__init__(**data)
+        self._initialize_state_context()
+
+    def _initialize_state_context(self):
+        """Initialize state context and related attributes."""
+        if not hasattr(self, 'state_manager'):
+            self.state_manager = StateManager()
+        self.state_context = self.state_manager.state_context

app/agent/react.py

@@ -5,7 +5,8 @@
 
 from app.agent.base import BaseAgent
 from app.llm import LLM
-from app.schema import AgentState, Memory
+from app.schema import Memory
+from app.agent.components.state_manager import AgentState
 
 
 class ReActAgent(BaseAgent, ABC):
@@ -17,7 +18,7 @@ class ReActAgent(BaseAgent, ABC):
 
     llm: Optional[LLM] = Field(default_factory=LLM)
     memory: Memory = Field(default_factory=Memory)
-    state: AgentState = AgentState.IDLE
+    # 移除直接定义的state属性，使用BaseAgent中的state_manager
 
     max_steps: int = 10
     current_step: int = 0

app/agent/toolcall.py

@@ -6,7 +6,8 @@
 from app.agent.react import ReActAgent
 from app.logger import logger
 from app.prompt.toolcall import NEXT_STEP_PROMPT, SYSTEM_PROMPT
-from app.schema import AgentState, Message, ToolCall
+from app.schema import Message, ToolCall
+from app.agent.components.state_manager import AgentState
 from app.tool import CreateChatCompletion, Terminate, ToolCollection