auto-coder 0.1.242__tar.gz → 0.1.244__tar.gz

{auto_coder-0.1.242 → auto_coder-0.1.244}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.242
+Version: 0.1.244
 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.160
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython

{auto_coder-0.1.242 → auto_coder-0.1.244}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.242
+Version: 0.1.244
 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.160
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython

{auto_coder-0.1.242 → auto_coder-0.1.244}/src/auto_coder.egg-info/requires.txt

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

{auto_coder-0.1.242 → auto_coder-0.1.244}/src/autocoder/auto_coder.py

@@ -692,6 +692,23 @@ def main(input_args: Optional[List[str]] = None):
                 )
                 llm.setup_sub_client("vl_model", vl_model)
 
+            if args.index_model:   
+                model_name = args.index_model.strip()
+                model_info = models_module.get_model_by_name(model_name)                
+                index_model = byzerllm.SimpleByzerLLM(default_model_name=model_name)
+                index_model.deploy(
+                    model_path="",
+                    pretrained_model_type="saas/openai",
+                    udf_name=model_name,
+                    infer_params={
+                        "saas.base_url": model_info["base_url"],
+                        "saas.api_key": model_info["api_key"],
+                        "saas.model": model_info["model_name"],
+                        "saas.is_reasoning": model_info["is_reasoning"]
+                    }
+                )
+                llm.setup_sub_client("index_model", index_model)    
+
             if args.sd_model:
                 model_name = args.sd_model.strip()
                 model_info = models_module.get_model_by_name(model_name)
@@ -1112,7 +1129,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",

{auto_coder-0.1.242 → auto_coder-0.1.244}/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:
@@ -1560,8 +1605,8 @@ def code_next(query: str):
         if os.path.exists(temp_yaml):
             os.remove(temp_yaml)
 
-    llm = byzerllm.ByzerLLM.from_default_model(
-        args.inference_model or args.model)
+    product_mode = conf.get("product_mode", "lite")
+    llm = get_single_llm(args.chat_model or args.model, product_mode=product_mode)
 
     auto_guesser = AutoGuessQuery(
         llm=llm, project_dir=os.getcwd(), skip_diff=True)
@@ -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.242 → auto_coder-0.1.244}/src/autocoder/chat_auto_coder_lang.py

@@ -1,4 +1,5 @@
 import locale
+from byzerllm.utils import format_str_jinja2
 
 MESSAGES = {
     "en": {
@@ -75,6 +76,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 +192,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}}' 失败。在默认模型中未找到该模型。",
@@ -228,3 +237,7 @@ def get_system_language():
 def get_message(key):
     lang = get_system_language()
     return MESSAGES.get(lang, MESSAGES['en']).get(key, MESSAGES['en'][key])
+
+
+def get_message_with_format(msg_key: str, **kwargs):
+    return format_str_jinja2(get_message(msg_key), **kwargs)

{auto_coder-0.1.242 → auto_coder-0.1.244}/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.242 → auto_coder-0.1.244}/src/autocoder/common/auto_coder_lang.py

@@ -1,8 +1,13 @@
 import locale
+from byzerllm.utils import format_str_jinja2
 
 MESSAGES = {
     "en": {
+        "model_not_found": "Model {{model_name}} not found",
+        "new_session_started": "New session started. Previous chat history has been archived.",    
         "memory_save_success": "✅ Saved to your memory",
+        "file_decode_error": "Failed to decode file: {{file_path}}. Tried encodings: {{encodings}}",
+        "file_write_error": "Failed to write file: {{file_path}}. Error: {{error}}",
         "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 }}",
@@ -63,10 +68,20 @@ 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": {
+        "model_not_found": "未找到模型: {{model_name}}",
+        "new_session_started": "新会话已开始。之前的聊天历史已存档。",
         "memory_save_success": "✅ 已保存到您的记忆中",
+        "file_decode_error": "无法解码文件: {{file_path}}。尝试的编码: {{encodings}}",
+        "file_write_error": "无法写入文件: {{file_path}}. 错误: {{error}}",
         "index_file_too_large": "⚠️ 文件 {{ file_path }} 过大 ({{ file_size }} > {{ max_length }}), 正在分块处理...",
         "index_update_success": "✅ 成功更新 {{ file_path }} 的索引 (md5: {{ md5 }}), 耗时 {{ duration }} 秒",
         "index_build_error": "❌ 构建 {{ file_path }} 索引时出错: {{ error }}",
@@ -116,12 +131,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 +149,7 @@ MESSAGES = {
         "ranking_process_failed": "排序过程失败: {{ error }}",
         "ranking_failed": "排序失败，耗时 {{ elapsed }} 秒，使用原始顺序",
         "stream_out_stats": "耗时 {{ elapsed_time }} 秒，输入token数: {{ input_tokens }}, 输出token数: {{ output_tokens }}"
-    },    
+    },
 }
 
 
@@ -148,3 +163,6 @@ def get_system_language():
 def get_message(key):
     lang = get_system_language()
     return MESSAGES.get(lang, MESSAGES['en']).get(key, MESSAGES['en'][key])
+
+def get_message_with_format(msg_key: str, **kwargs):
+    return format_str_jinja2(get_message(msg_key), **kwargs)

{auto_coder-0.1.242 → auto_coder-0.1.244}/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.242 → auto_coder-0.1.244}/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,

auto_coder-0.1.244/src/autocoder/common/files.py

