auto-coder 0.1.379__tar.gz → 0.1.381__tar.gz

{auto_coder-0.1.379 → auto_coder-0.1.381}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.379
+Version: 0.1.381
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10
@@ -43,6 +43,7 @@ Requires-Dist: python-docx
 Requires-Dist: docx2txt
 Requires-Dist: pdf2image
 Requires-Dist: docx2pdf
+Requires-Dist: pypdf
 Requires-Dist: pyperclip
 Requires-Dist: colorama
 Requires-Dist: pylint

{auto_coder-0.1.379 → auto_coder-0.1.381}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.379
+Version: 0.1.381
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10
@@ -43,6 +43,7 @@ Requires-Dist: python-docx
 Requires-Dist: docx2txt
 Requires-Dist: pdf2image
 Requires-Dist: docx2pdf
+Requires-Dist: pypdf
 Requires-Dist: pyperclip
 Requires-Dist: colorama
 Requires-Dist: pylint

{auto_coder-0.1.379 → auto_coder-0.1.381}/src/auto_coder.egg-info/SOURCES.txt

@@ -196,6 +196,7 @@ src/autocoder/common/v2/agent/agentic_edit_tools/plan_mode_respond_tool_resolver
 src/autocoder/common/v2/agent/agentic_edit_tools/read_file_tool_resolver.py
 src/autocoder/common/v2/agent/agentic_edit_tools/replace_in_file_tool_resolver.py
 src/autocoder/common/v2/agent/agentic_edit_tools/search_files_tool_resolver.py
+src/autocoder/common/v2/agent/agentic_edit_tools/test_execute_command_tool_resolver.py
 src/autocoder/common/v2/agent/agentic_edit_tools/test_search_files_tool_resolver.py
 src/autocoder/common/v2/agent/agentic_edit_tools/test_write_to_file_tool_resolver.py
 src/autocoder/common/v2/agent/agentic_edit_tools/use_mcp_tool_resolver.py
@@ -249,6 +250,9 @@ src/autocoder/linters/normal_linter.py
 src/autocoder/linters/python_linter.py
 src/autocoder/linters/reactjs_linter.py
 src/autocoder/linters/shadow_linter.py
+src/autocoder/linters/test_python_linter.py
+src/autocoder/linters/test_reactjs_linter.py
+src/autocoder/linters/test_vue_linter.py
 src/autocoder/linters/vue_linter.py
 src/autocoder/memory/__init__.py
 src/autocoder/memory/active_context_manager.py

{auto_coder-0.1.379 → auto_coder-0.1.381}/src/auto_coder.egg-info/requires.txt

@@ -33,6 +33,7 @@ python-docx
 docx2txt
 pdf2image
 docx2pdf
+pypdf
 pyperclip
 colorama
 pylint

{auto_coder-0.1.379 → auto_coder-0.1.381}/src/autocoder/agent/base_agentic/tools/execute_command_tool_resolver.py

@@ -19,7 +19,6 @@ class ExecuteCommandToolResolver(BaseToolResolver):
         self.tool: ExecuteCommandTool = tool # For type hinting
 
     def resolve(self) -> ToolResult:
-        printer = Printer()
         command = self.tool.command
         requires_approval = self.tool.requires_approval
         source_dir = self.args.source_dir or "."
@@ -35,11 +34,11 @@ class ExecuteCommandToolResolver(BaseToolResolver):
         # Approval mechanism (simplified)
         if requires_approval:
              # In a real scenario, this would involve user interaction
-             printer.print_str_in_terminal(f"Command requires approval: {command}")
+             logger.info(f"Command requires approval: {command}")
              # For now, let's assume approval is granted in non-interactive mode or handled elsewhere
              pass
 
-        printer.print_str_in_terminal(f"Executing command: {command} in {os.path.abspath(source_dir)}")
+        logger.info(f"Executing command: {command} in {os.path.abspath(source_dir)}")
         try:            
             # 使用封装的run_cmd方法执行命令
             if get_run_context().is_web():

{auto_coder-0.1.379 → auto_coder-0.1.381}/src/autocoder/common/command_file_manager/manager.py

