auto-coder 0.1.399__tar.gz → 0.1.400__tar.gz

{auto_coder-0.1.399 → auto_coder-0.1.400}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: auto-coder
-Version: 0.1.399
+Version: 0.1.400
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10

{auto_coder-0.1.399 → auto_coder-0.1.400}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: auto-coder
-Version: 0.1.399
+Version: 0.1.400
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10

{auto_coder-0.1.399 → auto_coder-0.1.400}/src/auto_coder.egg-info/SOURCES.txt

@@ -142,7 +142,6 @@ src/autocoder/common/token_cost_caculate.py
 src/autocoder/common/types.py
 src/autocoder/common/utils_code_auto_generate.py
 src/autocoder/common/ac_style_command_parser/__init__.py
-src/autocoder/common/ac_style_command_parser/example.py
 src/autocoder/common/ac_style_command_parser/parser.py
 src/autocoder/common/ac_style_command_parser/test_parser.py
 src/autocoder/common/command_file_manager/__init__.py
@@ -195,10 +194,29 @@ src/autocoder/common/ignorefiles/test_ignore_file_utils.py
 src/autocoder/common/mcp_servers/__init__.py
 src/autocoder/common/mcp_servers/mcp_server_gpt4o_mini_search.py
 src/autocoder/common/mcp_servers/mcp_server_perplexity.py
+src/autocoder/common/pull_requests/__init__.py
+src/autocoder/common/pull_requests/base_provider.py
+src/autocoder/common/pull_requests/config.py
+src/autocoder/common/pull_requests/example.py
+src/autocoder/common/pull_requests/exceptions.py
+src/autocoder/common/pull_requests/manager.py
+src/autocoder/common/pull_requests/models.py
+src/autocoder/common/pull_requests/test_module.py
+src/autocoder/common/pull_requests/utils.py
+src/autocoder/common/pull_requests/providers/__init__.py
+src/autocoder/common/pull_requests/providers/gitcode_provider.py
+src/autocoder/common/pull_requests/providers/gitee_provider.py
+src/autocoder/common/pull_requests/providers/github_provider.py
+src/autocoder/common/pull_requests/providers/gitlab_provider.py
 src/autocoder/common/rag_manager/__init__.py
 src/autocoder/common/rag_manager/rag_manager.py
 src/autocoder/common/rulefiles/__init__.py
 src/autocoder/common/rulefiles/autocoderrules_utils.py
+src/autocoder/common/tokens/__init__.py
+src/autocoder/common/tokens/counter.py
+src/autocoder/common/tokens/file_detector.py
+src/autocoder/common/tokens/filters.py
+src/autocoder/common/tokens/models.py
 src/autocoder/common/v2/__init__.py
 src/autocoder/common/v2/code_agentic_editblock_manager.py
 src/autocoder/common/v2/code_auto_generate.py
@@ -357,7 +375,6 @@ src/autocoder/rag/tools/search_tool.py
 src/autocoder/regexproject/__init__.py
 src/autocoder/sdk/__init__.py
 src/autocoder/sdk/constants.py
-src/autocoder/sdk/example.py
 src/autocoder/sdk/exceptions.py
 src/autocoder/sdk/cli/__init__.py
 src/autocoder/sdk/cli/__main__.py

{auto_coder-0.1.399 → auto_coder-0.1.400}/src/autocoder/auto_coder_runner.py

@@ -3357,7 +3357,8 @@ def run_auto_command(query: str,
             conversation_config.action = "command"
             task_query = render_command_file_with_variables(command_infos)
              
-        conversation_config.query = task_query        
+        conversation_config.query = task_query   
+        conversation_config.pull_request = pr     
 
         agent = AgenticEdit(llm=llm,args=args,files=SourceCodeList(sources=sources), 
                             conversation_history=conversation_history,

{auto_coder-0.1.399 → auto_coder-0.1.400}/src/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()
             
             # 分割剩余的位置参数（不带引号的）

{auto_coder-0.1.399 → auto_coder-0.1.400}/src/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}}"
     }
 }
 

{auto_coder-0.1.399 → auto_coder-0.1.400}/src/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": {}},

auto_coder-0.1.400/src/autocoder/common/pull_requests/__init__.py

