auto-coder 0.1.363__tar.gz → 0.1.364__tar.gz

{auto_coder-0.1.363 → auto_coder-0.1.364}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.363
+Version: 0.1.364
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10
@@ -28,7 +28,7 @@ Requires-Dist: prompt-toolkit
 Requires-Dist: tokenizers
 Requires-Dist: aiofiles
 Requires-Dist: readerwriterlock
-Requires-Dist: byzerllm[saas]>=0.1.181
+Requires-Dist: byzerllm[saas]>=0.1.182
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython

{auto_coder-0.1.363 → auto_coder-0.1.364}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.363
+Version: 0.1.364
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10
@@ -28,7 +28,7 @@ Requires-Dist: prompt-toolkit
 Requires-Dist: tokenizers
 Requires-Dist: aiofiles
 Requires-Dist: readerwriterlock
-Requires-Dist: byzerllm[saas]>=0.1.181
+Requires-Dist: byzerllm[saas]>=0.1.182
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython

{auto_coder-0.1.363 → auto_coder-0.1.364}/src/auto_coder.egg-info/SOURCES.txt

@@ -139,6 +139,18 @@ src/autocoder/common/conversations/example.py
 src/autocoder/common/directory_cache/__init__.py
 src/autocoder/common/directory_cache/cache.py
 src/autocoder/common/directory_cache/test_cache.py
+src/autocoder/common/file_checkpoint/__init__.py
+src/autocoder/common/file_checkpoint/backup.py
+src/autocoder/common/file_checkpoint/examples.py
+src/autocoder/common/file_checkpoint/manager.py
+src/autocoder/common/file_checkpoint/models.py
+src/autocoder/common/file_checkpoint/store.py
+src/autocoder/common/file_checkpoint/test_backup.py
+src/autocoder/common/file_checkpoint/test_manager.py
+src/autocoder/common/file_checkpoint/test_models.py
+src/autocoder/common/file_checkpoint/test_store.py
+src/autocoder/common/file_checkpoint/test_utils.py
+src/autocoder/common/file_checkpoint/utils.py
 src/autocoder/common/file_monitor/__init__.py
 src/autocoder/common/file_monitor/monitor.py
 src/autocoder/common/ignorefiles/__init__.py
@@ -180,6 +192,7 @@ 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_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
 src/autocoder/common/v2/agent/agentic_edit_tools/write_to_file_tool_resolver.py
 src/autocoder/compilers/__init__.py
@@ -189,6 +202,7 @@ src/autocoder/compilers/compiler_config_manager.py
 src/autocoder/compilers/compiler_factory.py
 src/autocoder/compilers/java_compiler.py
 src/autocoder/compilers/models.py
+src/autocoder/compilers/normal_compiler.py
 src/autocoder/compilers/provided_compiler.py
 src/autocoder/compilers/python_compiler.py
 src/autocoder/compilers/reactjs_compiler.py
@@ -226,6 +240,7 @@ src/autocoder/linters/__init__.py
 src/autocoder/linters/base_linter.py
 src/autocoder/linters/linter_factory.py
 src/autocoder/linters/models.py
+src/autocoder/linters/normal_linter.py
 src/autocoder/linters/python_linter.py
 src/autocoder/linters/reactjs_linter.py
 src/autocoder/linters/shadow_linter.py

{auto_coder-0.1.363 → auto_coder-0.1.364}/src/auto_coder.egg-info/requires.txt

@@ -18,7 +18,7 @@ prompt-toolkit
 tokenizers
 aiofiles
 readerwriterlock
-byzerllm[saas]>=0.1.181
+byzerllm[saas]>=0.1.182
 patch
 diff_match_patch
 GitPython

{auto_coder-0.1.363 → auto_coder-0.1.364}/src/autocoder/agent/base_agentic/tools/execute_command_tool_resolver.py

@@ -3,13 +3,13 @@ import subprocess
 from typing import Dict, Any, Optional
 from autocoder.agent.base_agentic.tools.base_tool_resolver import BaseToolResolver
 from autocoder.agent.base_agentic.types import ExecuteCommandTool, ToolResult # Import ToolResult from types
-from autocoder.common import shells
 from autocoder.common.printer import Printer
 from loguru import logger
 import typing
 from autocoder.common import AutoCoderArgs
 from autocoder.events.event_manager_singleton import get_event_manager
 from autocoder.run_context import get_run_context
