auto-coder 0.1.240__tar.gz → 0.1.243__tar.gz

{auto_coder-0.1.240 → auto_coder-0.1.243}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.240
+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.156
+Requires-Dist: byzerllm[saas]>=0.1.159
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython

{auto_coder-0.1.240 → auto_coder-0.1.243}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.240
+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.156
+Requires-Dist: byzerllm[saas]>=0.1.159
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython

{auto_coder-0.1.240 → auto_coder-0.1.243}/src/auto_coder.egg-info/requires.txt

@@ -16,7 +16,7 @@ tabulate
 jupyter_client
 prompt-toolkit
 tokenizers
-byzerllm[saas]>=0.1.156
+byzerllm[saas]>=0.1.159
 patch
 diff_match_patch
 GitPython

{auto_coder-0.1.240 → auto_coder-0.1.243}/src/autocoder/auto_coder.py

@@ -14,7 +14,7 @@ from autocoder.utils.queue_communicate import (
 
 import yaml
 import os
-import uuid
+import time
 from byzerllm.utils.client import EventCallbackResult, EventName
 from prompt_toolkit import prompt
 from prompt_toolkit.formatted_text import FormattedText
@@ -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",
@@ -1310,6 +1310,9 @@ def main(input_args: Optional[List[str]] = None):
                     printer = Printer()
                     printer.print_in_terminal("memory_save_success")
                 return {}
+
+            # 计算耗时            
+            start_time = time.time()    
                         
             if "rag" in args.action:
                 args.enable_rag_search = True
@@ -1335,12 +1338,23 @@ def main(input_args: Optional[List[str]] = None):
                     conversations=loaded_conversations,
                     llm_config={}
                 )              
+
+                
             
             assistant_response, last_meta = stream_out(
                     v, 
                     request_id=args.request_id,                    
                     console=console
                 )
+                                                                       
+            # 打印耗时和token统计            
+            if last_meta:
+                elapsed_time = time.time() - start_time
+                printer = Printer()
+                printer.print_in_terminal("stream_out_stats", 
+                                    elapsed_time=elapsed_time,
+                                    input_tokens=last_meta.input_tokens_count,
+                                    output_tokens=last_meta.generated_tokens_count)
             
             chat_history["ask_conversation"].append(
                 {"role": "assistant", "content": assistant_response}
@@ -1361,7 +1375,8 @@ def main(input_args: Optional[List[str]] = None):
                 save_to_memory_file(ask_conversation=chat_history["ask_conversation"],
                                     query=args.query,
                                     response=assistant_response)  
-                print("Saved to your memory")                      
+                printer = Printer()
+                printer.print_in_terminal("memory_save_success")                      
             return
 
         else:

{auto_coder-0.1.240 → auto_coder-0.1.243}/src/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"):

{auto_coder-0.1.240 → auto_coder-0.1.243}/src/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}}' 失败。在默认模型中未找到该模型。",

{auto_coder-0.1.240 → auto_coder-0.1.243}/src/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  

{auto_coder-0.1.240 → auto_coder-0.1.243}/src/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",
@@ -60,9 +61,19 @@ MESSAGES = {
         "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"
+        "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 }}",  
+        "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 }} 秒",
@@ -108,16 +119,17 @@ MESSAGES = {
         "normal_filter_start": "开始查找上下文(normal_filter)...",
         "pylint_check_failed": "⚠️ Pylint 检查失败: {{ error_message }}",
         "pylint_error": "❌ 运行 Pylint 时出错: {{ error_message }}",
+        "begin_index_source_code": "🚀 开始为 {{ source_dir }} 中的源代码建立索引",
         "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_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 }}",
@@ -128,8 +140,9 @@ MESSAGES = {
         "ranking_all_failed": "所有排序请求都失败",
         "ranking_complete": "排序完成，耗时 {{ elapsed }} 秒，总投票数: {{ total_tasks }}，最佳候选索引: {{ best_candidate }}，得分: {{ scores }}，输入token数: {{ input_tokens }}，输出token数: {{ output_tokens }}",
         "ranking_process_failed": "排序过程失败: {{ error }}",
-        "ranking_failed": "排序失败，耗时 {{ elapsed }} 秒，使用原始顺序"
-    }    
+        "ranking_failed": "排序失败，耗时 {{ elapsed }} 秒，使用原始顺序",
+        "stream_out_stats": "耗时 {{ elapsed_time }} 秒，输入token数: {{ input_tokens }}, 输出token数: {{ output_tokens }}"
+    },
 }
 
 

{auto_coder-0.1.240 → auto_coder-0.1.243}/src/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)

{auto_coder-0.1.240 → auto_coder-0.1.243}/src/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,
@@ -99,9 +99,7 @@ class CodeModificationRanker:
                         results.append(v.rank_result)
                     except Exception as e:
                         self.printer.print_in_terminal(
-                            "ranking_failed_request", style="yellow", error=str(e))
-                        if self.args.debug:
-                            print(traceback.format_exc())
+                            "ranking_failed_request", style="yellow", error=str(e))                        
                         continue
 
                 if not results:

{auto_coder-0.1.240 → auto_coder-0.1.243}/src/autocoder/common/printer.py

@@ -5,6 +5,7 @@ from typing import Optional,Dict,Any
 from byzerllm.utils import format_str_jinja2
 from autocoder.common.auto_coder_lang import get_message
 from autocoder.chat_auto_coder_lang import get_message as get_chat_message
+
 class Printer:
     def __init__(self,console:Optional[Console]=None):
         if console is None:
@@ -45,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)                  
+        

{auto_coder-0.1.240 → auto_coder-0.1.243}/src/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)
         
         # 更新对话历史

{auto_coder-0.1.240 → auto_coder-0.1.243}/src/autocoder/index/for_command.py

@@ -5,7 +5,7 @@ from autocoder.tsproject import TSProject
 from autocoder.pyproject import PyProject
 import tabulate
 import textwrap
-from loguru import logger
+from autocoder.common.printer import Printer
 import os
 from autocoder.utils.request_queue import (
     request_queue,
@@ -35,7 +35,8 @@ def wrap_text_in_table(data, max_width=60):
 def index_command(args, llm):
     source_dir = os.path.abspath(args.source_dir)
     args.source_dir = source_dir
-    logger.info(f"Beging to index source code in {source_dir}")
+    printer = Printer()
+    printer.print_in_terminal("begin_index_source_code", style="bold green", source_dir=source_dir)
     if args.project_type == "ts":
         pp = TSProject(args=args, llm=llm)
     elif args.project_type == "py":