auto-coder 1.0.0__py3-none-any.whl → 2.0.1__py3-none-any.whl

autocoder/common/file_checkpoint/test_manager.py

@@ -567,4 +567,273 @@ class TestFileChangeManager:
         abs_path_output = manager._get_absolute_path(abs_path_input)
         
         # 应该保持原样
-        assert abs_path_output == abs_path_input 
+        assert abs_path_output == abs_path_input 
+    
+    def test_get_checkpointed_message_ids(self, temp_test_dir, temp_backup_dir, temp_store_dir):
+        """测试获取有checkpoint的message_id列表"""
+        manager = FileChangeManager(
+            project_dir=temp_test_dir,
+            backup_dir=temp_backup_dir,
+            store_dir=temp_store_dir,
+            conversation_store_dir=temp_store_dir  # 使用相同的目录
+        )
+        
+        conversation_id = "test_conversation_123"
+        
+        # 场景1：创建带有对话checkpoint的变更组
+        group_id_1 = "group_with_messages_1"
+        changes_1 = {
+            "file1.txt": FileChange(
+                file_path="file1.txt",
+                content="内容1",
+                is_new=True
+            )
+        }
+        
+        result_1 = manager.apply_changes_with_conversation(
+            changes=changes_1,
+            conversation_id=conversation_id,
+            first_message_id="msg_001",
+            last_message_id="msg_002",
+            change_group_id=group_id_1
+        )
+        assert result_1.success is True
+        
+        # 场景2：创建另一个带有对话checkpoint的变更组
+        group_id_2 = "group_with_messages_2"
+        changes_2 = {
+            "file2.txt": FileChange(
+                file_path="file2.txt",
+                content="内容2",
+                is_new=True
+            )
+        }
+        
+        result_2 = manager.apply_changes_with_conversation(
+            changes=changes_2,
+            conversation_id=conversation_id,
+            first_message_id="msg_003",
+            last_message_id="msg_004",
+            change_group_id=group_id_2
+        )
+        assert result_2.success is True
+        
+        # 场景3：创建不同conversation_id的checkpoint（不应该被包含）
+        group_id_3 = "group_other_conversation"
+        changes_3 = {
+            "file3.txt": FileChange(
+                file_path="file3.txt",
+                content="内容3",
+                is_new=True
+            )
+        }
+        
+        result_3 = manager.apply_changes_with_conversation(
+            changes=changes_3,
+            conversation_id="other_conversation",
+            first_message_id="msg_005",
+            last_message_id="msg_006",
+            change_group_id=group_id_3
+        )
+        assert result_3.success is True
+        
+        # 获取checkpointed message ids
+        message_ids = manager.get_checkpointed_message_ids(conversation_id)
+        
+        # 验证结果
+        assert len(message_ids) == 2
+        assert "msg_002" in message_ids  # last_message_id from group_1
+        assert "msg_004" in message_ids  # last_message_id from group_2
+        assert "msg_006" not in message_ids  # 不同conversation的消息不应该包含
+    
+    def test_rollback_to_message(self, temp_test_dir, temp_backup_dir, temp_store_dir, sample_file):
+        """测试回滚到指定message_id"""
+        manager = FileChangeManager(
+            project_dir=temp_test_dir,
+            backup_dir=temp_backup_dir,
+            store_dir=temp_store_dir,
+            conversation_store_dir=temp_store_dir
+        )
+        
+        conversation_id = "test_conversation_456"
+        rel_path = os.path.basename(sample_file)
+        
+        # 步骤1：创建初始变更，关联message_id
+        group_id_1 = "initial_change"
+        changes_1 = {
+            rel_path: FileChange(
+                file_path=rel_path,
+                content="第一次修改内容",
+                is_new=False
+            )
+        }
+        
+        result_1 = manager.apply_changes_with_conversation(
+            changes=changes_1,
+            conversation_id=conversation_id,
+            first_message_id="msg_100",
+            last_message_id="msg_101",
+            change_group_id=group_id_1
+        )
+        assert result_1.success is True
+        
+        # 验证文件内容
+        with open(sample_file, 'r', encoding='utf-8') as f:
+            content = f.read()
+        assert content == "第一次修改内容"
+        
+        # 步骤2：创建第二个变更
+        group_id_2 = "second_change"
+        changes_2 = {
+            rel_path: FileChange(
+                file_path=rel_path,
+                content="第二次修改内容",
+                is_new=False
+            )
+        }
+        
+        result_2 = manager.apply_changes_with_conversation(
+            changes=changes_2,
+            conversation_id=conversation_id,
+            first_message_id="msg_102",
+            last_message_id="msg_103",
+            change_group_id=group_id_2
+        )
+        assert result_2.success is True
+        
+        # 验证文件内容
+        with open(sample_file, 'r', encoding='utf-8') as f:
+            content = f.read()
+        assert content == "第二次修改内容"
+        
+        # 步骤3：创建第三个变更
+        group_id_3 = "third_change"
+        changes_3 = {
+            rel_path: FileChange(
+                file_path=rel_path,
+                content="第三次修改内容",
+                is_new=False
+            ),
+            "new_file.txt": FileChange(
+                file_path="new_file.txt",
+                content="新文件内容",
+                is_new=True
+            )
+        }
+        
+        result_3 = manager.apply_changes_with_conversation(
+            changes=changes_3,
+            conversation_id=conversation_id,
+            first_message_id="msg_104",
+            last_message_id="msg_105",
+            change_group_id=group_id_3
+        )
+        assert result_3.success is True
+        
+        # 验证文件内容
+        with open(sample_file, 'r', encoding='utf-8') as f:
+            content = f.read()
+        assert content == "第三次修改内容"
+        
+        new_file_path = os.path.join(temp_test_dir, "new_file.txt")
+        assert os.path.exists(new_file_path)
+        
+        # 步骤4：回滚到msg_101（第一次修改后的状态）
+        undo_result, checkpoint = manager.rollback_to_message("msg_101", conversation_id)
+        
+        # 验证回滚结果
+        assert undo_result.success is True
+        assert checkpoint is not None
+        assert checkpoint.last_message_id == "msg_101"
+        assert checkpoint.conversation_id == conversation_id
+        
+        # 验证文件状态：应该回到第一次修改后的状态
+        with open(sample_file, 'r', encoding='utf-8') as f:
+            content = f.read()
+        assert content == "第一次修改内容"
+        
+        # 新文件应该被删除（因为它是在第三次修改时创建的）
+        assert not os.path.exists(new_file_path)
+    
+    def test_rollback_to_message_not_found(self, temp_test_dir, temp_backup_dir, temp_store_dir):
+        """测试回滚到不存在的message_id"""
+        manager = FileChangeManager(
+            project_dir=temp_test_dir,
+            backup_dir=temp_backup_dir,
+            store_dir=temp_store_dir,
+            conversation_store_dir=temp_store_dir
+        )
+        
+        # 尝试回滚到不存在的message_id
+        undo_result, checkpoint = manager.rollback_to_message("non_existent_msg_id", "test_conversation")
+        
+        # 验证结果
+        assert undo_result.success is False
+        assert "未找到包含message_id non_existent_msg_id 的checkpoint" in undo_result.errors.get("general", "")
+        assert checkpoint is None
+    
+    def test_rollback_to_message_with_single_change(self, temp_test_dir, temp_backup_dir, temp_store_dir):
+        """测试回滚单个变更（非组变更）的message"""
+        manager = FileChangeManager(
+            project_dir=temp_test_dir,
+            backup_dir=temp_backup_dir,
+            store_dir=temp_store_dir,
+            conversation_store_dir=temp_store_dir
+        )
+        
+        conversation_id = "test_conversation_789"
+        
+        # 创建单个变更（不使用group_id）
+        changes = {
+            "single_file.txt": FileChange(
+                file_path="single_file.txt",
+                content="单个文件内容",
+                is_new=True
+            )
+        }
+        
+        # 应用变更但不指定group_id
+        result = manager.apply_changes_with_conversation(
+            changes=changes,
+            conversation_id=conversation_id,
+            first_message_id="msg_200",
+            last_message_id="msg_201",
+            change_group_id=None  # 不使用group_id
+        )
+        assert result.success is True
+        
+        # 创建第二个变更
+        changes_2 = {
+            "another_file.txt": FileChange(
+                file_path="another_file.txt",
+                content="另一个文件",
+                is_new=True
+            )
+        }
+        
+        result_2 = manager.apply_changes_with_conversation(
+            changes=changes_2,
+            conversation_id=conversation_id,
+            first_message_id="msg_202",
+            last_message_id="msg_203",
+            change_group_id="group_after_single"
+        )
+        assert result_2.success is True
+        
+        # 验证文件存在
+        single_file_path = os.path.join(temp_test_dir, "single_file.txt")
+        another_file_path = os.path.join(temp_test_dir, "another_file.txt")
+        assert os.path.exists(single_file_path)
+        assert os.path.exists(another_file_path)
+        
+        # 回滚到msg_201（单个变更的消息）
+        undo_result, checkpoint = manager.rollback_to_message("msg_201", conversation_id)
+        
+        # 验证回滚结果
+        assert undo_result.success is True
+        assert checkpoint is not None
+        assert checkpoint.last_message_id == "msg_201"
+        
+        # 验证文件状态
+        assert os.path.exists(single_file_path)  # 第一个文件应该还在
+        assert not os.path.exists(another_file_path)  # 第二个文件应该被删除