@@ -37,7 +37,7 @@ class CommandManager:
             os.makedirs(self.commands_dir, exist_ok=True)
             logger.info(f"已创建命令目录: {self.commands_dir}")
     
-    def list_command_files(self, recursive: bool = False) -> ListCommandsResult:
+    def list_command_files(self, recursive: bool = True) -> ListCommandsResult:
         """
         列出命令目录中的所有命令文件
         

{auto_coder-0.1.379 → auto_coder-0.1.381}/src/autocoder/common/v2/agent/agentic_edit.py

@@ -391,20 +391,7 @@ class AgenticEdit:
         Your final result description here
         </result>
         <command>Command to demonstrate result (optional)</command>
-        </attempt_completion>
-
-        ## plan_mode_respond
-        Description: Respond to the user's inquiry in an effort to plan a solution to the user's task. This tool should be used when you need to provide a response to a question or statement from the user about how you plan to accomplish the task. This tool is only available in PLAN MODE. The environment_details will specify the current mode, if it is not PLAN MODE then you should not use this tool. Depending on the user's message, you may ask questions to get clarification about the user's request, architect a solution to the task, and to brainstorm ideas with the user. For example, if the user's task is to create a website, you may start by asking some clarifying questions, then present a detailed plan for how you will accomplish the task given the context, and perhaps engage in a back and forth to finalize the details before the user switches you to ACT MODE to implement the solution.
-        Parameters:
-        - response: (required) The response to provide to the user. Do not try to use tools in this parameter, this is simply a chat response. (You MUST use the response parameter, do not simply place the response text directly within <plan_mode_respond> tags.)
-        - options: (optional) An array of 2-5 options for the user to choose from. Each option should be a string describing a possible choice or path forward in the planning process. This can help guide the discussion and make it easier for the user to provide input on key decisions. You may not always need to provide options, but it may be helpful in many cases where it can save the user from having to type out a response manually. Do NOT present an option to toggle to Act mode, as this will be something you need to direct the user to do manually themselves.
-        Usage:
-        <plan_mode_respond>
-        <response>Your response here</response>
-        <options>
-        Array of options here (optional), e.g. ["Option 1", "Option 2", "Option 3"]
-        </options>
-        </plan_mode_respond>
+        </attempt_completion>        
 
         ## mcp_tool
         Description: Request to execute a tool via the Model Context Protocol (MCP) server. Use this when you need to execute a tool that is not natively supported by the agentic edit tools.
@@ -596,28 +583,7 @@ class AgenticEdit:
 
         By thoughtfully selecting between write_to_file and replace_in_file, you can make your file editing process smoother, safer, and more efficient.
 
-        ====
-
-        ACT MODE V.S. PLAN MODE
-
-        In each user message, the environment_details will specify the current mode. There are two modes:
-
-        - ACT MODE: In this mode, you have access to all tools EXCEPT the plan_mode_respond tool.
-        - In ACT MODE, you use tools to accomplish the user's task. Once you've completed the user's task, you use the attempt_completion tool to present the result of the task to the user.
-        - PLAN MODE: In this special mode, you have access to the plan_mode_respond tool.
-        - In PLAN MODE, the goal is to gather information and get context to create a detailed plan for accomplishing the task, which the user will review and approve before they switch you to ACT MODE to implement the solution.
-        - In PLAN MODE, when you need to converse with the user or present a plan, you should use the plan_mode_respond tool to deliver your response directly, rather than using <thinking> tags to analyze when to respond. Do not talk about using plan_mode_respond - just use it directly to share your thoughts and provide helpful answers.
-
-        ## What is PLAN MODE?
-
-        - While you are usually in ACT MODE, the user may switch to PLAN MODE in order to have a back and forth with you to plan how to best accomplish the task. 
-        - When starting in PLAN MODE, depending on the user's request, you may need to do some information gathering e.g. using read_file or search_files to get more context about the task. You may also ask the user clarifying questions to get a better understanding of the task. You may return mermaid diagrams to visually display your understanding.
-        - Once you've gained more context about the user's request, you should architect a detailed plan for how you will accomplish the task. Returning mermaid diagrams may be helpful here as well.
-        - Then you might ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and plan the best way to accomplish it.
-        - If at any point a mermaid diagram would make your plan clearer to help the user quickly see the structure, you are encouraged to include a Mermaid code block in the response. (Note: if you use colors in your mermaid diagrams, be sure to use high contrast colors so the text is readable.)
-        - Finally once it seems like you've reached a good plan, ask the user to switch you back to ACT MODE to implement the solution.
-
-        ====
+        ====        
 
         PACKAGE CONTEXT INFORMATION
 

{auto_coder-0.1.379 → auto_coder-0.1.381}/src/autocoder/common/v2/agent/agentic_edit_tools/execute_command_tool_resolver.py

@@ -8,6 +8,9 @@ from autocoder.common import shells
 from autocoder.common.printer import Printer
 from loguru import logger
 import typing   
+from autocoder.common.context_pruner import PruneContext
+from autocoder.rag.token_counter import count_tokens
+from autocoder.common import SourceCode
 from autocoder.common import AutoCoderArgs
 from autocoder.events.event_manager_singleton import get_event_manager
 from autocoder.run_context import get_run_context
@@ -18,9 +21,42 @@ class ExecuteCommandToolResolver(BaseToolResolver):
     def __init__(self, agent: Optional['AgenticEdit'], tool: ExecuteCommandTool, args: AutoCoderArgs):
         super().__init__(agent, tool, args)
         self.tool: ExecuteCommandTool = tool # For type hinting
+        self.context_pruner = PruneContext(
+            max_tokens=self.args.context_prune_safe_zone_tokens,
+            args=self.args,
+            llm=self.agent.context_prune_llm
+        )
 
-    def resolve(self) -> ToolResult:
-        printer = Printer()
+    def _prune_file_content(self, content: str, file_path: str) -> str:
+        """对文件内容进行剪枝处理"""
+        if not self.context_pruner:
+            return content
+
+        # 计算 token 数量
+        tokens = count_tokens(content)
+        if tokens <= self.args.context_prune_safe_zone_tokens:
+            return content
+
+        # 创建 SourceCode 对象
+        source_code = SourceCode(
+            module_name=file_path,
+            source_code=content,
+            tokens=tokens
+        )
+
+        # 使用 context_pruner 进行剪枝
+        pruned_sources = self.context_pruner.handle_overflow(
+            file_sources=[source_code],
+            conversations=self.agent.current_conversations if self.agent else [],
+            strategy=self.args.context_prune_strategy
+        )
+
+        if not pruned_sources:
+            return content
+
+        return pruned_sources[0].source_code    
+
+    def resolve(self) -> ToolResult:        
         command = self.tool.command
         requires_approval = self.tool.requires_approval
         source_dir = self.args.source_dir or "."
@@ -36,11 +72,11 @@ class ExecuteCommandToolResolver(BaseToolResolver):
         # Approval mechanism (simplified)
         if requires_approval:
              # In a real scenario, this would involve user interaction
-             printer.print_str_in_terminal(f"Command requires approval: {command}")
+             logger.info(f"Command requires approval: {command}")
              # For now, let's assume approval is granted in non-interactive mode or handled elsewhere
              pass
 
-        printer.print_str_in_terminal(f"Executing command: {command} in {os.path.abspath(source_dir)}")
+        logger.info(f"Executing command: {command} in {os.path.abspath(source_dir)}")
         try:            
             # 使用封装的run_cmd方法执行命令
             if get_run_context().is_web():
@@ -56,13 +92,17 @@ class ExecuteCommandToolResolver(BaseToolResolver):
             logger.info(f"Command executed: {command}")
             logger.info(f"Return Code: {exit_code}")
             if output:
-                logger.info(f"Output:\n{output}")
+                logger.info(f"Original Output (length: {len(output)} chars)") # Avoid logging potentially huge output directly
+
+            final_output = self._prune_file_content(output, "command_output")
 
             if exit_code == 0:
-                return ToolResult(success=True, message="Command executed successfully.", content=output)
+                return ToolResult(success=True, message="Command executed successfully.", content=final_output)
             else:
-                error_message = f"Command failed with return code {exit_code}.\nOutput:\n{output}"
-                return ToolResult(success=False, message=error_message, content={"output": output, "returncode": exit_code})
+                # For the human-readable error message, we might prefer the original full output.
+                # For the agent-consumable content, we provide the (potentially pruned) final_output.
+                error_message_for_human = f"Command failed with return code {exit_code}.\nOutput:\n{output}"
+                return ToolResult(success=False, message=error_message_for_human, content={"output": final_output, "returncode": exit_code})
 
         except FileNotFoundError:
             return ToolResult(success=False, message=f"Error: The command '{command.split()[0]}' was not found. Please ensure it is installed and in the system's PATH.")

auto_coder-0.1.381/src/autocoder/common/v2/agent/agentic_edit_tools/test_execute_command_tool_resolver.py

@@ -0,0 +1,70 @@
+import pytest
+from unittest.mock import MagicMock, patch
+from autocoder.common.v2.agent.agentic_edit_tools \
+    .execute_command_tool_resolver import ExecuteCommandToolResolver
+from autocoder.common.v2.agent.agentic_edit_types import ExecuteCommandTool
+from autocoder.common import AutoCoderArgs
+
+
+class TestExecuteCommandToolResolver:
+    @pytest.fixture
+    def mock_agent(self):
+        agent = MagicMock()
+        agent.args = AutoCoderArgs()
+        agent.args.context_prune_safe_zone_tokens = 1000
+        agent.context_prune_llm = None
+        agent.current_conversations = []
+        return agent
+
+    @pytest.fixture
+    def mock_tool(self):
+        return ExecuteCommandTool(
+            command="echo 'test output'", 
+            requires_approval=False
+        )
+
+
+    def test_command_execution_with_token_count(self, mock_agent, mock_tool):
+        """测试命令执行并验证token统计功能"""
+        resolver = ExecuteCommandToolResolver(mock_agent, mock_tool, mock_agent.args)
+        
+        # 模拟命令执行返回大量输出
+        with patch("autocoder.common.run_cmd.run_cmd_subprocess") as mock_run_cmd:
+            mock_run_cmd.return_value = (0, "test output " * 500)  # 生成大量输出
+            
+            result = resolver.resolve()
+            
+            assert result.success
+            assert "test output" in result.content
+            
+            # 验证token统计功能
+            # 这里需要修改ExecuteCommandToolResolver来添加token统计功能
+            # 测试将失败，符合TDD的红色阶段
+
+    def test_output_pruning_when_exceeds_token_limit(self, mock_agent, mock_tool):
+        """测试当输出超过token限制时的裁剪功能"""
+        resolver = ExecuteCommandToolResolver(mock_agent, mock_tool, mock_agent.args)
+        
+        # 模拟命令执行返回大量输出
+        with patch("autocoder.common.run_cmd.run_cmd_subprocess") as mock_run_cmd:
+            mock_run_cmd.return_value = (0, "test output " * 500)  # 生成大量输出
+            
+            result = resolver.resolve()
+            
+            assert result.success
+            # 验证输出是否被裁剪
+            # 这里需要修改ExecuteCommandToolResolver来添加裁剪功能
+            # 测试将失败，符合TDD的红色阶段
+
+    def test_command_execution_failure(self, mock_agent, mock_tool):
+        """测试命令执行失败的情况"""
+        resolver = ExecuteCommandToolResolver(mock_agent, mock_tool, mock_agent.args)
+        
+        # 模拟命令执行失败
+        with patch("autocoder.common.run_cmd.run_cmd_subprocess") as mock_run_cmd:
+            mock_run_cmd.return_value = (1, "command failed")
+            
+            result = resolver.resolve()
+            
+            assert not result.success
+            assert "command failed" in result.message

{auto_coder-0.1.379 → auto_coder-0.1.381}/src/autocoder/linters/python_linter.py

@@ -332,17 +332,7 @@ class PythonLinter(BaseLinter):
             result['warning_count'] += pylint_result['warning_count']
         except Exception as e:
             if self.verbose:
-                print(f"Error running pylint: {str(e)}")
-        
-        # Run flake8
-        try:
-            flake8_result = self._run_flake8(file_path)
-            result['issues'].extend(flake8_result['issues'])
-            result['error_count'] += flake8_result['error_count']
-            result['warning_count'] += flake8_result['warning_count']
-        except Exception as e:
-            if self.verbose:
-                print(f"Error running flake8: {str(e)}")
+                print(f"Error running pylint: {str(e)}")               
         
         # Mark as successful
         result['success'] = True
@@ -400,17 +390,7 @@ class PythonLinter(BaseLinter):
         except Exception as e:
             if self.verbose:
                 print(f"Error running pylint: {str(e)}")
-        
-        # Run flake8
-        try:
-            flake8_result = self._run_flake8(project_path)
-            result['issues'].extend(flake8_result['issues'])
-            result['error_count'] += flake8_result['error_count']
-            result['warning_count'] += flake8_result['warning_count']
-        except Exception as e:
-            if self.verbose:
-                print(f"Error running flake8: {str(e)}")
-        
+                        
         # Mark as successful
         result['success'] = True
         

{auto_coder-0.1.379 → auto_coder-0.1.381}/src/autocoder/linters/reactjs_linter.py

@@ -243,11 +243,18 @@ class ReactJSLinter(BaseLinter):
 
                 # Process individual messages
                 for message in file_result.get('messages', []):
+                    severity = "info"
+                    if message.get('severity', 1) == 2:
+                        severity = "error"
+                    elif message.get('severity', 1) == 1:
+                        severity = "warning"
+                    elif message.get('severity', 1) == 0:
+                        severity = "info"
                     issue = {
                         'file': file_rel_path,
                         'line': message.get('line', 0),
                         'column': message.get('column', 0),
-                        'severity': 'error' if message.get('severity', 1) == 2 else 'warning',
+                        'severity': severity,
                         'message': message.get('message', ''),
                         'rule': message.get('ruleId', 'unknown')
                     }

auto_coder-0.1.381/src/autocoder/linters/test_python_linter.py

@@ -0,0 +1,166 @@
+import os
+import pytest
+import json
+from unittest.mock import patch, MagicMock
+from autocoder.linters.python_linter import PythonLinter
+
+class TestPythonLinter:
+    """测试PythonLinter类"""
+    
+    def setup_method(self):
+        """每个测试方法前的设置"""
+        self.linter = PythonLinter(verbose=True)
+    
+    def test_lint_file_nonexistent_file(self):
+        """测试不存在的文件"""
+        result = self.linter.lint_file("nonexistent_file.py")
+        
+        assert result['success'] == False
+        assert "不存在" in result.get('error', '') or "does not exist" in result.get('error', '')
+    
+    def test_lint_file_unsupported_file(self):
+        """测试不支持的文件类型"""
+        # 创建一个临时文件
+        with open("temp.txt", "w") as f:
+            f.write("这不是Python文件")
+        
+        try:
+            result = self.linter.lint_file("temp.txt")
+            
+            assert result['success'] == False
+            assert "不支持" in result.get('error', '') or "Unsupported" in result.get('error', '')
+        finally:
+            # 清理
+            if os.path.exists("temp.txt"):
+                os.remove("temp.txt")
+    
+    @patch.object(PythonLinter, '_check_dependencies')
+    @patch.object(PythonLinter, '_install_dependencies_if_needed')
+    def test_lint_file_missing_dependencies(self, mock_install, mock_check):
+        """测试缺少依赖项的情况"""
+        # 模拟依赖检查失败
+        mock_check.return_value = False
+        # 模拟安装依赖失败
+        mock_install.return_value = False
+        
+        # 创建一个临时Python文件
+        with open("temp.py", "w") as f:
+            f.write("print('Hello, World!')")
+        
+        try:
+            result = self.linter.lint_file("temp.py")
+            
+            assert result['success'] == False
+            assert "依赖" in result.get('error', '') or "dependencies" in result.get('error', '')
+        finally:
+            # 清理
+            if os.path.exists("temp.py"):
+                os.remove("temp.py")
+    
+    @patch.object(PythonLinter, '_check_dependencies')
+    @patch.object(PythonLinter, '_run_pylint')
+    def test_lint_file_successful(self, mock_pylint, mock_check):
+        """测试成功的lint过程"""
+        # 模拟依赖检查成功
+        mock_check.return_value = True
+        
+        # 模拟pylint结果
+        mock_pylint.return_value = {
+            'error_count': 1,
+            'warning_count': 2,
+            'issues': [
+                {
+                    'file': 'test.py',
+                    'line': 10,
+                    'column': 5,
+                    'severity': 'error',
+                    'message': '未定义变量',
+                    'rule': 'undefined-variable',
+                    'tool': 'pylint'
+                },
+                {
+                    'file': 'test.py',
+                    'line': 15,
+                    'column': 1,
+                    'severity': 'warning',
+                    'message': '不必要的空行',
+                    'rule': 'trailing-whitespace',
+                    'tool': 'pylint'
+                }
+            ]
+        }
+        
+        # 创建一个临时Python文件
+        with open("test.py", "w") as f:
+            f.write("print('Hello, World!')")
+        
+        try:
+            result = self.linter.lint_file("test.py")
+            
+            assert result['success'] == True
+            assert result['language'] == 'python'
+            assert result['files_analyzed'] == 1
+            assert result['error_count'] == 1
+            assert result['warning_count'] == 2  # 只有pylint的警告
+            assert len(result['issues']) == 2  # 总共2个问题
+        finally:
+            # 清理
+            if os.path.exists("test.py"):
+                os.remove("test.py")
+    
+    # python -m pytest src/autocoder/linters/test_python_linter.py::TestPythonLinter::test_lint_real_file -v -s
+    @pytest.mark.integration
+    def test_lint_real_file(self):
+        """测试对实际文件的lint功能"""
+        # 实际存在的Python文件路径
+        file_path = "/Users/allwefantasy/projects/auto-coder/src/autocoder/common/v2/agent/agentic_edit_tools/read_file_tool_resolver.py"
+        
+        # 检查文件是否存在，如果不存在则跳过测试
+        if not os.path.exists(file_path):
+            pytest.skip(f"测试文件 {file_path} 不存在")
+        
+        # 执行lint操作
+        result = self.linter.lint_file(file_path)
+        
+        # 基本断言
+        assert result['success'] == True
+        assert result['language'] == 'python'
+        assert result['files_analyzed'] == 1
+        
+        # 打印完整的lint结果
+        print("\n==== Lint结果概述 ====")
+        print(f"文件: {file_path}")
+        print(f"错误数: {result['error_count']}")
+        print(f"警告数: {result['warning_count']}")
+        print(f"问题总数: {len(result['issues'])}")
+        
+        print("\n==== 详细问题列表 ====")
+        if not result['issues']:
+            print("没有发现问题！")
+        else:
+            for i, issue in enumerate(result['issues'], 1):
+                print(f"\n问题 #{i}:")
+                print(f"  文件: {issue['file']}")
+                print(f"  位置: 第{issue['line']}行, 第{issue['column']}列")
+                print(f"  严重性: {issue['severity']}")
+                print(f"  信息: {issue['message']}")
+                print(f"  规则: {issue['rule']}")
+                print(f"  工具: {issue['tool']}")
+                
+        # 可选：打印完整的JSON格式结果
+        print("\n==== 完整JSON结果 ====")
+        print(json.dumps(result, indent=2, ensure_ascii=False))
+        
+        # 验证结果中包含issues字段，且为列表类型
+        assert 'issues' in result
+        assert isinstance(result['issues'], list)
+        
+        # 如果有issues，验证其结构
+        if result['issues']:
+            issue = result['issues'][0]
+            assert 'file' in issue
+            assert 'line' in issue
+            assert 'severity' in issue
+            assert 'message' in issue
+            assert 'rule' in issue
+            assert 'tool' in issue