auto-coder 0.1.246__tar.gz → 0.1.248__tar.gz

{auto_coder-0.1.246 → auto_coder-0.1.248}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.246
+Version: 0.1.248
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence

{auto_coder-0.1.246 → auto_coder-0.1.248}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.246
+Version: 0.1.248
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence

{auto_coder-0.1.246 → auto_coder-0.1.248}/src/autocoder/auto_coder.py

@@ -276,7 +276,7 @@ def main(input_args: Optional[List[str]] = None):
                 )
                 byzerllm.connect_cluster(address=args.ray_address)
 
-            llm = byzerllm.ByzerLLM(verbose=args.print_request)
+            llm = byzerllm.ByzerLLM(verbose=args.print_request)            
 
             # code_model,index_filter_model,generate_rerank_model,chat_model
             # 这四个模型如果用户没有设置，就会使用默认的
@@ -1339,7 +1339,7 @@ def main(input_args: Optional[List[str]] = 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)
+                v = reviewer.review_commit(query=args.query,conversations=loaded_conversations)
             else:                
                 v = stream_chat_with_continue(
                     llm=chat_llm,

{auto_coder-0.1.246 → auto_coder-0.1.248}/src/autocoder/chat_auto_coder.py

@@ -1712,14 +1712,24 @@ def commit(query: str):
             finally:
                 if os.path.exists(temp_yaml):
                     os.remove(temp_yaml)
-
-            llm = get_single_llm(args.code_model or args.model, product_mode)
-            uncommitted_changes = git_utils.get_uncommitted_changes(".")
-            commit_message = git_utils.generate_commit_message.with_llm(llm).run(
-                uncommitted_changes
-            )
-            memory["conversation"].append(
-                {"role": "user", "content": commit_message})
+            
+            target_model = args.code_model or args.model
+            llm = get_single_llm(target_model, product_mode)
+            printer = Printer()
+            printer.print_in_terminal("commit_generating", style="yellow", model_name=target_model)
+            commit_message = ""
+            
+            try:
+                uncommitted_changes = git_utils.get_uncommitted_changes(".")
+                commit_message = git_utils.generate_commit_message.with_llm(llm).run(
+                    uncommitted_changes
+                )                
+                memory["conversation"].append(
+                    {"role": "user", "content": commit_message})
+            except Exception as e:
+                printer.print_in_terminal("commit_failed", style="red", error=str(e), model_name=target_model)
+                return
+            
             yaml_config["query"] = commit_message
             yaml_content = convert_yaml_config_to_str(yaml_config=yaml_config)
             with open(os.path.join(execute_file), "w") as f:
@@ -1732,6 +1742,8 @@ def commit(query: str):
                 ".", f"auto_coder_{file_name}_{md5}"
             )
             git_utils.print_commit_info(commit_result=commit_result)
+            if commit_message:
+                printer.print_in_terminal("commit_message", style="green", model_name=target_model, message=commit_message)                
         except Exception as e:
             import traceback
             traceback.print_exc()            
