auto-coder 0.1.244__tar.gz → 0.1.245__tar.gz

{auto_coder-0.1.244 → auto_coder-0.1.245}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.244
+Version: 0.1.245
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
@@ -26,7 +26,7 @@ Requires-Dist: tabulate
 Requires-Dist: jupyter_client
 Requires-Dist: prompt-toolkit
 Requires-Dist: tokenizers
-Requires-Dist: byzerllm[saas]>=0.1.160
+Requires-Dist: byzerllm[saas]>=0.1.161
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython

{auto_coder-0.1.244 → auto_coder-0.1.245}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.244
+Version: 0.1.245
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
@@ -26,7 +26,7 @@ Requires-Dist: tabulate
 Requires-Dist: jupyter_client
 Requires-Dist: prompt-toolkit
 Requires-Dist: tokenizers
-Requires-Dist: byzerllm[saas]>=0.1.160
+Requires-Dist: byzerllm[saas]>=0.1.161
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython

{auto_coder-0.1.244 → auto_coder-0.1.245}/src/auto_coder.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ src/autocoder/agent/__init__.py
 src/autocoder/agent/auto_demand_organizer.py
 src/autocoder/agent/auto_filegroup.py
 src/autocoder/agent/auto_guess_query.py
+src/autocoder/agent/auto_review_commit.py
 src/autocoder/agent/auto_tool.py
 src/autocoder/agent/coder.py
 src/autocoder/agent/designer.py

{auto_coder-0.1.244 → auto_coder-0.1.245}/src/auto_coder.egg-info/requires.txt

@@ -16,7 +16,7 @@ tabulate
 jupyter_client
 prompt-toolkit
 tokenizers
-byzerllm[saas]>=0.1.160
+byzerllm[saas]>=0.1.161
 patch
 diff_match_patch
 GitPython

auto_coder-0.1.245/src/autocoder/agent/auto_review_commit.py