autocoder/common/file_checkpoint/test_store.py

@@ -47,23 +47,7 @@ class TestFileChangeStore:
         assert os.path.exists(temp_store_dir)
         assert os.path.exists(os.path.join(temp_store_dir, "changes.db"))
     
-    def test_init_with_default_dir(self, monkeypatch):
-        """测试使用默认目录初始化"""
-        # 创建一个临时主目录
-        temp_home = tempfile.mkdtemp()
-        try:
-            # 模拟用户主目录
-            monkeypatch.setattr(os.path, 'expanduser', lambda path: temp_home)
-            
-            store = FileChangeStore()
-            
-            expected_dir = os.path.join(temp_home, ".autocoder", "changes")
-            assert store.store_dir == expected_dir
-            assert os.path.exists(expected_dir)
-            assert os.path.exists(os.path.join(expected_dir, "changes.db"))
-        finally:
-            shutil.rmtree(temp_home)
-    
+
     def test_save_change(self, temp_store_dir, sample_change_record):
         """测试保存变更记录"""
         store = FileChangeStore(store_dir=temp_store_dir)

autocoder/common/file_handler/__init__.py

@@ -0,0 +1,23 @@
+from .add_files_handler import AddFilesHandler
+from .remove_files_handler import RemoveFilesHandler
+from .mcp_handler import McpHandler
+from .commit_handler import CommitHandler
+from .coding_handler import CodingHandler
+from .chat_handler import ChatHandler
+from .active_context_handler import ActiveContextHandler
+from .models_handler import ModelsHandler
+from .list_files_handler import ListFilesHandler
+from .lib_handler import LibHandler
+
+__all__ = [
+    "AddFilesHandler",
+    "RemoveFilesHandler",
+    "McpHandler",
+    "CommitHandler",
+    "CodingHandler",
+    "ChatHandler",
+    "ActiveContextHandler",
+    "ModelsHandler",
+    "ListFilesHandler",
+    "LibHandler"
+]

