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

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

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

{auto_coder-0.1.243 → 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.243
+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.159
+Requires-Dist: byzerllm[saas]>=0.1.160
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython

{auto_coder-0.1.243 → 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.159
+byzerllm[saas]>=0.1.160
 patch
 diff_match_patch
 GitPython

{auto_coder-0.1.243 → 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)

{auto_coder-0.1.243 → auto_coder-0.1.244}/src/autocoder/chat_auto_coder.py

@@ -1605,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)

{auto_coder-0.1.243 → 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": {
@@ -236,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.243 → auto_coder-0.1.244}/src/autocoder/common/auto_coder_lang.py

@@ -1,9 +1,13 @@
 import locale
+from byzerllm.utils import format_str_jinja2
 
 MESSAGES = {
-"en": {
+    "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 }}",
@@ -73,8 +77,11 @@ MESSAGES = {
         "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 }}",
@@ -156,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.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.243 → auto_coder-0.1.244}/src/autocoder/index/index.py

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

{auto_coder-0.1.243 → 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.243 → 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 = []

auto_coder-0.1.244/src/autocoder/utils/auto_coder_utils/chat_stream_out.py

@@ -0,0 +1,257 @@
+from rich.console import Console
+from rich.live import Live
+from rich.panel import Panel
+from rich.markdown import Markdown
+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  # 最大保留历史行数
+
+class StreamRenderer:
+    def __init__(self, title: str):
+        self.title = title
+        self.content = ""
+        self.lock = Lock()
+        self.is_complete = False
+        
+    def update(self, content: str):
+        with self.lock:
+            self.content += content
+            
+    def get_content(self) -> str:
+        with self.lock:
+            return self.content
+            
+    def complete(self):
+        with self.lock:
+            self.is_complete = True
+
+class MultiStreamRenderer:
+    def __init__(self, stream_titles: List[str], layout: str = "horizontal", console: Optional[Console] = None):
+        """
+        Initialize multi-stream renderer
+        
+        Args:
+            stream_titles: List of titles for each stream
+            layout: "horizontal" or "vertical"
+            console: Rich console instance
+        """
+        if console is None:
+            console = Console(force_terminal=True, color_system="auto")
+            
+        self.console = console
+        self.layout_type = layout
+        self.streams = [StreamRenderer(title) for title in stream_titles]
+        self.layout = Layout()
+        
+        # Create named layouts for each stream
+        self.stream_layouts = [Layout(name=f"stream{i}") for i in range(len(stream_titles))]
+        
+        # Configure layout
+        if layout == "horizontal":
+            self.layout.split_row(*self.stream_layouts)
+        else:
+            self.layout.split_column(*self.stream_layouts)
+            
+    def _process_stream(self, 
+                       stream_idx: int, 
+                       stream_generator: Generator[Tuple[str, Dict[str, Any]], None, None]):
+        """Process a single stream in a separate thread"""
+        stream = self.streams[stream_idx]
+        try:
+            for content, meta in stream_generator:
+                if content:
+                    stream.update(content)
+        finally:
+            stream.complete()
+
+    def render_streams(self, 
+                      stream_generators: List[Generator[Tuple[str, Dict[str, Any]], None, None]]) -> List[str]:
+        """
+        Render multiple streams simultaneously
+        
+        Args:
+            stream_generators: List of stream generators to render
+            
+        Returns:
+            List of final content from each stream
+        """
+        assert len(stream_generators) == len(self.streams), "Number of generators must match number of streams"
+        
+        # Start processing threads
+        threads = []
+        for i, generator in enumerate(stream_generators):
+            thread = Thread(target=self._process_stream, args=(i, generator))
+            thread.daemon = True
+            thread.start()
+            threads.append(thread)
+            
+        try:
+            with Live(self.layout, console=self.console, refresh_per_second=10) as live:
+                while any(not stream.is_complete for stream in self.streams):
+                    # Update all panels
+                    for i, stream in enumerate(self.streams):
+                        panel = Panel(
+                            Markdown(stream.get_content() or "Waiting..."),
+                            title=stream.title,
+                            border_style="green" if not stream.is_complete else "blue"
+                        )
+                        
+                        # Update appropriate layout section
+                        self.stream_layouts[i].update(panel)
+                        
+                    time.sleep(0.1)  # Prevent excessive CPU usage
+                    
+        except KeyboardInterrupt:
+            print("\nStopping streams...")
+            
+        # Wait for all threads to complete
+        for thread in threads:
+            thread.join()
+            
+        return [stream.get_content() for stream in self.streams]
+
+def multi_stream_out(
+    stream_generators: List[Generator[Tuple[str, Dict[str, Any]], None, None]],
+    titles: List[str],
+    layout: str = "horizontal",
+    console: Optional[Console] = None
+) -> List[str]:
+    """
+    Render multiple streams with Rich
+    
+    Args:
+        stream_generators: List of stream generators
+        titles: List of titles for each stream
+        layout: "horizontal" or "vertical"
+        console: Optional Rich console instance
+        
+    Returns:
+        List of final content from each stream
+    """
+    renderer = MultiStreamRenderer(titles, layout, console)
+    return renderer.render_streams(stream_generators)
+
+
+def stream_out(
+    stream_generator: Generator[Tuple[str, Dict[str, Any]], None, None],
+    request_id: Optional[str] = None,    
+    console: Optional[Console] = None
+) -> Tuple[str, Optional[Dict[str, Any]]]:
+    """
+    处理流式输出事件并在终端中展示
+    
+    Args:
+        stream_generator: 生成流式输出的生成器
+        request_id: 请求ID,用于更新请求队列        
+        console: Rich Console对象
+        
+    Returns:
+        Tuple[str, Dict[str, Any]]: 返回完整的响应内容和最后的元数据
+    """
+    if console is None:
+        console = Console(force_terminal=True, color_system="auto", height=None)
+        
+    lines_buffer = []  # 存储历史行
+    current_line = ""  # 当前行
+    assistant_response = ""
+    last_meta = None
+    
+    try:
+        with Live(
+            Panel("", title="Response", border_style="green"),
+            refresh_per_second=4,
+            console=console
+        ) as live:
+            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 + 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])
+                
+                if request_id and request_queue:
+                    request_queue.add_request(
+                        request_id,
+                        RequestValue(
+                            value=StreamValue(value=[content]),
+                            status=RequestOption.RUNNING,
+                        ),
+                    )
+                    
+                live.update(
+                    Panel(
+                        Markdown(display_content),
+                        title="Response",
+                        border_style="green",
+                        height=min(50, live.console.height - 4)
+                    )
+                )
+            
+            # 处理最后一行的内容
+            if current_line:
+                lines_buffer.append(current_line)
+            
+            # 最终显示结果
+            live.update(
+                Panel(
+                    Markdown(assistant_response),
+                    title="Final Response",
+                    border_style="blue"
+                )
+            )
+            
+    except Exception as e:
+        console.print(Panel(
+            f"Error: {str(e)}",  
+            title="Error",
+            border_style="red"
+        ))
+        
+        if request_id and request_queue:
+            request_queue.add_request(
+                request_id,
+                RequestValue(
+                    value=StreamValue(value=[str(e)]), 
+                    status=RequestOption.FAILED
+                ),
+            )
+            
+    finally:
+        if request_id and request_queue:
+            request_queue.add_request(
+                request_id,
+                RequestValue(
+                    value=StreamValue(value=[""]), 
+                    status=RequestOption.COMPLETED
+                ),
+            )
+            
+    return assistant_response, last_meta