@@ -0,0 +1,207 @@
+from typing import Generator, List, Dict, Union, Tuple, Optional
+import os
+import yaml
+import byzerllm
+import pydantic
+import git
+from rich.console import Console
+from autocoder.utils.auto_coder_utils.chat_stream_out import stream_out
+from autocoder.common.printer import Printer
+from autocoder.common import AutoCoderArgs
+from autocoder.common.utils_code_auto_generate import stream_chat_with_continue
+
+
+def load_yaml_config(yaml_file: str) -> Dict:
+    """加载YAML配置文件"""
+    try:
+        with open(yaml_file, 'r', encoding='utf-8') as f:
+            return yaml.safe_load(f)
+    except Exception as e:
+        printer = Printer()
+        printer.print_in_terminal("yaml_load_error", style="red", yaml_file=yaml_file, error=str(e))
+        return {}
+
+
+class AutoReviewCommit:
+    def __init__(self, llm: Union[byzerllm.ByzerLLM,byzerllm.SimpleByzerLLM],
+                 args:AutoCoderArgs,                 
+                 skip_diff: bool = False,                 
+                 console: Optional[Console] = None):
+        """
+        初始化 AutoReviewCommit
+
+        Args:
+            llm: ByzerLLM 实例，用于代码审查
+            project_dir: 项目根目录
+            skip_diff: 是否跳过获取 diff 信息            
+        """
+        self.project_dir = args.source_dir
+        self.actions_dir = os.path.join(args.source_dir, "actions")
+        self.llm = llm        
+        self.skip_diff = skip_diff
+        self.console = console or Console()
+
+    @byzerllm.prompt()
+    def review(self, querie_with_urls_and_diffs: List[Tuple[str, List[str], str]], query: str) -> Generator[str,None,None]:
+        """
+        如果前面我们对话提供了文档，请参考上面的文档对提交的代码变更进行审查，提供改进建议。
+
+        下面包含最新一次提交的信息：        
+        <commit>
+        {% for query,urls,diff in querie_with_urls_and_diffs %}
+        ## 任务需求
+        {{ query }}
+
+        修改的文件:
+        {% for url in urls %}
+        - {{ url }}
+        {% endfor %}
+
+        代码变更:
+        ```diff
+        {{ diff }}
+        ```
+        {% endfor %}
+        </commit>
+
+        审查要求：
+        1. 代码质量评估
+           - 代码可读性：命名、注释、代码结构是否清晰
+           - 代码风格：是否符合项目规范
+           - 实现逻辑：算法和数据结构的选择是否合适
+           
+        2. 潜在问题检查
+           - 常见错误：是否存在空指针，数组越界，类型转换，未声明变量,typo等低级错误
+           - 安全性：是否存在安全隐患
+           - 性能：是否有性能问题
+           - 并发：是否有并发安全问题
+           - 异常处理：错误处理是否完善
+           - 资源管理：是否有资源泄露风险
+           
+        3. 架构合理性
+           - 模块化：职责划分是否合理
+           - 可扩展性：是否方便未来扩展
+           - 依赖关系：组件耦合是否合理
+           - 复用性：是否有重复代码
+
+        返回格式说明：
+        返回 markdown 格式，包含以下内容：
+        1. issues: 发现的具体问题列表
+        2. suggestions: 对应的改进建议列表
+        3. severity: 问题的严重程度(low/medium/high)
+        4. affected_files: 受影响的文件列表
+        5. summary: 总体评价
+
+        {% if query %}
+        用户额外 review 需求：
+        <user_review_requirement>
+        {{ query }}
+        </user_review_requirement>
+        {% endif %}
+
+        注意：
+        1. 评审意见应该具体且可操作，而不是泛泛而谈
+        2. 对于每个问题都应该提供明确的改进建议
+        3. 严重程度的判断要考虑问题对系统的潜在影响
+        4. 建议应该符合项目的技术栈和开发规范        
+        """
+        pass
+
+
+    def parse_history_tasks(self) -> List[Dict]:
+        """
+        解析历史任务信息
+
+        Returns:
+            List[Dict]: 每个字典包含一个历史任务的信息
+        """
+        # 获取所有YAML文件
+        action_files = [
+            f for f in os.listdir(self.actions_dir)
+            if f[:3].isdigit() and "_" in f and f.endswith('.yml')
+        ]
+
+        # 按序号排序
+        def get_seq(name):
+            return int(name.split("_")[0])
+
+        # 获取最新的action文件列表
+        action_files = sorted(action_files, key=get_seq)
+        action_files.reverse()        
+
+        action_file = action_files[0]
+
+        querie_with_urls_and_diffs = []
+        repo = git.Repo(self.project_dir)
+
+        # 收集所有query、urls和对应的commit diff
+        for yaml_file in [action_file]:
+            yaml_path = os.path.join(self.actions_dir, yaml_file)
+            config = load_yaml_config(yaml_path)
+
+            if not config:
+                continue
+
+            query = config.get('query', '')
+            urls = config.get('urls', [])
+
+            if query and urls:
+                commit_diff = ""
+                if not self.skip_diff:
+                    # 计算文件的MD5用于匹配commit
+                    import hashlib
+                    file_md5 = hashlib.md5(open(yaml_path, 'rb').read()).hexdigest()
+                    response_id = f"auto_coder_{yaml_file}_{file_md5}"
+                    # 查找对应的commit                   
+                    try:
+                        for commit in repo.iter_commits():
+                            if response_id in commit.message:
+                                if commit.parents:
+                                    parent = commit.parents[0]
+                                    commit_diff = repo.git.diff(
+                                        parent.hexsha, commit.hexsha)
+                                else:
+                                    commit_diff = repo.git.show(commit.hexsha)
+                                break
+                    except git.exc.GitCommandError as e:
+                        printer = Printer()
+                        printer.print_in_terminal("git_command_error", style="red", error=str(e))
+                    except Exception as e:
+                        printer = Printer()
+                        printer.print_in_terminal("get_commit_diff_error", style="red", error=str(e))
+
+                querie_with_urls_and_diffs.append((query, urls, commit_diff))
+
+        return querie_with_urls_and_diffs
+    
+
+    def review_commit(self,query: str, conversations: List[Dict]) -> Generator[str,None,None]:
+        """
+        审查最新的代码提交
+
+        Returns:
+            Optional[ReviewResult]: 审查结果，如果出错则返回None
+        """
+        printer = Printer()
+        # 获取最新的提交信息
+        commits = self.parse_history_tasks()
+        if not commits:            
+            printer.print_in_terminal("no_latest_commit", style="red")
+            return None
+
+        # 调用LLM进行代码审查
+        try:
+            # 获取 prompt 内容            
+            query = self.review.prompt(commits, query)
+            new_conversations = conversations.copy()[0:-1]
+            new_conversations.append({"role": "user", "content": query})
+            # 构造对话消息            
+            v = stream_chat_with_continue(
+                    llm=self.llm,
+                    conversations=new_conversations,
+                    llm_config={}
+            )
+            return v
+        except Exception as e:            
+            printer.print_in_terminal("code_review_error", style="red", error=str(e))
+            return None