+from autocoder.common.run_cmd import run_cmd_subprocess
 if typing.TYPE_CHECKING:
     from ..base_agent import BaseAgent
 

{auto_coder-0.1.363 → auto_coder-0.1.364}/src/autocoder/auto_coder_runner.py

@@ -2850,6 +2850,7 @@ def auto_command(query: str,extra_args: Dict[str,Any]={}):
         else:
             agent.run_in_terminal(AgenticEditRequest(user_input=query))
             
+        completer.refresh_files()
         return
         
     args = get_final_config()  
@@ -2902,3 +2903,4 @@ def auto_command(query: str,extra_args: Dict[str,Any]={}):
         border_style="blue",
         padding=(1, 2)
     ))
+    completer.refresh_files()

{auto_coder-0.1.363 → auto_coder-0.1.364}/src/autocoder/common/__init__.py

@@ -432,6 +432,8 @@ class AutoCoderArgs(pydantic.BaseModel):
     auto_fix_lint_max_attempts: Optional[int] = 5
     auto_fix_compile_max_attempts: Optional[int] = 5
     auto_fix_merge_max_attempts: Optional[int] = 5
+
+    enable_auto_select_rules: Optional[bool] = True
     
     ignore_clean_shadows: Optional[bool] = False
 

auto_coder-0.1.364/src/autocoder/common/file_checkpoint/__init__.py

@@ -0,0 +1,21 @@
+"""
+文件变更管理模块
+
+该模块提供了一种可靠的机制来应用、记录和撤销对项目文件的修改。
+主要功能包括：
+1. 将影子系统中的文件变更安全地应用到用户的实际项目中
+2. 记录每次变更的历史，支持多版本撤销功能
+3. 提供简单直观的API，便于集成到现有的编辑流程中
+"""
+
+from autocoder.common.file_checkpoint.models import (
+    FileChange, ChangeRecord, ApplyResult, UndoResult, DiffResult
+)
+from autocoder.common.file_checkpoint.manager import FileChangeManager
+from autocoder.common.file_checkpoint.store import FileChangeStore
+from autocoder.common.file_checkpoint.backup import FileBackupManager
+
+__all__ = [
+    'FileChange', 'ChangeRecord', 'ApplyResult', 'UndoResult', 'DiffResult',
+    'FileChangeManager', 'FileChangeStore', 'FileBackupManager'
+]

auto_coder-0.1.364/src/autocoder/common/file_checkpoint/backup.py