autocoder/common/file_handler/active_context_handler.py

@@ -0,0 +1,159 @@
+import os
+from typing import Optional
+
+from rich.console import Console
+from rich.table import Table
+
+from autocoder.common.international import get_message
+from autocoder.common.ac_style_command_parser import create_config, parse_typed_query
+from autocoder.common.ac_style_command_parser.parser import parse_query
+from autocoder.auto_coder_runner import (
+    get_final_config, get_single_llm
+)
+from autocoder.common.action_yml_file_manager import ActionYmlFileManager
+from autocoder.common.printer import Printer
+from autocoder.memory.active_context_manager import ActiveContextManager
+
+
+class ActiveContextHandler:
+    """处理活动上下文相关的操作"""
+    
+    def __init__(self):
+        self.console = Console()
+        self.printer = Printer()
+        self._config = None
+    
+    def _create_config(self):
+        """创建 active_context 命令的类型化配置"""
+        if self._config is None:
+            self._config = (create_config()
+                .collect_remainder("query")  # 收集剩余参数作为查询内容
+                .command("list")
+                .max_args(0)  # 列出所有任务
+                .command("run")
+                .positional("file_name", required=True)
+                .max_args(1)  # 运行指定文件
+                .build()
+            )
+        return self._config
+    
+    def handle_active_context_command(self, query: str) -> Optional[None]:
+        """
+        处理活动上下文命令的主入口
+        
+        Args:
+            query: 查询字符串
+            
+        Returns:
+            None: 表示处理了命令，应该返回而不继续执行
+        """
+        query = query.strip()
+        if not query:
+            query = "list"  # 默认列出所有任务
+        
+        # 解析命令 - 需要处理OrderedDict问题
+        commands_infos = parse_query(query)
+        command = "list"  # 默认命令是列出所有任务
+
+        if len(commands_infos) > 0:
+            if "list" in commands_infos:
+                command = "list"
+            if "run" in commands_infos:
+                command = "run"
+
+        args = get_final_config()
+        
+        # 获取LLM实例
+        llm = get_single_llm(args.model, product_mode=args.product_mode)
+        action_file_manager = ActionYmlFileManager(args.source_dir)
+
+        # 获取配置和参数
+        active_context_manager = ActiveContextManager(llm, args.source_dir)
+        
+        if command == "run":
+            file_name = commands_infos["run"]["args"][-1]
+            args.file = action_file_manager.get_full_path_by_file_name(file_name)
+            # 因为更新了args.file
+            active_context_manager = ActiveContextManager(llm, args.source_dir)
+            task_id = active_context_manager.process_changes(args)
+            self.printer.print_in_terminal("active_context_background_task",
+                                      style="blue",
+                                      task_id=task_id)
+
+        # 处理不同的命令
+        if command == "list":
+            self._handle_list_command(active_context_manager)
+        
+        return None
+    
+    def _handle_list_command(self, active_context_manager: ActiveContextManager) -> None:
+        """处理列表命令"""
+        # 获取所有任务
+        all_tasks = active_context_manager.get_all_tasks()
+
+        if not all_tasks:
+            self.console.print("[yellow]没有找到任何活动上下文任务[/yellow]")
+            return
+
+        # 创建表格
+        table = Table(title="活动上下文任务列表", show_lines=True, expand=True)
+        table.add_column("任务ID", style="cyan", no_wrap=False)
+        table.add_column("状态", style="green", no_wrap=False)
+        table.add_column("开始时间", style="yellow", no_wrap=False)
+        table.add_column("完成时间", style="yellow", no_wrap=False)
+        table.add_column("文件", style="blue", no_wrap=False)
+        table.add_column("Token统计", style="magenta", no_wrap=False)
+        table.add_column("费用", style="red", no_wrap=False)
+
+        # 添加任务数据
+        for task in all_tasks:
+            status = task.get("status", "未知")
+            status_display = status
+
+            # 根据状态设置不同的显示样式
+            if status == "completed":
+                status_display = "[green]已完成[/green]"
+            elif status == "running":
+                status_display = "[blue]运行中[/blue]"
+            elif status == "queued":
+                position = task.get("queue_position", 0)
+                status_display = f"[yellow]排队中 (位置: {position})[/yellow]"
+            elif status == "failed":
+                status_display = "[red]失败[/red]"
+
+            # 格式化时间
+            start_time = task.get("start_time", "")
+            start_time_str = start_time.strftime(
+                "%Y-%m-%d %H:%M:%S") if start_time else "未知"
+
+            completion_time = task.get("completion_time", "")
+            completion_time_str = completion_time.strftime(
+                "%Y-%m-%d %H:%M:%S") if completion_time else "-"
+
+            # 获取文件名
+            file_name = task.get("file_name", "未知")
+
+            # 获取token信息
+            total_tokens = task.get("total_tokens", 0)
+            input_tokens = task.get("input_tokens", 0)
+            output_tokens = task.get("output_tokens", 0)
+            token_info = f"总计: {total_tokens:,}\n输入: {input_tokens:,}\n输出: {output_tokens:,}"
+
+            # 获取费用信息
+            cost = task.get("cost", 0.0)
+            cost_info = f"${cost:.6f}"
+
+            # 添加到表格
+            table.add_row(
+                task.get("task_id", "未知"),
+                status_display,
+                start_time_str,
+                completion_time_str,
+                file_name,
+                token_info,
+                cost_info
+            )
+
+        # 显示表格
+        console = Console(width=120)  # 设置更宽的显示宽度
+        console.print(table)