auto-coder 0.1.259__py3-none-any.whl → 0.1.261__py3-none-any.whl

autocoder/common/auto_coder_lang.py

@@ -3,7 +3,26 @@ from byzerllm.utils import format_str_jinja2
 
 MESSAGES = {
     "en": {
+        "config_validation_error": "Config validation error: {{error}}",
+        "invalid_boolean_value": "Value '{{value}}' is not a valid boolean(true/false)",
+        "invalid_integer_value": "Value '{{value}}' is not a valid integer",
+        "invalid_float_value": "Value '{{value}}' is not a valid float",
+        "invalid_type_value": "Value '{{value}}' is not a valid type (expected: {{types}})",
+        "value_out_of_range": "Value {{value}} is out of allowed range({{min}}~{{max}})",
+        "invalid_choice": "Value '{{value}}' is not in allowed options({{allowed}})",
+        "unknown_config_key": "Unknown config key '{{key}}'",
+        "model_not_found": "Model '{{model}}' is not configured in models.yml",
+        "required_without_default": "Config key '{{key}}' requires explicit value",
+        "auto_command_action_break": "Command {{command}} execution failed (got {{action}} result), no result can be obtained, please try again",
+        "auto_command_break": "Auto command execution failed to execute command: {{command}}",
+        "auto_command_executing": "\n\n============= Executing command: {{command}} =============\n\n",
         "model_provider_select_title": "Select Model Provider",
+        "auto_config_analyzing": "Analyzing configuration...",
+        "config_delete_success": "Successfully deleted configuration: {{key}}",
+        "config_not_found": "Configuration not found: {{key}}",
+        "config_invalid_format": "Invalid configuration format. Expected 'key:value'",
+        "config_value_empty": "Configuration value cannot be empty",
+        "config_set_success": "Successfully set configuration: {{key}} = {{value}}",
         "model_provider_select_text": "Please select your model provider:",
         "model_provider_volcano": "Volcano Engine",
         "model_provider_siliconflow": "SiliconFlow AI",
@@ -71,7 +90,7 @@ MESSAGES = {
             "Paste the answer to the input box below, use '/break' to exit, '/clear' to clear the screen, '/eof' to submit."
         ),
         "code_generation_start": "Auto generate the code...",
-        "code_generation_complete": "{{ model_names}} Code generation completed in {{ duration }} seconds, input_tokens_count: {{ input_tokens }}, generated_tokens_count: {{ output_tokens }}, input_cost: {{ input_cost }}, output_cost: {{ output_cost }}, speed: {{ speed }} tokens/s",
+        "code_generation_complete": "{{ model_names}} Code generation completed in {{ duration }} seconds (sampling_count: {{ sampling_count }}), input_tokens_count: {{ input_tokens }}, generated_tokens_count: {{ output_tokens }}, input_cost: {{ input_cost }}, output_cost: {{ output_cost }}, speed: {{ speed }} tokens/s",
         "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": "{{ model_name }} Starting filter context(quick_filter)...",
@@ -89,12 +108,12 @@ MESSAGES = {
         "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": "{{ model_names }} Ranking completed in {{ elapsed }}s, total voters: {{ total_tasks }}, best candidate index: {{ best_candidate }}, scores: {{ scores }}, input_tokens: {{ input_tokens }}, output_tokens: {{ output_tokens }}, input_cost: {{ input_cost }}, output_cost: {{ output_cost }}",
+        "ranking_complete": "{{ model_names }} Ranking completed in {{ elapsed }}s, total voters: {{ total_tasks }}, best candidate index: {{ best_candidate }}, scores: {{ scores }}, input_tokens: {{ input_tokens }}, output_tokens: {{ output_tokens }}, input_cost: {{ input_cost }}, output_cost: {{ output_cost }}, speed: {{ speed }} tokens/s",
         "ranking_process_failed": "Ranking process failed: {{ error }}",
         "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": "Model: {{ model_name }}, Total time: {{ elapsed_time }} seconds, First token time: {{ first_token_time }} seconds, Speed: {{ speed }} tokens/s, Input tokens: {{ input_tokens }}, Output tokens: {{ output_tokens }}, Input cost: {{ input_cost }}, Output cost: {{ output_cost }}",
-        "quick_filter_stats": "{{ model_names }} 快速过滤器完成，耗时 {{ elapsed_time }} 秒，输入token数: {{ input_tokens }}, 输出token数: {{ output_tokens }}, 输入成本: {{ input_cost }}, 输出成本: {{ output_cost }}",
+        "quick_filter_stats": "{{ model_names }} Quick filter completed in {{ elapsed_time }} seconds, input tokens: {{ input_tokens }}, output tokens: {{ output_tokens }}, input cost: {{ input_cost }}, output cost: {{ output_cost }} speed: {{ speed }} tokens/s",
         "upsert_file": "✅ Updated file: {{ file_path }}",
         "unmerged_blocks_title": "Unmerged Blocks",
         "quick_filter_title": "{{ model_name }} is analyzing how to filter context...",
@@ -110,9 +129,36 @@ MESSAGES = {
         "estimated_chat_input_tokens": "Estimated chat input tokens: {{ estimated_input_tokens }}",
         "estimated_input_tokens_in_generate": "Estimated input tokens in generate ({{ generate_mode }}): {{ estimated_input_tokens }}",
         "model_has_access_restrictions": "{{model_name}} has access restrictions, cannot use the current function",
-    },
+        "auto_command_not_found": "Auto command not found: {{command}}. Please check your input and try again.",
+        "auto_command_failed": "Auto command failed: {{error}}. Please check your input and try again.",
+        "command_execution_result": "{{action}} execution result",
+        "satisfied_prompt": "Requirements satisfied, no further action needed",
+        "auto_command_analyzed": "Selected command",
+        "invalid_enum_value": "Value '{{value}}' is not in allowed values ({{allowed}})",
+        "no_changes_made": "⚠️ no changes made, the reason may be that the text block generated by the coding function has a problem, so it cannot be merged into the project",
+        "conversation_pruning_start": "Conversation pruning started, total tokens: {{total_tokens}}, safe zone: {{safe_zone}}",
+        },
     "zh": {
+        "config_validation_error": "配置验证错误: {{error}}",
+        "invalid_boolean_value": "值 '{{value}}' 不是有效的布尔值(true/false)",
+        "invalid_integer_value": "值 '{{value}}' 不是有效的整数",
+        "invalid_float_value": "值 '{{value}}' 不是有效的浮点数",
+        "invalid_type_value": "值 '{{value}}' 不是有效的类型 (期望: {{types}})",
+        "value_out_of_range": "值 {value} 超出允许范围({min}~{max})",
+        "invalid_choice": "值 '{value}' 不在允许选项中({allowed})",
+        "unknown_config_key": "未知的配置项 '{key}'",
+        "model_not_found": "模型 '{model}' 未在 models.yml 中配置",
+        "required_without_default": "配置项 '{key}' 需要明确设置值",
+        "auto_command_action_break": "命令 {{command}} 执行失败（获取到了 {{action}} 的结果），无法获得任何结果,请重试",
+        "auto_command_break": "自动命令执行失败: {{command}}",
+        "auto_command_executing": "\n\n============= 正在执行指令: {{command}} =============\n\n",
         "model_provider_select_title": "选择模型供应商",
+        "auto_config_analyzing": "正在分析配置...",
+        "config_delete_success": "成功删除配置: {{key}}",
+        "config_not_found": "未找到配置: {{key}}",
+        "config_invalid_format": "配置格式无效，应为'key:value'格式",
+        "config_value_empty": "配置值不能为空",
+        "config_set_success": "成功设置配置: {{key}} = {{value}}",
         "model_provider_select_text": "请选择您的模型供应商：",
         "model_provider_volcano": "火山方舟",
         "model_provider_siliconflow": "硅基流动",
@@ -179,7 +225,7 @@ MESSAGES = {
             "将获得答案黏贴到下面的输入框，换行后，使用 '/break' 退出，'/clear' 清屏，'/eof' 提交。"
         ),
         "code_generation_start": "正在自动生成代码...",
-        "code_generation_complete": "{{ model_names}} 代码生成完成，耗时 {{ duration }} 秒，输入token数: {{ input_tokens }}, 输出token数: {{ output_tokens }}, 输入成本: {{ input_cost }}, 输出成本: {{ output_cost }}, 速度: {{ speed }} tokens/秒",
+        "code_generation_complete": "{{ model_names}} 代码生成完成，耗时 {{ duration }} 秒 (采样数: {{ sampling_count }}), 输入token数: {{ input_tokens }}, 输出token数: {{ output_tokens }}, 输入成本: {{ input_cost }}, 输出成本: {{ output_cost }}, 速度: {{ speed }} tokens/秒",
         "code_merge_start": "正在自动合并代码...",
         "code_execution_warning": "发送给模型的内容长度为 {{ content_length }} tokens（您可能收集了太多文件），超过了最大输入长度 {{ max_length }}",
         "quick_filter_start": "{{ model_name }} 开始查找上下文(quick_filter)...",
@@ -190,7 +236,7 @@ MESSAGES = {
         "unmerged_blocks_warning": "⚠️ 发现 {{ num_blocks }} 个未合并的代码块，更改将不会被应用。请手动检查后重试。",
         "pylint_file_check_failed": "⚠️ {{ file_path }} 的 Pylint 检查失败。更改未应用。错误: {{ error_message }}",
         "merge_success": "✅ 成功合并了 {{ num_files }} 个文件中的更改 {{ num_changes }}/{{ total_blocks }} 个代码块。",
-        "no_changes_made": "⚠️ 未对任何文件进行更改。",
+        "no_changes_made": "⚠️ 未对任何文件进行更改。这个原因可能是因为coding函数生成的文本块格式有问题，导致无法合并进项目",
         "unmerged_blocks_title": "未合并代码块",
         "unmerged_file_path": "文件: {{file_path}}",
         "unmerged_search_block": "Search Block({{similarity}}):",
@@ -208,16 +254,23 @@ MESSAGES = {
         "ranking_start": "开始对 {{ count }} 个候选项进行排序,使用模型 {{ model_name }} 打分",
         "ranking_failed_request": "排序请求失败: {{ error }}",
         "ranking_all_failed": "所有排序请求都失败",
-        "ranking_complete": "{{ model_names }} 排序完成，耗时 {{ elapsed }} 秒，总投票数: {{ total_tasks }}，最佳候选索引: {{ best_candidate }}，得分: {{ scores }}，输入token数: {{ input_tokens }}，输出token数: {{ output_tokens }}  输入成本: {{ input_cost }}, 输出成本: {{ output_cost }}",
+        "ranking_complete": "{{ model_names }} 排序完成，耗时 {{ elapsed }} 秒，总投票数: {{ total_tasks }}，最佳候选索引: {{ best_candidate }}，得分: {{ scores }}，输入token数: {{ input_tokens }}，输出token数: {{ output_tokens }}，输入成本: {{ input_cost }}, 输出成本: {{ output_cost }}，速度: {{ speed }} tokens/秒",
         "ranking_process_failed": "排序过程失败: {{ error }}",
         "ranking_failed": "排序失败，耗时 {{ elapsed }} 秒，使用原始顺序",
         "stream_out_stats": "模型: {{ model_name }},总耗时 {{ elapsed_time }} 秒,首token时间: {{ first_token_time }} 秒, 速度: {{ speed }} tokens/秒, 输入token数: {{ input_tokens }}, 输出token数: {{ output_tokens }}, 输入成本: {{ input_cost }}, 输出成本: {{ output_cost }}",
-        "quick_filter_stats": "{{ model_names }} Quick filter completed in {{ elapsed_time }} seconds, input tokens: {{ input_tokens }}, output tokens: {{ output_tokens }}, input cost: {{ input_cost }}, output cost: {{ output_cost }}",
+        "quick_filter_stats": "{{ model_names }} Quick Filter 完成耗时 {{ elapsed_time }} 秒，输入token数: {{ input_tokens }}, 输出token数: {{ output_tokens }}, 输入成本: {{ input_cost }}, 输出成本: {{ output_cost }} 速度: {{ speed }} tokens/秒",
         "quick_filter_title": "{{ model_name }} 正在分析如何筛选上下文...",
         "quick_filter_failed": "❌ 快速过滤器失败: {{ error }}. ",
         "estimated_chat_input_tokens": "对话输入token预估为: {{ estimated_input_tokens }}",
         "estimated_input_tokens_in_generate": "生成代码({{ generate_mode }})预计输入token数: {{ estimated_input_tokens_in_generate }}",
         "model_has_access_restrictions": "{{model_name}} 有访问限制，无法使用当前功能",
+        "auto_command_not_found": "未找到自动命令: {{command}}。请检查您的输入并重试。",
+        "auto_command_failed": "自动命令执行失败: {{error}}。请检查您的输入并重试。",
+        "command_execution_result": "{{action}} 执行结果",
+        "satisfied_prompt": "已满足需求，无需进一步操作",
+        "auto_command_analyzed": "被选择指令",
+        "invalid_enum_value": "值 '{{value}}' 不在允许的值列表中 ({{allowed}})",
+        "conversation_pruning_start": "⚠️ 对话长度 {{total_tokens}} tokens 超过安全阈值 {{safe_zone}}，开始修剪对话。"
     }}
 
 

autocoder/common/auto_configure.py

@@ -0,0 +1,304 @@
+import json
+import logging
+import os
+import time
+import traceback
+import uuid
+from typing import Dict, Any, Optional, Union, Callable, List
+from pydantic import BaseModel, Field, SkipValidation
+import byzerllm
+from byzerllm import ByzerLLM
+from byzerllm.utils.client import code_utils
+from autocoder.common.printer import Printer
+from byzerllm.utils.str2model import to_model
+from autocoder.utils.auto_coder_utils.chat_stream_out import stream_out
+from autocoder.common.result_manager import ResultManager
+from autocoder.utils import llms as llms_utils
+logger = logging.getLogger(__name__)
+
+class ConfigMessage(BaseModel):
+    role: str
+    content: str
+
+class ExtenedConfigMessage(BaseModel):
+    message: ConfigMessage
+    timestamp: str
+
+class ConfigConversation(BaseModel):
+    history: Dict[str, ExtenedConfigMessage]
+    current_conversation: List[ConfigMessage]
+
+def save_to_memory_file(query: str, response: str):
+    """Save conversation to memory file using ConfigConversation structure"""
+    memory_dir = os.path.join(".auto-coder", "memory")
+    os.makedirs(memory_dir, exist_ok=True)
+    file_path = os.path.join(memory_dir, "config_chat_history.json")
+    
+    # Create new message objects
+    user_msg = ConfigMessage(role="user", content=query)
+    assistant_msg = ConfigMessage(role="assistant", content=response)
+    
+    extended_user_msg = ExtenedConfigMessage(
+        message=user_msg,
+        timestamp=str(int(time.time()))
+    )
+    extended_assistant_msg = ExtenedConfigMessage(
+        message=assistant_msg,
+        timestamp=str(int(time.time()))
+    )
+    
+    # Load existing conversation or create new
+    if os.path.exists(file_path):
+        with open(file_path, "r", encoding="utf-8") as f:
+            try:
+                existing_conv = ConfigConversation.model_validate_json(f.read())
+            except Exception:
+                existing_conv = ConfigConversation(
+                    history={},
+                    current_conversation=[]
+                )
+    else:
+        existing_conv = ConfigConversation(
+            history={},
+            current_conversation=[]
+        )
+
+    existing_conv.current_conversation.append(extended_user_msg)
+    existing_conv.current_conversation.append(extended_assistant_msg)        
+    # Save updated conversation
+    with open(file_path, "w", encoding="utf-8") as f:
+        f.write(existing_conv.model_dump_json(indent=2))
+
+class MemoryConfig(BaseModel):
+    """
+    A model to encapsulate memory configuration and operations.
+    """
+    memory: Dict[str, Any]
+    save_memory_func: SkipValidation[Callable]
+
+    class Config:
+        arbitrary_types_allowed = True
+    
+    def configure(self, conf: str, skip_print: bool = False) -> None:
+        """
+        Configure memory with the given key-value pair.
+        """
+        printer = Printer()
+        parts = conf.split(None, 1)
+        if len(parts) == 2 and parts[0] in ["/drop", "/unset", "/remove"]:
+            key = parts[1].strip()
+            if key in self.memory["conf"]:
+                del self.memory["conf"][key]
+                self.save_memory_func()
+                printer.print_in_terminal("config_delete_success", style="green", key=key)
+            else:
+                printer.print_in_terminal("config_not_found", style="yellow", key=key)
+        else:
+            parts = conf.split(":", 1)
+            if len(parts) != 2:
+                printer.print_in_terminal("config_invalid_format", style="red")
+                return
+            key, value = parts
+            key = key.strip()
+            value = value.strip()
+            if not value:
+                printer.print_in_terminal("config_value_empty", style="red")
+                return
+            self.memory["conf"][key] = value
+            self.save_memory_func()
+            if not skip_print:
+                printer.print_in_terminal("config_set_success", style="green", key=key, value=value)
+
+
+
+class AutoConfigRequest(BaseModel):
+    query: str = Field(..., description="用户原始请求内容")    
+
+
+class AutoConfigResponse(BaseModel):
+    configs: List[Dict[str, Any]] = Field(default_factory=list)
+    reasoning: str = ""        
+
+class ConfigAutoTuner:
+    def __init__(self, llm: Union[byzerllm.ByzerLLM, byzerllm.SimpleByzerLLM], memory_config: MemoryConfig):
+        self.llm = llm
+        self.memory_config = memory_config
+            
+
+    def configure(self, conf: str, skip_print: bool = False) -> None:
+        """
+        Delegate configuration to MemoryConfig instance.
+        """
+        self.memory_config.configure(conf, skip_print)
+
+
+    @byzerllm.prompt()
+    def config_readme(self) -> str:
+        """
+        # 配置项说明
+        ## auto_merge: 代码合并方式，可选值为editblock、diff、wholefile.
+        - editblock: 生成 SEARCH/REPLACE 块，然后根据 SEARCH块到对应的源码查找，如果相似度阈值大于 editblock_similarity， 那么则将
+        找到的代码块替换为 REPLACE 块。大部分情况都推荐使用 editblock。        
+        - wholefile: 重新生成整个文件，然后替换原来的文件。对于重构场景，推荐使用 wholefile。
+        - diff: 生成标准 git diff 格式，适用于简单的代码修改。        
+
+        ## editblock_similarity: editblock相似度阈值
+        - editblock相似度阈值，取值范围为0-1，默认值为0.9。如果设置的太低，虽然能合并进去，但是会引入错误。推荐不要修改该值。
+
+        ## generate_times_same_model: 相同模型生成次数
+        当进行生成代码时，大模型会对同一个需求生成多份代码，然后会使用 generate_rerank_model 模型对多份代码进行重排序，
+        然后选择得分最高的代码。一般次数越多，最终得到正确的代码概率越高。默认值为1，推荐设置为3。但是设置值越多，可能速度就越慢，消耗的token也越多。
+
+        ## skip_filter_index: 是否跳过索引过滤
+        是否跳过根据用户的query 自动查找上下文。推荐设置为 false
+        
+        ## skip_build_index: 是否跳过索引构建
+        是否自动构建索引。推荐设置为 false。注意，如果该值设置为 true, 那么 skip_filter_index 设置不会生效。
+
+        ## rank_times_same_model: 相同模型重排序次数
+        默认值为1. 如果 generate_times_same_model 参数设置大于1，那么 coding 函数会自动对多份代码进行重排序。
+        rank_times_same_model 表示重拍的次数，次数越多，选择到最好的代码的可能性越高，但是也会显著增加消耗的token和时间。
+        建议保持默认，要修改也建议不要超过3。
+        """
+
+    def command_readme(self) -> str:
+        """
+        # 命令说明
+        ## /chat: 进入配置对话模式
+        ## /coding: 进入代码生成模式
+        """
+        
+    @byzerllm.prompt()
+    def _generate_config_str(self, request: AutoConfigRequest) -> str:
+        """
+        配置项说明：
+        <config_readme>
+        {{ config_readme }}
+        </config_readme>
+
+        用户请求: 
+        <query>
+        {{ query }}
+        </query>
+
+        当前配置: 
+        <current_conf>
+        {{ current_conf }}
+        </current_conf>
+        
+        上次执行情况：
+        <last_execution_stat>
+        {{ last_execution_stat }}
+        </last_execution_stat>
+
+        阅读配置说明，根据用户请求和当前配置以及上次执行情况，生成优化参数，严格使用以下JSON格式：
+
+        ```json
+        {
+            "configs": [{
+                "config": {
+                    "auto_merge": "editblock",
+                },
+                "reasoning": "配置变更原因",            
+                }
+            ]
+        }
+        ```
+        """
+        return {
+            "query": request.query,
+            "current_conf": json.dumps(self.memory_config.memory["conf"], indent=2),        
+            "last_execution_stat": "",
+            "config_readme": self.config_readme.prompt()
+        }
+
+    def tune(self, request: AutoConfigRequest) -> 'AutoConfigResponse':
+        result_manager = ResultManager()
+        try:
+            # 获取 prompt 内容
+            prompt = self._generate_config_str.prompt(request)
+            
+            # 构造对话上下文
+            conversations = [{"role": "user", "content": prompt}]
+
+            def extract_command_response(content):
+                # 提取 JSON 并转换为 AutoConfigResponse
+                try:
+                    response = to_model(content, AutoConfigResponse)
+                    return response.reasoning
+                except Exception as e:
+                    return content
+            
+            
+            # 使用 stream_out 进行输出
+            model_name = ",".join(llms_utils.get_llm_names(self.llm))
+            printer = Printer()
+            title = printer.get_message_from_key("auto_config_analyzing")
+            start_time = time.monotonic()
+            result, last_meta = stream_out(
+                self.llm.stream_chat_oai(conversations=conversations, delta_mode=True),
+                model_name=self.llm.default_model_name,
+                title=title,
+                display_func=extract_command_response
+            )            
+
+            if last_meta:
+                elapsed_time = time.monotonic() - start_time
+                printer = Printer()
+                speed = last_meta.generated_tokens_count / elapsed_time
+                
+                # Get model info for pricing
+                from autocoder.utils import llms as llm_utils
+                model_info = llm_utils.get_model_info(model_name, self.args.product_mode) or {}
+                input_price = model_info.get("input_price", 0.0) if model_info else 0.0
+                output_price = model_info.get("output_price", 0.0) if model_info else 0.0
+                
+                # Calculate costs
+                input_cost = (last_meta.input_tokens_count * input_price) / 1000000  # Convert to millions
+                output_cost = (last_meta.generated_tokens_count * output_price) / 1000000  # Convert to millions
+                
+                printer.print_in_terminal("stream_out_stats", 
+                                    model_name=",".join(llms_utils.get_llm_names(self.llm)),
+                                    elapsed_time=elapsed_time,
+                                    first_token_time=last_meta.first_token_time,
+                                    input_tokens=last_meta.input_tokens_count,
+                                    output_tokens=last_meta.generated_tokens_count,
+                                    input_cost=round(input_cost, 4),
+                                    output_cost=round(output_cost, 4),
+                                    speed=round(speed, 2))
+                        
+            
+            # 提取 JSON 并转换为 AutoConfigResponse            
+            response = to_model(result, AutoConfigResponse)
+            
+            # 保存对话记录
+            save_to_memory_file(                
+                query=request.query,
+                response=response.model_dump_json(indent=2)
+            )
+                        
+            content = response.reasoning or "success"
+            for config in response.configs:
+                for k, v in config["config"].items():
+                    self.configure(f"{k}:{v}")
+                    content += f"\nconf({k}:{v})"
+
+            result_manager = ResultManager()
+            
+            result_manager.add_result(content=content, meta={
+                "action": "help",
+                "input": {
+                    "query": request.query
+                }
+            })        
+            return response
+        except Exception as e:
+            v = f"help error: {str(e)} {traceback.format_exc()}"
+            logger.error(v)            
+            result_manager.add_result(content=v, meta={
+                "action": "help",
+                "input": {
+                    "query": request.query
+                }
+            })
+            return AutoConfigResponse()

autocoder/common/code_auto_merge.py

@@ -157,7 +157,7 @@ class CodeAutoMerge:
         # get the file name 
         file_name = os.path.basename(self.args.file)
         
-        if not force_skip_git:
+        if not force_skip_git and not self.args.skip_commit:
             try:
                 git_utils.commit_changes(self.args.source_dir, f"auto_coder_pre_{file_name}_{md5}")
             except Exception as e:            
@@ -176,6 +176,6 @@ class CodeAutoMerge:
                 f.write(block.content)
 
         self.printer.print_in_terminal("files_merged", total=total)
-        if not force_skip_git:
+        if not force_skip_git and not self.args.skip_commit:
             commit_result = git_utils.commit_changes(self.args.source_dir, f"auto_coder_{file_name}_{md5}\n{self.args.query}")
             git_utils.print_commit_info(commit_result=commit_result)

autocoder/common/code_auto_merge_diff.py

@@ -511,7 +511,7 @@ class CodeAutoMergeDiff:
         # get the file name 
         file_name = os.path.basename(self.args.file)
         
-        if not force_skip_git:
+        if not force_skip_git and not self.args.skip_commit:
             try:
                 git_utils.commit_changes(self.args.source_dir, f"auto_coder_pre_{file_name}_{md5}")
             except Exception as e:            
@@ -522,6 +522,6 @@ class CodeAutoMergeDiff:
         self.apply_edits(edits)
 
         self.printer.print_in_terminal("files_merged_total", total=total)
-        if not force_skip_git:
+        if not force_skip_git and not self.args.skip_commit:
             commit_result = git_utils.commit_changes(self.args.source_dir, f"auto_coder_{file_name}_{md5}\n{self.args.query}")
             git_utils.print_commit_info(commit_result=commit_result)

autocoder/common/code_auto_merge_editblock.py

@@ -360,7 +360,7 @@ class CodeAutoMergeEditBlock:
                                                   file_path=file_path, 
                                                   error_message=error_message)
 
-        if changes_made and not force_skip_git:
+        if changes_made and not force_skip_git and not self.args.skip_commit:
             try:
                 git_utils.commit_changes(
                     self.args.source_dir, f"auto_coder_pre_{file_name}_{md5}"
@@ -400,7 +400,7 @@ class CodeAutoMergeEditBlock:
             )
 
         if changes_made:
-            if not force_skip_git:
+            if not force_skip_git and not self.args.skip_commit:
                 try:
                     commit_result = git_utils.commit_changes(
                         self.args.source_dir, f"auto_coder_{file_name}_{md5}\n{self.args.query}"

autocoder/common/code_auto_merge_strict_diff.py

@@ -209,7 +209,7 @@ class CodeAutoMergeStrictDiff:
         # get the file name 
         file_name = os.path.basename(self.args.file)
         
-        if not force_skip_git:
+        if not force_skip_git and not self.args.skip_commit:
             try:
                 git_utils.commit_changes(self.args.source_dir, f"auto_coder_pre_{file_name}_{md5}")
             except Exception as e:            
@@ -232,7 +232,7 @@ class CodeAutoMergeStrictDiff:
                 raise Exception("Error applying diff to file: " + path)
                             
         self.printer.print_in_terminal("files_merged_total", total=total)
-        if not force_skip_git:
+        if not force_skip_git and not self.args.skip_commit:
             commit_result = git_utils.commit_changes(self.args.source_dir, f"auto_coder_{file_name}_{md5}\n{self.args.query}")
             git_utils.print_commit_info(commit_result=commit_result)
 

autocoder/common/code_modification_ranker.py

@@ -18,10 +18,11 @@ class CodeModificationRanker:
     def __init__(self, llm: byzerllm.ByzerLLM, args: AutoCoderArgs):
         self.llm = llm
         self.args = args
-        self.llms = self.llm.get_sub_client(
-            "generate_rerank_model") or [self.llm]
+        self.llms = self.llm.get_sub_client("generate_rerank_model") or [self.llm]
+        
         if not isinstance(self.llms, list):
             self.llms = [self.llms]
+        
         self.printer = Printer()
 
     @byzerllm.prompt()
@@ -65,9 +66,7 @@ class CodeModificationRanker:
         if len(generate_result.contents) == 1:
             self.printer.print_in_terminal("ranking_skip", style="blue")
             return generate_result
-
-        self.printer.print_in_terminal(
-            "ranking_start", style="blue", count=len(generate_result.contents))
+        
         rank_times = self.args.rank_times_same_model
         total_tasks = len(self.llms) * rank_times
 
@@ -79,7 +78,7 @@ 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 = ",".join(get_llm_names(llm))
                     self.printer.print_in_terminal(
                         "ranking_start", style="blue", count=len(generate_result.contents), model_name=model_name)
@@ -159,6 +158,7 @@ class CodeModificationRanker:
                                            reverse=True)
 
                 elapsed = time.time() - start_time
+                speed = generated_tokens_count / elapsed
                 # Format scores for logging
                 score_details = ", ".join(
                     [f"candidate {i}: {candidate_scores[i]:.2f}" for i in sorted_candidates])
@@ -173,7 +173,8 @@ class CodeModificationRanker:
                     output_tokens=generated_tokens_count,
                     input_cost=total_input_cost,
                     output_cost=total_output_cost,
-                    model_names=", ".join(model_names)
+                    model_names=", ".join(model_names),
+                    speed=f"{speed:.2f}"
                 )
 
                 rerank_contents = [generate_result.contents[i]