@@ -0,0 +1,264 @@
+"""
+文件备份管理器
+
+负责文件的备份和恢复操作，支持多版本文件备份。
+"""
+
+import os
+import uuid
+import shutil
+import logging
+from typing import Optional, Dict, List, Tuple
+from datetime import datetime
+import json
+import threading
+
+logger = logging.getLogger(__name__)
+
+
+class FileBackupManager:
+    """负责文件的备份和恢复操作"""
+    
+    def __init__(self, backup_dir: Optional[str] = None):
+        """
+        初始化备份管理器
+        
+        Args:
+            backup_dir: 备份文件存储目录，如果为None则使用默认目录
+        """
+        if backup_dir is None:
+            # 默认备份目录为项目根目录下的.auto-coder/checkpoint
+            backup_dir = os.path.join(os.getcwd(), ".auto-coder", "checkpoint")
+        
+        self.backup_dir = backup_dir
+        self.metadata_file = os.path.join(backup_dir, "backup_metadata.json")
+        self.lock = threading.RLock()
+        
+        # 确保备份目录存在
+        os.makedirs(backup_dir, exist_ok=True)
+        
+        # 加载备份元数据
+        self.metadata = self._load_metadata()
+    
+    def backup_file(self, file_path: str) -> Optional[str]:
+        """
+        备份指定文件
+        
+        Args:
+            file_path: 文件路径
+            
+        Returns:
+            str: 备份文件ID，如果文件不存在则返回None
+        """
+        if not os.path.exists(file_path):
+            return None
+        
+        with self.lock:
+            # 生成唯一的备份ID
+            backup_id = str(uuid.uuid4())
+            
+            # 构建备份文件路径
+            backup_file_path = os.path.join(self.backup_dir, backup_id)
+            
+            try:
+                # 复制文件到备份目录
+                shutil.copy2(file_path, backup_file_path)
+                
+                # 更新元数据
+                self.metadata[backup_id] = {
+                    "original_path": file_path,
+                    "timestamp": datetime.now().timestamp(),
+                    "size": os.path.getsize(file_path)
+                }
+                
+                # 保存元数据
+                self._save_metadata()
+                
+                logger.debug(f"已备份文件 {file_path} 到 {backup_file_path}")
+                return backup_id
+            
+            except Exception as e:
+                logger.error(f"备份文件 {file_path} 失败: {str(e)}")
+                # 清理可能部分创建的备份文件
+                if os.path.exists(backup_file_path):
+                    os.remove(backup_file_path)
+                return None
+    
+    def restore_file(self, file_path: str, backup_id: str) -> bool:
+        """
+        从备份恢复文件
+        
+        Args:
+            file_path: 目标文件路径
+            backup_id: 备份文件ID
+            
+        Returns:
+            bool: 恢复是否成功
+        """
+        with self.lock:
+            # 检查备份ID是否存在
+            if backup_id not in self.metadata:
+                logger.error(f"备份ID {backup_id} 不存在")
+                return False
+            
+            # 构建备份文件路径
+            backup_file_path = os.path.join(self.backup_dir, backup_id)
+            
+            # 检查备份文件是否存在
+            if not os.path.exists(backup_file_path):
+                logger.error(f"备份文件 {backup_file_path} 不存在")
+                return False
+            
+            try:
+                # 确保目标目录存在
+                os.makedirs(os.path.dirname(file_path), exist_ok=True)
+                
+                # 复制备份文件到目标路径
+                shutil.copy2(backup_file_path, file_path)
+                
+                logger.debug(f"已从 {backup_file_path} 恢复文件到 {file_path}")
+                return True
+            
+            except Exception as e:
+                logger.error(f"恢复文件 {file_path} 失败: {str(e)}")
+                return False
+    
+    def get_backup_content(self, backup_id: str) -> Optional[str]:
+        """
+        获取备份文件的内容
+        
+        Args:
+            backup_id: 备份文件ID
+            
+        Returns:
+            str: 备份文件内容，如果备份不存在则返回None
+        """
+        with self.lock:
+            # 检查备份ID是否存在
+            if backup_id not in self.metadata:
+                logger.error(f"备份ID {backup_id} 不存在")
+                return None
+            
+            # 构建备份文件路径
+            backup_file_path = os.path.join(self.backup_dir, backup_id)
+            
+            # 检查备份文件是否存在
+            if not os.path.exists(backup_file_path):
+                logger.error(f"备份文件 {backup_file_path} 不存在")
+                return None
+            
+            try:
+                # 读取备份文件内容
+                with open(backup_file_path, 'r', encoding='utf-8') as f:
+                    return f.read()
+            
+            except Exception as e:
+                logger.error(f"读取备份文件 {backup_file_path} 失败: {str(e)}")
+                return None
+    
+    def delete_backup(self, backup_id: str) -> bool:
+        """
+        删除指定的备份文件
+        
+        Args:
+            backup_id: 备份文件ID
+            
+        Returns:
+            bool: 删除是否成功
+        """
+        with self.lock:
+            # 检查备份ID是否存在
+            if backup_id not in self.metadata:
+                logger.error(f"备份ID {backup_id} 不存在")
+                return False
+            
+            # 构建备份文件路径
+            backup_file_path = os.path.join(self.backup_dir, backup_id)
+            
+            try:
+                # 删除备份文件
+                if os.path.exists(backup_file_path):
+                    os.remove(backup_file_path)
+                
+                # 更新元数据
+                del self.metadata[backup_id]
+                
+                # 保存元数据
+                self._save_metadata()
+                
+                logger.debug(f"已删除备份 {backup_id}")
+                return True
+            
+            except Exception as e:
+                logger.error(f"删除备份 {backup_id} 失败: {str(e)}")
+                return False
+    
+    def clean_old_backups(self, max_age_days: int = 30) -> int:
+        """
+        清理过旧的备份文件
+        
+        Args:
+            max_age_days: 最大保留天数
+            
+        Returns:
+            int: 清理的备份文件数量
+        """
+        with self.lock:
+            now = datetime.now().timestamp()
+            max_age_seconds = max_age_days * 24 * 60 * 60
+            
+            backup_ids_to_delete = []
+            
+            # 找出过旧的备份
+            for backup_id, metadata in self.metadata.items():
+                if now - metadata["timestamp"] > max_age_seconds:
+                    backup_ids_to_delete.append(backup_id)
+            
+            # 删除过旧的备份
+            deleted_count = 0
+            for backup_id in backup_ids_to_delete:
+                if self.delete_backup(backup_id):
+                    deleted_count += 1
+            
+            return deleted_count
+    
+    def get_backups_for_file(self, file_path: str) -> List[Tuple[str, float]]:
+        """
+        获取指定文件的所有备份
+        
+        Args:
+            file_path: 文件路径
+            
+        Returns:
+            List[Tuple[str, float]]: 备份ID和时间戳的列表，按时间戳降序排序
+        """
+        with self.lock:
+            backups = []
+            
+            for backup_id, metadata in self.metadata.items():
+                if metadata["original_path"] == file_path:
+                    backups.append((backup_id, metadata["timestamp"]))
+            
+            # 按时间戳降序排序
+            backups.sort(key=lambda x: x[1], reverse=True)
+            
+            return backups
+    
+    def _load_metadata(self) -> Dict:
+        """加载备份元数据"""
+        if os.path.exists(self.metadata_file):
+            try:
+                with open(self.metadata_file, 'r', encoding='utf-8') as f:
+                    return json.load(f)
+            except Exception as e:
+                logger.error(f"加载备份元数据失败: {str(e)}")
+        
+        return {}
+    
+    def _save_metadata(self) -> None:
+        """保存备份元数据"""
+        try:
+            with open(self.metadata_file, 'w', encoding='utf-8') as f:
+                json.dump(self.metadata, f, indent=2)
+        except Exception as e:
+            logger.error(f"保存备份元数据失败: {str(e)}")

