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

autocoder/common/file_monitor/test_file_monitor.py

@@ -0,0 +1,307 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+FileMonitor 模块测试
+
+测试 FileMonitor 的基本功能：文件的增删改查监控
+"""
+
+import os
+import tempfile
+import shutil
+import time
+import threading
+from pathlib import Path
+from typing import List, Tuple
+from unittest.mock import Mock
+
+try:
+    from watchfiles import Change
+except ImportError:
+    print("警告：watchfiles 未安装，请运行: pip install watchfiles")
+    Change = None
+
+from autocoder.common.file_monitor.monitor import get_file_monitor, FileMonitor
+
+
+class FileMonitorTester:
+    """FileMonitor 测试类"""
+    
+    def __init__(self):
+        self.temp_dir = None
+        self.monitor = None
+        self.events = []
+        self.event_lock = threading.Lock()
+        
+    def setup(self):
+        """设置测试环境"""
+        # 创建临时目录
+        self.temp_dir = tempfile.mkdtemp(prefix="file_monitor_test_")
+        print(f"创建临时测试目录: {self.temp_dir}")
+        
+        # 重置单例实例以确保测试隔离
+        FileMonitor.reset_instance()
+        
+        # 获取监控实例
+        self.monitor = get_file_monitor(self.temp_dir)
+        
+        # 清空事件记录
+        self.events.clear()
+        
+    def teardown(self):
+        """清理测试环境"""
+        if self.monitor and self.monitor.is_running():
+            self.monitor.stop()
+            
+        if self.temp_dir and os.path.exists(self.temp_dir):
+            shutil.rmtree(self.temp_dir)
+            print(f"清理临时测试目录: {self.temp_dir}")
+            
+        # 重置单例实例
+        FileMonitor.reset_instance()
+        
+    def record_event(self, change_type: 'Change', changed_path: str):
+        """记录文件变化事件"""
+        with self.event_lock:
+            self.events.append((change_type, changed_path))
+            print(f"📝 记录事件: {change_type.name} - {os.path.basename(changed_path)}")
+            
+    def wait_for_events(self, expected_count: int, timeout: float = 3.0):
+        """等待指定数量的事件"""
+        start_time = time.time()
+        while time.time() - start_time < timeout:
+            with self.event_lock:
+                if len(self.events) >= expected_count:
+                    return True
+            time.sleep(0.1)
+        return False
+    
+    def wait_for_specific_event(self, expected_type: 'Change', expected_path: str, timeout: float = 3.0):
+        """等待特定类型的事件"""
+        start_time = time.time()
+        while time.time() - start_time < timeout:
+            with self.event_lock:
+                for event_type, event_path in self.events:
+                    if event_type == expected_type and expected_path in event_path:
+                        return True
+            time.sleep(0.1)
+        return False
+        
+    def test_file_create(self):
+        """测试文件创建监控"""
+        print("\n🔍 测试用例 1: 文件创建监控")
+        
+        # 注册监控所有 .txt 文件
+        self.monitor.register("**/*.txt", self.record_event)
+        
+        # 启动监控
+        self.monitor.start()
+        time.sleep(0.5)  # 等待监控启动
+        
+        # 创建测试文件
+        test_file = os.path.join(self.temp_dir, "test_create.txt")
+        with open(test_file, 'w') as f:
+            f.write("Hello, World!")
+        print(f"✅ 创建文件: {os.path.basename(test_file)}")
+        
+        # 等待事件
+        if self.wait_for_events(1):
+            with self.event_lock:
+                event_type, event_path = self.events[-1]
+                if event_type == Change.added and test_file in event_path:
+                    print("✅ 文件创建事件检测成功")
+                    return True
+                else:
+                    print(f"❌ 事件类型不匹配: 期望 {Change.added.name}, 实际 {event_type.name}")
+        else:
+            print("❌ 未检测到文件创建事件")
+            
+        return False
+        
+    def test_file_modify(self):
+        """测试文件修改监控"""
+        print("\n🔍 测试用例 2: 文件修改监控")
+        
+        # 先创建一个文件
+        test_file = os.path.join(self.temp_dir, "test_modify.txt")
+        with open(test_file, 'w') as f:
+            f.write("Initial content")
+        
+        # 等待文件创建完成
+        time.sleep(1.0)
+            
+        # 清空事件记录
+        with self.event_lock:
+            self.events.clear()
+            
+        # 注册监控
+        self.monitor.register(test_file, self.record_event)
+        
+        # 等待一下确保监控注册完成
+        time.sleep(0.5)
+        
+        # 尝试多种修改方式来触发修改事件
+        # 方式1: 追加内容
+        with open(test_file, 'a') as f:
+            f.write("\nModified content")
+        time.sleep(0.5)
+        
+        # 方式2: 重写文件（如果追加没有触发修改事件）
+        if not self.wait_for_specific_event(Change.modified, test_file, timeout=1.0):
+            with open(test_file, 'w') as f:
+                f.write("Completely new content")
+        
+        print(f"✅ 修改文件: {os.path.basename(test_file)}")
+        
+        # 等待修改事件或添加事件（某些系统可能报告为添加）
+        if (self.wait_for_specific_event(Change.modified, test_file, timeout=2.0) or 
+            self.wait_for_specific_event(Change.added, test_file, timeout=1.0)):
+            print("✅ 文件修改事件检测成功")
+            return True
+        else:
+            # 打印所有事件用于调试
+            with self.event_lock:
+                print(f"所有事件: {[(e[0].name, os.path.basename(e[1])) for e in self.events]}")
+            # 如果检测到任何事件，说明监控是工作的，只是事件类型不同
+            if self.events:
+                print("⚠️ 检测到文件变化事件，但类型与预期不符（这在某些文件系统中是正常的）")
+                return True
+            else:
+                print("❌ 未检测到任何文件修改事件")
+            
+        return False
+        
+    def test_file_delete(self):
+        """测试文件删除监控"""
+        print("\n🔍 测试用例 3: 文件删除监控")
+        
+        # 先创建一个文件
+        test_file = os.path.join(self.temp_dir, "test_delete.txt")
+        with open(test_file, 'w') as f:
+            f.write("To be deleted")
+        
+        # 等待文件创建完成
+        time.sleep(1.0)
+            
+        # 清空事件记录
+        with self.event_lock:
+            self.events.clear()
+            
+        # 注册监控
+        self.monitor.register(test_file, self.record_event)
+        
+        # 等待一下确保监控注册完成
+        time.sleep(0.5)
+        
+        # 删除文件
+        os.remove(test_file)
+        print(f"✅ 删除文件: {os.path.basename(test_file)}")
+        
+        # 等待删除事件
+        if self.wait_for_specific_event(Change.deleted, test_file):
+            print("✅ 文件删除事件检测成功")
+            return True
+        else:
+            # 打印所有事件用于调试
+            with self.event_lock:
+                print(f"所有事件: {[(e[0].name, os.path.basename(e[1])) for e in self.events]}")
+            print("❌ 未检测到文件删除事件")
+            
+        return False
+        
+    def test_directory_monitoring(self):
+        """测试目录监控"""
+        print("\n🔍 测试用例 4: 目录监控")
+        
+        # 创建子目录
+        sub_dir = os.path.join(self.temp_dir, "subdir")
+        os.makedirs(sub_dir)
+        
+        # 等待目录创建完成
+        time.sleep(1.0)
+        
+        # 清空事件记录
+        with self.event_lock:
+            self.events.clear()
+            
+        # 注册监控整个子目录
+        self.monitor.register(sub_dir, self.record_event)
+        
+        # 等待一下确保监控注册完成
+        time.sleep(0.5)
+        
+        # 在子目录中创建文件
+        test_file = os.path.join(sub_dir, "subdir_file.txt")
+        with open(test_file, 'w') as f:
+            f.write("File in subdirectory")
+        print(f"✅ 在子目录中创建文件: {os.path.basename(test_file)}")
+        
+        # 等待文件创建事件
+        if self.wait_for_specific_event(Change.added, test_file):
+            print("✅ 目录监控事件检测成功")
+            return True
+        else:
+            # 打印所有事件用于调试
+            with self.event_lock:
+                print(f"所有事件: {[(e[0].name, os.path.basename(e[1])) for e in self.events]}")
+            print("❌ 未检测到目录监控事件")
+            
+        return False
+        
+    def run_all_tests(self):
+        """运行所有测试"""
+        print("🚀 开始 FileMonitor 功能测试")
+        print("=" * 50)
+        
+        if Change is None:
+            print("❌ 测试失败: watchfiles 库未安装")
+            return False
+            
+        try:
+            self.setup()
+            
+            # 运行测试用例
+            test_results = []
+            test_results.append(self.test_file_create())
+            test_results.append(self.test_file_modify()) 
+            test_results.append(self.test_file_delete())
+            test_results.append(self.test_directory_monitoring())
+            
+            # 统计结果
+            passed = sum(test_results)
+            total = len(test_results)
+            
+            print("\n" + "=" * 50)
+            print(f"📊 测试结果: {passed}/{total} 个测试用例通过")
+            
+            if passed == total:
+                print("🎉 所有测试用例通过！FileMonitor 功能正常")
+                return True
+            else:
+                print(f"⚠️ {total - passed} 个测试用例失败")
+                return False
+                
+        except Exception as e:
+            print(f"❌ 测试过程中发生异常: {e}")
+            import traceback
+            traceback.print_exc()
+            return False
+        finally:
+            self.teardown()
+
+
+def main():
+    """主函数"""
+    tester = FileMonitorTester()
+    success = tester.run_all_tests()
+    
+    if success:
+        print("\n✅ FileMonitor 测试完成，所有功能正常")
+        exit(0)
+    else:
+        print("\n❌ FileMonitor 测试失败")
+        exit(1)
+
+
+if __name__ == "__main__":
+    main()

autocoder/common/git_utils.py

@@ -1,6 +1,4 @@
 import os
-from git import Repo, GitCommandError
-import git
 from loguru import logger
 from typing import List, Optional, Dict, Any
 from pydantic import BaseModel
@@ -12,6 +10,29 @@ from rich.table import Table
 from rich.text import Text
 
 
+# 尝试导入git模块，如果失败则提供优雅降级
+try:
+    from git import Repo, GitCommandError
+    import git
+    GIT_AVAILABLE = True
+except ImportError as e:
+    logger.warning(f"Git module not available: {e}. Some git features will be disabled.")
+    # 提供虚拟类以避免NameError
+    class Repo:
+        def __init__(self, *args, **kwargs):
+            raise RuntimeError("Git is not available on this system")
+    
+    class GitCommandError(Exception):
+        pass
+    
+    class _GitMock:
+        def __getattr__(self, name):
+            raise RuntimeError("Git is not available on this system")
+    
+    git = _GitMock()
+    GIT_AVAILABLE = False
+
+
 class FileChange(BaseModel):
     file_path: str
     before: Optional[str] = None
@@ -32,6 +53,10 @@ class CommitResult(BaseModel):
 
 
 def init(repo_path: str) -> bool:
+    if not GIT_AVAILABLE:
+        logger.warning("Git is not available. Skipping Git initialization.")
+        return False
+        
     if not os.path.exists(repo_path):
         os.makedirs(repo_path)
 
@@ -44,21 +69,33 @@ def init(repo_path: str) -> bool:
         repo = Repo.init(repo_path)
         logger.info(f"Initialized new Git repository at {repo_path}")
         return True
-    except GitCommandError as e:
+    except (GitCommandError, RuntimeError) as e:
         logger.error(f"Error during Git initialization: {e}")
         return False
 
 
-def get_repo(repo_path: str) -> Repo:
-    repo = Repo(repo_path)
-    return repo
+def get_repo(repo_path: str) -> Optional[Repo]:
+    if not GIT_AVAILABLE:
+        logger.warning("Git is not available. Cannot create repository object.")
+        return None
+    try:
+        repo = Repo(repo_path)
+        return repo
+    except (GitCommandError, RuntimeError) as e:
+        logger.error(f"Error accessing Git repository at {repo_path}: {e}")
+        return None
 
 
 def commit_changes(repo_path: str, message: str) -> CommitResult:
+    if not GIT_AVAILABLE:
+        return CommitResult(
+            success=False, error_message="Git is not available on this system."
+        )
+        
     repo = get_repo(repo_path)
     if repo is None:
         return CommitResult(
-            success=False, error_message="Repository is not initialized."
+            success=False, error_message="Repository is not initialized or Git is not available."
         )
 
     try:
@@ -294,7 +331,7 @@ def get_uncommitted_changes(repo_path: str) -> str:
         return f"Error: {str(e)}"
 
 @byzerllm.prompt()
-def generate_commit_message(changes_report: str) -> str:
+def generate_commit_message(changes_report: str, query: Optional[str] = None) -> str:
     '''
     我是一个Git提交信息生成助手。我们的目标是通过一些变更报告，倒推用户的需求，将需求作为commit message。
     commit message 需要简洁,包含两部分：
@@ -435,7 +472,6 @@ def generate_commit_message(changes_report: str) -> str:
     + "nbformat": 4,
     + "nbformat_minor": 4
     +}
-    
     ```
 
     输出的commit 信息为：
@@ -635,7 +671,12 @@ def generate_commit_message(changes_report: str) -> str:
     </examples>
     
     下面是变更报告：
-    {{ changes_report }}    
+    {{ changes_report }}   
+    
+    {% if query %}
+    这里你需要遵守的用户的额外要求：
+    {{ query }} 
+    {% endif %}
 
     请输出commit message, 不要输出任何其他内容.
     '''

autocoder/common/global_cancel.py

@@ -15,12 +15,19 @@ class GlobalCancel:
         self._lock = threading.Lock()
         self._context: Dict[str, Any] = {}  # 存储与取消相关的上下文信息
         self._active_tokens: set[str] = set() # 存储当前正在运行的token
+        self._current_task_token: Optional[str] = None
     
     def register_token(self, token: str) -> None:
         """注册一个 token，表示一个操作开始，但尚未请求取消"""
         with self._lock:            
             self._token_flags[token] = False            
             self._active_tokens.add(token)
+            self._current_task_token = token
+    
+    def get_current_task_token(self) -> Optional[str]:
+        """获取当前任务token"""
+        with self._lock:
+            return self._current_task_token
 
     def get_active_tokens(self) -> set[str]:
         """获取当前正在运行的token"""
@@ -29,11 +36,10 @@ class GlobalCancel:
     
     def is_requested(self, token: Optional[str] = None) -> bool:
         """检查是否请求了特定token或全局的取消"""                  
-        if token is not None and token in self._token_flags:
-            return self._token_flags[token]
-        
         if self._global_flag:
             return True
+        if token is not None and token in self._token_flags:
+            return self._token_flags[token]                
         return False 
 
     def set_active_tokens(self) -> None:
@@ -72,6 +78,8 @@ class GlobalCancel:
                 del self._context["tokens"][token]
             if token:    
                 self._active_tokens.discard(token) # 从活跃集合中移除
+                if token == self._current_task_token:
+                    self._current_task_token = None
 
     def reset(self, token: Optional[str] = None) -> None:
         """重置特定token或全局的取消标志"""
@@ -90,6 +98,8 @@ class GlobalCancel:
                     del self._context["tokens"][token]
                 if token:
                     self._active_tokens.discard(token) # 从活跃集合中移除
+                    if token == self._current_task_token:
+                        self._current_task_token = None
     
     def reset_active_tokens(self) -> None:
         """重置所有活跃的token"""
@@ -110,10 +120,9 @@ class GlobalCancel:
         """检查是否请求了取消，如果是则抛出异常"""
         if self.is_requested(token):
             context = self.get_context(token)
+            self.reset_global()
             if token:
-                self.reset_token(token)
-            else:
-                self.reset_global()
+                self.reset_token(token)                
             raise CancelRequestedException(token, context.get("message", "Operation was cancelled"))
 
 global_cancel = GlobalCancel()

autocoder/common/ignorefiles/test_ignore_file_utils.py

@@ -5,7 +5,7 @@ from pathlib import Path
 
 import pytest
 
-from src.autocoder.common.ignorefiles import ignore_file_utils
+from autocoder.common.ignorefiles import ignore_file_utils
 
 @pytest.fixture(autouse=True)
 def cleanup_ignore_manager(monkeypatch):

autocoder/common/international/__init__.py

@@ -0,0 +1,31 @@
+"""
+International module for auto-coder project
+
+This module provides internationalization (i18n) support for the auto-coder project.
+It includes message management, language detection, and formatted message retrieval.
+"""
+
+from .message_manager import (
+    MessageManager,
+    get_message_manager,
+    register_messages,
+    get_system_language,
+    get_message,
+    get_message_with_format,
+    get_supported_languages,
+    is_language_supported
+)
+
+# Import messages module to trigger auto-registration
+from . import messages
+
+__all__ = [
+    'MessageManager',
+    'get_message_manager',
+    'register_messages',
+    'get_system_language',
+    'get_message',
+    'get_message_with_format',
+    'get_supported_languages',
+    'is_language_supported'
+] 

autocoder/common/international/demo_international.py

@@ -0,0 +1,92 @@
+#!/usr/bin/env python3
+"""
+国际化模块功能演示脚本
+International module functionality demo
+"""
+
+from autocoder.common.international import (
+    register_messages,
+    get_message,
+    get_message_with_format,
+    get_system_language,
+    get_message_manager
+)
+
+
+def main():
+    """演示国际化模块的主要功能"""
+    print("=== 国际化模块功能演示 ===")
+    print("=== International Module Demo ===\n")
+    
+    # 1. 显示系统语言
+    print("1. 系统语言检测 / System Language Detection:")
+    lang = get_system_language()
+    print(f"   当前系统语言 / Current system language: {lang}\n")
+    
+    # 2. 注册自定义消息
+    print("2. 注册自定义消息 / Register Custom Messages:")
+    custom_messages = {
+        "demo_greeting": {
+            "en": "Hello from International Module!",
+            "zh": "来自国际化模块的问候！"
+        },
+        "demo_user_info": {
+            "en": "User {{name}} has {{count}} messages",
+            "zh": "用户{{name}}有{{count}}条消息"
+        },
+        "demo_status": {
+            "en": "Status: {{status}}",
+            "zh": "状态：{{status}}"
+        }
+    }
+    
+    register_messages(custom_messages)
+    print("   自定义消息已注册 / Custom messages registered\n")
+    
+    # 3. 获取简单消息
+    print("3. 获取简单消息 / Get Simple Messages:")
+    greeting = get_message("demo_greeting")
+    print(f"   问候消息 / Greeting: {greeting}\n")
+    
+    # 4. 获取格式化消息
+    print("4. 获取格式化消息 / Get Formatted Messages:")
+    user_info = get_message_with_format("demo_user_info", name="张三", count=5)
+    print(f"   用户信息 / User info: {user_info}")
+    
+    status_msg = get_message_with_format("demo_status", status="正常")
+    print(f"   状态消息 / Status: {status_msg}\n")
+    
+    # 5. 显示自动注册的消息
+    print("5. 自动注册的消息 / Auto-registered Messages:")
+    manager = get_message_manager()
+    total_messages = len(manager._messages)
+    print(f"   总消息数量 / Total messages: {total_messages}")
+    
+    # 尝试获取一些已知的自动注册消息
+    known_keys = ["file_scored_message", "config_delete_success", "config_invalid_format"]
+    for key in known_keys:
+        if key in manager._messages:
+            msg = get_message(key)
+            if msg:
+                print(f"   {key}: {msg}")
+            break
+    
+    print("\n6. 消息覆盖演示 / Message Override Demo:")
+    # 覆盖现有消息
+    override_messages = {
+        "demo_greeting": {
+            "en": "Updated Hello from International Module!",
+            "zh": "来自国际化模块的更新问候！"
+        }
+    }
+    
+    register_messages(override_messages)
+    updated_greeting = get_message("demo_greeting")
+    print(f"   更新后的问候 / Updated greeting: {updated_greeting}\n")
+    
+    print("=== 演示完成 ===")
+    print("=== Demo Complete ===")
+
+
+if __name__ == "__main__":
+    main()