auto-coder 0.1.263__py3-none-any.whl → 0.1.265__py3-none-any.whl

autocoder/commands/auto_command.py

@@ -138,6 +138,11 @@ class CommandConfig(BaseModel):
     lib: SkipValidation[Callable]
     execute_shell_command: SkipValidation[Callable]
     generate_shell_command: SkipValidation[Callable]
+    conf_export: SkipValidation[Callable]
+    conf_import: SkipValidation[Callable]
+    index_export: SkipValidation[Callable]
+    index_import: SkipValidation[Callable]
+    exclude_files: SkipValidation[Callable]
 
     
 
@@ -298,6 +303,7 @@ class CommandAutoTuner:
             try:
                 response = to_model(content, AutoCommandResponse)  
                 if response.suggestions:
+                    print(response)
                     command = response.suggestions[0].command
                     parameters = response.suggestions[0].parameters                    
                     if parameters:
@@ -306,9 +312,9 @@ class CommandAutoTuner:
                         params_str = ""                    
                     return f"{command}({params_str})"
                 else:
-                    return printer.get_message_from_key("satisfied_prompt", style="green")                    
-            except Exception as e:
-                logger.error(f"Error extracting command response: {e}")
+                    return printer.get_message_from_key("satisfied_prompt")                    
+            except Exception as e:                
+                logger.error(f"Error extracting command response: {str(e)}")
                 return content
             
         model_name = ",".join(llms_utils.get_llm_names(self.llm))
@@ -1111,7 +1117,72 @@ class CommandAutoTuner:
         </usage>
         </command>
 
