auto-coder 0.1.400__py3-none-any.whl → 2.0.0__py3-none-any.whl

autocoder/agent/base_agentic/default_tools.py

@@ -13,7 +13,7 @@ from .types import (
     ExecuteCommandTool, ReadFileTool, WriteToFileTool, ReplaceInFileTool,
     SearchFilesTool, ListFilesTool, AskFollowupQuestionTool,
     AttemptCompletionTool, PlanModeRespondTool, UseMcpTool,
-    TalkToTool, TalkToGroupTool
+    TalkToTool, TalkToGroupTool, ToolDefinition
 )
 
 # Import all resolvers
@@ -530,163 +530,164 @@ def register_default_tools(params: Dict[str, Any], default_tools_list: Optional[
     tool_desc_gen = ToolDescGenerators(params)
     tool_examples_gen = ToolExampleGenerators(params)
 
-    # 统一的工具定义数据结构
+    # 使用 Pydantic 模型定义工具
     DEFAULT_TOOLS = {
-        "execute_command": {
-            "tool_cls": ExecuteCommandTool,
-            "resolver_cls": ExecuteCommandToolResolver,
-            "description": ToolDescription(
+        "execute_command": ToolDefinition(
+            tool_cls=ExecuteCommandTool,
+            resolver_cls=ExecuteCommandToolResolver,
+            description=ToolDescription(
                 description=tool_desc_gen.execute_command.prompt(),
             ),
-            "example": ToolExample(
+            example=ToolExample(
                 title="Requesting to execute a command",
                 body=tool_examples_gen.example_1.prompt()
             ),
-            "use_guideline": "",
-            "category": "system",
-            "is_default": True,
-            "case_docs": []
-        },
-        "read_file": {
-            "tool_cls": ReadFileTool,
-            "resolver_cls": ReadFileToolResolver,
-            "description": ToolDescription(
+            use_guideline="",
+            category="system",
+            is_default=True,
+            case_docs=[]
+        ),
+        "read_file": ToolDefinition(
+            tool_cls=ReadFileTool,
+            resolver_cls=ReadFileToolResolver,
+            description=ToolDescription(
                 description=tool_desc_gen.read_file.prompt(),
             ),
-            "use_guideline": "",
-            "category": "file_operation",
-            "is_default": True,
-            "case_docs": []
-        },
-        "write_to_file": {
-            "tool_cls": WriteToFileTool,
-            "resolver_cls": WriteToFileToolResolver,
-            "description": ToolDescription(
+            use_guideline="",
+            category="file_operation",
+            is_default=True,
+            case_docs=[]
+        ),
+        "write_to_file": ToolDefinition(
+            tool_cls=WriteToFileTool,
+            resolver_cls=WriteToFileToolResolver,
+            description=ToolDescription(
                 description=tool_desc_gen.write_to_file.prompt(),
             ),
-            "example": ToolExample(
+            example=ToolExample(
                 title="Requesting to create a new file",
                 body=tool_examples_gen.example_2.prompt()
             ),
-            "use_guideline": "",
-            "category": "file_operation",
-            "is_default": True,
-            "case_docs": ["editing_files"]
-        },
-        "replace_in_file": {
-            "tool_cls": ReplaceInFileTool,
-            "resolver_cls": ReplaceInFileToolResolver,
-            "description": ToolDescription(
+            use_guideline="",
+            category="file_operation",
+            is_default=True,
+            case_docs=["editing_files"]
+        ),
+        "replace_in_file": ToolDefinition(
+            tool_cls=ReplaceInFileTool,
+            resolver_cls=ReplaceInFileToolResolver,
+            description=ToolDescription(
                 description=tool_desc_gen.replace_in_file.prompt(),
             ),
-            "use_guideline": "",
-            "example": ToolExample(
+            use_guideline="",
+            example=ToolExample(
                 title="Requesting to make targeted edits to a file",
                 body=tool_examples_gen.example_3.prompt()
             ),
-            "category": "file_operation",
-            "is_default": True,
-            "case_docs": ["editing_files"]
-        },
-        "search_files": {
-            "tool_cls": SearchFilesTool,
-            "resolver_cls": SearchFilesToolResolver,
-            "description": ToolDescription(
+            category="file_operation",
+            is_default=True,
+            case_docs=["editing_files"]
+        ),
+        "search_files": ToolDefinition(
+            tool_cls=SearchFilesTool,
+            resolver_cls=SearchFilesToolResolver,
+            description=ToolDescription(
                 description=tool_desc_gen.search_files.prompt(),
             ),
-            "use_guideline": "",
-            "category": "file_operation",
-            "is_default": True,
-            "case_docs": []
-        },
-        "list_files": {
-            "tool_cls": ListFilesTool,
-            "resolver_cls": ListFilesToolResolver,
-            "description": ToolDescription(
+            use_guideline="",
+            category="file_operation",
+            is_default=True,
+            case_docs=[]
+        ),
+        "list_files": ToolDefinition(
+            tool_cls=ListFilesTool,
+            resolver_cls=ListFilesToolResolver,
+            description=ToolDescription(
                 description=tool_desc_gen.list_files.prompt(),
             ),
-            "use_guideline": "",
-            "category": "file_operation",
-            "is_default": True,
-            "case_docs": []
-        },
-        "ask_followup_question": {
-            "tool_cls": AskFollowupQuestionTool,
-            "resolver_cls": AskFollowupQuestionToolResolver,
-            "description": ToolDescription(
+            use_guideline="",
+            category="file_operation",
+            is_default=True,
+            case_docs=[]
+        ),
+        "ask_followup_question": ToolDefinition(
+            tool_cls=AskFollowupQuestionTool,
+            resolver_cls=AskFollowupQuestionToolResolver,
+            description=ToolDescription(
                 description=tool_desc_gen.ask_followup_question.prompt(),
             ),
-            "use_guideline": "",
-            "category": "interaction",
-            "is_default": True,
-            "case_docs": []
-        },
-        "attempt_completion": {
-            "tool_cls": AttemptCompletionTool,
-            "resolver_cls": AttemptCompletionToolResolver,
-            "description": ToolDescription(
+            use_guideline="",
+            category="interaction",
+            is_default=True,
+            case_docs=[]
+        ),
+        "attempt_completion": ToolDefinition(
+            tool_cls=AttemptCompletionTool,
+            resolver_cls=AttemptCompletionToolResolver,
+            description=ToolDescription(
                 description=tool_desc_gen.attempt_completion.prompt(),
             ),
-            "use_guideline": "",
-            "category": "interaction",
-            "is_default": True,
-            "case_docs": []
-        },
-        "plan_mode_respond": {
-            "tool_cls": PlanModeRespondTool,
-            "resolver_cls": PlanModeRespondToolResolver,
-            "description": ToolDescription(
+            use_guideline="",
+            category="interaction",
+            is_default=True,
+            case_docs=[]
+        ),
+        "plan_mode_respond": ToolDefinition(
+            tool_cls=PlanModeRespondTool,
+            resolver_cls=PlanModeRespondToolResolver,
+            description=ToolDescription(
                 description=tool_desc_gen.plan_mode_respond.prompt(),
             ),
-            "use_guideline": "",
-            "category": "interaction",
-            "is_default": True,
-            "case_docs": []
-        },
-        "use_mcp_tool": {
-            "tool_cls": UseMcpTool,
-            "resolver_cls": UseMcpToolResolver,
-            "description": ToolDescription(
+            use_guideline="",
+            category="interaction",
+            is_default=True,
+            case_docs=[]
+        ),
+        "use_mcp_tool": ToolDefinition(
+            tool_cls=UseMcpTool,
+            resolver_cls=UseMcpToolResolver,
+            description=ToolDescription(
                 description=tool_desc_gen.use_mcp_tool.prompt(),
             ),
-            "example": ToolExample(
+            example=ToolExample(
                 title="Another example of using an MCP tool (where the server name is a unique identifier listed in MCP_SERVER_LIST)",
                 body=tool_examples_gen.example_4.prompt()
             ),
-            "use_guideline": "",
-            "category": "external",
-            "is_default": True,
-            "case_docs": []
-        },
-        "talk_to": {
-            "tool_cls": TalkToTool,
-            "resolver_cls": TalkToToolResolver,
-            "description": ToolDescription(
+            use_guideline="",
+            category="external",
+            is_default=True,
+            case_docs=[]
+        ),
+        "talk_to": ToolDefinition(
+            tool_cls=TalkToTool,
+            resolver_cls=TalkToToolResolver,
+            description=ToolDescription(
                 description=tool_desc_gen.talk_to.prompt(),
             ),
-            "use_guideline": "",
-            "category": "interaction",
-            "is_default": True,
-            "case_docs": []
-        },
-        "talk_to_group": {
-            "tool_cls": TalkToGroupTool,
-            "resolver_cls": TalkToGroupToolResolver,
-            "description": ToolDescription(
+            use_guideline="",
+            category="interaction",
+            is_default=True,
+            case_docs=[]
+        ),
+        "talk_to_group": ToolDefinition(
+            tool_cls=TalkToGroupTool,
+            resolver_cls=TalkToGroupToolResolver,
+            description=ToolDescription(
                 description=tool_desc_gen.talk_to_group_description.prompt(),
             ),
-            "use_guideline": "",
-            "category": "interaction",
-            "is_default": True,
-            "case_docs": []
-        }
+            use_guideline="",
+            category="interaction",
+            is_default=True,
+            case_docs=[]
+        )
     }
-    # 先使用统一的工具注册方法注册工具
+    
+    # 直接传递 ToolDefinition 对象进行注册
     registered_count = 0
-    for tool_tag, tool_info in DEFAULT_TOOLS.items():
+    for tool_tag, tool_definition in DEFAULT_TOOLS.items():
         # attempt_completion 工具是必须注册的
         if tool_tag == "attempt_completion":
-            ToolRegistry.register_unified_tool(tool_tag, tool_info)
+            ToolRegistry.register_unified_tool(tool_tag, tool_definition)
             registered_count += 1
             continue
             
@@ -694,7 +695,7 @@ def register_default_tools(params: Dict[str, Any], default_tools_list: Optional[
         if default_tools_list is not None and tool_tag not in default_tools_list:
             continue
             
-        ToolRegistry.register_unified_tool(tool_tag, tool_info)
+        ToolRegistry.register_unified_tool(tool_tag, tool_definition)
         registered_count += 1        
 
     logger.info(

autocoder/agent/base_agentic/test_base_agent.py

@@ -51,7 +51,7 @@ def setup_file_monitor(temp_test_dir):
     
     # 加载规则文件
     try:
-        from autocoder.common.rulefiles.autocoderrules_utils import get_rules, reset_rules_manager
+        from autocoder.common.rulefiles import get_rules, reset_rules_manager
         reset_rules_manager()  # 重置规则管理器，确保测试隔离性
         rules = get_rules(temp_test_dir)
         print(f"已加载规则: {len(rules)} 条")

autocoder/agent/base_agentic/tool_registry.py

@@ -1,7 +1,7 @@
-from typing import Dict, Type, ClassVar, Optional, List
+from typing import Dict, Type, ClassVar, Optional, List, Union
 import logging
 import inspect
-from .types import BaseTool, ToolDescription, ToolExample
+from .types import BaseTool, ToolDescription, ToolExample, ToolDefinition
 from .tools.base_tool_resolver import BaseToolResolver
 
 from loguru import logger
@@ -99,30 +99,42 @@ class ToolRegistry:
         logger.info(f"成功注册工具用例文档: {case_name}, 包含工具: {', '.join(tools)}")
     
     @classmethod
-    def register_unified_tool(cls, tool_tag: str, tool_info: Dict) -> None:
+    def register_unified_tool(cls, tool_tag: str, tool_info: Union[ToolDefinition, Dict]) -> None:
         """
         统一注册工具的所有相关信息
 
         Args:
             tool_tag: 工具标签
-            tool_info: 工具信息字典，包含以下字段：
-                - tool_cls: 工具类
-                - resolver_cls: 解析器类
-                - description: 工具描述对象
-                - example: 工具示例对象
-                - use_guideline: 工具使用指南（可选）
-                - category: 工具分类（可选）
-                - is_default: 是否为默认工具（可选，默认为False）
-                - case_docs: 关联的用例文档列表（可选）
-        """
+            tool_info: 工具信息，可以是：
+                - ToolDefinition 对象
+                - 工具信息字典，包含以下字段：
+                    - tool_cls: 工具类
+                    - resolver_cls: 解析器类
+                    - description: 工具描述对象
+                    - example: 工具示例对象
+                    - use_guideline: 工具使用指南（可选）
+                    - category: 工具分类（可选）
+                    - is_default: 是否为默认工具（可选，默认为False）
+                    - case_docs: 关联的用例文档列表（可选）
+        """
+        # 如果是字典，转换为 ToolDefinition 对象以进行验证
+        if isinstance(tool_info, dict):
+            try:
+                tool_definition = ToolDefinition(**tool_info)
+            except Exception as e:
+                logger.error(f"注册工具 {tool_tag} 失败：无法创建 ToolDefinition 对象 - {e}")
+                return
+        else:
+            tool_definition = tool_info
+        
         # 提取工具信息
-        tool_cls = tool_info.get("tool_cls")
-        resolver_cls = tool_info.get("resolver_cls")
-        description = tool_info.get("description")
-        example = tool_info.get("example")
-        use_guideline = tool_info.get("use_guideline", "")
-        is_default = tool_info.get("is_default", False)
-        case_docs = tool_info.get("case_docs", [])
+        tool_cls = tool_definition.tool_cls
+        resolver_cls = tool_definition.resolver_cls
+        description = tool_definition.description
+        example = tool_definition.example
+        use_guideline = tool_definition.use_guideline
+        is_default = tool_definition.is_default
+        case_docs = tool_definition.case_docs
         
         # 验证必要字段
         if not all([tool_cls, resolver_cls, description]):

autocoder/agent/base_agentic/tools/read_file_tool_resolver.py

@@ -1,13 +1,14 @@
 import os
 from typing import Dict, Any, Optional
+from autocoder.common.autocoderargs_parser import AutoCoderArgsParser
 from autocoder.agent.base_agentic.tools.base_tool_resolver import BaseToolResolver
 from autocoder.agent.base_agentic.types import ReadFileTool, ToolResult  # Import ToolResult from types
 from loguru import logger
 import typing
 from autocoder.common import AutoCoderArgs
-from autocoder.common.context_pruner import PruneContext
+from autocoder.common.pruner.context_pruner import PruneContext
 from autocoder.common import SourceCode
-from autocoder.rag.token_counter import count_tokens
+from autocoder.common.tokens import count_string_tokens as count_tokens
 from loguru import logger
 import typing
 from autocoder.rag.loaders import (
@@ -25,12 +26,31 @@ class ReadFileToolResolver(BaseToolResolver):
         super().__init__(agent, tool, args)
         self.tool: ReadFileTool = tool  # For type hinting
         self.shadow_manager = self.agent.shadow_manager if self.agent else None
+        
+        # Initialize AutoCoderArgs parser for flexible parameter parsing
+        self.args_parser = AutoCoderArgsParser()
+        
+        # 解析 context_prune_safe_zone_tokens 参数
+        parsed_safe_zone_tokens = self._get_parsed_safe_zone_tokens()
+        
         self.context_pruner = PruneContext(
-            max_tokens=self.args.context_prune_safe_zone_tokens,
+            max_tokens=parsed_safe_zone_tokens,
             args=self.args,
             llm=self.agent.context_prune_llm
         )
 
+    def _get_parsed_safe_zone_tokens(self) -> int:
+        """
+        解析 context_prune_safe_zone_tokens 参数，支持多种格式
+        
+        Returns:
+            解析后的 token 数量
+        """
+        return self.args_parser.parse_context_prune_safe_zone_tokens(
+            self.args.context_prune_safe_zone_tokens,
+            self.args.code_model
+        )
+
     def _prune_file_content(self, content: str, file_path: str) -> str:
         """对文件内容进行剪枝处理"""
         if not self.context_pruner:
@@ -38,7 +58,8 @@ class ReadFileToolResolver(BaseToolResolver):
 
         # 计算 token 数量
         tokens = count_tokens(content)
-        if tokens <= self.args.context_prune_safe_zone_tokens:
+        parsed_safe_zone_tokens = self._get_parsed_safe_zone_tokens()
+        if tokens <= parsed_safe_zone_tokens:
             return content
 
         # 创建 SourceCode 对象

autocoder/agent/base_agentic/tools/write_to_file_tool_resolver.py

@@ -76,22 +76,33 @@ class WriteToFileToolResolver(BaseToolResolver):
         return "\n".join(formatted_issues)
     
 
-    def write_file_normal(self, file_path: str, content: str, source_dir: str, abs_project_dir: str, abs_file_path: str) -> ToolResult:
+    def write_file_normal(self, file_path: str, content: str, source_dir: str, abs_project_dir: str, abs_file_path: str, mode: str = "write") -> ToolResult:
         """Write file directly without using shadow manager"""
         try:
-            os.makedirs(os.path.dirname(abs_file_path), exist_ok=True)            
+            os.makedirs(os.path.dirname(abs_file_path), exist_ok=True)
+
+            is_new = not os.path.exists(abs_file_path)
+            new_content_to_write = content
+            if mode == "append" and not is_new:
+                try:
+                    with open(abs_file_path, 'r', encoding='utf-8') as f:
+                        existing_content = f.read()
+                except Exception:
+                    existing_content = ""
+                new_content_to_write = f"{existing_content}{content}"
 
             if self.agent:
                 rel_path = os.path.relpath(abs_file_path, abs_project_dir)
-                self.agent.record_file_change(rel_path, "added", diff=None, content=content)
+                change_type = "added" if is_new else "modified"
+                self.agent.record_file_change(rel_path, change_type, diff=None, content=new_content_to_write)
 
             if self.agent and self.agent.checkpoint_manager:
                 changes = {
                     file_path: CheckpointFileChange(
                         file_path=file_path,
-                        content=content,
+                        content=new_content_to_write,
                         is_deletion=False,
-                        is_new=True
+                        is_new=is_new
                     )
                 }
                 change_group_id = self.args.event_file
@@ -101,11 +112,13 @@ class WriteToFileToolResolver(BaseToolResolver):
                             conversations=self.agent.current_conversations,
                             change_group_id=change_group_id,
                             metadata={"event_file": self.args.event_file}
-                        )                    
+                        )
             else:
-                with open(abs_file_path, 'w', encoding='utf-8') as f:
-                    f.write(content)
-            logger.info(f"Successfully wrote to file: {file_path}")    
+                open_mode = 'a' if (mode == "append" and not is_new) else 'w'
+                with open(abs_file_path, open_mode, encoding='utf-8') as f:
+                    f.write(content if open_mode == 'a' else new_content_to_write)
+            action_text = "appended to" if (mode == "append" and not is_new) else "wrote to"
+            logger.info(f"Successfully {action_text} file: {file_path}")
             
             # 新增：执行代码质量检查
             lint_results = None
@@ -167,5 +180,5 @@ class WriteToFileToolResolver(BaseToolResolver):
         # Security check: ensure the path is within the source directory
         if not abs_file_path.startswith(abs_project_dir):
             return ToolResult(success=False, message=f"Error: Access denied. Attempted to write file outside the project directory: {file_path}")
-                
-        return self.write_file_normal(file_path, content, source_dir, abs_project_dir, abs_file_path)
+        mode = getattr(self.tool, "mode", "write")
+        return self.write_file_normal(file_path, content, source_dir, abs_project_dir, abs_file_path, mode=mode)

autocoder/agent/base_agentic/types.py

@@ -2,6 +2,25 @@ from pydantic import BaseModel, SkipValidation
 from typing import List, Dict, Any, Optional, Type, Union, Tuple, Generator, Literal
 
 
+# 对话配置类
+class ConversationAction(BaseModel):
+    """对话动作配置"""
+    action: str
+    conversation_name: Optional[str] = None
+    conversation_id: Optional[str] = None
+
+
+class AgenticEditConversationConfig(BaseModel):
+    """代理编辑对话配置"""
+    conversation_name: Optional[str] = "current"
+    conversation_id: Optional[str] = None
+    action: Optional[str] = None
+    query: Optional[str] = None
+    pull_request: bool = False
+    pre_commit: bool = False
+    post_commit: bool = False
+
+
 # 工具结果类，由工具解析器使用
 class ToolResult(BaseModel):
     """
@@ -30,6 +49,7 @@ class ReadFileTool(BaseTool):
 class WriteToFileTool(BaseTool):
     path: str
     content: str
+    mode: str = "write"  # "write" or "append"
 
 class ReplaceInFileTool(BaseTool):
     path: str
@@ -90,6 +110,23 @@ class ToolExample(BaseModel):
     body: str   # 示例内容
 
 
+class ToolDefinition(BaseModel):
+    """
+    工具定义模型，用于统一管理工具配置
+    """
+    tool_cls: Type[BaseTool]  # 工具类
+    resolver_cls: Type  # 解析器类
+    description: ToolDescription  # 工具描述
+    example: Optional[ToolExample] = None  # 工具示例（可选）
+    use_guideline: str = ""  # 使用指南
+    category: str = "general"  # 工具分类
+    is_default: bool = False  # 是否为默认工具
+    case_docs: List[str] = []  # 相关用例文档
+    
+    class Config:
+        arbitrary_types_allowed = True  # 允许任意类型（如 Type）
+
+
 class RoleDescription(BaseModel):
     """
     代理角色描述
@@ -136,6 +173,10 @@ class ErrorEvent(BaseModel):
     """表示过程中的错误"""
     message: str
 
+class RetryEvent(BaseModel):
+    """表示需要重试的事件，通常在流处理未完成时触发"""
+    message: str
+
 class PlanModeRespondEvent(BaseModel):
     """Represents the LLM attempting to complete the task."""
     completion: SkipValidation[PlanModeRespondTool] # Skip validation
@@ -151,6 +192,7 @@ AgentEvent = Union[
     TokenUsageEvent,
     CompletionEvent,
     ErrorEvent,
+    RetryEvent,
     PlanModeRespondEvent
 ]