auto_coder-0.1.364/src/autocoder/common/file_checkpoint/examples.py

@@ -0,0 +1,217 @@
+"""
+文件变更管理模块的使用示例
+
+展示如何使用文件变更管理模块进行文件变更的应用和撤销。
+"""
+
+import os
+import sys
+import json
+from typing import Dict, Any
+
+from autocoder.common.file_checkpoint.models import FileChange
+from autocoder.common.file_checkpoint.manager import FileChangeManager
+
+
+def example_apply_changes(project_dir: str):
+    """
+    示例：应用文件变更
+    
+    Args:
+        project_dir: 项目目录
+    """
+    print(f"示例：应用文件变更到项目 {project_dir}")
+    
+    # 创建文件变更管理器
+    manager = FileChangeManager(project_dir)
+    
+    # 准备文件变更
+    changes = {
+        "example.txt": FileChange(
+            file_path="example.txt",
+            content="这是一个示例文件\n用于演示文件变更管理模块的功能\n",
+            is_new=True
+        ),
+        "README.md": FileChange(
+            file_path="README.md",
+            content="# 示例项目\n\n这是一个用于演示文件变更管理模块的示例项目。\n",
+            is_new=True
+        )
+    }
+    
+    # 应用变更
+    result = manager.apply_changes(changes)
+    
+    # 输出结果
+    if result.success:
+        print(f"成功应用了 {len(result.change_ids)} 个文件变更")
+        for change_id in result.change_ids:
+            print(f"  - 变更ID: {change_id}")
+    else:
+        print("应用变更失败")
+        for file_path, error in result.errors.items():
+            print(f"  - {file_path}: {error}")
+
+
+def example_preview_changes(project_dir: str):
+    """
+    示例：预览文件变更
+    
+    Args:
+        project_dir: 项目目录
+    """
+    print(f"示例：预览文件变更")
+    
+    # 创建文件变更管理器
+    manager = FileChangeManager(project_dir)
+    
+    # 准备文件变更
+    changes = {
+        "example.txt": FileChange(
+            file_path="example.txt",
+            content="这是一个修改后的示例文件\n用于演示文件变更管理模块的功能\n新增的一行\n",
+            is_new=False
+        )
+    }
+    
+    # 预览变更
+    diff_results = manager.preview_changes(changes)
+    
+    # 输出差异
+    for file_path, diff_result in diff_results.items():
+        print(f"\n文件: {file_path}")
+        print(diff_result.get_diff_summary())
+        if diff_result.old_content is not None and not diff_result.is_new and not diff_result.is_deletion:
+            diff_text = manager.get_diff_text(diff_result.old_content, diff_result.new_content)
+            print("\n差异:")
+            print(diff_text)
+
+
+def example_undo_changes(project_dir: str):
+    """
+    示例：撤销文件变更
+    
+    Args:
+        project_dir: 项目目录
+    """
+    print(f"示例：撤销文件变更")
+    
+    # 创建文件变更管理器
+    manager = FileChangeManager(project_dir)
+    
+    # 撤销最近的变更
+    result = manager.undo_last_change()
+    
+    # 输出结果
+    if result.success:
+        print(f"成功撤销了变更，恢复了 {len(result.restored_files)} 个文件")
+        for file_path in result.restored_files:
+            print(f"  - {file_path}")
+    else:
+        print("撤销变更失败")
+        for file_path, error in result.errors.items():
+            print(f"  - {file_path}: {error}")
+
+
+def example_get_history(project_dir: str):
+    """
+    示例：获取变更历史
+    
+    Args:
+        project_dir: 项目目录
+    """
+    print(f"示例：获取变更历史")
+    
+    # 创建文件变更管理器
+    manager = FileChangeManager(project_dir)
+    
+    # 获取变更历史
+    changes = manager.get_change_history(limit=5)
+    
+    # 输出历史记录
+    print(f"最近 {len(changes)} 条变更记录:")
+    for change in changes:
+        timestamp = change.timestamp
+        file_path = change.file_path
+        change_type = "新建" if change.is_new else "删除" if change.is_deletion else "修改"
+        print(f"  - [{timestamp}] {change_type} {file_path} (ID: {change.change_id})")
+
+
+def example_integration_with_agentic_edit():
+    """
+    示例：与 AgenticEdit 集成
+    
+    展示如何将文件变更管理模块集成到 AgenticEdit 中
+    """
+    print("示例：与 AgenticEdit 集成")
+    
+    # 这是一个伪代码示例，展示如何修改 AgenticEdit.apply_changes 方法
+    code = """
+def apply_changes(self):
+    \"\"\"
+    Apply all tracked file changes to the original project directory.
+    \"\"\"
+    from autocoder.common.file_checkpoint.models import FileChange
+    from autocoder.common.file_checkpoint.manager import FileChangeManager
+    
+    # 创建文件变更管理器
+    manager = FileChangeManager(self.args.source_dir)
+    
+    # 将影子系统的变更转换为 FileChange 对象
+    changes = {}
+    for file_path, change in self.get_all_file_changes().items():
+        changes[file_path] = FileChange(
+            file_path=file_path,
+            content=change.content,
+            is_new=not os.path.exists(file_path)
+        )
+    
+    # 应用变更
+    result = manager.apply_changes(changes)
+    
+    # 处理结果
+    if result.success:
+        # 继续执行原有的 Git 提交等逻辑
+        if not self.args.skip_commit:
+            try:
+                # ... 原有的 Git 提交代码 ...
+            except Exception as e:
+                # ... 原有的错误处理 ...
+    else:
+        # 处理应用变更失败的情况
+        error_messages = "\\n".join([f"{path}: {error}" for path, error in result.errors.items()])
+        self.printer.print_str_in_terminal(
+            f"Failed to apply changes:\\n{error_messages}",
+            style="red"
+        )
+    """
+    
+    print(code)
+
+
+def main():
+    """主函数"""
+    if len(sys.argv) < 2:
+        print("用法: python examples.py <项目目录>")
+        return
+    
+    project_dir = sys.argv[1]
+    
+    # 运行示例
+    example_apply_changes(project_dir)
+    print("\n" + "-" * 50 + "\n")
+    
+    example_preview_changes(project_dir)
+    print("\n" + "-" * 50 + "\n")
+    
+    example_get_history(project_dir)
+    print("\n" + "-" * 50 + "\n")
+    
+    example_undo_changes(project_dir)
+    print("\n" + "-" * 50 + "\n")
+    
+    example_integration_with_agentic_edit()
+
+
+if __name__ == "__main__":
+    main()