-        </commands>        
+        <command>
+        <name>conf_export</name>
+        <description>配置管理命令，用于管理和控制配置。</description>
+        <usage>
+         该命令导出当前软件的配置，并保存到指定路径。
+         
+         使用例子：         
+         conf_export(path="导出路径,通常是.json文件")
+         
+        </usage>
+        </command>
+
+        <command>
+        <name>conf_import</name>
+        <description>配置管理命令，用于管理和控制配置。</description>
+        <usage>
+         该命令导入指定路径的配置文件到当前软件。
+         
+         使用例子：         
+         conf_import(path="导入路径,通常是.json文件")
+         
+        </usage>
+        </command>
+
+        <command>
+        <name>index_export</name>
+        <description>索引管理命令，用于管理和控制索引。</description>
+        <usage>
+         该命令导出当前软件的索引，并保存到指定路径。
+         
+         使用例子：         
+         index_export(path="导出路径,通常是.json文件")
+         
+        </usage>
+        </command>
+
+        <command>
+        <name>index_import</name>
+        <description>索引管理命令，用于管理和控制索引。</description>
+        <usage>
+         该命令导入指定路径的索引文件到当前软件。
+         
+         使用例子：         
+         index_import(path="导入路径，通常最后是.json文件")
+         
+        </usage>
+        </command>
+
+        <command>
+        <name>exclude_files</name>
+        <description>排除指定文件。</description>
+        <usage>
+         该命令接受一个参数 file_patterns, 为要排除的文件模式字符串列表。
+         
+         使用例子,比如你想要排除 package-lock.json 文件，你可以这样调用：
+        
+         exclude_files(file_patterns=["regex://.*/package-lock\.json"])
+         
+         注意：
+         - 文件模式字符串必须以 regex:// 开头
+         - regex:// 后面部分是标准的正则表达式         
+        </usage>
+        </command>
+        </commands>
+        
+        
         '''
 
     def execute_auto_command(self, command: str, parameters: Dict[str, Any]) -> None:
@@ -1135,6 +1206,11 @@ class CommandAutoTuner:
             "models": self.command_config.models,
             "execute_shell_command": self.command_config.execute_shell_command,
             "generate_shell_command": self.command_config.generate_shell_command,
+            "conf_export": self.command_config.conf_export,
+            "conf_import": self.command_config.conf_import,
+            "index_export": self.command_config.index_export,
+            "index_import": self.command_config.index_import,
+            "exclude_files": self.command_config.exclude_files,
 
             "run_python": self.tools.run_python_code,            
             "get_related_files_by_symbols": self.tools.get_related_files_by_symbols,
@@ -1146,6 +1222,7 @@ class CommandAutoTuner:
             "get_project_related_files": self.tools.get_project_related_files,
             "ask_user":self.tools.ask_user,
             "read_file_with_keyword_ranges": self.tools.read_file_with_keyword_ranges,
+
             
                         
         }

autocoder/commands/tools.py

@@ -27,6 +27,7 @@ from autocoder.utils.queue_communicate import (
 )
 import sys
 import io
+from autocoder.common import files as files_utils
 
 @byzerllm.prompt()
 def detect_rm_command(command: str) -> Bool:
@@ -286,34 +287,33 @@ class AutoCommandTools:
 
         result = []
         try:
-            with open(absolute_path, 'r', encoding='utf-8') as f:
-                lines = f.readlines()
+            
+            lines = files_utils.read_lines(absolute_path)            
+            # Find all lines containing the keyword
+            keyword_lines = []
+            for i, line in enumerate(lines):
+                if keyword.lower() in line.lower():
+                    keyword_lines.append(i)
+            
+            # Process each keyword line and its surrounding range
+            processed_ranges = set()
+            for line_num in keyword_lines:
+                # Calculate range boundaries
+                start = max(0, line_num - before_size)
+                end = min(len(lines), line_num + after_size + 1)
                 
-                # Find all lines containing the keyword
-                keyword_lines = []
-                for i, line in enumerate(lines):
-                    if keyword.lower() in line.lower():
-                        keyword_lines.append(i)
+                # Check if this range overlaps with any previously processed range
+                range_key = (start, end)
+                if range_key in processed_ranges:
+                    continue
                 
-                # Process each keyword line and its surrounding range
-                processed_ranges = set()
-                for line_num in keyword_lines:
-                    # Calculate range boundaries
-                    start = max(0, line_num - before_size)
-                    end = min(len(lines), line_num + after_size + 1)
-                    
-                    # Check if this range overlaps with any previously processed range
-                    range_key = (start, end)
-                    if range_key in processed_ranges:
-                        continue
-                    
-                    processed_ranges.add(range_key)
-                    
-                    # Format the content block
-                    content = f"##File: {absolute_path}\n"
-                    content += f"##Line: {start+1}-{end}\n\n"
-                    content += "".join(lines[start:end])
-                    result.append(content)
+                processed_ranges.add(range_key)
+                
+                # Format the content block
+                content = f"##File: {absolute_path}\n"
+                content += f"##Line: {start+1}-{end}\n\n"
+                content += "".join(lines[start:end])
+                result.append(content)
                 
         except Exception as e:
             v = f"Error reading file {absolute_path}: {str(e)}"
@@ -403,23 +403,22 @@ class AutoCommandTools:
                         if path in os.path.join(root, file):
                             absolute_path = os.path.join(root, file)
                             break
-
-            with open(absolute_path, "r", encoding="utf-8") as f:
-                if path in file_line_ranges:
-                    # Read specific line ranges
-                    lines = f.readlines()
-                    filtered_lines = []
-                    for start, end in file_line_ranges[path]:
-                        # Adjust for 0-based indexing
-                        start = max(0, start - 1)
-                        end = min(len(lines), end)
-                        content = "".join(lines[start:end])
-                        filtered_lines.extend(f"##File: {absolute_path}\n##Line: {start}-{end}\n\n{content}")
-                    source_code = "".join(filtered_lines)
-                else:
-                    # Read entire file if no range specified
-                    content = f.read()
-                    source_code = f"##File: {absolute_path}\n\n{content}"
+            
+            if path in file_line_ranges:
+                # Read specific line ranges
+                lines = files_utils.read_lines(absolute_path)
+                filtered_lines = []
+                for start, end in file_line_ranges[path]:
+                    # Adjust for 0-based indexing
+                    start = max(0, start - 1)
+                    end = min(len(lines), end)
+                    content = "".join(lines[start:end])
+                    filtered_lines.extend(f"##File: {absolute_path}\n##Line: {start}-{end}\n\n{content}")
+                source_code = "".join(filtered_lines)
+            else:
+                # Read entire file if no range specified
+                content = files_utils.read_file(absolute_path)
+                source_code = f"##File: {absolute_path}\n\n{content}"
                 
                 sc = SourceCode(module_name=absolute_path, source_code=source_code)
                 source_code_str += f"{sc.source_code}\n\n"
@@ -510,13 +509,12 @@ class AutoCommandTools:
             for file in files:
                 file_path = os.path.join(root, file)
                 try:
-                    with open(file_path, "r", encoding="utf-8") as f:
-                        content = f.read()
-                        if keyword.lower() in content.lower():
-                            matched_files.append(file_path)
-                            # Limit to first 10 matches
-                            if len(matched_files) >= 10:
-                                break
+                    content = files_utils.read_file(file_path)
+                    if keyword.lower() in content.lower():
+                        matched_files.append(file_path)
+                        # Limit to first 10 matches
+                        if len(matched_files) >= 10:
+                            break
                 except Exception:
                     # Skip files that can't be read
                     pass

autocoder/common/__init__.py

@@ -6,7 +6,6 @@ import os
 import time
 from typing import List, Dict, Any, Optional, Union
 
-
 class SourceCode(pydantic.BaseModel):
     module_name: str
     source_code: str
@@ -359,6 +358,9 @@ class AutoCoderArgs(pydantic.BaseModel):
     data_cells_max_num: Optional[int] = 2000
     generate_times_same_model: Optional[int] = 1
     rank_times_same_model: Optional[int] = 1
+    
+    # block:给定每个文件修改的代码块 file: 给定每个文件修改前后内容
+    rank_strategy: Optional[str] = "file"
 
     action: List[str] = []
     enable_global_memory: Optional[bool] = True  
@@ -374,6 +376,9 @@ class AutoCoderArgs(pydantic.BaseModel):
     conversation_prune_group_size: Optional[int] = 4
     conversation_prune_strategy: Optional[str] = "summarize"
 
+    context_prune_strategy: Optional[str] = "score"
+    context_prune: Optional[bool] = True
+
     auto_command_max_iterations: Optional[int] = 10
     
     skip_commit: Optional[bool] = False    

autocoder/common/auto_coder_lang.py

@@ -3,6 +3,7 @@ from byzerllm.utils import format_str_jinja2
 
 MESSAGES = {
     "en": {
+        "invalid_file_pattern": "Invalid file pattern: {{file_pattern}}. e.g. regex://.*/package-lock\\.json",
         "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",
@@ -137,9 +138,42 @@ MESSAGES = {
         "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}}",
-        "invalid_file_number": "⚠️ Invalid file number {{file_number}}, total files: {{total_files}}"
-        },
+        "invalid_file_number": "⚠️ Invalid file number {{file_number}}, total files: {{total_files}}",
+        "all_merge_results_failed": "⚠️ All merge attempts failed, returning first candidate",
+        "only_one_merge_result_success": "✅ Only one merge result succeeded, returning that candidate",
+        "conf_import_success": "Successfully imported configuration: {{path}}",
+        "conf_export_success": "Successfully exported configuration: {{path}}",
+        "conf_import_error": "Error importing configuration: {{error}}",
+        "conf_export_error": "Error exporting configuration: {{error}}",
+        "conf_import_invalid_format": "Invalid import configuration format, expected 'key:value'",
+        "conf_export_invalid_format": "Invalid export configuration format, expected 'key:value'",
+        "conf_import_file_not_found": "Import configuration file not found: {{file_path}}",
+        "conf_export_file_not_found": "Export configuration file not found: {{file_path}}",
+        "conf_import_file_empty": "Import configuration file is empty: {{file_path}}",
+        "conf_export_file_empty": "Export configuration file is empty: {{file_path}}",
+        "generated_shell_script": "Generated Shell Script",
+        "confirm_execute_shell_script": "Do you want to execute this shell script?",
+        "shell_script_not_executed": "Shell script was not executed",
+        "conf_not_found": "Configuration file not found: {{path}}",
+        "index_export_success": "Index exported successfully: {{path}}",
+        "index_import_success": "Index imported successfully: {{path}}",
+    },
     "zh": {
+        "invalid_file_pattern": "无效的文件模式: {{file_pattern}}. 例如: regex://.*/package-lock\\.json",
+        "conf_not_found": "未找到配置文件: {{path}}",
+        "conf_import_success": "成功导入配置: {{path}}",
+        "conf_export_success": "成功导出配置: {{path}}",
+        "conf_import_error": "导入配置出错: {{error}}",
+        "conf_export_error": "导出配置出错: {{error}}",
+        "conf_import_invalid_format": "导入配置格式无效, 应为 'key:value' 格式",
+        "conf_export_invalid_format": "导出配置格式无效, 应为 'key:value' 格式",
+        "conf_import_file_not_found": "未找到导入配置文件: {{file_path}}",
+        "conf_export_file_not_found": "未找到导出配置文件: {{file_path}}",
+        "conf_import_file_empty": "导入配置文件为空: {{file_path}}",
+        "conf_export_file_empty": "导出配置文件为空: {{file_path}}",
+        "generated_shell_script": "生成的 Shell 脚本",
+        "confirm_execute_shell_script": "您要执行此 shell 脚本吗？",
+        "shell_script_not_executed": "Shell 脚本未执行",
         "config_validation_error": "配置验证错误: {{error}}",
         "invalid_boolean_value": "值 '{{value}}' 不是有效的布尔值(true/false)",
         "invalid_integer_value": "值 '{{value}}' 不是有效的整数",
@@ -272,7 +306,11 @@ MESSAGES = {
         "auto_command_analyzed": "被选择指令",
         "invalid_enum_value": "值 '{{value}}' 不在允许的值列表中 ({{allowed}})",
         "conversation_pruning_start": "⚠️ 对话长度 {{total_tokens}} tokens 超过安全阈值 {{safe_zone}}，开始修剪对话。",
-        "invalid_file_number": "⚠️ 无效的文件编号 {{file_number}}，总文件数为 {{total_files}}"
+        "invalid_file_number": "⚠️ 无效的文件编号 {{file_number}}，总文件数为 {{total_files}}",        
+        "all_merge_results_failed": "⚠️ 所有合并尝试都失败，返回第一个候选",
+        "only_one_merge_result_success": "✅ 只有一个合并结果成功，返回该候选",
+        "index_export_success": "索引导出成功: {{path}}",
+        "index_import_success": "索引导入成功: {{path}}",
     }}
 
 

autocoder/common/code_auto_generate.py

@@ -197,7 +197,7 @@ class CodeAutoGenerate:
                 instruction=query, content=source_content
             )
 
-        with open(self.args.target_file, "w") as file:
+        with open(self.args.target_file, "w",encoding="utf-8") as file:
             file.write(init_prompt)
 
         conversations = []
@@ -298,7 +298,7 @@ class CodeAutoGenerate:
 
         conversations = [{"role": "user", "content": init_prompt}]
 
-        with open(self.args.target_file, "w") as file:
+        with open(self.args.target_file, "w",encoding="utf-8") as file:
             file.write(init_prompt)
 
         t = self.llm.chat_oai(conversations=conversations, llm_config=llm_config)
@@ -320,7 +320,7 @@ class CodeAutoGenerate:
 
             conversations.append({"role": "user", "content": "继续"})
 
-            with open(self.args.target_file, "w") as file:
+            with open(self.args.target_file, "w",encoding="utf-8") as file:
                 file.write("继续")
 
             t = self.llm.chat_oai(conversations=conversations, llm_config=llm_config)

autocoder/common/code_auto_generate_diff.py

@@ -315,10 +315,7 @@ class CodeAutoGenerateDiff:
         elif self.args.template == "auto_implement":
             init_prompt = self.auto_implement_function.prompt(
                 instruction=query, content=source_content
-            )
-
-        with open(self.args.target_file, "w") as file:
-            file.write(init_prompt)
+            )        
 
         conversations = []
 
@@ -359,16 +356,16 @@ class CodeAutoGenerateDiff:
             with ThreadPoolExecutor(max_workers=len(self.llms) * self.generate_times_same_model) as executor:
                 futures = []
                 for llm in self.llms:
+                                        
+                    model_names_list = llm_utils.get_llm_names(llm)
+                    model_name = None
+                    if model_names_list:
+                        model_name = model_names_list[0]
+                    
                     for _ in range(self.generate_times_same_model):
-                        model_names_list = llm_utils.get_llm_names(llm)
-                        model_name = None
-                        if model_names_list:
-                            model_name = model_names_list[0]
-                        
-                        for _ in range(self.generate_times_same_model):
-                            model_names.append(model_name)
-                            futures.append(executor.submit(
-                                chat_with_continue, llm=llm, conversations=conversations, llm_config=llm_config))
+                        model_names.append(model_name)
+                        futures.append(executor.submit(
+                            chat_with_continue, llm=llm, conversations=conversations, llm_config=llm_config))
                 
                 temp_results = [future.result() for future in futures]
                 for result in temp_results:
@@ -447,7 +444,7 @@ class CodeAutoGenerateDiff:
         # conversations.append({"role": "system", "content": sys_prompt.prompt()})
         conversations.append({"role": "user", "content": init_prompt})
 
-        with open(self.args.target_file, "w") as file:
+        with open(self.args.target_file, "w",encoding="utf-8") as file:
             file.write(init_prompt)
 
         code_llm = self.llms[0]
@@ -467,7 +464,7 @@ class CodeAutoGenerateDiff:
 
             conversations.append({"role": "user", "content": "继续"})
 
-            with open(self.args.target_file, "w") as file:
+            with open(self.args.target_file, "w",encoding="utf-8") as file:
                 file.write("继续")
 
             t = code_llm.chat_oai(

autocoder/common/code_auto_generate_editblock.py

@@ -418,7 +418,7 @@ class CodeAutoGenerateEditBlock:
                 instruction=query, content=source_content
             )
 
-        with open(self.args.target_file, "w") as file:
+        with open(self.args.target_file, "w",encoding="utf-8") as file:
             file.write(init_prompt)
 
         conversations = []
@@ -538,7 +538,7 @@ class CodeAutoGenerateEditBlock:
         # conversations.append({"role": "system", "content": sys_prompt.prompt()})
         conversations.append({"role": "user", "content": init_prompt})
 
-        with open(self.args.target_file, "w") as file:
+        with open(self.args.target_file, "w",encoding="utf-8") as file:
             file.write(init_prompt)
 
         code_llm = self.llms[0]
@@ -558,7 +558,7 @@ class CodeAutoGenerateEditBlock:
 
             conversations.append({"role": "user", "content": "继续"})
 
-            with open(self.args.target_file, "w") as file:
+            with open(self.args.target_file, "w",encoding="utf-8") as file:
                 file.write("继续")
 
             t = code_llm.chat_oai(

autocoder/common/code_auto_generate_strict_diff.py

@@ -287,7 +287,7 @@ class CodeAutoGenerateStrictDiff:
                 instruction=query, content=source_content
             )
 
-        with open(self.args.target_file, "w") as file:
+        with open(self.args.target_file, "w",encoding="utf-8") as file:
             file.write(init_prompt)
 
         conversations = []
@@ -417,7 +417,7 @@ class CodeAutoGenerateStrictDiff:
         # conversations.append({"role": "system", "content": sys_prompt.prompt()})
         conversations.append({"role": "user", "content": init_prompt})
 
-        with open(self.args.target_file, "w") as file:
+        with open(self.args.target_file, "w",encoding="utf-8") as file:
             file.write(init_prompt)
         
         code_llm = self.llms[0]
@@ -437,7 +437,7 @@ class CodeAutoGenerateStrictDiff:
 
             conversations.append({"role": "user", "content": "继续"})
 
-            with open(self.args.target_file, "w") as file:
+            with open(self.args.target_file, "w",encoding="utf-8") as file:
                 file.write("继续")
 
             t = code_llm.chat_oai(

autocoder/common/code_auto_merge.py

@@ -73,15 +73,35 @@ class CodeAutoMerge:
     def choose_best_choice(self, generate_result: CodeGenerateResult) -> CodeGenerateResult:
         if len(generate_result.contents) == 1:
             return generate_result
+        
+        merge_results = []
+        for content,conversations in zip(generate_result.contents,generate_result.conversations):
+            merge_result = self._merge_code_without_effect(content)
+            merge_results.append(merge_result)
 
+        # If all merge results are None, return first one
+        if all(len(result.failed_blocks) != 0 for result in merge_results):
+            self.printer.print_in_terminal("all_merge_results_failed")
+            return CodeGenerateResult(contents=[generate_result.contents[0]], conversations=[generate_result.conversations[0]])
+        
+        # If only one merge result is not None, return that one
+        not_none_indices = [i for i, result in enumerate(merge_results) if len(result.failed_blocks) == 0]
+        if len(not_none_indices) == 1:
+            idx = not_none_indices[0]
+            self.printer.print_in_terminal("only_one_merge_result_success")
+            return CodeGenerateResult(contents=[generate_result.contents[idx]], conversations=[generate_result.conversations[idx]])        
+
+        # 最后，如果有多个，那么根据质量排序再返回
         ranker = CodeModificationRanker(self.llm, self.args)
-        ranked_result = ranker.rank_modifications(generate_result)
-        # Filter out contents with failed blocks
+        ranked_result = ranker.rank_modifications(generate_result,merge_results)        
+         
+        ## 得到的结果，再做一次合并，第一个通过的返回 , 返回做合并有点重复低效，未来修改。
         for content,conversations in zip(ranked_result.contents,ranked_result.conversations):
             merge_result = self._merge_code_without_effect(content)
             if not merge_result.failed_blocks:
                 return CodeGenerateResult(contents=[content], conversations=[conversations])
-        # If all have failed blocks, return the first one
+
+        # 最后保底，但实际不会出现
         return CodeGenerateResult(contents=[ranked_result.contents[0]], conversations=[ranked_result.conversations[0]])
 
 

autocoder/common/code_auto_merge_diff.py

@@ -387,15 +387,35 @@ class CodeAutoMergeDiff:
     def choose_best_choice(self, generate_result: CodeGenerateResult) -> CodeGenerateResult:
         if len(generate_result.contents) == 1:
             return generate_result
+        
+        merge_results = []
+        for content,conversations in zip(generate_result.contents,generate_result.conversations):
+            merge_result = self._merge_code_without_effect(content)
+            merge_results.append(merge_result)
 
+        # If all merge results are None, return first one
+        if all(len(result.failed_blocks) != 0 for result in merge_results):
+            self.printer.print_in_terminal("all_merge_results_failed")
+            return CodeGenerateResult(contents=[generate_result.contents[0]], conversations=[generate_result.conversations[0]])
+        
+        # If only one merge result is not None, return that one
+        not_none_indices = [i for i, result in enumerate(merge_results) if len(result.failed_blocks) == 0]
+        if len(not_none_indices) == 1:
+            idx = not_none_indices[0]
+            self.printer.print_in_terminal("only_one_merge_result_success")
+            return CodeGenerateResult(contents=[generate_result.contents[idx]], conversations=[generate_result.conversations[idx]])        
+
+        # 最后，如果有多个，那么根据质量排序再返回
         ranker = CodeModificationRanker(self.llm, self.args)
-        ranked_result = ranker.rank_modifications(generate_result)
-        # Filter out contents with failed blocks
+        ranked_result = ranker.rank_modifications(generate_result,merge_results)        
+         
+        ## 得到的结果，再做一次合并，第一个通过的返回 , 返回做合并有点重复低效，未来修改。
         for content,conversations in zip(ranked_result.contents,ranked_result.conversations):
             merge_result = self._merge_code_without_effect(content)
             if not merge_result.failed_blocks:
                 return CodeGenerateResult(contents=[content], conversations=[conversations])
-        # If all have failed blocks, return the first one
+
+        # 最后保底，但实际不会出现
         return CodeGenerateResult(contents=[ranked_result.contents[0]], conversations=[ranked_result.conversations[0]])
     
     @byzerllm.prompt(render="jinja2")
@@ -440,6 +460,11 @@ class CodeAutoMergeDiff:
         errors = []
         for path, hunk in uniq:
             full_path = self.abs_root_path(path)
+
+            if not os.path.exists(full_path):            
+                with open(full_path, "w") as f:
+                    f.write("")
+            
             content = FileUtils.read_file(full_path)
 
             original, _ = hunk_to_before_after(hunk)
@@ -506,7 +531,7 @@ class CodeAutoMergeDiff:
     def _merge_code(self, content: str,force_skip_git:bool=False):        
         total = 0
         
-        file_content = open(self.args.file).read()
+        file_content = FileUtils.read_file(self.args.file)
         md5 = hashlib.md5(file_content.encode('utf-8')).hexdigest()
         # get the file name 
         file_name = os.path.basename(self.args.file)

autocoder/common/code_auto_merge_editblock.py

@@ -164,15 +164,35 @@ class CodeAutoMergeEditBlock:
     def choose_best_choice(self, generate_result: CodeGenerateResult) -> CodeGenerateResult:
         if len(generate_result.contents) == 1:
             return generate_result
-
+        
+        merge_results = []
+        for content,conversations in zip(generate_result.contents,generate_result.conversations):
+            merge_result = self._merge_code_without_effect(content)
+            merge_results.append(merge_result)
+
+        # If all merge results are None, return first one
+        if all(len(result.failed_blocks) != 0 for result in merge_results):
+            self.printer.print_in_terminal("all_merge_results_failed")
+            return CodeGenerateResult(contents=[generate_result.contents[0]], conversations=[generate_result.conversations[0]])
+        
+        # If only one merge result is not None, return that one
+        not_none_indices = [i for i, result in enumerate(merge_results) if len(result.failed_blocks) == 0]
+        if len(not_none_indices) == 1:
+            idx = not_none_indices[0]
+            self.printer.print_in_terminal("only_one_merge_result_success")
+            return CodeGenerateResult(contents=[generate_result.contents[idx]], conversations=[generate_result.conversations[idx]])        
+
+        # 最后，如果有多个，那么根据质量排序再返回
         ranker = CodeModificationRanker(self.llm, self.args)
-        ranked_result = ranker.rank_modifications(generate_result)
-        # Filter out contents with failed blocks
+        ranked_result = ranker.rank_modifications(generate_result,merge_results)        
+         
+        ## 得到的结果，再做一次合并，第一个通过的返回 , 返回做合并有点重复低效，未来修改。
         for content,conversations in zip(ranked_result.contents,ranked_result.conversations):
             merge_result = self._merge_code_without_effect(content)
             if not merge_result.failed_blocks:
                 return CodeGenerateResult(contents=[content], conversations=[conversations])
-        # If all have failed blocks, return the first one
+
+        # 最后保底，但实际不会出现
         return CodeGenerateResult(contents=[ranked_result.contents[0]], conversations=[ranked_result.conversations[0]])
 
     @byzerllm.prompt()
@@ -269,7 +289,7 @@ class CodeAutoMergeEditBlock:
         )
 
     def _merge_code(self, content: str, force_skip_git: bool = False):
-        file_content = open(self.args.file).read()
+        file_content = FileUtils.read_file(self.args.file)
         md5 = hashlib.md5(file_content.encode("utf-8")).hexdigest()
         file_name = os.path.basename(self.args.file)