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

autocoder/common/__init__.py

@@ -397,13 +397,13 @@ class AutoCoderArgs(pydantic.BaseModel):
     in_code_apply: bool = False
     model_filter_path: Optional[str] = None
 
-    conversation_prune_safe_zone_tokens: Optional[int] = 50*1024
+    conversation_prune_safe_zone_tokens: int = 50*1024
     conversation_prune_group_size: Optional[int] = 4
     conversation_prune_strategy: Optional[str] = "summarize"
 
     context_prune_strategy: Optional[str] = "extract"
     context_prune: Optional[bool] = True
-    context_prune_safe_zone_tokens: Optional[int] = 32*1024
+    context_prune_safe_zone_tokens: Optional[int] = 24*1024
     context_prune_sliding_window_size: Optional[int] = 1000
     context_prune_sliding_window_overlap: Optional[int] = 100
 

autocoder/common/ac_style_command_parser/parser.py

@@ -22,8 +22,8 @@ class CommandParser:
         # 匹配命令的正则表达式 - 必须是以/开头，后跟单词字符，且不能后跟/或.
         # (?<!\S) 确保命令前是字符串开头或空白字符
         self.command_pattern = r'(?<!\S)/(\w+)(?!/|\.)'
-        # 匹配键值对参数的正则表达式，支持带引号的值
-        self.key_value_pattern = r'(\w+)=(?:"([^"]*?)"|\'([^\']*?)\'|([^\s"\']+))(?:\s|$)'
+        # 匹配键值对参数的正则表达式，支持带引号的值（包括三重引号）
+        self.key_value_pattern = r'(\w+)=(?:\'\'\'([^\']*?)\'\'\'|"""([^"]*?)"""|"([^"]*?)"|\'([^\']*?)\'|([^\s"\']*))(?:\s|$)'
         # 匹配路径模式的正则表达式
         self.path_pattern = r'/\w+(?:/[^/\s]+)+'
 
@@ -119,8 +119,9 @@ class CommandParser:
         if key_value_pairs:
             for match in key_value_pairs:
                 key = match[0]
-                # 值可能在三个捕获组中的一个，取非空的那个
-                value = match[1] or match[2] or match[3]
+                # 值可能在六个捕获组中的一个，取非空的那个
+                # match[1]: 三重单引号, match[2]: 三重双引号, match[3]: 双引号, match[4]: 单引号, match[5]: 无引号
+                value = match[1] or match[2] or match[3] or match[4] or match[5]
                 kwargs[key] = value.strip()
                 
             # 替换带引号的键值对
@@ -131,15 +132,22 @@ class CommandParser:
             
             # 现在 processed_params_str 中应该只剩下位置参数
             
-            # 处理带引号的位置参数
-            quote_pattern = r'(?:"([^"]*?)"|\'([^\']*?)\')'
+            # 处理带引号的位置参数（包括三重引号）
+            quote_pattern = r'(?:\'\'\'([^\']*?)\'\'\'|"""([^"]*?)"""|"([^"]*?)"|\'([^\']*?)\')'
             quoted_args = re.findall(quote_pattern, processed_params_str)
             for quoted_arg in quoted_args:
                 # 取非空的那个捕获组
-                arg = quoted_arg[0] or quoted_arg[1]
+                arg = quoted_arg[0] or quoted_arg[1] or quoted_arg[2] or quoted_arg[3]
                 args.append(arg)
                 # 从参数字符串中移除这个带引号的参数
-                quoted_pattern = f'"{arg}"' if quoted_arg[0] else f"'{arg}'"
+                if quoted_arg[0]:  # 三重单引号
+                    quoted_pattern = f"'''{arg}'''"
+                elif quoted_arg[1]:  # 三重双引号
+                    quoted_pattern = f'"""{arg}"""'
+                elif quoted_arg[2]:  # 双引号
+                    quoted_pattern = f'"{arg}"'
+                else:  # 单引号
+                    quoted_pattern = f"'{arg}'"
                 processed_params_str = processed_params_str.replace(quoted_pattern, "", 1).strip()
             
             # 分割剩余的位置参数（不带引号的）
@@ -148,17 +156,24 @@ class CommandParser:
         else:
             # 如果没有键值对，处理所有参数作为位置参数
             
-            # 处理带引号的位置参数
-            quote_pattern = r'(?:"([^"]*?)"|\'([^\']*?)\')'
+            # 处理带引号的位置参数（包括三重引号）
+            quote_pattern = r'(?:\'\'\'([^\']*?)\'\'\'|"""([^"]*?)"""|"([^"]*?)"|\'([^\']*?)\')'
             quoted_args = re.findall(quote_pattern, params_str)
             processed_params_str = params_str
             
             for quoted_arg in quoted_args:
                 # 取非空的那个捕获组
-                arg = quoted_arg[0] or quoted_arg[1]
+                arg = quoted_arg[0] or quoted_arg[1] or quoted_arg[2] or quoted_arg[3]
                 args.append(arg)
                 # 从参数字符串中移除这个带引号的参数
