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

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:
@@ -435,7 +472,6 @@ def generate_commit_message(changes_report: str, query: Optional[str] = None) ->
     + "nbformat": 4,
     + "nbformat_minor": 4
     +}
-    
     ```
 
     输出的commit 信息为：

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() 

autocoder/common/international/message_manager.py

@@ -0,0 +1,157 @@
+import locale
+from typing import Dict, Any
+from byzerllm.utils import format_str_jinja2
+
+
+class MessageManager:
+    """
+    Central message manager for handling internationalization across the auto-coder project
+    """
+    
+    def __init__(self):
+        self._messages: Dict[str, Dict[str, str]] = {}
+    
+    def register_messages(self, messages: Dict[str, Dict[str, str]]):
+        """
+        Register a set of messages with the manager
+        
+        Args:
+            messages: Dictionary of message keys to language-specific messages
+        """
+        self._messages.update(messages)
+    
+    def get_system_language(self) -> str:
+        """
+        Get the system's default language code
+        
+        Returns:
+            Two-letter language code (e.g., 'en', 'zh'), falls back to 'en' for unsupported languages
+        """
+        try:
+            lang_code, _ = locale.getdefaultlocale()
+            if lang_code:
+                detected_lang = lang_code[:2]
+                # 检查是否是支持的语言，如果不是则回退到英文
+                supported_languages = ['en', 'zh', 'ja', 'ar', 'ru']
+                if detected_lang in supported_languages:
+                    return detected_lang
+                else:
+                    return "en"
+            return "en"
+        except:
+            return "en"
+    
+    def get_message(self, key: str) -> str:
+        """
+        Get a localized message by key
+        
+        Args:
+            key: Message key to look up
+            
+        Returns:
+            Localized message string, or empty string if not found
+        """
+        lang = self.get_system_language()
+        if key in self._messages:
+            return self._messages[key].get(lang, self._messages[key].get("en", ""))
+        return ""
+    
+    def get_message_with_format(self, msg_key: str, **kwargs) -> str:
+        """
+        Get a localized message with template formatting
+        
+        Args:
+            msg_key: Message key to look up
+            **kwargs: Variables to substitute in the message template
+            
+        Returns:
+            Formatted localized message string
+        """
+        message = self.get_message(msg_key)
+        if message:
+            return format_str_jinja2(message, **kwargs)
+        return ""
+
+
+# Global message manager instance
+_global_message_manager = MessageManager()
+
+
+def get_message_manager() -> MessageManager:
+    """
+    Get the global message manager instance
+    
+    Returns:
+        Global MessageManager instance
+    """
+    return _global_message_manager
+
+
+def register_messages(messages: Dict[str, Dict[str, str]]):
+    """
+    Register messages with the global message manager
+    
+    Args:
+        messages: Dictionary of message keys to language-specific messages
+    """
+    _global_message_manager.register_messages(messages)
+
+
+def get_system_language() -> str:
+    """
+    Get the system's default language code
+    
+    Returns:
+        Two-letter language code (e.g., 'en', 'zh')
+    """
+    return _global_message_manager.get_system_language()
+
+
+def get_message(key: str) -> str:
+    """
+    Get a localized message by key
+    
+    Args:
+        key: Message key to look up
+        
+    Returns:
+        Localized message string, or empty string if not found
+    """
+    return _global_message_manager.get_message(key)
+
+
+def get_message_with_format(msg_key: str, **kwargs) -> str:
+    """
+    Get a localized message with template formatting
+    
+    Args:
+        msg_key: Message key to look up
+        **kwargs: Variables to substitute in the message template
+        
+    Returns:
+        Formatted localized message string
+    """
+    return _global_message_manager.get_message_with_format(msg_key, **kwargs)
+
+
+def get_supported_languages() -> list:
+    """
+    Get list of supported languages
+    
+    Returns:
+        List of supported language codes
+    """
+    return ['en', 'zh', 'ja', 'ar', 'ru']
+
+
+def is_language_supported(language: str) -> bool:
+    """
+    Check if a language is supported
+    
+    Args:
+        language: Language code to check
+        
+    Returns:
+        True if language is supported, False otherwise
+    """
+    return language in get_supported_languages() 

autocoder/common/international/messages/__init__.py

@@ -0,0 +1,56 @@
+"""
+Messages module for auto-coder international support
+
+This module automatically registers all message files and provides a unified interface.
+"""
+
+from .auto_coder_messages import AUTO_CODER_MESSAGES
+from .chat_auto_coder_messages import CHAT_AUTO_CODER_MESSAGES
+from .sdk_messages import SDK_MESSAGES
+from .tool_display_messages import TOOL_DISPLAY_MESSAGES
+from .git_helper_plugin_messages import GIT_HELPER_PLUGIN_MESSAGES
+from .token_helper_plugin_messages import TOKEN_HELPER_PLUGIN_MESSAGES
+from .rules_command_messages import RULES_COMMAND_MESSAGES
+from .queue_command_messages import QUEUE_COMMAND_MESSAGES
+from .async_command_messages import ASYNC_COMMAND_MESSAGES
+from .conversation_command_messages import CONVERSATION_COMMAND_MESSAGES
+from .command_help_messages import COMMAND_HELP_MESSAGES
+from .workflow_exception_messages import WORKFLOW_EXCEPTION_MESSAGES
+from ..message_manager import register_messages
+
+
+# Automatically register all messages when the module is imported
+def register_all_messages():
+    """Register all messages with the global message manager"""
+    register_messages(AUTO_CODER_MESSAGES)
+    register_messages(CHAT_AUTO_CODER_MESSAGES)
+    register_messages(SDK_MESSAGES)
+    register_messages(TOOL_DISPLAY_MESSAGES)
+    register_messages(GIT_HELPER_PLUGIN_MESSAGES)
+    register_messages(TOKEN_HELPER_PLUGIN_MESSAGES)
+    register_messages(RULES_COMMAND_MESSAGES)
+    register_messages(QUEUE_COMMAND_MESSAGES)
+    register_messages(ASYNC_COMMAND_MESSAGES)
+    register_messages(CONVERSATION_COMMAND_MESSAGES)
+    register_messages(COMMAND_HELP_MESSAGES)
+    register_messages(WORKFLOW_EXCEPTION_MESSAGES)
+
+
+# Auto-register on import
+register_all_messages()
+
+__all__ = [
+    "AUTO_CODER_MESSAGES",
+    "CHAT_AUTO_CODER_MESSAGES",
+    "SDK_MESSAGES",
+    "TOOL_DISPLAY_MESSAGES",
+    "GIT_HELPER_PLUGIN_MESSAGES",
+    "TOKEN_HELPER_PLUGIN_MESSAGES",
+    "RULES_COMMAND_MESSAGES",
+    "QUEUE_COMMAND_MESSAGES",
+    "ASYNC_COMMAND_MESSAGES",
+    "CONVERSATION_COMMAND_MESSAGES",
+    "COMMAND_HELP_MESSAGES",
+    "WORKFLOW_EXCEPTION_MESSAGES",
+    "register_all_messages",
+]