auto-coder 0.1.247__tar.gz → 0.1.249__tar.gz

{auto_coder-0.1.247 → auto_coder-0.1.249}/PKG-INFO

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

{auto_coder-0.1.247 → auto_coder-0.1.249}/src/auto_coder.egg-info/PKG-INFO

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

{auto_coder-0.1.247 → auto_coder-0.1.249}/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.247 → auto_coder-0.1.249}/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)
 

{auto_coder-0.1.247 → auto_coder-0.1.249}/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.247 → auto_coder-0.1.249}/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.247 → auto_coder-0.1.249}/src/autocoder/common/__init__.py

@@ -260,6 +260,7 @@ class AutoCoderArgs(pydantic.BaseModel):
 
     index_model: Optional[str] = ""
     index_filter_model: Optional[str] = ""
+    index_filter_model_max_input_length: Optional[int] = 50*1024
     index_model_max_length: Optional[int] = 0
     index_model_max_input_length: Optional[int] = 0
     index_model_anti_quota_limit: Optional[int] = 0

{auto_coder-0.1.247 → auto_coder-0.1.249}/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}}",
@@ -83,10 +84,13 @@ MESSAGES = {
         "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 }}",
-        "quick_filter_reason": "Auto get(quick_filter mode)"
+        "quick_filter_reason": "Auto get(quick_filter mode)",
+        "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"
     },
     "zh": {
         "model_not_found": "未找到模型: {{model_name}}",
+        "generating_shell_script": "正在生成 Shell 脚本",
         "new_session_started": "新会话已开始。之前的聊天历史已存档。",
         "memory_save_success": "✅ 已保存到您的记忆中",
         "file_decode_error": "无法解码文件: {{file_path}}。尝试的编码: {{encodings}}",
@@ -152,6 +156,8 @@ MESSAGES = {
         "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 }}",
         "quick_filter_reason": "自动获取(quick_filter模式)",
+        "quick_filter_too_long": "⚠️ 索引文件过大 ({{ tokens_len }}/{{ max_tokens }})。查询将被分成 {{ split_size }} 个部分执行。",
+        "quick_filter_tokens_len": "📊 当前索引大小: {{ tokens_len }} tokens",
         "upsert_file": "✅ 更新文件: {{ file_path }}",
         "files_merged": "✅ 成功合并了 {{ total }} 个文件到项目中。",
         "merge_failed": "❌ 合并文件 {{ path }} 失败: {{ error }}",

auto_coder-0.1.249/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)[0][1]
+    return code

auto_coder-0.1.249/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]"
+        )