{auto_coder-0.1.244 → auto_coder-0.1.245}/src/autocoder/auto_coder.py

@@ -278,8 +278,13 @@ def main(input_args: Optional[List[str]] = None):
 
             llm = byzerllm.ByzerLLM(verbose=args.print_request)
 
+            # code_model,index_filter_model,generate_rerank_model,chat_model
+            # 这四个模型如果用户没有设置，就会使用默认的
+            # 如果用户随便填写 deepseek 官方key,就会导致 Authentic(No User) 的错误
+            # 或者 Insuffient Balance 之类的错误
+
             code_model = byzerllm.ByzerLLM()
-            code_model.setup_default_model_name("deepseek_chat")
+            code_model.setup_default_model_name(args.model)
             llm.setup_sub_client("code_model", code_model)
 
             index_filter_model = byzerllm.ByzerLLM()
@@ -295,7 +300,8 @@ def main(input_args: Optional[List[str]] = None):
             llm.setup_sub_client("chat_model", chat_model)
         
         if args.product_mode == "lite":
-            llm = byzerllm.SimpleByzerLLM(default_model_name="deepseek_chat")
+            default_model = args.model
+            llm = byzerllm.SimpleByzerLLM(default_model_name=default_model)
             api_key_dir = os.path.expanduser("~/.auto-coder/keys")
             api_key_file = os.path.join(api_key_dir, "api.deepseek.com")
             
@@ -308,7 +314,7 @@ def main(input_args: Optional[List[str]] = None):
             llm.deploy(
                 model_path="",
                 pretrained_model_type="saas/openai",
-                udf_name="deepseek_chat",
+                udf_name=default_model,
                 infer_params={
                     "saas.base_url": "https://api.deepseek.com/v1",
                     "saas.api_key": api_key,
@@ -317,11 +323,11 @@ def main(input_args: Optional[List[str]] = None):
                 }
             )
             
-            code_llm = byzerllm.SimpleByzerLLM(default_model_name="deepseek_chat")
+            code_llm = byzerllm.SimpleByzerLLM(default_model)
             code_llm.deploy(
                 model_path="",
                 pretrained_model_type="saas/openai",
-                udf_name="deepseek_chat",
+                udf_name=default_model,
                 infer_params={
                     "saas.base_url": "https://api.deepseek.com/v1",
                     "saas.api_key": api_key,
@@ -368,7 +374,8 @@ def main(input_args: Optional[List[str]] = None):
                     "saas.is_reasoning": True
                 }
             )
-
+            
+            # 这四个模型如果用户没有设置，就会使用默认的
             llm.setup_sub_client("code_model", code_llm)
             llm.setup_sub_client("chat_model", chat_llm)
             llm.setup_sub_client("generate_rerank_model", generate_rerank_llm)
@@ -1349,6 +1356,10 @@ def main(input_args: Optional[List[str]] = None):
                     )
                 )
                 v = [[response.result,None]]
