auto-coder 0.1.248__tar.gz → 0.1.250__tar.gz

{auto_coder-0.1.248 → auto_coder-0.1.250}/PKG-INFO

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

{auto_coder-0.1.248 → auto_coder-0.1.250}/src/auto_coder.egg-info/PKG-INFO

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

{auto_coder-0.1.248 → auto_coder-0.1.250}/src/auto_coder.egg-info/SOURCES.txt

@@ -69,6 +69,7 @@ src/autocoder/common/recall_validation.py
 src/autocoder/common/screenshots.py
 src/autocoder/common/search.py
 src/autocoder/common/search_replace.py
+src/autocoder/common/shells.py
 src/autocoder/common/sys_prompt.py
 src/autocoder/common/text.py
 src/autocoder/common/types.py

{auto_coder-0.1.248 → auto_coder-0.1.250}/src/autocoder/agent/auto_review_commit.py

@@ -5,7 +5,6 @@ import byzerllm
 import pydantic
 import git
 from rich.console import Console
-from autocoder.utils.auto_coder_utils.chat_stream_out import stream_out
 from autocoder.common.printer import Printer
 from autocoder.common import AutoCoderArgs
 from autocoder.common.utils_code_auto_generate import stream_chat_with_continue

{auto_coder-0.1.248 → auto_coder-0.1.250}/src/autocoder/auto_coder.py

@@ -1002,15 +1002,7 @@ def main(input_args: Optional[List[str]] = None):
         elif raw_args.agent_command == "generate_command":
             from autocoder.common.command_generator import generate_shell_script
 
-            console = Console()
-
-            console.print(
-                Panel(
-                    f"Generating shell script from user input {args.query}...",
-                    title="Command Generator",
-                    border_style="green",
-                )
-            )
+            console = Console()            
 
             shell_script = generate_shell_script(args.query, llm)
 
@@ -1356,7 +1348,8 @@ def main(input_args: Optional[List[str]] = None):
                     v, 
                     request_id=args.request_id,                    
                     console=console,
-                    model_name=model_name
+                    model_name=model_name,
+                    args=args
                 )
                                                                        
             # 打印耗时和token统计            

{auto_coder-0.1.248 → auto_coder-0.1.250}/src/autocoder/chat_auto_coder.py

@@ -2385,64 +2385,8 @@ def list_files():
 
 @run_in_raw_thread()
 def execute_shell_command(command: str):
-    console = Console()
-    try:
-        # Use shell=True to support shell mode
-        process = subprocess.Popen(
-            command,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-            bufsize=1,
-            universal_newlines=True,
-            shell=True,
-        )
-
-        output = []
-        with Live(console=console, refresh_per_second=4) as live:
-            while True:
-                output_line = process.stdout.readline()
-                error_line = process.stderr.readline()
-
-                if output_line:
-                    output.append(output_line.strip())
-                    live.update(
-                        Panel(
-                            Text("\n".join(output[-20:])),
-                            title="Shell Output",
-                            border_style="green",
-                        )
-                    )
-                if error_line:
-                    output.append(f"ERROR: {error_line.strip()}")
-                    live.update(
-                        Panel(
-                            Text("\n".join(output[-20:])),
-                            title="Shell Output",
-                            border_style="red",
-                        )
-                    )
-
-                if (
-                    output_line == ""
-                    and error_line == ""
-                    and process.poll() is not None
-                ):
-                    break
-
-        if process.returncode != 0:
-            console.print(
-                f"[bold red]Command failed with return code {process.returncode}[/bold red]"
-            )        
-
-    except FileNotFoundError:
-        console.print(
-            f"[bold red]Command not found:[/bold red] [yellow]{command}[/yellow]"
-        )
-    except subprocess.SubprocessError as e:
-        console.print(
-            f"[bold red]Error executing command:[/bold red] [yellow]{str(e)}[/yellow]"
-        )
+    from autocoder.common.shells import execute_shell_command as shell_exec
+    shell_exec(command)
 
 
 def lib_command(args: List[str]):
@@ -2723,13 +2667,13 @@ def main():
                 if temp_user_input.startswith('/'):
                     user_input = temp_user_input
 