@@ -1875,8 +1887,8 @@ def coding(query: str):
 @byzerllm.prompt()
 def code_review(query: str) -> str:
     """
-    对代码进行review，参考如下检查点。
-    1. 有没有调用不符合方法，类的签名的调用
+    掐面提供了上下文，对代码进行review，参考如下检查点。
+    1. 有没有调用不符合方法，类的签名的调用，包括对第三方类，模块，方法的检查（如果上下文提供了这些信息）
     2. 有没有未声明直接使用的变量，方法，类
     3. 有没有明显的语法错误
     4. 如果是python代码，检查有没有缩进方面的错误

{auto_coder-0.1.246 → auto_coder-0.1.248}/src/autocoder/chat_auto_coder_lang.py

@@ -113,9 +113,15 @@ MESSAGES = {
         "remove_files_none": "No files were removed.",
         "files_removed": "Files Removed",
         "models_api_key_empty": "Warning : {{name}} API key is empty. Please set a valid API key.",
+        "commit_generating": "{{ model_name }} Generating commit message...",
+        "commit_message": "{{ model_name }} Generated commit message: {{ message }}",
+        "commit_failed": "{{ model_name }} Failed to generate commit message: {{ error }}",
     },
     "zh": {
-        "mcp_remove_error": "移除 MCP 服务器时出错：{error}",
+        "commit_generating": "{{ model_name }} 正在生成提交信息...", 
+        "commit_message": "{{ model_name }} 生成的提交信息: {{ message }}",
+        "commit_failed": "{{ model_name }} 生成提交信息失败: {{ error }}",
+        "mcp_remove_error": "移除 MCP 服务器时出错:{error}",
         "mcp_remove_success": "成功移除 MCP 服务器：{result}",
         "mcp_list_running_error": "列出运行中的 MCP 服务器时出错：{error}",
         "mcp_list_running_title": "正在运行的 MCP 服务器：",

{auto_coder-0.1.246 → auto_coder-0.1.248}/src/autocoder/common/__init__.py

@@ -260,6 +260,7 @@ class AutoCoderArgs(pydantic.BaseModel):
 
     index_model: Optional[str] = ""
     index_filter_model: Optional[str] = ""
+    index_filter_model_max_input_length: Optional[int] = 50*1024
     index_model_max_length: Optional[int] = 0
     index_model_max_input_length: Optional[int] = 0
     index_model_anti_quota_limit: Optional[int] = 0

{auto_coder-0.1.246 → auto_coder-0.1.248}/src/autocoder/common/auto_coder_lang.py

@@ -53,7 +53,7 @@ MESSAGES = {
         "code_generation_complete": "Code generation completed in {{ duration }} seconds, input_tokens_count: {{ input_tokens }}, generated_tokens_count: {{ output_tokens }}",
         "code_merge_start": "Auto merge the code...",
         "code_execution_warning": "Content(send to model) is {{ content_length }} tokens (you may collect too much files), which is larger than the maximum input length {{ max_length }}",
-        "quick_filter_start": "Starting filter context(quick_filter)...",
+        "quick_filter_start": "{{ model_name }} Starting filter context(quick_filter)...",
         "normal_filter_start": "{{ model_name }} Starting filter context(normal_filter)...",
         "pylint_check_failed": "⚠️ Pylint check failed: {{ error_message }}",
         "pylint_error": "❌ Error running pylint: {{ error_message }}",
@@ -65,7 +65,7 @@ MESSAGES = {
         "merge_failed": "❌ Merge file {{ path }} failed: {{ error }}",
         "files_merged_total": "✅ Merged {{ total }} files into the project.",
         "ranking_skip": "Only 1 candidate, skip ranking",
-        "ranking_start": "Start ranking {{ count }} candidates",
+        "ranking_start": "Start ranking {{ count }} candidates using model {{ model_name }}",
         "ranking_failed_request": "Ranking request failed: {{ error }}",
         "ranking_all_failed": "All ranking requests failed",
         "ranking_complete": "Ranking completed in {{ elapsed }}s, total voters: {{ total_tasks }}, best candidate index: {{ best_candidate }}, scores: {{ scores }}, input_tokens: {{ input_tokens }}, output_tokens: {{ output_tokens }}",
@@ -73,13 +73,19 @@ MESSAGES = {
         "ranking_failed": "Ranking failed in {{ elapsed }}s, using original order",
         "begin_index_source_code": "🚀 Begin to index source code in {{ source_dir }}",
         "stream_out_stats": "Elapsed time {{ elapsed_time }} seconds, input tokens: {{ input_tokens }}, output tokens: {{ output_tokens }}",
+        "quick_filter_stats": "快速过滤器完成，耗时 {{ elapsed_time }} 秒，输入token数: {{ input_tokens }}, 输出token数: {{ output_tokens }}",
         "upsert_file": "✅ Updated file: {{ file_path }}",  
-        "unmerged_blocks_title": "Unmerged Blocks",                     
+        "unmerged_blocks_title": "Unmerged Blocks",
+        "quick_filter_title": "{{ model_name }} is analyzing how to filter context...",
+        "quick_filter_failed": "❌ Quick filter failed: {{ error }}. ",
         "unmerged_file_path": "File: {{file_path}}",
         "unmerged_search_block": "Search Block({{similarity}}):",
         "unmerged_replace_block": "Replace Block:",
         "unmerged_blocks_total": "Total unmerged blocks: {{num_blocks}}",
-        "git_init_required": "⚠️ auto_merge only applies to git repositories.\n\nPlease try using git init in the source directory:\n\n```shell\ncd {{ source_dir }}\ngit init.\n```\n\nThen run auto - coder again.\nError: {{ error }}"
+        "git_init_required": "⚠️ auto_merge only applies to git repositories.\n\nPlease try using git init in the source directory:\n\n```shell\ncd {{ source_dir }}\ngit init.\n```\n\nThen run auto - coder again.\nError: {{ error }}",
+        "quick_filter_reason": "Auto get(quick_filter mode)",
+        "quick_filter_too_long": "⚠️ index file is too large ({{ tokens_len }}/{{ max_tokens }}). The query will be split into {{ split_size }} chunks.",
+        "quick_filter_tokens_len": "📊 Current index size: {{ tokens_len }} tokens"
     },
     "zh": {
         "model_not_found": "未找到模型: {{model_name}}",
@@ -132,7 +138,7 @@ MESSAGES = {
         "code_generation_complete": "代码生成完成，耗时 {{ duration }} 秒，输入token数: {{ input_tokens }}, 输出token数: {{ output_tokens }}",
         "code_merge_start": "正在自动合并代码...",
         "code_execution_warning": "发送给模型的内容长度为 {{ content_length }} tokens（您可能收集了太多文件），超过了最大输入长度 {{ max_length }}",
-        "quick_filter_start": "开始查找上下文(quick_filter)...",
+        "quick_filter_start": "{{ model_name }} 开始查找上下文(quick_filter)...",
         "normal_filter_start": "{{ model_name }} 开始查找上下文(normal_filter)...",
         "pylint_check_failed": "⚠️ Pylint 检查失败: {{ error_message }}",
         "pylint_error": "❌ 运行 Pylint 时出错: {{ error_message }}",
@@ -146,19 +152,25 @@ MESSAGES = {
         "unmerged_search_block": "Search Block({{similarity}}):",
         "unmerged_replace_block": "Replace Block:",
         "unmerged_blocks_total": "未合并代码块数量: {{num_blocks}}",
-        "git_init_required": "⚠️ auto_merge 仅适用于 git 仓库。\n\n请尝试在源目录中使用 git init：\n\n```shell\ncd {{ source_dir }}\ngit init.\n```\n\n然后再次运行 auto-coder。\n错误: {{ error }}",
+        "git_init_required": "⚠️ auto_merge 仅适用于 git 仓库。\n\n请尝试在源目录中使用 git init:\n\n```shell\ncd {{ source_dir }}\ngit init.\n```\n\n然后再次运行 auto-coder。\n错误: {{ error }}",
+        "quick_filter_reason": "自动获取(quick_filter模式)",
+        "quick_filter_too_long": "⚠️ 索引文件过大 ({{ tokens_len }}/{{ max_tokens }})。查询将被分成 {{ split_size }} 个部分执行。",
+        "quick_filter_tokens_len": "📊 当前索引大小: {{ tokens_len }} tokens",
         "upsert_file": "✅ 更新文件: {{ file_path }}",
         "files_merged": "✅ 成功合并了 {{ total }} 个文件到项目中。",
         "merge_failed": "❌ 合并文件 {{ path }} 失败: {{ error }}",
         "files_merged_total": "✅ 合并了 {{ total }} 个文件到项目中。",
         "ranking_skip": "只有1个候选项，跳过排序",
-        "ranking_start": "开始对 {{ count }} 个候选项进行排序",
+        "ranking_start": "开始对 {{ count }} 个候选项进行排序,使用模型 {{ model_name }} 打分",
         "ranking_failed_request": "排序请求失败: {{ error }}",
         "ranking_all_failed": "所有排序请求都失败",
         "ranking_complete": "排序完成，耗时 {{ elapsed }} 秒，总投票数: {{ total_tasks }}，最佳候选索引: {{ best_candidate }}，得分: {{ scores }}，输入token数: {{ input_tokens }}，输出token数: {{ output_tokens }}",
         "ranking_process_failed": "排序过程失败: {{ error }}",
         "ranking_failed": "排序失败，耗时 {{ elapsed }} 秒，使用原始顺序",
-        "stream_out_stats": "耗时 {{ elapsed_time }} 秒，输入token数: {{ input_tokens }}, 输出token数: {{ output_tokens }}"
+        "stream_out_stats": "耗时 {{ elapsed_time }} 秒，输入token数: {{ input_tokens }}, 输出token数: {{ output_tokens }}",
+        "quick_filter_stats": "Quick filter completed in {{ elapsed_time }} seconds, input tokens: {{ input_tokens }}, output tokens: {{ output_tokens }}",
+        "quick_filter_title": "{{ model_name }} 正在分析如何筛选上下文...",
+        "quick_filter_failed": "❌ 快速过滤器失败: {{ error }}. ",
     },
 }
 

{auto_coder-0.1.246 → auto_coder-0.1.248}/src/autocoder/common/code_auto_generate.py

@@ -7,6 +7,7 @@ from autocoder.common import sys_prompt
 from concurrent.futures import ThreadPoolExecutor
 from autocoder.common.types import CodeGenerateResult
 from autocoder.common.utils_code_auto_generate import chat_with_continue
+import json
 
 
 class CodeAutoGenerate:

{auto_coder-0.1.246 → auto_coder-0.1.248}/src/autocoder/common/code_modification_ranker.py

@@ -77,8 +77,15 @@ class CodeModificationRanker:
             with ThreadPoolExecutor(max_workers=total_tasks) as executor:
                 # Submit tasks for each model and generate_times
                 futures = []
-                for llm in self.llms:
+                for llm in self.llms:                    
+                    model_name = getattr(llm, 'default_model_name', None)                    
+                    if not model_name:
+                        model_name = "unknown(without default model name)"
+                    self.printer.print_in_terminal(
+                        "ranking_start", style="blue", count=len(generate_result.contents), model_name=model_name)
+                    
                     for _ in range(rank_times):
+                        
                         futures.append(
                             executor.submit(
                                 chat_with_continue,

{auto_coder-0.1.246 → auto_coder-0.1.248}/src/autocoder/common/git_utils.py

@@ -262,7 +262,9 @@ def get_uncommitted_changes(repo_path: str) -> str:
 def generate_commit_message(changes_report: str) -> str:
     '''
     我是一个Git提交信息生成助手。我们的目标是通过一些变更报告，倒推用户的需求，将需求作为commit message。
-    commit message 需要简洁，不要超过100个字符。
+    commit message 需要简洁,包含两部分：
+    1. 这个commit 背后的需求是什么
+    2. 为了完成这个需求做了哪些事情
 
     下面是一些示例：
     <examples>
@@ -613,7 +615,7 @@ def print_commit_info(commit_result: CommitResult):
 
     table.add_row("Commit Hash", commit_result.commit_hash)
     table.add_row("Commit Message", commit_result.commit_message)
-    table.add_row("Changed Files", "\n".join(commit_result.changed_files))
+    table.add_row("Changed Files", "\n".join(commit_result.changed_files) if commit_result.changed_files else "No files changed")
 
     console.print(
         Panel(table, expand=False, border_style="green", title="Git Commit Summary")