auto-coder 0.1.242__py3-none-any.whl → 0.1.243__py3-none-any.whl

{auto_coder-0.1.242.dist-info → auto_coder-0.1.243.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.242
+Version: 0.1.243
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
@@ -26,7 +26,7 @@ Requires-Dist: tabulate
 Requires-Dist: jupyter-client
 Requires-Dist: prompt-toolkit
 Requires-Dist: tokenizers
-Requires-Dist: byzerllm[saas] >=0.1.158
+Requires-Dist: byzerllm[saas] >=0.1.159
 Requires-Dist: patch
 Requires-Dist: diff-match-patch
 Requires-Dist: GitPython

{auto_coder-0.1.242.dist-info → auto_coder-0.1.243.dist-info}/RECORD

@@ -1,17 +1,17 @@
 autocoder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder/auto_coder.py,sha256=jbfgZoO9EguLjFifzl0Ea4QHiRh75WMoZ5LBEfhLHMs,61858
+autocoder/auto_coder.py,sha256=iQeyrg5L87IgBLFJLZLIJetHFeMuT2uslRlzo_Vjq9s,61829
 autocoder/auto_coder_lang.py,sha256=Rtupq6N3_HT7JRhDKdgCBcwRaiAnyCOR_Gsp4jUomrI,3229
 autocoder/auto_coder_rag.py,sha256=illKgzP2bv-Tq50ujsofJnOHdI4pzr0ALtfR8NHHWdQ,22351
 autocoder/auto_coder_rag_client_mcp.py,sha256=WV7j5JUiQge0x4-B7Hp5-pSAFXLbvLpzQMcCovbauIM,6276
 autocoder/auto_coder_rag_mcp.py,sha256=-RrjNwFaS2e5v8XDIrKR-zlUNUE8UBaeOtojffBrvJo,8521
 autocoder/auto_coder_server.py,sha256=XU9b4SBH7zjPPXaTWWHV4_zJm-XYa6njuLQaplYJH_c,20290
 autocoder/benchmark.py,sha256=Ypomkdzd1T3GE6dRICY3Hj547dZ6_inqJbBJIp5QMco,4423
-autocoder/chat_auto_coder.py,sha256=z4EPTD2fSR72BbzY0HjKm8mp-EJELXyp0C_dQCBUiTU,103431
-autocoder/chat_auto_coder_lang.py,sha256=rS6hD5ZiNLaQZx36WO4LohRBEN8uZfsgv3QEM7ax03A,14540
+autocoder/chat_auto_coder.py,sha256=s9uMjDQQawXEsq171GO7SVMO4fDjWd4xWT0KYO7nRp4,105295
+autocoder/chat_auto_coder_lang.py,sha256=V-VIieyKF5cwlK448B1V2LUbTdrU03tfgDrOk2aBvFk,14891
 autocoder/command_args.py,sha256=9aYJ-AmPxP1sQh6ciw04FWHjSn31f2W9afXFwo8wgx4,30441
 autocoder/lang.py,sha256=U6AjVV8Rs1uLyjFCZ8sT6WWuNUxMBqkXXIOs4S120uk,14511
 autocoder/models.py,sha256=FlBrF6HhGao_RiCSgYhCmP7vs0KlG4hI_BI6dyZiL9s,5292
-autocoder/version.py,sha256=FFFI0ll8Bfzd8j7JSYymsgRmF-NwiONXrIeZWd_8lvQ,23
+autocoder/version.py,sha256=u0hWeuFclX3Z9nFe5oFsCdX854VeUHOs69Ggv1pvBvk,23
 autocoder/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/agent/auto_demand_organizer.py,sha256=NWSAEsEk94vT3lGjfo25kKLMwYdPcpy9e-i21txPasQ,6942
 autocoder/agent/auto_filegroup.py,sha256=CW7bqp0FW1GIEMnl-blyAc2UGT7O9Mom0q66ITz1ckM,6635
@@ -24,11 +24,11 @@ autocoder/agent/project_reader.py,sha256=tWLaPoLw1gI6kO_NzivQj28KbobU2ceOLuppHMb
 autocoder/chat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/common/JupyterClient.py,sha256=O-wi6pXeAEYhAY24kDa0BINrLYvKS6rKyWe98pDClS0,2816
 autocoder/common/ShellClient.py,sha256=fM1q8t_XMSbLBl2zkCNC2J9xuyKN3eXzGm6hHhqL2WY,2286
-autocoder/common/__init__.py,sha256=vpfo3RctksezDoraVSpHtfnxpspVNiYh8OmQhqQvcfE,11729
+autocoder/common/__init__.py,sha256=2isE_u4VgfogwmcUCnFcussVFlzeNOLHDMFm5z_axbU,11774
 autocoder/common/anything2images.py,sha256=0ILBbWzY02M-CiWB-vzuomb_J1hVdxRcenAfIrAXq9M,25283
 autocoder/common/anything2img.py,sha256=4TREa-sOA-iargieUy7MpyCYVUE-9Mmq0wJtwomPqnE,7662
 autocoder/common/audio.py,sha256=Kn9nWKQddWnUrAz0a_ZUgjcu4VUU_IcZBigT7n3N3qc,7439
-autocoder/common/auto_coder_lang.py,sha256=Bs_jxhVcmvVnTGD2pNsS7r46i39ZPGT62fErfaC33EE,11850
+autocoder/common/auto_coder_lang.py,sha256=9FBNhcl6Do4ICh-klevYsCTsDuy5kD99r8EE5Gs1QoM,12592
 autocoder/common/buildin_tokenizer.py,sha256=L7d5t39ZFvUd6EoMPXUhYK1toD0FHlRH1jtjKRGokWU,1236
 autocoder/common/chunk_validation.py,sha256=BrR_ZWavW8IANuueEE7hS8NFAwEvm8TX34WnPx_1hs8,3030
 autocoder/common/cleaner.py,sha256=NU72i8C6o9m0vXExab7nao5bstBUsfJFcj11cXa9l4U,1089
@@ -39,9 +39,9 @@ autocoder/common/code_auto_generate_editblock.py,sha256=QdUHUkGaervvQNCY8T2vQ_tf
 autocoder/common/code_auto_generate_strict_diff.py,sha256=uteWDEHfIbrnVgwKgqC7qwrIeW0enJCXcHzZGa48yY8,14774
 autocoder/common/code_auto_merge.py,sha256=8dtnz61l0B5gNbQmx26TZ4_jD825dsnnWtAFD_zs6es,7335
 autocoder/common/code_auto_merge_diff.py,sha256=yocfe8s3Pz6hTGDUl9wRIewY3NcTize_gEla64lsGT0,15331
-autocoder/common/code_auto_merge_editblock.py,sha256=B-zDKGEJ7uRFPLIasnX7w2I2DXe5UAj1T-rDSjL4xes,17477
+autocoder/common/code_auto_merge_editblock.py,sha256=sp7C0fZJMVcNgI8uWy43CKDk7gGXFTkMB9kbP2VdY8k,17485
 autocoder/common/code_auto_merge_strict_diff.py,sha256=9rm0NJ_n6M3LohEX7xl1Jym0xmm8UEYqj_ZTSO3oSlM,9519
-autocoder/common/code_modification_ranker.py,sha256=7xHrNO4fXmWcrPXTCjZGZhE2FIn0ZnL7nEpZgP6-mq4,6120
+autocoder/common/code_modification_ranker.py,sha256=l0OAR7ad0hTV3xdfn7rO0KqnY5Y5qSG4BmWcClZ9RUQ,6104
 autocoder/common/command_completer.py,sha256=SSeb8MDH0JPvfdyW-S2uaHnui4VBDfSQvQPLbv3ORPA,9314
 autocoder/common/command_generator.py,sha256=v4LmU7sO-P7jEZIXCWHUC6P-vT7AvBi_x_PTwCqBAE8,1323
 autocoder/common/command_templates.py,sha256=mnB3n8i0yjH1mqzyClEg8Wpr9VbZV44kxky66Zu6OJY,8557
@@ -55,7 +55,7 @@ autocoder/common/mcp_hub.py,sha256=2ZyJv3Aiv4Y97UHut49oYhIFcu7ICR-mptDEBSgT3uE,1
 autocoder/common/mcp_server.py,sha256=QCFa-15kx7rbNsinwdGFFX2y47pww0fVdI-ldKFSSWI,12267
 autocoder/common/mcp_tools.py,sha256=KsLvRrB6pvmebqd-lDaSH6IBJR0AIxWRE-dtCEG_w9k,12485
 autocoder/common/memory_manager.py,sha256=2ZjYG7BPyvbYalZBF6AM_G5e10Qkw_zrqtD4Zd7GSsQ,3663
-autocoder/common/printer.py,sha256=h4AK7e_y8wlnlUYjckcv1qr4vBXRPBWXumlQN0izJ0I,1906
+autocoder/common/printer.py,sha256=TIqgGOq5YdWqH4_776QHwHmwfVpubZ9zzUq8rstNxuM,1911
 autocoder/common/recall_validation.py,sha256=Avt9Q9dX3kG6Pf2zsdlOHmsjd-OeSj7U1PFBDp_Cve0,1700
 autocoder/common/screenshots.py,sha256=_gA-z1HxGjPShBrtgkdideq58MG6rqFB2qMUJKjrycs,3769
 autocoder/common/search.py,sha256=245iPFgWhMldoUK3CqCP89ltaxZiNPK73evoG6Fp1h8,16518
@@ -63,7 +63,7 @@ autocoder/common/search_replace.py,sha256=GphFkc57Hb673CAwmbiocqTbw8vrV7TrZxtOhD
 autocoder/common/sys_prompt.py,sha256=JlexfjZt554faqbgkCmzOJqYUzDHfbnxly5ugFfHfEE,26403
 autocoder/common/text.py,sha256=KGRQq314GHBmY4MWG8ossRoQi1_DTotvhxchpn78c-k,1003
 autocoder/common/types.py,sha256=PXTETrsTvhLE49jqAeUKGySvxBN9pjeyCgRHLDYdd9U,664
-autocoder/common/utils_code_auto_generate.py,sha256=QwJYr6QhjlQbSo231IWuI6c8G0kXkYDDoDHMo5NSXqI,3348
+autocoder/common/utils_code_auto_generate.py,sha256=kDW5B_2wRLk7hAls2hewliDacV86lrPz8Jan01BvtCw,3573
 autocoder/common/mcp_servers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/common/mcp_servers/mcp_server_perplexity.py,sha256=jz0LkCgZcqKkNdLZ9swNOu9Besoba4JOyHDedoZnWHo,5546
 autocoder/data/tokenizer.json,sha256=QfO_ZCE9qMAS2L0IcaWKH99wRj6PCPEQ3bsQgvUp9mk,4607451
@@ -138,11 +138,11 @@ autocoder/utils/rest.py,sha256=opE_kBEdNQdxh350M5lUTMk5TViRfpuKP_qWc0B1lks,8861
 autocoder/utils/tests.py,sha256=BqphrwyycGAvs-5mhH8pKtMZdObwhFtJ5MC_ZAOiLq8,1340
 autocoder/utils/types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder/utils/auto_coder_utils/chat_stream_out.py,sha256=6D_SIa5hHSwIHC1poO_ztK7IVugAqNHu-jQySd7EnfQ,4181
+autocoder/utils/auto_coder_utils/chat_stream_out.py,sha256=fcXusKEUKMu8WY9Y1_JL5aPkC-soKFxQcFAKThrNZoQ,13338
 autocoder/utils/chat_auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_coder-0.1.242.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-auto_coder-0.1.242.dist-info/METADATA,sha256=FWP2bnOYAaDc-zY3f72Tcfadcnv8vk_v1p-4cQ2yWPU,2616
-auto_coder-0.1.242.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-auto_coder-0.1.242.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
-auto_coder-0.1.242.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
-auto_coder-0.1.242.dist-info/RECORD,,
+auto_coder-0.1.243.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+auto_coder-0.1.243.dist-info/METADATA,sha256=zq_UlYzkagreMYmIrWVkCmf43Zr3_jIX1w577MlSXQE,2616
+auto_coder-0.1.243.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+auto_coder-0.1.243.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
+auto_coder-0.1.243.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
+auto_coder-0.1.243.dist-info/RECORD,,

autocoder/auto_coder.py

@@ -1112,7 +1112,7 @@ def main(input_args: Optional[List[str]] = None):
                     json.dump(chat_history, f, ensure_ascii=False)
                 console.print(
                     Panel(
-                        "New session started. Previous chat history has been archived.",
+                        get_message("new_session_started"),
                         title="Session Status",
                         expand=False,
                         border_style="green",

autocoder/chat_auto_coder.py

@@ -1002,6 +1002,51 @@ def load_memory():
     completer.update_current_files(memory["current_files"]["files"])
 
 
+def print_conf(content:Dict[str,Any]):        
+        """Display configuration dictionary in a Rich table format with enhanced visual styling.
+        
+        Args:
+            conf (Dict[str, Any]): Configuration dictionary to display
+        """
+        console = Console()
+        
+        # Create a styled table with rounded borders
+        table = Table(
+            show_header=True,
+            header_style="bold magenta",
+            title=get_message("conf_title"),
+            title_style="bold blue",
+            border_style="blue",
+            show_lines=True            
+        )
+        
+        # Add columns with explicit width and alignment
+        table.add_column(get_message("conf_key"), style="cyan", justify="right", width=30, no_wrap=False)
+        table.add_column(get_message("conf_value"), style="green", justify="left", width=50, no_wrap=False)
+        
+        # Sort keys for consistent display
+        for key in sorted(content.keys()):
+            value = content[key]
+            # Format value based on type
+            if isinstance(value, (dict, list)):
+                formatted_value = Text(json.dumps(value, indent=2), style="yellow")
+            elif isinstance(value, bool):
+                formatted_value = Text(str(value), style="bright_green" if value else "red")
+            elif isinstance(value, (int, float)):
+                formatted_value = Text(str(value), style="bright_cyan")
+            else:
+                formatted_value = Text(str(value), style="green")
+                
+            table.add_row(str(key), formatted_value)
+        
+        # Add padding and print with a panel
+        console.print(Panel(
+            table,
+            padding=(1, 2),
+            subtitle=f"[italic]{get_message('conf_subtitle')}[/italic]",
+            border_style="blue"
+        ))
+
 def revert():
     last_yaml_file = get_last_yaml_file("actions")
     if last_yaml_file:
@@ -2123,6 +2168,11 @@ def manage_models(params, query: str):
     if "/add" in query:
         subcmd = "/add"
         query = query.replace("/add", "", 1).strip()
+
+    # alias to /add
+    if "/activate" in query:
+        subcmd = "/add"
+        query = query.replace("/activate", "", 1).strip()    
     
     if "/remove" in query:
         subcmd = "/remove"
@@ -2141,7 +2191,7 @@ def manage_models(params, query: str):
             )
             table.add_column("Name", style="cyan", width=40, no_wrap=False)
             table.add_column("Model Name", style="magenta", width=30, overflow="fold")
-            table.add_column("Description", style="white", width=50, overflow="fold")
+            table.add_column("Base URL", style="white", width=50, overflow="fold")
             for m in models_data:
                 # Check if api_key_path exists and file exists
                 api_key_path = m.get("api_key_path", "")
@@ -2154,7 +2204,7 @@ def manage_models(params, query: str):
                 table.add_row(
                     name,                    
                     m.get("model_name", ""),                    
-                    m.get("description", "")
+                    m.get("base_url", "")
                 )
             console.print(table)
         else:
@@ -2366,10 +2416,7 @@ def execute_shell_command(command: str):
         if process.returncode != 0:
             console.print(
                 f"[bold red]Command failed with return code {process.returncode}[/bold red]"
-            )
-        else:
-            console.print(
-                "[bold green]Command completed successfully[/bold green]")
+            )        
 
     except FileNotFoundError:
         console.print(
@@ -2705,7 +2752,7 @@ def main():
             elif user_input.startswith("/conf"):
                 conf = user_input[len("/conf"):].strip()
                 if not conf:
-                    print(memory["conf"])
+                    print_conf(memory["conf"])
                 else:
                     configure(conf)
             elif user_input.startswith("/revert"):

autocoder/chat_auto_coder_lang.py

@@ -75,6 +75,10 @@ MESSAGES = {
         "shell_desc": "Execute a shell command",
         "voice_input_desc": "Convert voice input to text",
         "mode_desc": "Switch input mode",
+        "conf_key": "Key",
+        "conf_value": "Value",
+        "conf_title": "Configuration Settings",
+        "conf_subtitle": "Use /conf <key>:<value> to modify these settings",
         "lib_desc": "Manage libraries",
         "exit_desc": "Exit the program",
         "design_desc": "Generate SVG image based on the provided description",
@@ -187,6 +191,10 @@ MESSAGES = {
         "design_desc": "根据需求设计SVG图片",
         "commit_desc": "根据用户人工修改的代码自动生成yaml文件并提交更改",
         "models_desc": "管理模型配置，仅在lite模式下可用",
+        "conf_key": "键",
+        "conf_value": "值",
+        "conf_title": "配置设置",
+        "conf_subtitle": "使用 /conf <key>:<value> 修改这些设置",
         "models_usage": "用法: /models /list|/add|/add_model|/remove ...",
         "models_added": "成功添加/更新模型 '{{name}}'。",
         "models_add_failed": "添加模型 '{{name}}' 失败。在默认模型中未找到该模型。",

autocoder/common/__init__.py

@@ -350,6 +350,7 @@ class AutoCoderArgs(pydantic.BaseModel):
     skip_events: Optional[bool] = False
     data_cells_max_num: Optional[int] = 2000
     generate_times_same_model: Optional[int] = 1
+    rank_times_same_model: Optional[int] = 1
 
     action: List[str] = []
     enable_global_memory: Optional[bool] = True  

autocoder/common/auto_coder_lang.py

@@ -1,7 +1,8 @@
 import locale
 
 MESSAGES = {
-    "en": {
+"en": {
+        "new_session_started": "New session started. Previous chat history has been archived.",    
         "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",
@@ -63,9 +64,16 @@ 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 }}",
-        "upsert_file": "✅ Updated file: {{ file_path }}",        
+        "upsert_file": "✅ Updated file: {{ file_path }}",  
+        "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 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 }}"
     },
     "zh": {
+        "new_session_started": "新会话已开始。之前的聊天历史已存档。",
         "memory_save_success": "✅ 已保存到您的记忆中",
         "index_file_too_large": "⚠️ 文件 {{ file_path }} 过大 ({{ file_size }} > {{ max_length }}), 正在分块处理...",
         "index_update_success": "✅ 成功更新 {{ file_path }} 的索引 (md5: {{ md5 }}), 耗时 {{ duration }} 秒",
@@ -116,12 +124,12 @@ MESSAGES = {
         "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_blocks_title": "未合并代码块",
+        "unmerged_file_path": "文件: {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 }}",
+        "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 }}",
         "upsert_file": "✅ 更新文件: {{ file_path }}",
         "files_merged": "✅ 成功合并了 {{ total }} 个文件到项目中。",
         "merge_failed": "❌ 合并文件 {{ path }} 失败: {{ error }}",
@@ -134,7 +142,7 @@ MESSAGES = {
         "ranking_process_failed": "排序过程失败: {{ error }}",
         "ranking_failed": "排序失败，耗时 {{ elapsed }} 秒，使用原始顺序",
         "stream_out_stats": "耗时 {{ elapsed_time }} 秒，输入token数: {{ input_tokens }}, 输出token数: {{ output_tokens }}"
-    },    
+    },
 }
 
 

autocoder/common/code_auto_merge_editblock.py

@@ -422,11 +422,11 @@ class CodeAutoMergeEditBlock:
         self.printer.print_in_terminal("unmerged_blocks_title", style="bold red")
         for file_path, head, update, similarity in unmerged_blocks:
             self.printer.print_str_in_terminal(
-                f"\n{self.printer.get_message_from_key('unmerged_file_path').format(file_path=file_path)}",
+                f"\n{self.printer.get_message_from_key_with_format('unmerged_file_path',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)}",
+                f"\n{self.printer.get_message_from_key_with_format('unmerged_search_block',similarity=similarity)}",
                 style="bold green"
             )
             syntax = Syntax(head, "python", theme="monokai", line_numbers=True)

autocoder/common/code_modification_ranker.py

@@ -66,8 +66,8 @@ class CodeModificationRanker:
 
         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
+        rank_times = self.args.rank_times_same_model
+        total_tasks = len(self.llms) * rank_times
 
         query = self._rank_modifications.prompt(generate_result)
         input_tokens_count = 0
@@ -78,7 +78,7 @@ class CodeModificationRanker:
                 # Submit tasks for each model and generate_times
                 futures = []
                 for llm in self.llms:
-                    for _ in range(generate_times):
+                    for _ in range(rank_times):
                         futures.append(
                             executor.submit(
                                 chat_with_continue,

autocoder/common/printer.py

@@ -46,5 +46,5 @@ class Printer:
 
     def print_panel(self, content: str, text_options:Dict[str,Any], panel_options:Dict[str,Any]):
         panel = Panel(Text(content, **text_options), **panel_options)
-        self.console.print(panel)    
-                 
+        self.console.print(panel)                  
+        

autocoder/common/utils_code_auto_generate.py

@@ -57,7 +57,7 @@ def stream_chat_with_continue(
     count = 0
     temp_conversations = conversations
     current_metadata = None
-    
+    metadatas = {}
     while True:
         # 使用流式接口获取生成内容
         stream_generator = llm.stream_chat_oai(
@@ -67,17 +67,20 @@ def stream_chat_with_continue(
         )
         
         current_content = ""        
+        
         for res in stream_generator:
             content = res[0]
             current_content += content 
             if current_metadata is None:
                 current_metadata = res[1]            
             else:
-                current_metadata.generated_tokens_count += res[1].generated_tokens_count
-                current_metadata.input_tokens_count += res[1].input_tokens_count
-                current_metadata.finish_reason = res[1].finish_reason                
+                metadatas[count] = res[1]                
+                current_metadata.finish_reason = res[1].finish_reason     
+                current_metadata.reasoning_content = res[1].reasoning_content           
             
             # Yield 当前的 StreamChatWithContinueResult
+            current_metadata.generated_tokens_count = sum([v.generated_tokens_count for _, v in metadatas.items()])
+            current_metadata.input_tokens_count = sum([v.input_tokens_count for _, v in metadatas.items()])            
             yield (content,current_metadata)
         
         # 更新对话历史

autocoder/utils/auto_coder_utils/chat_stream_out.py

@@ -2,11 +2,265 @@ from rich.console import Console
 from rich.live import Live
 from rich.panel import Panel
 from rich.markdown import Markdown
-from typing import Generator, List, Dict, Any, Optional, Tuple
+from rich.layout import Layout
+from threading import Thread, Lock
+from queue import Queue, Empty
+from typing import Generator, List, Dict, Any, Optional, Tuple, Literal
 from autocoder.utils.request_queue import RequestValue, RequestOption, StreamValue
 from autocoder.utils.request_queue import request_queue
+import time
 
 MAX_HISTORY_LINES = 40  # 最大保留历史行数
+LAYOUT_TYPES = Literal["vertical", "horizontal"]
+
+class StreamController:
+    def __init__(self, layout_type: LAYOUT_TYPES = "vertical", console: Optional[Console] = None):
+        self.console = console or Console(force_terminal=True, color_system="auto", height=24)  # 设置默认高度
+        self.layout = Layout()
+        self.queue = Queue()
+        self.lock = Lock()
+        self.running = True
+        self.workers = []
+        self.layout_type = layout_type
+        self.stream_count = 0
+
+    def _create_stream_panel(self, idx: int) -> Layout:
+        """创建流面板布局"""
+        # 计算安全高度
+        current_height = self.console.height or 24  # 默认24行防止获取失败
+        safe_height = max(min(50, current_height // 2 - 4), 5)  # 限制最小高度为5行
+        
+        # 使用整数设置 Layout 的 size
+        panel = Layout(name=f"stream-{idx}", size=safe_height)
+        
+        panel.update(
+            Panel(
+                Markdown(""),
+                title=f"Stream {idx + 1}",
+                border_style="green",
+                height=safe_height  # 确保数值有效
+            )
+        )
+        return panel
+
+    def prepare_layout(self, count: int):
+        """准备动态布局结构"""
+        self.stream_count = count
+        
+        # 创建一个主布局容器
+        streams_layout = Layout(name="streams")
+        
+        # 创建所有流的布局
+        stream_layouts = []
+        for i in range(count):
+            stream_layout = Layout(name=f"stream-{i}")
+            panel = self._create_stream_panel(i)
+            stream_layout.update(panel)
+            stream_layouts.append(stream_layout)
+        
+        # 将所有流添加到主布局
+        if stream_layouts:
+            streams_layout.update(stream_layouts[0])
+            for i in range(1, len(stream_layouts)):
+                if self.layout_type == "vertical":
+                    streams_layout.split_column(stream_layouts[i])
+                elif self.layout_type == "horizontal":
+                    streams_layout.split_row(stream_layouts[i])
+                else:
+                    streams_layout.split_column(stream_layouts[i])
+        
+        # header 与 streams 布局分开
+        self.layout.split(
+            Layout(name="header", size=1),
+            streams_layout
+        )
+
+    def update_panel(self, idx: int, content: str, final: bool = False):
+        """线程安全的面板更新方法"""
+        with self.lock:
+            # 计算安全高度
+            safe_height = min(50, self.console.height // 2 - 4)
+            
+            if final:
+                new_panel = Panel(
+                    Markdown(content),
+                    title=f"Final Stream {idx+1}",
+                    border_style="blue",
+                    height=safe_height
+                )
+            else:
+                new_panel = Panel(
+                    Markdown(content),
+                    title=f"Stream {idx+1}",
+                    border_style="green",
+                    height=safe_height
+                )
+
+            panel_name = f"stream-{idx}"
+            streams_layout = self.layout["streams"]
+            
+            # 递归查找目标布局
+            def find_layout(layout, name):
+                if layout.name == name:
+                    return layout
+                for child in layout.children:
+                    result = find_layout(child, name)
+                    if result:
+                        return result
+                return None
+            
+            # 查找并更新目标布局
+            target_layout = find_layout(streams_layout, panel_name)
+            if target_layout:
+                target_layout.update(new_panel)
+            else:
+                import logging
+                logging.warning(f"未找到布局 {panel_name}，无法更新面板。")
+
+def stream_worker(
+    idx: int,
+    generator: Generator[Tuple[str, Dict[str, Any]], None, None],
+    controller: StreamController,
+    request_id: Optional[str] = None
+) -> Tuple[str, Optional[Dict[str, Any]]]:
+    """单个流处理工作线程"""
+    lines_buffer = []
+    current_line = ""
+    assistant_response = ""
+    last_meta = None
+    
+    try:
+        for res in generator:
+            content, meta = res
+            last_meta = meta
+            
+            assistant_response += content
+            display_delta = meta.reasoning_content or content
+
+            parts = (current_line + display_delta).split("\n")
+            if len(parts) > 1:
+                lines_buffer.extend(parts[:-1])
+                if len(lines_buffer) > MAX_HISTORY_LINES:
+                    del lines_buffer[0:len(lines_buffer) - MAX_HISTORY_LINES]
+            
+            current_line = parts[-1]
+            display_content = "\n".join(lines_buffer[-MAX_HISTORY_LINES:] + [current_line])
+            
+            controller.queue.put((idx, display_content, False))
+            
+            if request_id and request_queue:
+                request_queue.add_request(
+                    request_id,
+                    RequestValue(
+                        value=StreamValue(value=[content]),
+                        status=RequestOption.RUNNING,
+                    ),
+                )
+
+        if current_line:
+            lines_buffer.append(current_line)
+        controller.queue.put((idx, assistant_response, True))
+        return assistant_response, last_meta
+    
+    except Exception as e:
+        error_content = f"Error: {str(e)}"
+        controller.queue.put((idx, error_content, True))
+        if request_id and request_queue:
+            request_queue.add_request(
+                request_id,
+                RequestValue(
+                    value=StreamValue(value=[str(e)]), 
+                    status=RequestOption.FAILED
+                ),
+            )
+        return assistant_response, last_meta
+    finally:
+        if request_id and request_queue:
+            request_queue.add_request(
+                request_id,
+                RequestValue(
+                    value=StreamValue(value=[""]), 
+                    status=RequestOption.COMPLETED
+                ),
+            )
+
+def multi_stream_out(
+    stream_generators: List[Generator[Tuple[str, Dict[str, Any]], None, None]],
+    request_ids: Optional[List[str]] = None,
+    console: Optional[Console] = None,
+    layout_type: LAYOUT_TYPES = "vertical"
+) -> List[Tuple[str, Optional[Dict[str, Any]]]]:
+    """
+    多流并行输出处理器
+    
+    Args:
+        stream_generators: 流处理器列表
+        request_ids: 对应请求ID列表
+        console: Rich Console对象
+        layout_type: 布局类型 vertical/horizontal
+        
+    Returns:
+        List[Tuple[str, Dict]]: 各流的处理结果
+    """
+    # 确保使用统一的console实例
+    if console is None:
+        console = Console(force_terminal=True, color_system="auto", height=24)
+    
+    # 初始化控制器
+    controller = StreamController(layout_type, console=console)
+    stream_count = len(stream_generators)
+    controller.prepare_layout(stream_count)
+    
+    # 启动工作线程
+    results = [None] * stream_count
+    threads = []
+    
+    # 创建工作线程
+    def worker_target(idx: int, gen: Generator[Tuple[str, Dict[str, Any]], None, None]):
+        req_id = request_ids[idx] if request_ids and idx < len(request_ids) else None
+        results[idx] = stream_worker(idx, gen, controller, req_id)
+    
+    # 启动所有工作线程
+    for idx, gen in enumerate(stream_generators):
+        t = Thread(target=worker_target, args=(idx, gen))
+        t.start()
+        threads.append(t)
+    
+    # 主渲染线程
+    try:
+        with Live(
+            controller.layout, 
+            console=console or controller.console,
+            refresh_per_second=10,
+            screen=True
+        ) as live:
+            while controller.running:
+                updated = False
+                try:
+                    while True:  # 处理队列中的所有更新
+                        idx, content, final = controller.queue.get_nowait()
+                        controller.update_panel(idx, content, final)
+                        updated = True
+                except Empty:
+                    pass
+                
+                if updated:
+                    live.refresh()
+                
+                # 检查线程是否全部完成
+                if all(not t.is_alive() for t in threads):
+                    break
+                
+                time.sleep(0.1)
+                
+    finally:
+        controller.running = False
+        for t in threads:
+            t.join()
+
+    # 确保最后一次刷新
+    (console or controller.console).print(controller.layout)        
+    return results
 
 def stream_out(
     stream_generator: Generator[Tuple[str, Dict[str, Any]], None, None],
@@ -41,10 +295,17 @@ def stream_out(
             for res in stream_generator:
                 last_meta = res[1]                
                 content = res[0]
+                reasoning_content = last_meta.reasoning_content
+
+                if reasoning_content == "" and content == "":
+                    continue
+            
                 assistant_response += content
+
+                display_delta = reasoning_content if reasoning_content else content
                 
                 # 处理所有行
-                parts = (current_line + content).split("\n")
+                parts = (current_line + display_delta).split("\n")
                 
                 # 最后一部分是未完成的新行
                 if len(parts) > 1:

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.242"
+__version__ = "0.1.243"