auto-coder 0.1.233__py3-none-any.whl → 0.1.237__py3-none-any.whl

autocoder/common/auto_coder_lang.py

@@ -0,0 +1,141 @@
+import locale
+
+MESSAGES = {
+    "en": {
+        "memory_save_success": "✅ Saved to your memory",
+        "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 }}",
+        "index_build_summary": "📊 Total Files: {{ total_files }}, Need to Build Index: {{ num_files }}",
+        "building_index_progress": "⏳ Building Index: {{ counter }}/{{ num_files }}...",
+        "index_source_dir_mismatch": "⚠️ Source directory mismatch (file_path: {{ file_path }}, source_dir: {{ source_dir }})",
+        "index_related_files_fail": "⚠️ Failed to find related files for chunk {{ chunk_count }}",
+        "index_threads_completed": "✅ Completed {{ completed_threads }}/{{ total_threads }} threads",
+        "index_related_files_fail": "⚠️ Failed to find related files for chunk {{ chunk_count }}",
+        "human_as_model_instructions": (
+            "You are now in Human as Model mode. The content has been copied to your clipboard.\n"
+            "The system is waiting for your input. When finished, enter 'EOF' on a new line to submit.\n"
+            "Use '/break' to exit this mode. If you have issues with copy-paste, use '/clear' to clean and paste again."
+        ),
+        "clipboard_not_supported": (
+            "pyperclip not installed or clipboard is not supported, instruction will not be copied to clipboard."
+        ),
+        "human_as_model_instructions_no_clipboard": (
+            "You are now in Human as Model mode. [bold red]The content could not be copied to your clipboard.[/bold red]\n"
+            "but you can copy prompt from output.txt file.\n"
+            "The system is waiting for your input. When finished, enter 'EOF' on a new line to submit.\n"
+            "Use '/break' to exit this mode. If you have issues with copy-paste, use '/clear' to clean and paste again."
+        ),
+        "phase1_processing_sources": "Phase 1: Processing REST/RAG/Search sources...",
+        "phase2_building_index": "Phase 2: Building index for all files...",
+        "phase6_file_selection": "Phase 6: Processing file selection and limits...",
+        "phase7_preparing_output": "Phase 7: Preparing final output...",
+        "chat_human_as_model_instructions": (
+            "Chat is now in Human as Model mode.\n"
+            "The question has been copied to your clipboard.\n"
+            "Please use Web version model to get the answer.\n"
+            "Or use /conf human_as_model:false to close this mode and get the answer in terminal directly."
+            "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": "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)...",
+        "normal_filter_start": "Starting filter context(normal_filter)...",
+        "pylint_check_failed": "⚠️ Pylint check failed: {{ error_message }}",
+        "pylint_error": "❌ Error running pylint: {{ error_message }}",
+        "unmerged_blocks_warning": "⚠️ Found {{ num_blocks }} unmerged blocks, the changes will not be applied. Please review them manually then try again.",
+        "pylint_file_check_failed": "⚠️ Pylint check failed for {{ file_path }}. Changes not applied. Error: {{ error_message }}",
+        "merge_success": "✅ Merged changes in {{ num_files }} files {{ num_changes }}/{{ total_blocks }} blocks.",
+        "no_changes_made": "⚠️ No changes were made to any files.",
+        "files_merged": "✅ Merged {{ total }} files into the project.",
+        "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_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 }}",
+        "ranking_process_failed": "Ranking process failed: {{ error }}",
+        "ranking_failed": "Ranking failed in {{ elapsed }}s, using original order"
+    },
+    "zh": {
+        "memory_save_success": "✅ 已保存到您的记忆中",
+        "index_file_too_large": "⚠️ 文件 {{ file_path }} 过大 ({{ file_size }} > {{ max_length }}), 正在分块处理...",
+        "index_update_success": "✅ 成功更新 {{ file_path }} 的索引 (md5: {{ md5 }}), 耗时 {{ duration }} 秒",
+        "index_build_error": "❌ 构建 {{ file_path }} 索引时出错: {{ error }}",
+        "index_build_summary": "📊 总文件数: {{ total_files }}, 需要构建索引: {{ num_files }}",
+        "building_index_progress": "⏳ 正在构建索引: {{ counter }}/{{ num_files }}...",
+        "index_source_dir_mismatch": "⚠️ 源目录不匹配 (文件路径: {{ file_path }}, 源目录: {{ source_dir }})",
+        "index_related_files_fail": "⚠️ 无法为块 {{ chunk_count }} 找到相关文件",
+        "index_threads_completed": "✅ 已完成 {{ completed_threads }}/{{ total_threads }} 个线程",
+        "index_related_files_fail": "⚠️ 无法为块 {{ chunk_count }} 找到相关文件",
+        "human_as_model_instructions": (
+            "您现在处于人类作为模型模式。内容已复制到您的剪贴板。\n"
+            "系统正在等待您的输入。完成后，在新行输入'EOF'提交。\n"
+            "使用'/break'退出此模式。如果复制粘贴有问题，使用'/clear'清理并重新粘贴。"
+        ),
+        "clipboard_not_supported": (
+            "未安装pyperclip或不支持剪贴板，指令将不会被复制到剪贴板。"
+        ),
+        "human_as_model_instructions_no_clipboard": (
+            "您现在处于人类作为模型模式。[bold red]内容无法复制到您的剪贴板。[/bold red]\n"
+            "但您可以从output.txt文件复制提示。\n"
+            "系统正在等待您的输入。完成后，在新行输入'EOF'提交。\n"
+            "使用'/break'退出此模式。如果复制粘贴有问题，使用'/clear'清理并重新粘贴。"
+        ),
+        "phase1_processing_sources": "阶段 1: 正在处理 REST/RAG/Search 源...",
+        "phase2_building_index": "阶段 2: 正在为所有文件构建索引...",
+        "phase6_file_selection": "阶段 6: 正在处理文件选择和限制...",
+        "phase7_preparing_output": "阶段 7: 正在准备最终输出...",
+        "chat_human_as_model_instructions": (
+            "\n============= Chat 处于 Human as Model 模式 =============\n"
+            "问题已复制到剪贴板\n"
+            "请使用Web版本模型获取答案\n"
+            "或者使用 /conf human_as_model:false 关闭该模式直接在终端获得答案。"
+            "将获得答案黏贴到下面的输入框，换行后，使用 '/break' 退出，'/clear' 清屏，'/eof' 提交。"
+        ),
+        "code_generation_start": "正在自动生成代码...",
+        "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)...",
+        "normal_filter_start": "开始查找上下文(normal_filter)...",
+        "pylint_check_failed": "⚠️ Pylint 检查失败: {{ error_message }}",
+        "pylint_error": "❌ 运行 Pylint 时出错: {{ error_message }}",
+        "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": "⚠️ 未对任何文件进行更改。",
+        "unmerged_blocks_title": "Unmerged Blocks",
+        "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 仅适用于 git 仓库。\n\n请尝试在源目录中使用 git init：\n\n```shell\ncd {{ source_dir }}\ngit init .\n```\n\n然后再次运行 auto-coder。\n错误: {{ error }}",
+        "upsert_file": "✅ 更新文件: {{ file_path }}",
+        "files_merged": "✅ 成功合并了 {{ total }} 个文件到项目中。",
+        "merge_failed": "❌ 合并文件 {{ path }} 失败: {{ error }}",
+        "files_merged_total": "✅ 合并了 {{ total }} 个文件到项目中。",
+        "ranking_skip": "只有1个候选项，跳过排序",
+        "ranking_start": "开始对 {{ count }} 个候选项进行排序",
+        "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 }} 秒，使用原始顺序"
+    }    
+}
+
+
+def get_system_language():
+    try:
+        return locale.getdefaultlocale()[0][:2]
+    except:
+        return 'en'
+
+
+def get_message(key):
+    lang = get_system_language()
+    return MESSAGES.get(lang, MESSAGES['en']).get(key, MESSAGES['en'][key])

autocoder/common/code_auto_merge.py

@@ -1,24 +1,26 @@
 
 import os
 from byzerllm.utils.client import code_utils
-from autocoder.common import AutoCoderArgs,git_utils
-from typing import List,Union,Tuple
+from autocoder.common import AutoCoderArgs, git_utils
+from typing import List, Union, Tuple
 import pydantic
 import byzerllm
-from loguru import logger
 from autocoder.common.types import CodeGenerateResult, MergeCodeWithoutEffect
 from autocoder.common.code_modification_ranker import CodeModificationRanker
 import hashlib
 from autocoder.common import files as FileUtils
+from autocoder.common.printer import Printer
+from autocoder.common.auto_coder_lang import get_message
 
 class PathAndCode(pydantic.BaseModel):
     path: str
     content: str
 
 class CodeAutoMerge:
-    def __init__(self, llm:byzerllm.ByzerLLM,args:AutoCoderArgs):
+    def __init__(self, llm: byzerllm.ByzerLLM, args: AutoCoderArgs):
         self.llm = llm
-        self.args = args  
+        self.args = args
+        self.printer = Printer()
 
 
     def parse_whole_text_v2(self,text: str) -> List[PathAndCode]:
@@ -159,8 +161,9 @@ class CodeAutoMerge:
             try:
                 git_utils.commit_changes(self.args.source_dir, f"auto_coder_pre_{file_name}_{md5}")
             except Exception as e:            
-                logger.error(self.git_require_msg(source_dir=self.args.source_dir,error=str(e)))
-                return            
+                self.printer.print_in_terminal("git_init_required", 
+                    source_dir=self.args.source_dir, error=str(e))
+                return
 
         codes = self.parse_whole_text_v2(content)
         for block in codes:
@@ -168,11 +171,11 @@ class CodeAutoMerge:
             os.makedirs(os.path.dirname(file_path), exist_ok=True)
 
             with open(file_path, "w") as f:
-                logger.info(f"Upsert path: {file_path}")
+                self.printer.print_in_terminal("upsert_file", file_path=file_path)
                 total += 1
                 f.write(block.content)
 
-        logger.info(f"Merged {total} files into the project.")
+        self.printer.print_in_terminal("files_merged", total=total)
         if not force_skip_git:
             commit_result = git_utils.commit_changes(self.args.source_dir, f"auto_coder_{file_name}_{md5}")
             git_utils.print_commit_info(commit_result=commit_result)

autocoder/common/code_auto_merge_diff.py

@@ -4,7 +4,7 @@ from autocoder.common import AutoCoderArgs,git_utils
 from typing import List,Union,Tuple
 import pydantic
 import byzerllm
-from loguru import logger
+from autocoder.common.printer import Printer
 import hashlib
 from pathlib import Path
 from itertools import groupby
@@ -361,7 +361,8 @@ other_hunks_applied = (
 class CodeAutoMergeDiff:
     def __init__(self, llm:byzerllm.ByzerLLM,args:AutoCoderArgs):
         self.llm = llm
-        self.args = args  
+        self.args = args
+        self.printer = Printer()
 
     def get_edits(self,content:str):        
         # might raise ValueError for malformed ORIG/UPD blocks
@@ -514,13 +515,13 @@ class CodeAutoMergeDiff:
             try:
                 git_utils.commit_changes(self.args.source_dir, f"auto_coder_pre_{file_name}_{md5}")
             except Exception as e:            
-                logger.error(self.git_require_msg(source_dir=self.args.source_dir,error=str(e)))
+                self.printer.print_in_terminal("git_init_required", style="red", source_dir=self.args.source_dir, error=str(e))
                 return            
        
         edits = self.get_edits(content)        
         self.apply_edits(edits)
 
-        logger.info(f"Merged {total} files into the project.")
+        self.printer.print_in_terminal("files_merged_total", total=total)
         if not force_skip_git:
             commit_result = git_utils.commit_changes(self.args.source_dir, f"auto_coder_{file_name}_{md5}")
             git_utils.print_commit_info(commit_result=commit_result)

autocoder/common/code_auto_merge_editblock.py

@@ -9,7 +9,7 @@ from autocoder.utils.queue_communicate import (
 )
 import pydantic
 import byzerllm
-from loguru import logger
+
 import hashlib
 import subprocess
 import tempfile
@@ -21,6 +21,7 @@ from typing import Union, List, Tuple
 from autocoder.common.types import CodeGenerateResult, MergeCodeWithoutEffect
 from autocoder.common.code_modification_ranker import CodeModificationRanker
 from autocoder.common import files as FileUtils
+from autocoder.common.printer import Printer
 
 class PathAndCode(pydantic.BaseModel):
     path: str
@@ -39,6 +40,7 @@ class CodeAutoMergeEditBlock:
         self.args = args
         self.fence_0 = fence_0
         self.fence_1 = fence_1
+        self.printer = Printer()
 
     def run_pylint(self, code: str) -> tuple[bool, str]:
         with tempfile.NamedTemporaryFile(
@@ -62,12 +64,12 @@ class CodeAutoMergeEditBlock:
             os.unlink(temp_file_path)
             if result.returncode != 0:
                 error_message = result.stdout.strip() or result.stderr.strip()
-                logger.warning(f"Pylint check failed: {error_message}")
+                self.printer.print_in_terminal("pylint_check_failed", error_message=error_message)
                 return False, error_message
             return True, ""
         except subprocess.CalledProcessError as e:
             error_message = f"Error running pylint: {str(e)}"
-            logger.error(error_message)
+            self.printer.print_in_terminal("pylint_error", error_message=error_message)
             os.unlink(temp_file_path)
             return False, error_message
 
@@ -344,9 +346,8 @@ class CodeAutoMergeEditBlock:
                     ),
                 )
                 return
-
-            s = f"Found {len(unmerged_blocks)} unmerged blocks, the changes will not be applied. Please review them manually then try again."
-            logger.warning(s)
+            
+            self.printer.print_in_terminal("unmerged_blocks_warning", num_blocks=len(unmerged_blocks))
             self._print_unmerged_blocks(unmerged_blocks)
             return
 
@@ -355,9 +356,9 @@ class CodeAutoMergeEditBlock:
             if file_path.endswith(".py"):
                 pylint_passed, error_message = self.run_pylint(new_content)
                 if not pylint_passed:
-                    logger.warning(
-                        f"Pylint check failed for {file_path}. Changes not applied. Error: {error_message}"
-                    )
+                    self.printer.print_in_terminal("pylint_file_check_failed", 
+                                                  file_path=file_path, 
+                                                  error_message=error_message)
 
         if changes_made and not force_skip_git:
             try:
@@ -365,9 +366,9 @@ class CodeAutoMergeEditBlock:
                     self.args.source_dir, f"auto_coder_pre_{file_name}_{md5}"
                 )
             except Exception as e:
-                logger.error(
-                    self.git_require_msg(
-                        source_dir=self.args.source_dir, error=str(e))
+                self.printer.print_str_in_terminal(
+                    self.git_require_msg(source_dir=self.args.source_dir, error=str(e)),
+                    style="red"
                 )
                 return
         # Now, apply the changes
@@ -406,30 +407,31 @@ class CodeAutoMergeEditBlock:
                     )
                     git_utils.print_commit_info(commit_result=commit_result)
                 except Exception as e:
-                    logger.error(
-                        self.git_require_msg(
-                            source_dir=self.args.source_dir, error=str(e)
-                        )
+                    self.printer.print_str_in_terminal(
+                        self.git_require_msg(source_dir=self.args.source_dir, error=str(e)),
+                        style="red"
                     )
-            logger.info(
-                f"Merged changes in {len(file_content_mapping.keys())} files {len(changes_to_make)}/{len(codes)} blocks."
-            )
+            self.printer.print_in_terminal("merge_success", 
+                                         num_files=len(file_content_mapping.keys()),
+                                         num_changes=len(changes_to_make),
+                                         total_blocks=len(codes))
         else:
-            logger.warning("No changes were made to any files.")
+            self.printer.print_in_terminal("no_changes_made")
 
     def _print_unmerged_blocks(self, unmerged_blocks: List[tuple]):
-        console = Console()
-        console.print("\n[bold red]Unmerged Blocks:[/bold red]")
+        self.printer.print_in_terminal("unmerged_blocks_title", style="bold red")
         for file_path, head, update, similarity in unmerged_blocks:
-            console.print(f"\n[bold blue]File:[/bold blue] {file_path}")
-            console.print(
-                f"\n[bold green]Search Block({similarity}):[/bold green]")
+            self.printer.print_str_in_terminal(
+                f"\n{self.printer.get_message_from_key('unmerged_file_path').format(file_path=file_path)}",
+                style="bold blue"
+            )
+            self.printer.print_str_in_terminal(
+                f"\n{self.printer.get_message_from_key('unmerged_search_block').format(similarity=similarity)}",
+                style="bold green"
+            )
             syntax = Syntax(head, "python", theme="monokai", line_numbers=True)
-            console.print(Panel(syntax, expand=False))
-            console.print("\n[bold yellow]Replace Block:[/bold yellow]")
-            syntax = Syntax(update, "python", theme="monokai",
-                            line_numbers=True)
-            console.print(Panel(syntax, expand=False))
-        console.print(
-            f"\n[bold red]Total unmerged blocks: {len(unmerged_blocks)}[/bold red]"
-        )
+            self.printer.console.print(Panel(syntax, expand=False))
+            self.printer.print_in_terminal("unmerged_replace_block", style="bold yellow")
+            syntax = Syntax(update, "python", theme="monokai", line_numbers=True)
+            self.printer.console.print(Panel(syntax, expand=False))
+        self.printer.print_in_terminal("unmerged_blocks_total", num_blocks=len(unmerged_blocks), style="bold red")

autocoder/common/code_auto_merge_strict_diff.py

@@ -5,7 +5,7 @@ from autocoder.common import AutoCoderArgs, git_utils
 from typing import List,Tuple
 import pydantic
 import byzerllm
-from loguru import logger
+from autocoder.common.printer import Printer
 import hashlib
 from pathlib import Path
 from autocoder.common.types import CodeGenerateResult, MergeCodeWithoutEffect
@@ -84,6 +84,7 @@ class CodeAutoMergeStrictDiff:
     def __init__(self, llm: byzerllm.ByzerLLM, args: AutoCoderArgs):
         self.llm = llm
         self.args = args
+        self.printer = Printer()
 
 
     def parse_diff_block(self,text: str) -> List[PathAndCode]:
@@ -192,7 +193,7 @@ class CodeAutoMergeStrictDiff:
                 else:
                     failed_blocks.append((full_path, content))
             except Exception as e:
-                logger.warning(f"Failed to apply patch to {full_path}: {str(e)}")
+                self.printer.print_in_terminal("merge_failed", style="yellow", path=full_path, error=str(e))
                 failed_blocks.append((full_path, content))
                 
         return MergeCodeWithoutEffect(
@@ -212,7 +213,7 @@ class CodeAutoMergeStrictDiff:
             try:
                 git_utils.commit_changes(self.args.source_dir, f"auto_coder_pre_{file_name}_{md5}")
             except Exception as e:            
-                logger.error(self.git_require_msg(source_dir=self.args.source_dir, error=str(e)))
+                self.printer.print_in_terminal("git_init_required", style="red", source_dir=self.args.source_dir, error=str(e))
                 return            
        
         diff_blocks = self.parse_diff_block(content)
@@ -230,7 +231,7 @@ class CodeAutoMergeStrictDiff:
             if not success:
                 raise Exception("Error applying diff to file: " + path)
                             
-        logger.info(f"Merged {total} files into the project.")
+        self.printer.print_in_terminal("files_merged_total", total=total)
         if not force_skip_git:
             commit_result = git_utils.commit_changes(self.args.source_dir, f"auto_coder_{file_name}_{md5}")
             git_utils.print_commit_info(commit_result=commit_result)

autocoder/common/code_modification_ranker.py

@@ -1,70 +1,79 @@
 import byzerllm
-from typing import List,Union
+from typing import List, Union
 from autocoder.common import AutoCoderArgs
 from autocoder.common.types import CodeGenerateResult
 from pydantic import BaseModel
-from loguru import logger
+from autocoder.common.printer import Printer
 from concurrent.futures import ThreadPoolExecutor, as_completed
 import traceback
-
+from autocoder.common.utils_code_auto_generate import chat_with_continue
+from byzerllm.utils.str2model import to_model
 class RankResult(BaseModel):
-    rank_result:List[int]
+    rank_result: List[int]
+
 
 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.args = args
+        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()
-    def _rank_modifications(self, s:CodeGenerateResult) -> str:
+    def _rank_modifications(self, s: CodeGenerateResult) -> str:
         '''
         对一组代码修改进行质量评估并排序。
 
         下面是修改需求：
-        
+
         <edit_requirement>
         {{ s.conversations[0][-2]["content"] }}
         </edit_requirement>
-        
+
         下面是相应的代码修改：
         {% for content in s.contents %}
         <edit_block id="{{ loop.index0 }}">
         {{content}}
         </edit_block>
         {% endfor %}
-        
+
         请输出如下格式的评估结果,只包含 JSON 数据:
 
         ```json
         {
-            "rank_result": [id1, id2, id3]  // id 为 edit_block 的 id,按质量从高到低排序
+            "rank_result": [id1, id2, id3] 
         }
         ```
 
-        注意：        
-        1. 只输出前面要求的 Json 格式就好，不要输出其他内容，Json 需要使用 ```json ```包裹        
+        注意：   
+        1. id 为 edit_block 的 id,按质量从高到低排序，并且 id 必须是数字        
+        2. 只输出前面要求的 Json 格式就好，不要输出其他内容，Json 需要使用 ```json ```包裹                
         '''
-        
 
     def rank_modifications(self, generate_result: CodeGenerateResult) -> CodeGenerateResult:
         import time
         from collections import defaultdict
 
         start_time = time.time()
-        
+
         # 如果只有一个候选，直接返回
         if len(generate_result.contents) == 1:
-            logger.info("Only 1 candidate, skip ranking")
+            self.printer.print_in_terminal("ranking_skip", style="blue")
             return generate_result
-            
-        logger.info(f"Start ranking {len(generate_result.contents)} candidates")
+
+        self.printer.print_in_terminal(
+            "ranking_start", style="blue", count=len(generate_result.contents))
         generate_times = self.args.generate_times_same_model
         total_tasks = len(self.llms) * generate_times
+
+        query = self._rank_modifications.prompt(generate_result)
+        input_tokens_count = 0
+        generated_tokens_count = 0
         try:
-            # Create a thread pool with (number of models * generate_times) workers            
+            # Create a thread pool with (number of models * generate_times) workers
             with ThreadPoolExecutor(max_workers=total_tasks) as executor:
                 # Submit tasks for each model and generate_times
                 futures = []
@@ -72,49 +81,70 @@ class CodeModificationRanker:
                     for _ in range(generate_times):
                         futures.append(
                             executor.submit(
-                                self._rank_modifications.with_llm(llm).with_return_type(RankResult).run,
-                                generate_result
+                                chat_with_continue,
+                                llm,
+                                [{"role": "user", "content": query}],
+                                {}
                             )
                         )
-                
+
                 # Collect all results
                 results = []
                 for future in as_completed(futures):
                     try:
-                        v = future.result()
+                        result = future.result()
+                        input_tokens_count += result.input_tokens_count
+                        generated_tokens_count += result.generated_tokens_count
+                        v = to_model(result.content,RankResult)                        
                         results.append(v.rank_result)
                     except Exception as e:
-                        logger.warning(f"Ranking request failed: {str(e)}")
-                        logger.debug(traceback.format_exc())
+                        self.printer.print_in_terminal(
+                            "ranking_failed_request", style="yellow", error=str(e))
+                        if self.args.debug:
+                            print(traceback.format_exc())
                         continue
-                
+
                 if not results:
-                    raise Exception("All ranking requests failed")
-                
+                    raise Exception(
+                        self.printer.get_message_from_key("ranking_all_failed"))
+
                 # Calculate scores for each candidate
                 candidate_scores = defaultdict(float)
                 for rank_result in results:
                     for idx, candidate_id in enumerate(rank_result):
                         # Score is 1/(position + 1) since position starts from 0
                         candidate_scores[candidate_id] += 1.0 / (idx + 1)
-                
+
                 # Sort candidates by score in descending order
-                sorted_candidates = sorted(candidate_scores.keys(), 
-                                         key=lambda x: candidate_scores[x], 
-                                         reverse=True)
-                
+                sorted_candidates = sorted(candidate_scores.keys(),
+                                           key=lambda x: candidate_scores[x],
+                                           reverse=True)
+
                 elapsed = time.time() - start_time
                 # Format scores for logging
-                score_details = ", ".join([f"candidate {i}: {candidate_scores[i]:.2f}" for i in sorted_candidates])
-                logger.info(f"Ranking completed in {elapsed:.2f}s, total voters: {total_tasks}, best candidate index: {sorted_candidates[0]}, scores: {score_details}")
-                
-                rerank_contents = [generate_result.contents[i] for i in sorted_candidates]
-                rerank_conversations = [generate_result.conversations[i] for i in sorted_candidates]
-                return CodeGenerateResult(contents=rerank_contents,conversations=rerank_conversations)
-                
+                score_details = ", ".join(
+                    [f"candidate {i}: {candidate_scores[i]:.2f}" for i in sorted_candidates])
+                self.printer.print_in_terminal(
+                    "ranking_complete",
+                    style="green",
+                    elapsed=f"{elapsed:.2f}",
+                    total_tasks=total_tasks,
+                    best_candidate=sorted_candidates[0],
+                    scores=score_details,
+                    input_tokens=input_tokens_count,
+                    output_tokens=generated_tokens_count
+                )
+
+                rerank_contents = [generate_result.contents[i]
+                                   for i in sorted_candidates]
+                rerank_conversations = [
+                    generate_result.conversations[i] for i in sorted_candidates]
+                return CodeGenerateResult(contents=rerank_contents, conversations=rerank_conversations)
+
         except Exception as e:
-            logger.error(f"Ranking process failed: {str(e)}")
-            logger.debug(traceback.format_exc())
+            self.printer.print_in_terminal(
+                "ranking_process_failed", style="red", error=str(e))            
             elapsed = time.time() - start_time
-            logger.warning(f"Ranking failed in {elapsed:.2f}s, using original order")
+            self.printer.print_in_terminal(
+                "ranking_failed", style="yellow", elapsed=f"{elapsed:.2f}")
             return generate_result