-                quoted_pattern = f'"{arg}"' if quoted_arg[0] else f"'{arg}'"
+                if quoted_arg[0]:  # 三重单引号
+                    quoted_pattern = f"'''{arg}'''"
+                elif quoted_arg[1]:  # 三重双引号
+                    quoted_pattern = f'"""{arg}"""'
+                elif quoted_arg[2]:  # 双引号
+                    quoted_pattern = f'"{arg}"'
+                else:  # 单引号
+                    quoted_pattern = f"'{arg}'"
                 processed_params_str = processed_params_str.replace(quoted_pattern, "", 1).strip()
             
             # 分割剩余的位置参数（不带引号的）

autocoder/common/auto_coder_lang.py

@@ -849,6 +849,84 @@ MESSAGES = {
     "/agent/edit/apply_changes":{
         "en":"Commit the changes in preview steps",
         "zh":"提交前面步骤的修改"
+    },
+    "/agent/edit/pull_request/branch_name_failed": {
+        "en": "Unable to get current branch name, skipping PR creation",
+        "zh": "无法获取当前分支名，跳过 PR 创建"
+    },
+    "/agent/edit/pull_request/title": {
+        "en": "AutoCoder: {{query}}",
+        "zh": "AutoCoder: {{query}}"
+    },
+    "/agent/edit/pull_request/default_query": {
+        "en": "Code auto generation",
+        "zh": "代码自动生成"
+    },
+    "/agent/edit/pull_request/description": {
+        "en": """## 🤖 AutoCoder Generated Pull Request
+
+**Task Description**: {{query}}
+
+### 📝 Change Summary
+- Modified {{file_count}} files
+- Commit Hash: `{{commit_hash}}`
+
+### 📂 Changed Files List
+{{file_list}}
+
+### ⚙️ Generation Configuration
+- Source Branch: `{{source_branch}}`
+- Target Branch: `{{target_branch}}`
+- Auto-generated Time: {{timestamp}}
+
+### 🔍 Next Steps
+- [ ] Code Review
+- [ ] Test Verification
+- [ ] Merge to Main Branch
+
+---
+*This PR was automatically created by AutoCoder*
+""",
+        "zh": """## 🤖 AutoCoder 自动生成的 Pull Request
+
+**任务描述**: {{query}}
+
+### 📝 变更摘要
+- 共修改 {{file_count}} 个文件
+- 提交哈希: `{{commit_hash}}`
+
+### 📂 变更文件列表
+{{file_list}}
+
+### ⚙️ 生成配置
+- 源分支: `{{source_branch}}`
+- 目标分支: `{{target_branch}}`
+- 自动生成时间: {{timestamp}}
+
+### 🔍 下一步
+- [ ] 代码审查
+- [ ] 测试验证
+- [ ] 合并到主分支
+
+---
+*此 PR 由 AutoCoder 自动创建*
+"""
+    },
+    "/agent/edit/pull_request/creating": {
+        "en": "Creating Pull Request: {{title}}",
+        "zh": "正在创建 Pull Request: {{title}}"
+    },
+    "/agent/edit/pull_request/success": {
+        "en": "✅ Pull Request created successfully",
+        "zh": "✅ Pull Request 创建成功"
+    },
+    "/agent/edit/pull_request/failed": {
+        "en": "❌ Pull Request creation failed: {{error}}",
+        "zh": "❌ Pull Request 创建失败: {{error}}"
+    },
+    "/agent/edit/pull_request/exception": {
+        "en": "❌ Exception occurred while creating Pull Request: {{error}}",
+        "zh": "❌ 创建 Pull Request 时发生异常: {{error}}"
     }
 }
 

autocoder/common/command_completer_v2.py

@@ -22,7 +22,7 @@ COMMAND_HIERARCHY = {
     "/mcp": {"/add": {}, "/remove": {}, "/list": {}, "/list_running": {}, "/refresh": {}, "/info": {}},
     "/lib": {"/add": {}, "/remove": {}, "/list": {}, "/set-proxy": {}, "/refresh": {}, "/get": {}},
     "/models": {"/chat": {}, "/add": {}, "/add_model": {}, "/remove": {}, "/list": {}, "/speed": {}, "/speed-test": {}, "/input_price": {}, "/output_price": {}, "/activate": {}},
-    "/auto": {"/new": {}, "/id": {}, "/list": {}},
+    "/auto": {"/new": {}, "/resume": {}, "/list": {},"/command":{}},
     "/shell": {"/chat": {}},
     "/active_context": {"/list": {}, "/run": {}},
     "/index": {"/query": {}, "/build": {}, "/export": {}, "/import": {}},

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

@@ -294,7 +294,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 需要简洁,包含两部分：
@@ -635,7 +635,12 @@ def generate_commit_message(changes_report: str) -> str:
     </examples>
     
     下面是变更报告：
-    {{ changes_report }}    
+    {{ changes_report }}   
+    
+    {% if query %}
+    这里你需要遵守的用户的额外要求：
+    {{ query }} 
+    {% endif %}
 
     请输出commit message, 不要输出任何其他内容.
     '''