auto-coder 0.1.270__tar.gz → 0.1.272__tar.gz

{auto_coder-0.1.270 → auto_coder-0.1.272}/PKG-INFO

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

{auto_coder-0.1.270 → auto_coder-0.1.272}/src/auto_coder.egg-info/PKG-INFO

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

{auto_coder-0.1.270 → auto_coder-0.1.272}/src/auto_coder.egg-info/SOURCES.txt

@@ -129,6 +129,7 @@ src/autocoder/rag/simple_rag.py
 src/autocoder/rag/token_checker.py
 src/autocoder/rag/token_counter.py
 src/autocoder/rag/token_limiter.py
+src/autocoder/rag/token_limiter_utils.py
 src/autocoder/rag/types.py
 src/autocoder/rag/utils.py
 src/autocoder/rag/variable_holder.py

{auto_coder-0.1.270 → auto_coder-0.1.272}/src/auto_coder.egg-info/requires.txt

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

{auto_coder-0.1.270 → auto_coder-0.1.272}/src/autocoder/auto_coder_runner.py

@@ -2133,7 +2133,7 @@ def manage_models(query: str):
         # Check duplication
         if any(m["name"] == data_dict["name"] for m in models_data):
             printer.print_in_terminal("models_add_model_exists", style="yellow", name=data_dict["name"])