-            if (
-                memory["mode"] == "auto_detect"
+            if (  
+                memory["mode"] == "auto_detect" 
                 and user_input
                 and not user_input.startswith("/")
             ):
                 shell_script = generate_shell_command(user_input)
-                if confirm("Do you want to execute this script?"):
+                if confirm(get_message("confirm_execute")):
                     execute_shell_command(shell_script)
                 else:
                     continue
@@ -2850,8 +2794,8 @@ def main():
                 command = user_input
                 if user_input.startswith("/shell"):
                     command = user_input[len("/shell"):].strip()
-                if not command:
-                    print("Please enter a shell command to execute.")
+                    if not command:
+                        print("Please enter a shell command to execute.")
                 else:
                     execute_shell_command(command)
 

{auto_coder-0.1.248 → auto_coder-0.1.250}/src/autocoder/chat_auto_coder_lang.py

@@ -116,6 +116,7 @@ MESSAGES = {
         "commit_generating": "{{ model_name }} Generating commit message...",
         "commit_message": "{{ model_name }} Generated commit message: {{ message }}",
         "commit_failed": "{{ model_name }} Failed to generate commit message: {{ error }}",
+        "confirm_execute": "Do you want to execute this script?",
     },
     "zh": {
         "commit_generating": "{{ model_name }} 正在生成提交信息...", 
@@ -231,6 +232,7 @@ MESSAGES = {
         "remove_files_none": "没有文件被移除。",
         "files_removed": "移除的文件",
         "models_api_key_empty": "警告:  {{name}}  API key 为空。请设置一个有效的 API key。",
+        "confirm_execute": "是否执行此脚本？",
     }
 }
 

{auto_coder-0.1.248 → auto_coder-0.1.250}/src/autocoder/common/__init__.py

@@ -357,6 +357,8 @@ class AutoCoderArgs(pydantic.BaseModel):
     enable_global_memory: Optional[bool] = True  
     product_mode: Optional[str] = "lite"
 
+    keep_reasoning_content: Optional[bool] = True
+
     in_code_apply: bool = False
 
     class Config:

{auto_coder-0.1.248 → auto_coder-0.1.250}/src/autocoder/common/auto_coder_lang.py

@@ -4,6 +4,7 @@ from byzerllm.utils import format_str_jinja2
 MESSAGES = {
     "en": {
         "model_not_found": "Model {{model_name}} not found",
+        "generating_shell_script": "Generating Shell Script",
         "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}}",
@@ -89,6 +90,7 @@ MESSAGES = {
     },
     "zh": {
         "model_not_found": "未找到模型: {{model_name}}",
+        "generating_shell_script": "正在生成 Shell 脚本",
         "new_session_started": "新会话已开始。之前的聊天历史已存档。",
         "memory_save_success": "✅ 已保存到您的记忆中",
         "file_decode_error": "无法解码文件: {{file_path}}。尝试的编码: {{encodings}}",

auto_coder-0.1.250/src/autocoder/common/command_generator.py

@@ -0,0 +1,62 @@
+import byzerllm
+from byzerllm.utils.client import code_utils
+from autocoder.utils.auto_coder_utils.chat_stream_out import stream_out
+from autocoder.common import detect_env
+from autocoder.common import shells
+from autocoder.common.printer import Printer
+
+@byzerllm.prompt()
+def _generate_shell_script(user_input: str) -> str:
+    """
+    环境信息如下:
+
+    操作系统: {{ env_info.os_name }} {{ env_info.os_version }}
+    Python版本: {{ env_info.python_version }}
+    终端类型: {{ env_info.shell_type }}
+    终端编码: {{ env_info.shell_encoding }}
+    {%- if env_info.conda_env %}
+    Conda环境: {{ env_info.conda_env }}
+    {%- endif %}
+    {%- if env_info.virtualenv %}
+    虚拟环境: {{ env_info.virtualenv }}
+    {%- endif %}    
+
+    根据用户的输入以及当前的操作系统和Shell类型生成合适的 shell 脚本，注意只能生成一个shell脚本，不要生成多个。
+
+    用户输入: {{ user_input }}
+
+    请生成一个适当的 shell 脚本来执行用户的请求。确保脚本是安全的,并且可以在当前Shell环境中运行。
+    脚本应该包含必要的注释来解释每个步骤。
+    脚本内容请用如下方式返回:
+
+    ```shell    
+    # 你的 shell 脚本内容
+    ```
+    """
+    env_info = detect_env()    
+    return {
+        "env_info": env_info,
+        "shell_type": shells.get_terminal_name(),
+        "shell_encoding": shells.get_terminal_encoding()
+    }
+
+
+def generate_shell_script(user_input: str, llm: byzerllm.ByzerLLM) -> str:
+    # 获取 prompt 内容
+    prompt = _generate_shell_script.prompt(user_input=user_input)
+    
+    # 构造对话上下文
+    conversations = [{"role": "user", "content": prompt}]
+    
+    # 使用 stream_out 进行输出
+    printer = Printer()
+    title = printer.get_message_from_key("generating_shell_script")
+    result, _ = stream_out(
+        llm.stream_chat_oai(conversations=conversations, delta_mode=True),
+        model_name=llm.default_model_name,
+        title=title        
+    )
+    
+    # 提取代码块
+    code = code_utils.extract_code(result)[-1][1]
+    return code

auto_coder-0.1.250/src/autocoder/common/shells.py

@@ -0,0 +1,225 @@
+
+import sys
+import os
+import locale
+import subprocess
+import platform
+from rich.console import Console
+from rich.panel import Panel
+from rich.text import Text
+from rich.live import Live
+
+def get_terminal_name() -> str:
+    """
+    获取当前终端名称(自动适配 Windows/Linux/Mac)
+    返回终端名称如: cmd.exe, bash, zsh 等
+    """
+    if sys.platform == 'win32':
+        return _get_windows_terminal_name()
+    else:
+        return _get_unix_terminal_name()
+
+def _get_windows_terminal_name() -> str:
+    """Windows 系统终端检测"""
+    # 检查是否在 PowerShell
+    if 'POWERSHELL_DISTRIBUTION_CHANNEL' in os.environ:
+        return 'powershell'
+    
+    # 检查是否在 Git Bash
+    if 'MINGW' in platform.system():
+        return 'git-bash'
+    
+    # 默认返回 cmd.exe
+    return 'cmd.exe'
+
+def _get_unix_terminal_name() -> str:
+    """Linux/Mac 系统终端检测"""
+    # 从环境变量获取终端名称
+    term = os.environ.get('TERM')
+    shell = os.environ.get('SHELL', '')
+    
+    # 检查是否在 VS Code 终端
+    if 'VSCODE_GIT_IPC_HANDLE' in os.environ:
+        return 'vscode-terminal'
+    
+    # 如果是 Mac 的 Terminal.app
+    if sys.platform == 'darwin' and 'Apple_Terminal' in os.environ.get('TERM_PROGRAM', ''):
+        return 'terminal.app'
+    
+    # 从 shell 路径获取终端名称
+    if shell:
+        shell_name = os.path.basename(shell)
+        if shell_name in ['bash', 'zsh', 'fish']:
+            return shell_name
+    
+    # 从 TERM 环境变量判断
+    if term:
+        if 'xterm' in term:
+            return 'xterm'
+        elif 'rxvt' in term:
+            return 'rxvt'
+        elif 'screen' in term:
+            return 'screen'
+        elif 'tmux' in term:
+            return 'tmux'
+    
+    return 'unknown'
+
+def get_terminal_encoding() -> str:
+    """
+    获取当前终端编码(自动适配 Windows/Linux/Mac)
+    返回标准编码名称如: utf-8, gbk, cp936 等
+    """
+    # 第一优先级:尝试标准库locale检测
+    try:
+        return locale.getencoding()  # Python 3.10+ 新增方法
+    except AttributeError:
+        pass
+    
+    # 第二优先级:各平台专用检测逻辑
+    if sys.platform == 'win32':
+        return _get_windows_terminal_encoding()
+    else:
+        return _get_unix_terminal_encoding()
+
+def _get_windows_terminal_encoding() -> str:
+    """Windows 系统编码检测"""
+    try:
+        # 通过 chcp 命令获取代码页
+        result = subprocess.run(
+            ['chcp'], 
+            capture_output=True, 
+            text=True,
+            shell=True,
+            timeout=1
+        )
+        code_page = result.stdout.split(':')[-1].strip()
+        return _win_code_page_to_encoding(code_page)
+    except Exception:
+        return locale.getpreferredencoding(do_setlocale=False) or 'gbk'
+
+def _get_unix_terminal_encoding() -> str:
+    """Linux/Mac 系统编码检测"""
+    # 尝试读取环境变量
+    for var in ['LC_ALL', 'LC_CTYPE', 'LANG']:
+        lang = os.environ.get(var)
+        if lang and '.' in lang:
+            return lang.split('.')[-1]
+    
+    # 通过 locale 命令检测
+    try:
+        result = subprocess.run(
+            ['locale', '-c', 'LC_CTYPE'],
+            capture_output=True,
+            text=True,
+            timeout=1
+        )
+        return result.stdout.strip().split('.')[-1] or 'utf-8'
+    except Exception:
+        return locale.getpreferredencoding(do_setlocale=False) or 'utf-8'
+
+def _win_code_page_to_encoding(code_page: str) -> str:
+    """Windows 代码页转编码名称"""
+    cp_map = {
+        '65001': 'utf-8',
+        '936': 'gbk',
+        '950': 'big5',
+        '54936': 'gb18030',
+        '437': 'cp437',
+        '850': 'cp850'
+    }
+    return cp_map.get(code_page, f'cp{code_page}')
+
+def execute_shell_command(command: str):
+    """
+    Execute a shell command with cross-platform encoding support.
+    
+    Args:
+        command (str): The shell command to execute
+        encoding (str, optional): Override default encoding. Defaults to None.
+    """
+    console = Console()
+    try:
+        # Get terminal encoding
+        encoding = get_terminal_encoding()
+
+        # Start subprocess
+        process = subprocess.Popen(
+            command,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            shell=True
+        )
+
+        # Safe decoding helper
+        def safe_decode(byte_stream, encoding):
+            try:
+                return byte_stream.decode(encoding).strip()
+            except UnicodeDecodeError:
+                return byte_stream.decode(encoding, errors='replace').strip()
+
+        output = []
+        with Live(console=console, refresh_per_second=4) as live:
+            while True:
+                # Read output streams
+                output_bytes = process.stdout.readline()
+                error_bytes = process.stderr.readline()
+
+                # Handle standard output
+                if output_bytes:
+                    output_line = safe_decode(output_bytes, encoding)
+                    output.append(output_line)
+                    live.update(
+                        Panel(
+                            Text("\n".join(output[-20:])),
+                            title="Shell Output",
+                            border_style="green",
+                        )
+                    )
+
+                # Handle error output
+                if error_bytes:
+                    error_line = safe_decode(error_bytes, encoding)
+                    output.append(f"ERROR: {error_line}")
+                    live.update(
+                        Panel(
+                            Text("\n".join(output[-20:])),
+                            title="Shell Output",
+                            border_style="red",
+                        )
+                    )
+
+                # Check if process has ended
+                if process.poll() is not None:
+                    break
+
+        # Get remaining output
+        remaining_out, remaining_err = process.communicate()
+        if remaining_out:
+            output.append(safe_decode(remaining_out, encoding))
+        if remaining_err:
+            output.append(f"ERROR: {safe_decode(remaining_err, encoding)}")
+
+        # Show final output
+        console.print(
+            Panel(
+                Text("\n".join(output)),
+                title="Final Output",
+                border_style="blue",
+                subtitle=f"Encoding: {encoding} | OS: {sys.platform}"
+            )
+        )
+
+        if process.returncode != 0:
+            console.print(
+                f"[bold red]Command failed with code {process.returncode}[/bold red]"
+            )
+
+    except FileNotFoundError:
+        console.print(
+            f"[bold red]Command not found:[/bold red] [yellow]{command}[/yellow]"
+        )
+    except Exception as e:
+        console.print(
+            f"[bold red]Unexpected error:[/bold red] [yellow]{str(e)}[/yellow]"
+        )

{auto_coder-0.1.248 → auto_coder-0.1.250}/src/autocoder/index/filter/quick_filter.py

@@ -84,7 +84,8 @@ class QuickFilter():
                     full_response, _ = stream_out(
                         stream_generator,
                         model_name=model_name,
-                        title=self.printer.get_message_from_key_with_format("quick_filter_title", model_name=model_name)
+                        title=self.printer.get_message_from_key_with_format("quick_filter_title", model_name=model_name),
+                        args=self.args
                     )
                     file_number_list = to_model(full_response, FileNumberList)
                 else:
@@ -162,8 +163,7 @@ class QuickFilter():
 
     def filter(self, index_items: List[IndexItem], query: str) -> Dict[str, TargetFile]:
         final_files: Dict[str, TargetFile] = {}                
-        start_time = time.monotonic()
-        index_items = self.index_manager.read_index()
+        start_time = time.monotonic()        
 
         prompt_str = self.quick_filter_files.prompt(index_items,query)            
         
@@ -198,7 +198,8 @@ class QuickFilter():
             full_response, last_meta = stream_out(
                 stream_generator,
                 model_name=model_name,
-                title=self.printer.get_message_from_key_with_format("quick_filter_title", model_name=model_name)
+                title=self.printer.get_message_from_key_with_format("quick_filter_title", model_name=model_name),
+                args=self.args
             )                
             # 解析结果
             file_number_list = to_model(full_response, FileNumberList)

{auto_coder-0.1.248 → auto_coder-0.1.250}/src/autocoder/utils/auto_coder_utils/chat_stream_out.py

@@ -10,6 +10,7 @@ from autocoder.utils.request_queue import RequestValue, RequestOption, StreamVal
 from autocoder.utils.request_queue import request_queue
 import time
 from byzerllm.utils.types import SingleOutputMeta
+from autocoder.common import AutoCoderArgs
 
 MAX_HISTORY_LINES = 40  # 最大保留历史行数
 
@@ -144,7 +145,8 @@ def stream_out(
     request_id: Optional[str] = None,    
     console: Optional[Console] = None,
     model_name: Optional[str] = None,
-    title: Optional[str] = None
+    title: Optional[str] = None,
+    args: Optional[AutoCoderArgs] = None
 ) -> Tuple[str, Optional[SingleOutputMeta]]:
     """
     处理流式输出事件并在终端中展示
@@ -155,17 +157,22 @@ def stream_out(
         console: Rich Console对象
         model_name: 模型名称
         title: 面板标题，如果没有提供则使用默认值
+        args: AutoCoderArgs对象
     Returns:
-        Tuple[str, Dict[str, Any]]: 返回完整的响应内容和最后的元数据
+        Tuple[str, Dict[SingleOutputMeta]]: 返回完整的响应内容和最后的元数据
     """
     if console is None:
         console = Console(force_terminal=True, color_system="auto", height=None)
-        
+    
+    keep_reasoning_content = True
+    if args:
+        keep_reasoning_content = args.keep_reasoning_content            
+
     lines_buffer = []  # 存储历史行
     current_line = ""  # 当前行
     assistant_response = ""
     last_meta = None
-    panel_title = title if title is not None else f"Response[ {model_name} ]"
+    panel_title = title if title is not None else f"Response[ {model_name} ]"    
     try:        
         with Live(
             Panel("", title=panel_title, border_style="green"),
@@ -179,8 +186,22 @@ def stream_out(
 
                 if reasoning_content == "" and content == "":
                     continue
-            
-                assistant_response += content
+                
+                if keep_reasoning_content:
+                    # 处理思考内容
+                    if reasoning_content:
+                        if assistant_response == "":  # 首次遇到思考内容时添加开标签
+                            assistant_response = "<thinking>"
+                        assistant_response += reasoning_content
+                        
+                    # 处理正式内容
+                    if content:
+                        # 如果之前有思考内容,需要先关闭thinking标签
+                        if "</thinking>" not in assistant_response and "<thinking>" in assistant_response:
+                            assistant_response += "</thinking>"
+                        assistant_response += content
+                else:
+                    assistant_response += content
 
                 display_delta = reasoning_content if reasoning_content else content
                 
@@ -230,7 +251,7 @@ def stream_out(
                     title=f"Final {panel_title}",
                     border_style="blue"
                 )
-            )
+            )            
             
     except Exception as e:
         console.print(Panel(

auto_coder-0.1.250/src/autocoder/version.py

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

auto_coder-0.1.248/src/autocoder/common/command_generator.py

@@ -1,45 +0,0 @@
-import byzerllm
-from byzerllm.utils.client import code_utils
-from autocoder.common import detect_env
-
-
-@byzerllm.prompt()
-def _generate_shell_script(user_input: str) -> str:
-    """
-    环境信息如下:
-
-    操作系统: {{ env_info.os_name }} {{ env_info.os_version }}
-    Python版本: {{ env_info.python_version }}
-    {%- if env_info.conda_env %}
-    Conda环境: {{ env_info.conda_env }}
-    {%- endif %}
-    {%- if env_info.virtualenv %}
-    虚拟环境: {{ env_info.virtualenv }}
-    {%- endif %}
-    {%- if env_info.has_bash %}
-    支持Bash
-    {%- else %}
-    不支持Bash
-    {%- endif %}
-
-    根据用户的输入以及当前的操作系统生成合适的 shell 脚本。
-
-    用户输入: {{ user_input }}
-
-    请生成一个适当的 shell 脚本来执行用户的请求。确保脚本是安全的，并且可以在操作系统支持的 shell 中运行。
-    脚本应该包含必要的注释来解释每个步骤。
-    脚本内容请用如下方式返回：
-
-    ```shell    
-    # 你的 shell 脚本内容
-    ```
-    """
-    return {
-        "env_info": detect_env()
-    }
-
-
-def generate_shell_script(user_input: str, llm: byzerllm.ByzerLLM) -> str:
-    result = _generate_shell_script.with_llm(llm).run(user_input=user_input)
-    code = code_utils.extract_code(result)[0][1]
-    return code

auto_coder-0.1.248/src/autocoder/version.py

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