@@ -0,0 +1,58 @@
+from autocoder.common.auto_coder_lang import get_message_with_format
+from typing import List, Dict, Union
+
+def read_file(file_path):
+    """Read a file with automatic encoding detection.
+    
+    Tries common encodings in sequence (UTF-8 > GBK > UTF-16 > Latin-1) to handle
+    cross-platform encoding issues between Windows and Linux systems.
+    
+    Args:
+        file_path (str): Path to the file to read
+        
+    Returns:
+        str: The file contents as a string
+        
+    Raises:
+        ValueError: If the file cannot be decoded with any of the tried encodings
+    """
+    encodings = ['utf-8', 'gbk', 'utf-16', 'latin-1']
+    
+    for encoding in encodings:
+        try:
+            with open(file_path, 'r', encoding=encoding) as f:
+                content = f.read()
+                return content
+        except UnicodeDecodeError:
+            continue
+            
+    raise ValueError(get_message_with_format("file_decode_error", 
+        file_path=file_path, 
+        encodings=", ".join(encodings)))
+
+
+
+def save_file(file_path: str, content: Union[str, List[str]]) -> None:
+    """Save content to a file using UTF-8 encoding.
+    
+    Args:
+        file_path (str): Path to the file to write
+        content (Union[str, List[str]]): Content to write to the file. 
+            Can be a string or list of strings (will be joined with newlines)
+        
+    Raises:
+        IOError: If the file cannot be written
+        TypeError: If content is neither str nor List[str]
+    """
+    try:
+        with open(file_path, 'w', encoding='utf-8') as f:
+            if isinstance(content, str):
+                f.write(content)
+            elif isinstance(content, list):
+                f.write('\n'.join(content))
+            else:
+                raise TypeError("Content must be either str or List[str]")
+    except IOError as e:
+        raise IOError(get_message_with_format("file_write_error",
+            file_path=file_path,
+            error=str(e)))

{auto_coder-0.1.242 → auto_coder-0.1.244}/src/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)                  
+        

{auto_coder-0.1.242 → auto_coder-0.1.244}/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.242 → auto_coder-0.1.244}/src/autocoder/index/index.py

@@ -130,6 +130,7 @@ class IndexManager:
         如果有符号，按如下格式返回:
 
         ```
+        用途：主要用于提供自动实现函数模板的功能。
         {符号类型}: {符号名称}, {符号名称}, ...
         ```
 

{auto_coder-0.1.242 → auto_coder-0.1.244}/src/autocoder/models.py

@@ -36,6 +36,22 @@ default_models_list = [
     }
 ]
 
+def process_api_key_path(base_url: str) -> str:
+    """
+    从 base_url 中提取 host 部分并处理特殊字符
+    例如: https://api.example.com:8080/v1 -> api.example.com_8080
+    """
+    if not base_url:
+        return ""
+    
+    parsed = urlparse(base_url)
+    host = parsed.netloc
+    
+    # 将冒号替换为下划线
+    host = host.replace(":", "_")
+    
+    return host
+
 def load_models() -> List[Dict]:
     """
     Load models from ~/.auto-coder/keys/models.json and merge with default_models_list.
@@ -73,7 +89,7 @@ def load_models() -> List[Dict]:
             api_key_file = os.path.join(api_key_dir, model["api_key_path"])
             if os.path.exists(api_key_file):
                 with open(api_key_file, "r") as f:
-                    model["api_key"] = f.read()
+                    model["api_key"] = f.read()                   
     return target_models
 
 def save_models(models: List[Dict]) -> None:
@@ -85,22 +101,6 @@ def save_models(models: List[Dict]) -> None:
         json.dump(models, f, indent=2, ensure_ascii=False)
 
 
-def process_api_key_path(base_url: str) -> str:
-    """
-    从 base_url 中提取 host 部分并处理特殊字符
-    例如: https://api.example.com:8080/v1 -> api.example.com_8080
-    """
-    if not base_url:
-        return ""
-    
-    parsed = urlparse(base_url)
-    host = parsed.netloc
-    
-    # 将冒号替换为下划线
-    host = host.replace(":", "_")
-    
-    return host
-
 def get_model_by_name(name: str) -> Dict:
     """
     根据模型名称查找模型
@@ -109,7 +109,8 @@ def get_model_by_name(name: str) -> Dict:
     v = [m for m in models if m["name"] == name.strip()]
     
     if len(v) == 0:
-        raise Exception(f"Model {name} not found")
+        from autocoder.common.auto_coder_lang import get_message_with_format
+        raise Exception(get_message_with_format("model_not_found", model_name=name))
     return v[0]
 
 def update_model_with_api_key(name: str, api_key: str) -> Dict:
@@ -135,9 +136,8 @@ def update_model_with_api_key(name: str, api_key: str) -> Dict:
                     
     if not found_model:
         return None
-        
-    # 从 base_url 中提取并处理 host
-    api_key_path = process_api_key_path(found_model["base_url"])
+            
+    api_key_path = name
     if api_key_path:
         found_model["api_key_path"] = api_key_path
         

{auto_coder-0.1.242 → auto_coder-0.1.244}/src/autocoder/suffixproject/__init__.py

@@ -36,9 +36,8 @@ class SuffixProject:
         self.target_file = args.target_file
         self.project_type = args.project_type
         self.suffixs = [
-            f".{suffix.strip()}" if not suffix.startswith(".") else suffix.strip()
-            for suffix in self.project_type.split(",")
-            if suffix.strip() != ""
+            suffix.strip() if suffix.startswith(".") else f".{suffix.strip()}"
+            for suffix in self.project_type.split(",") if suffix.strip()
         ]
         self.file_filter = file_filter
         self.sources = []