-            result_manager.add_result(content=printer.get_message_from_key("models_add_model_exists",name=data_dict["name"]),meta={
+            result_manager.add_result(content=printer.get_message_from_key_with_format("models_add_model_exists",name=data_dict["name"]),meta={
                 "action": "models",
                 "input": {
                     "query": query
@@ -2177,7 +2177,7 @@ def manage_models(query: str):
         filtered_models = [m for m in models_data if m["name"] != name]
         if len(filtered_models) == len(models_data):
             printer.print_in_terminal("models_add_model_remove", style="yellow", name=name)
-            result_manager.add_result(content=printer.get_message_from_key("models_add_model_remove",name=name),meta={
+            result_manager.add_result(content=printer.get_message_from_key_with_format("models_add_model_remove",name=name),meta={
                 "action": "models",
                 "input": {
                     "query": query
@@ -2186,7 +2186,7 @@ def manage_models(query: str):
             return
         models_module.save_models(filtered_models)
         printer.print_in_terminal("models_add_model_removed", style="green", name=name)
-        result_manager.add_result(content=printer.get_message_from_key("models_add_model_removed",name=name),meta={ 
+        result_manager.add_result(content=printer.get_message_from_key_with_format("models_add_model_removed",name=name),meta={ 
             "action": "models",
             "input": {
                 "query": query
@@ -2194,7 +2194,7 @@ def manage_models(query: str):
         })
     else:
         printer.print_in_terminal("models_unknown_subcmd", style="yellow", subcmd=subcmd)
-        result_manager.add_result(content=printer.get_message_from_key("models_unknown_subcmd",subcmd=subcmd),meta={ 
+        result_manager.add_result(content=printer.get_message_from_key_with_format("models_unknown_subcmd",subcmd=subcmd),meta={ 
             "action": "models",
             "input": {
                 "query": query

{auto_coder-0.1.270 → auto_coder-0.1.272}/src/autocoder/commands/auto_command.py

@@ -171,15 +171,21 @@ class CommandAutoTuner:
         当前用户环境信息如下:
         <os_info>
         操作系统: {{ env_info.os_name }} {{ env_info.os_version }}
+        操作系统发行版: {{ os_distribution }}
         Python版本: {{ env_info.python_version }}
         终端类型: {{ env_info.shell_type }}
         终端编码: {{ env_info.shell_encoding }}
+        
+        {%- if shell_type %}
+        脚本类型：{{ shell_type }}
+        {%- endif %}
+
         {%- if env_info.conda_env %}
         Conda环境: {{ env_info.conda_env }}
         {%- endif %}
         {%- if env_info.virtualenv %}
         虚拟环境: {{ env_info.virtualenv }}
-        {%- endif %}  
+        {%- endif %}   
         </os_info>
         
         我们的目标是根据用户输入和当前上下文，组合多个函数来完成用户的需求。
@@ -221,6 +227,7 @@ class CommandAutoTuner:
         每个文件的tokens数，你可以根据这个信息来决定如何读取这个文件。比如对于很小的文件，那么可以直接全部读取，
         而对于分析一个超大文件推荐组合 read_files 带上 line_ranges 参数来读取，或者组合 read_file_withread_file_with_keyword_ranges 等来读取，
         每个函数你还可以使用多次来获取更多信息。
+        9. 根据操作系统，终端类型，脚本类型等各种信息，在涉及到路径或者脚本的时候，需要考虑平台差异性。
         </function_combination_readme>
 
 
@@ -260,7 +267,13 @@ class CommandAutoTuner:
         满足需求。
         """
 
-        env_info = detect_env()            
+        env_info = detect_env() 
+        shell_type = "bash"
+        if shells.is_running_in_cmd():
+            shell_type = "cmd"
+        elif shells.is_running_in_powershell():
+            shell_type = "powershell"
+
         return {
             "user_input": request.user_input,
             "current_files": self.memory_config.memory["current_files"]["files"],            
@@ -268,9 +281,10 @@ class CommandAutoTuner:
             "available_commands": self._command_readme.prompt(),
             "current_conf": json.dumps(self.memory_config.memory["conf"], indent=2),        
             "env_info": env_info,
-            "shell_type": shells.get_terminal_name(),
+            "shell_type": shell_type,
             "shell_encoding": shells.get_terminal_encoding(),
-            "conversation_safe_zone_tokens": self.args.conversation_prune_safe_zone_tokens
+            "conversation_safe_zone_tokens": self.args.conversation_prune_safe_zone_tokens,
+            "os_distribution": shells.get_os_distribution()
         }
     
     @byzerllm.prompt()
@@ -1179,6 +1193,18 @@ class CommandAutoTuner:
          此时会返回诸如 "ts,py,java,go,js,ts" 这样的字符串，表示项目类型。
         </usage>
         </command>
+
+        <command>
+        <name>response_user</name>
+        <description>响应用户。</description>
+        <usage>
+         如果你需要直接发送信息给用户，那么可以通过 response_user 函数来直接回复用户。
+         
+         比如用户问你是谁？
+         你可以通过如下方式来回答：
+         response_user(response="你好，我是 auto-coder")
+        </usage>
+        </command>
         </commands>
         
         
@@ -1224,7 +1250,9 @@ class CommandAutoTuner:
             "get_project_related_files": self.tools.get_project_related_files,
             "ask_user":self.tools.ask_user,
             "read_file_with_keyword_ranges": self.tools.read_file_with_keyword_ranges,
-            "get_project_type": self.project_type_analyzer.analyze,                                    
+            "get_project_type": self.project_type_analyzer.analyze,
+            "response_user": self.tools.response_user,
+                                    
         }
 
         if command not in command_map:

{auto_coder-0.1.270 → auto_coder-0.1.272}/src/autocoder/commands/tools.py

@@ -28,6 +28,10 @@ from autocoder.utils.queue_communicate import (
 import sys
 import io
 from autocoder.common import files as files_utils
+from autocoder.common.printer import Printer
+from prompt_toolkit import PromptSession
+from prompt_toolkit.styles import Style
+
 
 @byzerllm.prompt()
 def detect_rm_command(command: str) -> Bool:
@@ -56,6 +60,7 @@ class AutoCommandTools:
         self.args = args
         self.llm = llm
         self.result_manager = ResultManager()
+        self.printer = Printer()
 
     def ask_user(self,question:str) -> str:
         '''
@@ -91,35 +96,43 @@ class AutoCommandTools:
         )
 
         # 显示问题面板
-        console.print(question_panel)
+        console.print(question_panel)        
 
-        # 创建一个自定义提示符
-        prompt = Prompt.ask(
-            "\n[bold green]Your Answer[/bold green]",
-            console=console
-        )
+        session = PromptSession( message=self.printer.get_message_from_key('tool_ask_user'))
+        try:
+            answer = session.prompt()
+        except KeyboardInterrupt:
+            answer = ""        
 
-        # 获取用户的回答
-        answer = prompt
+        self.result_manager.append(content=answer, meta = {
+            "action": "ask_user",
+            "input": {
+                "question": question
+            }
+        })
 
-        # 显示用户的回答
-        answer_text = Text(answer, style="italic")
+        return answer
+    
+    def response_user(self, response: str):
+        console = Console()
+        answer_text = Text(response, style="italic")
         answer_panel = Panel(
             answer_text,
-            title="[bold yellow]Your Response[/bold yellow]",
+            title="",
             border_style="green",
             expand=False
         )
         console.print(answer_panel)
 
-        self.result_manager.append(content=answer, meta = {
-            "action": "ask_user",
+        self.result_manager.append(content=response, meta = {
+            "action": "response_user",
             "input": {
-                "question": question
+                "response": response
             }
         })
 
-        return answer
+        return response
+        
 
     def run_python_code(self, code: str) -> str:
         """

{auto_coder-0.1.270 → auto_coder-0.1.272}/src/autocoder/common/auto_coder_lang.py

@@ -130,7 +130,7 @@ MESSAGES = {
         "quick_filter_too_long": "⚠️ index file is too large ({{ tokens_len }}/{{ max_tokens }}). The query will be split into {{ split_size }} chunks.",
         "quick_filter_tokens_len": "📊 Current index size: {{ tokens_len }} tokens",
         "estimated_chat_input_tokens": "Estimated chat input tokens: {{ estimated_input_tokens }}",
-        "estimated_input_tokens_in_generate": "Estimated input tokens in generate ({{ generate_mode }}): {{ estimated_input_tokens }}",        
+        "estimated_input_tokens_in_generate": "Estimated input tokens in generate ({{ generate_mode }}): {{ estimated_input_tokens_in_generate }}",        
         "model_has_access_restrictions": "{{model_name}} has access restrictions, cannot use the current function",
         "auto_command_not_found": "Auto command not found: {{command}}. Please check your input and try again.",
         "auto_command_failed": "Auto command failed: {{error}}. Please check your input and try again.",
@@ -170,6 +170,8 @@ MESSAGES = {
         "sorted_files_message": "Reordered files:\n{% for file in files %}- {{ file }}\n{% endfor %}",
         "estimated_input_tokens_in_ranking": "estimate input token {{ estimated_input_tokens }} when ranking",
         "file_snippet_procesed": "{{ file_path }} processed with tokens: {{ tokens }} => {{ snippet_tokens }}. Current total tokens: {{ total_tokens }}",
+        "tool_ask_user": "Your Reply: ",
+        "tool_ask_user_accept":"Your Response received",
         
     },
     "zh": {
@@ -317,7 +319,7 @@ MESSAGES = {
         "quick_filter_title": "{{ model_name }} 正在分析如何筛选上下文...",
         "quick_filter_failed": "❌ 快速过滤器失败: {{ error }}. ",
         "estimated_chat_input_tokens": "对话输入token预估为: {{ estimated_input_tokens }}",
-        "estimated_input_tokens_in_generate": "生成代码({{ generate_mode }})预计输入token数: {{ estimated_input_tokens }}",        
+        "estimated_input_tokens_in_generate": "生成代码({{ generate_mode }})预计输入token数: {{ estimated_input_tokens_in_generate }}",        
         "model_has_access_restrictions": "{{model_name}} 有访问限制，无法使用当前功能",
         "auto_command_not_found": "未找到自动命令: {{command}}。请检查您的输入并重试。",
         "auto_command_failed": "自动命令执行失败: {{error}}。请检查您的输入并重试。",
@@ -337,7 +339,9 @@ MESSAGES = {
         "rank_code_modification_title": "模型{{model_name}}对代码打分",
         "sorted_files_message": "重新排序后的文件路径:\n{% for file in files %}- {{ file }}\n{% endfor %}",
         "estimated_input_tokens_in_ranking": "排序预计输入token数: {{ estimated_input_tokens }}",
-        "file_snippet_procesed": "文件 {{ file_path }} 处理后token数: {{ tokens }} => {{ snippet_tokens }} 当前总token数: {{ total_tokens }}"
+        "file_snippet_procesed": "文件 {{ file_path }} 处理后token数: {{ tokens }} => {{ snippet_tokens }} 当前总token数: {{ total_tokens }}",
+        "tool_ask_user": "您的回复: ",
+        "tool_ask_user_accept":"收到您的回复",
     }}
 
 

{auto_coder-0.1.270 → auto_coder-0.1.272}/src/autocoder/common/auto_configure.py

@@ -154,7 +154,7 @@ def config_readme() -> str:
     项目类型通常为如下三种选择：
     1. ts
     2. py
-    3. 代码文件后缀名列表（比如.java,.py,.go,.js,.ts），多个按逗号分割
+    3. 代码文件后缀名列表（比如.java,.py,.go,.js,.ts），多个按逗号分割    
 
     推荐使用 3 选项，因为项目类型通常为多种后缀名混合。
     """

{auto_coder-0.1.270 → auto_coder-0.1.272}/src/autocoder/common/command_generator.py

@@ -12,6 +12,7 @@ def _generate_shell_script(user_input: str) -> str:
     环境信息如下:
 
     操作系统: {{ env_info.os_name }} {{ env_info.os_version }}
+    操作系统发行版: {{ os_distribution }}
     Python版本: {{ env_info.python_version }}
     终端类型: {{ env_info.shell_type }}
     终端编码: {{ env_info.shell_encoding }}
@@ -49,7 +50,8 @@ def _generate_shell_script(user_input: str) -> str:
     return {
         "env_info": env_info,
         "shell_type": shell_type,
-        "shell_encoding": shells.get_terminal_encoding()
+        "shell_encoding": shells.get_terminal_encoding(),
+        "os_distribution": shells.get_os_distribution()
     }
 
 

{auto_coder-0.1.270 → auto_coder-0.1.272}/src/autocoder/common/files.py

@@ -4,8 +4,7 @@ from typing import List, Dict, Union, Generator, Tuple
 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.
+    Tries common encodings in sequence to handle cross-platform encoding issues.
     
     Args:
         file_path (str): Path to the file to read
@@ -16,7 +15,10 @@ def read_file(file_path):
     Raises:
         ValueError: If the file cannot be decoded with any of the tried encodings
     """
-    encodings = ['utf-8', 'gbk', 'utf-16', 'latin-1']
+    # Expanded list of encodings to try
+    encodings = ['utf-8', 'gbk', 'utf-16', 'latin-1', 
+                'big5', 'shift_jis', 'euc-jp', 'iso-8859-1',
+                'cp1252', 'ascii']
     
     for encoding in encodings:
         try:
@@ -25,22 +27,54 @@ def read_file(file_path):
                 return content
         except UnicodeDecodeError:
             continue
+        except Exception as e:
+            # Log other errors but continue trying other encodings
+            continue
             
-    raise ValueError(get_message_with_format("file_decode_error", 
-        file_path=file_path, 
-        encodings=", ".join(encodings)))
+    # If all encodings fail, try reading as binary and decode with 'replace'
+    try:
+        with open(file_path, 'rb') as f:
+            return f.read().decode('utf-8', errors='replace')
+    except Exception as e:
+        raise ValueError(get_message_with_format("file_decode_error", 
+            file_path=file_path, 
+            encodings=", ".join(encodings)))
 
 def read_lines(file_path:str):
-    encodings = ['utf-8', 'gbk', 'utf-16', 'latin-1']
+    """Read a file line by line with automatic encoding detection.
+    
+    Args:
+        file_path (str): Path to the file to read
+        
+    Returns:
+        List[str]: List of lines in the file
+        
+    Raises:
+        ValueError: If the file cannot be decoded with any of the tried encodings
+    """
+    # Expanded list of encodings to try
+    encodings = ['utf-8', 'gbk', 'utf-16', 'latin-1', 
+                'big5', 'shift_jis', 'euc-jp', 'iso-8859-1',
+                'cp1252', 'ascii']
+    
     for encoding in encodings:
         try:
             with open(file_path, 'r', encoding=encoding) as f:
                 return f.readlines()
         except UnicodeDecodeError:
             continue
-    raise ValueError(get_message_with_format("file_decode_error", 
-        file_path=file_path, 
-        encodings=", ".join(encodings)))
+        except Exception as e:
+            # Log other errors but continue trying other encodings
+            continue
+            
+    # If all encodings fail, try reading as binary and decode with 'replace'
+    try:
+        with open(file_path, 'rb') as f:
+            return f.read().decode('utf-8', errors='replace').splitlines()
+    except Exception as e:
+        raise ValueError(get_message_with_format("file_decode_error", 
+            file_path=file_path, 
+            encodings=", ".join(encodings)))
 
 
 

{auto_coder-0.1.270 → auto_coder-0.1.272}/src/autocoder/common/shells.py

@@ -5,6 +5,7 @@ import subprocess
 import platform
 import tempfile
 import uuid
+import re
 from rich.console import Console
 from rich.panel import Panel
 from rich.text import Text
@@ -187,6 +188,71 @@ def _get_windows_terminal_name() -> str:
     # 默认返回 cmd.exe
     return 'cmd'
 
+def get_os_distribution() -> str:
+    """
+    获取操作系统发行版名称
+    
+    Returns:
+        str: 操作系统发行版名称，如 'Ubuntu 22.04', 'CentOS 7', 'Windows 10' 等
+    """
+    system = platform.system()
+    
+    if system == 'Windows':
+        # Windows 系统版本
+        version = sys.getwindowsversion()
+        if version.major == 10 and version.build >= 22000:
+            return 'Windows 11'
+        elif version.major == 10:
+            return 'Windows 10'
+        elif version.major == 6:
+            if version.minor == 3:
+                return 'Windows 8.1'
+            elif version.minor == 2:
+                return 'Windows 8'
+            elif version.minor == 1:
+                return 'Windows 7'
+            elif version.minor == 0:
+                return 'Windows Vista'
+        elif version.major == 5:
+            if version.minor == 2:
+                return 'Windows Server 2003'
+            elif version.minor == 1:
+                return 'Windows XP'
+        return f'Windows {version.major}.{version.minor}'
+    
+    elif system == 'Linux':
+        # Linux 发行版检测
+        try:
+            # 尝试读取 /etc/os-release
+            with open('/etc/os-release', 'r') as f:
+                os_release = f.read()
+            
+            # 解析 NAME 和 VERSION_ID
+            name = re.search(r'NAME="([^"]+)"', os_release)
+            version = re.search(r'VERSION_ID="([^"]+)"', os_release)
+            
+            if name and version:
+                return f"{name.group(1)} {version.group(1)}"
+            
+            # 如果无法解析，尝试 lsb_release
+            try:
+                output = subprocess.check_output(['lsb_release', '-d'], stderr=subprocess.STDOUT)
+                return output.decode('utf-8').split(':')[1].strip()
+            except (subprocess.CalledProcessError, FileNotFoundError):
+                pass
+            
+            # 最后尝试 uname
+            return platform.platform()
+        except Exception:
+            return platform.platform()
+    
+    elif system == 'Darwin':
+        # macOS 版本
+        version = platform.mac_ver()[0]
+        return f'macOS {version}'
+    
+    return platform.platform()
+
 def _get_unix_terminal_name() -> str:
     """Linux/Mac 系统终端检测"""
     # 从环境变量获取终端名称
@@ -238,6 +304,8 @@ def get_terminal_encoding() -> str:
         return _get_unix_terminal_encoding()
 
 def _get_windows_terminal_encoding() -> str:
+    # 添加发行版信息到环境变量
+    # os.environ['OS_DISTRIBUTION'] = get_os_distribution()
     """Windows 系统编码检测"""
     try:
         # 通过 chcp 命令获取代码页

{auto_coder-0.1.270 → auto_coder-0.1.272}/src/autocoder/index/filter/quick_filter.py

@@ -287,6 +287,7 @@ class QuickFilter():
         当用户提一个需求的时候，我们要找到两种类型的源码文件：
         1. 根据需求需要被修改的文件，我们叫 edited_files
         2. 为了能够完成修改这些文件，还需要的一些额外参考文件, 我们叫 reference_files
+        3. 因为修改了 edited_files 文件，可能有一些依赖 edited_files 的文件也需要被修改，我们叫 dependent_files
 
         现在，给定下面的索引文件：
 
@@ -315,9 +316,9 @@ class QuickFilter():
         ```
 
         特别注意:    
-        1. 如果用户的query里有 @文件 或者 @@符号，那么被@的文件或者@@的符号必须要返回。
-        2. 根据需求以及根据 @文件 或者 @@符号 找到的文件，猜测需要被修改的edited_files文件，然后尝试通过索引文件诸如导入语句等信息找到这些文件依赖的其他文件得到 reference_files。
-        3. file_list 里的文件序号，按被 @ 或者 @@ 文件，edited_files文件，reference_files文件的顺序排列。注意，reference_files 你要根据需求来猜测是否需要，过滤掉不相关的，避免返回文件数过多。
+        1. 如果用户的query里有 @文件 或者 @@符号，并且他们在索引文件中，那么被@的文件或者@@的符号必须要返回。
+        2. 根据需求以及根据 @文件 或者 @@符号 找到的文件，猜测需要被修改的edited_files文件，然后尝试通过索引文件诸如导入语句等信息找到这些文件依赖的其他文件得到 reference_files,dependent_files。
+        3. file_list 里的文件序号，按被 @ 或者 @@ 文件，edited_files文件，reference_files,dependent_files文件的顺序排列。注意，reference_files 你要根据需求来猜测是否需要，过滤掉不相关的，避免返回文件数过多。
         4. 如果 query 里是一段历史对话，那么对话里的内容提及的文件路径必须要返回。        
         5. 如果用户需求为空，则直接返回空列表即可。        
         6. 返回的 json格式数据不允许有注释