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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.270
+Version: 0.1.271
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence

{auto_coder-0.1.270 → auto_coder-0.1.271}/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.271
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence

{auto_coder-0.1.270 → auto_coder-0.1.271}/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.271}/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.271}/src/autocoder/common/auto_coder_lang.py

@@ -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": {
@@ -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.271}/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.271}/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.271}/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.271/src/autocoder/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.271"

auto_coder-0.1.270/src/autocoder/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.270"