+            elif "review_commit" in args.action:
+                from autocoder.agent.auto_review_commit import AutoReviewCommit
+                reviewer = AutoReviewCommit(llm=chat_llm, args=args)
+                v = reviewer.review_commit(args.query)
             else:                
                 v = stream_chat_with_continue(
                     llm=chat_llm,

{auto_coder-0.1.244 → auto_coder-0.1.245}/src/autocoder/chat_auto_coder.py

@@ -1937,14 +1937,18 @@ def chat(query: str):
     if "/save" in query:
         yaml_config["action"].append("save")
         query = query.replace("/save", "", 1).strip()        
-
-    is_review = query.strip().startswith("/review")
-    if is_review:
-        query = query.replace("/review", "", 1).strip()
-        if "prompt_review" in conf:
-            query = format_str_jinja2(conf["prompt_review"], query=query)
-        else:
-            query = code_review.prompt(query)
+    
+    if "/review" in query and "/commit" in query:
+        yaml_config["action"].append("review_commit")
+        query = query.replace("/review", "", 1).replace("/commit", "", 1).strip()
+    else:    
+        is_review = query.strip().startswith("/review")
+        if is_review:
+            query = query.replace("/review", "", 1).strip()
+            if "prompt_review" in conf:
+                query = format_str_jinja2(conf["prompt_review"], query=query)
+            else:
+                query = code_review.prompt(query)
 
     is_no_context = query.strip().startswith("/no_context")
     if is_no_context:
@@ -2194,13 +2198,14 @@ def manage_models(params, query: str):
             table.add_column("Base URL", style="white", width=50, overflow="fold")
             for m in models_data:
                 # Check if api_key_path exists and file exists
-                api_key_path = m.get("api_key_path", "")
-                name = m.get("name", "")
-                if api_key_path:
-                    api_key_file = os.path.expanduser(f"~/.auto-coder/keys/{api_key_path}")
-                    if os.path.exists(api_key_file):
-                        name = f"{name}*"                        
-            
+                is_api_key_set = "api_key" in m  
+                name = m.get("name", "")              
+                if is_api_key_set:
+                    api_key = m.get("api_key", "").strip()                    
+                    if not api_key:                                                
+                        printer.print_in_terminal("models_api_key_empty", style="yellow", name=name)                                           
+                    name = f"{name} *"
+                
                 table.add_row(
                     name,                    
                     m.get("model_name", ""),                    
@@ -2700,6 +2705,11 @@ def main():
             if "mode" not in memory:
                 memory["mode"] = "normal"
 
+            # 处理 user_input 的空格
+            temp_user_input = user_input.lstrip()  # 去掉左侧空格
+            if temp_user_input.startswith('/'):
+                user_input = temp_user_input
+
             if (
                 memory["mode"] == "auto_detect"
                 and user_input

{auto_coder-0.1.244 → auto_coder-0.1.245}/src/autocoder/chat_auto_coder_lang.py

@@ -111,7 +111,8 @@ MESSAGES = {
         "remove_files_all": "Removed all files.",
         "remove_files_removed": "Removed Files",
         "remove_files_none": "No files were removed.",
-        "files_removed": "Files Removed"
+        "files_removed": "Files Removed",
+        "models_api_key_empty": "Warning : {{name}} API key is empty. Please set a valid API key.",
     },
     "zh": {
         "mcp_remove_error": "移除 MCP 服务器时出错：{error}",
@@ -222,7 +223,8 @@ MESSAGES = {
         "remove_files_all": "已移除所有文件。",
         "remove_files_removed": "已移除的文件",
         "remove_files_none": "没有文件被移除。",
-        "files_removed": "移除的文件"
+        "files_removed": "移除的文件",
+        "models_api_key_empty": "警告:  {{name}}  API key 为空。请设置一个有效的 API key。",
     }
 }
 

{auto_coder-0.1.244 → auto_coder-0.1.245}/src/autocoder/common/auto_coder_lang.py

@@ -8,6 +8,11 @@ MESSAGES = {
         "memory_save_success": "✅ Saved to your memory",
         "file_decode_error": "Failed to decode file: {{file_path}}. Tried encodings: {{encodings}}",
         "file_write_error": "Failed to write file: {{file_path}}. Error: {{error}}",
+        "yaml_load_error": "Error loading yaml file {{yaml_file}}: {{error}}",
+        "git_command_error": "Git command execution error: {{error}}",
+        "get_commit_diff_error": "Error getting commit diff: {{error}}",
+        "no_latest_commit": "Unable to get latest commit information",
+        "code_review_error": "Code review process error: {{error}}",
         "index_file_too_large": "⚠️ File {{ file_path }} is too large ({{ file_size }} > {{ max_length }}), splitting into chunks...",
         "index_update_success": "✅ Successfully updated index for {{ file_path }} (md5: {{ md5 }}) in {{ duration }}s",
         "index_build_error": "❌ Error building index for {{ file_path }}: {{ error }}",
@@ -82,6 +87,11 @@ MESSAGES = {
         "memory_save_success": "✅ 已保存到您的记忆中",
         "file_decode_error": "无法解码文件: {{file_path}}。尝试的编码: {{encodings}}",
         "file_write_error": "无法写入文件: {{file_path}}. 错误: {{error}}",
+        "yaml_load_error": "加载YAML文件出错 {{yaml_file}}: {{error}}",
+        "git_command_error": "Git命令执行错误: {{error}}",
+        "get_commit_diff_error": "获取commit diff时出错: {{error}}",
+        "no_latest_commit": "无法获取最新的提交信息",
+        "code_review_error": "代码审查过程出错: {{error}}",
         "index_file_too_large": "⚠️ 文件 {{ file_path }} 过大 ({{ file_size }} > {{ max_length }}), 正在分块处理...",
         "index_update_success": "✅ 成功更新 {{ file_path }} 的索引 (md5: {{ md5 }}), 耗时 {{ duration }} 秒",
         "index_build_error": "❌ 构建 {{ file_path }} 索引时出错: {{ error }}",
@@ -132,7 +142,7 @@ MESSAGES = {
         "merge_success": "✅ 成功合并了 {{ num_files }} 个文件中的更改 {{ num_changes }}/{{ total_blocks }} 个代码块。",
         "no_changes_made": "⚠️ 未对任何文件进行更改。",
         "unmerged_blocks_title": "未合并代码块",
-        "unmerged_file_path": "文件: {file_path}",
+        "unmerged_file_path": "文件: {{file_path}}",
         "unmerged_search_block": "Search Block({{similarity}}):",
         "unmerged_replace_block": "Replace Block:",
         "unmerged_blocks_total": "未合并代码块数量: {{num_blocks}}",

{auto_coder-0.1.244 → auto_coder-0.1.245}/src/autocoder/index/entry.py

@@ -100,13 +100,13 @@ def build_index_and_filter_files(
                     })
                 )
             )
+
+        if not args.skip_filter_index and args.index_filter_model:       
+            printer.print_in_terminal("quick_filter_start", style="blue")
+            quick_filter = QuickFilter(index_manager,stats,sources)        
+            final_files = quick_filter.filter(index_manager.read_index(),args.query)
         
-        #MARK
-        printer.print_in_terminal("quick_filter_start", style="blue")
-        quick_filter = QuickFilter(index_manager,stats,sources)        
-        final_files = quick_filter.filter(index_manager.read_index(),args.query)
-        
-        if not final_files:
+        if not args.skip_filter_index and not args.index_filter_model:
             printer.print_in_terminal("normal_filter_start", style="blue")
             normal_filter = NormalFilter(index_manager,stats,sources)
             final_files = normal_filter.filter(index_manager.read_index(),args.query)

{auto_coder-0.1.244 → auto_coder-0.1.245}/src/autocoder/index/filter/normal_filter.py

@@ -34,6 +34,7 @@ class NormalFilter():
         self.sources = sources
 
     def filter(self, index_items: List[IndexItem], query: str) -> Dict[str, TargetFile]:
+        
         final_files: Dict[str, TargetFile] = {}
         if not self.args.skip_filter_index:
             if self.args.request_id and not self.args.skip_events:
@@ -125,7 +126,7 @@ class NormalFilter():
                         if source.module_name == file.file_path:
                             file_content = source.source_code
                             try:
-                                result = self.index_manager.verify_file_relevance.with_llm(llm).with_return_type(VerifyFileRelevance).run(
+                                result = self.index_manager.verify_file_relevance.with_llm(self.index_manager.llm).with_return_type(VerifyFileRelevance).run(
                                     file_content=file_content,
                                     query=self.args.query
                                 )

{auto_coder-0.1.244 → auto_coder-0.1.245}/src/autocoder/index/filter/quick_filter.py

@@ -69,7 +69,7 @@ class QuickFilter():
 
     def filter(self, index_items: List[IndexItem], query: str) -> Dict[str, TargetFile]:
         final_files: Dict[str, TargetFile] = {}
-        if not self.args.skip_filter_index and self.index_manager.llm.get_sub_client("index_filter_model"):
+        if not self.args.skip_filter_index and self.args.index_filter_model:
             start_time = time.monotonic()
             index_items = self.index_manager.read_index()
 

{auto_coder-0.1.244 → auto_coder-0.1.245}/src/autocoder/models.py

@@ -2,6 +2,7 @@ import os
 import json
 from typing import List, Dict
 from urllib.parse import urlparse
+from autocoder.common.auto_coder_lang import get_message_with_format
 
 MODELS_JSON = os.path.expanduser("~/.auto-coder/keys/models.json")
 
@@ -108,8 +109,7 @@ def get_model_by_name(name: str) -> Dict:
     models = load_models()
     v = [m for m in models if m["name"] == name.strip()]
     
-    if len(v) == 0:
-        from autocoder.common.auto_coder_lang import get_message_with_format
+    if len(v) == 0:        
         raise Exception(get_message_with_format("model_not_found", model_name=name))
     return v[0]
 

{auto_coder-0.1.244 → auto_coder-0.1.245}/src/autocoder/utils/auto_coder_utils/chat_stream_out.py

@@ -234,6 +234,8 @@ def stream_out(
             title="Error",
             border_style="red"
         ))
+        # import traceback
+        # traceback.print_exc()
         
         if request_id and request_queue:
             request_queue.add_request(

auto_coder-0.1.245/src/autocoder/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.245"

auto_coder-0.1.244/src/autocoder/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.244"