@@ -0,0 +1,256 @@
+"""
+Pull Request 统一管理模块
+
+统一的 Pull Request 创建和管理模块，支持 GitHub、GitLab、Gitee、GitCode 四大代码托管平台的 PR 操作。
+"""
+from typing import Optional, List, Dict, Any
+from loguru import logger
+
+from .models import (
+    PRConfig, PRResult, PRInfo, PRData, RepoInfo, PlatformType, 
+    DEFAULT_TEMPLATES
+)
+from .manager import PullRequestManager, get_global_manager, set_global_config
+from .exceptions import (
+    PRError, AuthenticationError, RepositoryNotFoundError, 
+    BranchNotFoundError, NetworkError, RateLimitError, 
+    ValidationError, PlatformNotSupportedError, ConfigurationError
+)
+from .config import get_config
+from .utils import (
+    parse_git_url, detect_platform_from_repo, get_repo_info_from_path,
+    get_current_branch, branch_exists, is_git_repo, get_default_remote_branch,
+    ensure_branch_exists_remotely, is_main_branch, create_and_checkout_branch,
+    generate_auto_branch_name
+)
+
+
+def create_pull_request(
+    repo_path: str,
+    title: str,
+    source_branch: Optional[str] = None,
+    target_branch: Optional[str] = None,
+    description: str = "",
+    labels: Optional[List[str]] = None,
+    assignees: Optional[List[str]] = None,
+    reviewers: Optional[List[str]] = None,
+    draft: bool = False,
+    template_type: Optional[str] = None,
+    template_vars: Optional[Dict[str, str]] = None,
+    platform: Optional[str] = None,
+    token: Optional[str] = None,
+    **kwargs
+) -> PRResult:
+    """
+    创建 Pull Request（主要接口函数）
+    
+    Args:
+        repo_path: 仓库路径
+        title: PR标题
+        source_branch: 源分支（可选，默认为当前分支）
+        target_branch: 目标分支（可选，默认为远程默认分支或main）
+        description: PR描述
+        labels: 标签列表
+        assignees: 负责人列表
+        reviewers: 审查者列表
+        draft: 是否为草稿PR
+        template_type: 模板类型
+        template_vars: 模板变量
+        platform: 平台类型（可选，会自动检测）
+        token: 访问令牌（可选）
+        **kwargs: 其他配置参数
+    
+    Returns:
+        PR创建结果
+    """
+    # 处理可选的分支参数
+    if source_branch is None:
+        source_branch = get_current_branch(repo_path)
+        if not source_branch:
+            raise ValidationError("无法获取当前分支，请指定source_branch参数")
+    
+    # 从当前分支，自动创建新分支
+    auto_branch_name = generate_auto_branch_name()
+    logger.info(f"检测到当前分支 '{source_branch}' 为主分支，自动创建新分支: {auto_branch_name}")
+    
+    if not create_and_checkout_branch(repo_path, auto_branch_name):
+        raise ValidationError(f"无法从主分支 '{source_branch}' 创建新分支 '{auto_branch_name}'")
+    
+    source_branch = auto_branch_name
+    logger.info(f"已切换到新分支: {source_branch}")
+    
+    if target_branch is None:
+        target_branch = get_default_remote_branch(repo_path)
+        if not target_branch:
+            target_branch = "main"  # 默认值
+    
+    # 验证仓库是否为Git仓库
+    if not is_git_repo(repo_path):
+        raise ValidationError(f"路径 {repo_path} 不是一个有效的Git仓库")
+    
+    # 检查源分支和目标分支是否相同
+    if source_branch == target_branch:
+        raise ValidationError(f"源分支和目标分支不能相同: {source_branch}")
+    
+    # 确保源分支存在于远程仓库，如果不存在则自动推送
+    if not ensure_branch_exists_remotely(repo_path, source_branch):
+        raise BranchNotFoundError(
+            f"源分支 '{source_branch}' 在本地不存在或推送失败。"
+            f"请检查分支是否存在或网络连接是否正常。"
+        )
+    
+    # 检查目标分支是否存在于远程仓库
+    if not branch_exists(repo_path, target_branch, remote=True):
+        raise BranchNotFoundError(
+            f"目标分支 '{target_branch}' 在远程仓库中不存在。"
+        )
+    
+    # 如果提供了token，创建临时配置
+    manager = get_global_manager()
+    
+    if token:
+        # 自动检测平台或使用指定平台
+        if not platform:
+            detected_platform = detect_platform_from_repo(repo_path)
+            if detected_platform:
+                platform = detected_platform.value
+            else:
+                raise ValidationError("无法检测平台类型，请指定platform参数")
+        
+        # 创建临时配置
+        temp_config = PRConfig(platform=PlatformType(platform), token=token)
+        temp_manager = PullRequestManager(temp_config)
+        
+        return temp_manager.create_pull_request(
+            repo_path=repo_path,
+            source_branch=source_branch,
+            target_branch=target_branch,
+            title=title,
+            description=description,
+            labels=labels,
+            assignees=assignees,
+            reviewers=reviewers,
+            draft=draft,
+            template_type=template_type,
+            template_vars=template_vars,
+            platform=platform
+        )
+    else:
+        # 使用全局管理器
+        return manager.create_pull_request(
+            repo_path=repo_path,
+            source_branch=source_branch,
+            target_branch=target_branch,
+            title=title,
+            description=description,
+            labels=labels,
+            assignees=assignees,
+            reviewers=reviewers,
+            draft=draft,
+            template_type=template_type,
+            template_vars=template_vars,
+            platform=platform
+        )
+
+
+def get_pull_request(
+    repo_path: str,
+    pr_number: int,
+    platform: Optional[str] = None,
+    token: Optional[str] = None,
+    **kwargs
+) -> PRResult:
+    """获取 Pull Request 信息"""
+    manager = get_global_manager()
+    
+    if token:
+        if not platform:
+            detected_platform = detect_platform_from_repo(repo_path)
+            if detected_platform:
+                platform = detected_platform.value
+            else:
+                raise ValidationError("无法检测平台类型，请指定platform参数")
+        
+        config_data = {"token": token}
+        config_data.update(kwargs)
+        temp_config = PRConfig(platform=platform, **config_data)
+        temp_manager = PullRequestManager(temp_config)
+        
+        return temp_manager.get_pull_request(repo_path, pr_number, platform)
+    else:
+        return manager.get_pull_request(repo_path, pr_number, platform)
+
+
+def list_pull_requests(
+    repo_path: str,
+    state: str = "open",
+    per_page: int = 30,
+    page: int = 1,
+    platform: Optional[str] = None,
+    token: Optional[str] = None,
+    **kwargs
+) -> List[PRInfo]:
+    """列出 Pull Requests"""
+    manager = get_global_manager()
+    
+    if token:
+        if not platform:
+            detected_platform = detect_platform_from_repo(repo_path)
+            if detected_platform:
+                platform = detected_platform.value
+            else:
+                raise ValidationError("无法检测平台类型，请指定platform参数")
+        
+        config_data = {"token": token}
+        config_data.update(kwargs)
+        temp_config = PRConfig(platform=platform, **config_data)
+        temp_manager = PullRequestManager(temp_config)
+        
+        return temp_manager.list_pull_requests(repo_path, state, per_page, page, platform)
+    else:
+        return manager.list_pull_requests(repo_path, state, per_page, page, platform)
+
+
+# 导出所有公共接口
+__all__ = [
+    # 主要函数
+    'create_pull_request',
+    'get_pull_request', 
+    'list_pull_requests',
+    
+    # 类和模型
+    'PullRequestManager',
+    'PRConfig',
+    'PRResult',
+    'PRInfo',
+    'PRData',
+    'RepoInfo',
+    'PlatformType',
+    
+    # 异常
+    'PRError',
+    'AuthenticationError',
+    'RepositoryNotFoundError',
+    'BranchNotFoundError',
+    'NetworkError',
+    'RateLimitError',
+    'ValidationError',
+    'PlatformNotSupportedError',
+    'ConfigurationError',
+    
+    # 工具函数
+    'parse_git_url',
+    'detect_platform_from_repo',
+    'get_repo_info_from_path',
+    'get_current_branch',
+    'branch_exists',
+    'is_git_repo',
+    
+    # 配置函数
+    'get_config',
+    'set_global_config',
+    'get_global_manager',
+    
+    # 模板
+    'DEFAULT_TEMPLATES'
+]