auto-coder 0.1.348__tar.gz → 0.1.349__tar.gz

{auto_coder-0.1.348 → auto_coder-0.1.349}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.348
+Version: 0.1.349
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10

{auto_coder-0.1.348 → auto_coder-0.1.349}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.348
+Version: 0.1.349
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10

{auto_coder-0.1.348 → auto_coder-0.1.349}/src/auto_coder.egg-info/SOURCES.txt

@@ -83,11 +83,12 @@ src/autocoder/common/mcp_server_install.py
 src/autocoder/common/mcp_server_types.py
 src/autocoder/common/mcp_tools.py
 src/autocoder/common/memory_manager.py
-src/autocoder/common/model_speed_test.py
+src/autocoder/common/model_speed_tester.py
 src/autocoder/common/openai_content.py
 src/autocoder/common/printer.py
 src/autocoder/common/recall_validation.py
 src/autocoder/common/result_manager.py
+src/autocoder/common/run_cmd.py
 src/autocoder/common/screenshots.py
 src/autocoder/common/search.py
 src/autocoder/common/search_replace.py
@@ -95,6 +96,7 @@ src/autocoder/common/shells.py
 src/autocoder/common/stats_panel.py
 src/autocoder/common/stream_out_type.py
 src/autocoder/common/sys_prompt.py
+src/autocoder/common/test_run_cmd.py
 src/autocoder/common/text.py
 src/autocoder/common/token_cost_caculate.py
 src/autocoder/common/types.py
@@ -121,7 +123,6 @@ src/autocoder/common/v2/agent/agentic_edit.py
 src/autocoder/common/v2/agent/agentic_edit_conversation.py
 src/autocoder/common/v2/agent/agentic_edit_types.py
 src/autocoder/common/v2/agent/agentic_tool_display.py
-src/autocoder/common/v2/agent/ignore_utils.py
 src/autocoder/common/v2/agent/agentic_edit_tools/__init__.py
 src/autocoder/common/v2/agent/agentic_edit_tools/ask_followup_question_tool_resolver.py
 src/autocoder/common/v2/agent/agentic_edit_tools/attempt_completion_tool_resolver.py
@@ -166,6 +167,10 @@ src/autocoder/events/event_store.py
 src/autocoder/events/event_types.py
 src/autocoder/helper/__init__.py
 src/autocoder/helper/project_creator.py
+src/autocoder/helper/rag_doc_creator.py
+src/autocoder/ignorefiles/__init__.py
+src/autocoder/ignorefiles/ignore_file_utils.py
+src/autocoder/ignorefiles/test_ignore_file_utils.py
 src/autocoder/index/__init__.py
 src/autocoder/index/entry.py
 src/autocoder/index/for_command.py
@@ -233,9 +238,11 @@ src/autocoder/rag/cache/simple_cache.py
 src/autocoder/rag/loaders/__init__.py
 src/autocoder/rag/loaders/docx_loader.py
 src/autocoder/rag/loaders/excel_loader.py
+src/autocoder/rag/loaders/filter_utils.py
 src/autocoder/rag/loaders/image_loader.py
 src/autocoder/rag/loaders/pdf_loader.py
 src/autocoder/rag/loaders/ppt_loader.py
+src/autocoder/rag/loaders/test_image_loader.py
 src/autocoder/rag/stream_event/__init__.py
 src/autocoder/rag/stream_event/event_writer.py
 src/autocoder/rag/stream_event/types.py

{auto_coder-0.1.348 → auto_coder-0.1.349}/src/autocoder/auto_coder_runner.py

@@ -2019,9 +2019,9 @@ def manage_models(query: str):
       /models /add_model name=xxx base_url=xxx ... - Add model with custom params
       /models /remove <name> - Remove model by name
     """
-    printer = Printer()
     console = Console()
-
+    printer = Printer(console=console)    
+    
     product_mode = memory.get("product_mode", "lite")
     if product_mode != "lite":
         printer.print_in_terminal("models_lite_only", style="red")
@@ -2246,7 +2246,7 @@ def manage_models(query: str):
             printer.print_in_terminal("models_speed_usage", style="red")
 
     elif subcmd == "/speed-test":
-        from autocoder.common.model_speed_test import render_speed_test_in_terminal
+        from autocoder.common.model_speed_tester import render_speed_test_in_terminal
         test_rounds = 1  # 默认测试轮数
 
         enable_long_context = False
@@ -2274,7 +2274,7 @@ def manage_models(query: str):
 
     elif subcmd == "/add":
         # Support both simplified and legacy formats
-        args = query.strip().split(" ")        
+        args = query.strip().split(" ")               
         if len(args) == 2:
             # Simplified: /models /add <name> <api_key>
             name, api_key = args[0], args[1]            
@@ -2295,9 +2295,10 @@ def manage_models(query: str):
                     }
                 })
                 printer.print_in_terminal("models_add_failed", style="red", name=name)
-        else:
-            printer.print_in_terminal("models_add_usage", style="red")
-            result_manager.add_result(content=printer.get_message_from_key("models_add_usage"),meta={
+        else:            
+            models_list = "\n".join([m["name"] for m in models_module.default_models_list])                     
+            printer.print_in_terminal("models_add_usage", style="red", models=models_list)
+            result_manager.add_result(content=printer.get_message_from_key_with_format("models_add_usage",models=models_list),meta={
                 "action": "models",
                 "input": {
                     "query": query
@@ -2828,8 +2829,11 @@ def auto_command(query: str,extra_args: Dict[str,Any]={}):
         current_files = memory.get("current_files",{}).get("files",[])
         sources = []
         for file in current_files:
-            with open(file,"r",encoding="utf-8") as f:
-                sources.append(SourceCode(module_name=file,source_code=f.read()))  
+            try:
+                with open(file,"r",encoding="utf-8") as f:
+                    sources.append(SourceCode(module_name=file,source_code=f.read()))  
+            except Exception as e:
+                global_logger.error(f"Failed to read file {file}: {e}")
                     
         llm = get_single_llm(args.code_model or args.model,product_mode=args.product_mode) 
         conversation_history = extra_args.get("conversations",[])   
@@ -2895,4 +2899,4 @@ def auto_command(query: str,extra_args: Dict[str,Any]={}):
         title=printer.get_message_from_key_with_format("auto_command_reasoning_title"),
         border_style="blue",
         padding=(1, 2)
-    ))    
+    ))

{auto_coder-0.1.348 → auto_coder-0.1.349}/src/autocoder/chat_auto_coder_lang.py

@@ -387,8 +387,8 @@ MESSAGES = {
         "zh": "添加模型 '{{name}}' 失败。在默认模型中未找到该模型。"
     },
     "models_add_usage": {
-        "en": "Usage: /models /add <name> <api_key> or\n/models /add <name> <model_type> <model_name> <base_url> <api_key_path> [description]",
-        "zh": "用法: /models /add <name> <api_key> 或\n/models /add <name> <model_type> <model_name> <base_url> <api_key_path> [description]"
+        "en": "Usage: /models /add <name> <api_key> \n Available models: \n{{models}}",
+        "zh": "用法: /models /add <name> <api_key> \n 可用模型: \n{{models}}"
     },
     "models_add_model_params": {
         "en": "Please provide parameters in key=value format",
@@ -582,7 +582,9 @@ def get_system_language():
 
 def get_message(key):
     lang = get_system_language()
-    return MESSAGES.get(key, {}).get(lang, MESSAGES[key].get("en", ""))
+    if key in MESSAGES:
+        return MESSAGES[key].get(lang, MESSAGES[key].get("en", ""))
+    return ""
 
 
 def get_message_with_format(msg_key: str, **kwargs):

{auto_coder-0.1.348 → auto_coder-0.1.349}/src/autocoder/common/printer.py

@@ -15,19 +15,18 @@ class Printer:
 
     def get_message_from_key(self, msg_key: str):
         try:
-            return get_message(msg_key)
+            v = get_message(msg_key)
+            if not v:
+                return get_chat_message(msg_key)
         except Exception as e:
             return get_chat_message(msg_key)
 
-    def get_message_from_key_with_format(self, msg_key: str, **kwargs):
-        try:
-            return format_str_jinja2(self.get_message_from_key(msg_key), **kwargs)
-        except Exception as e:
-            return format_str_jinja2(self.get_chat_message_from_key(msg_key), **kwargs)
-
+    def get_message_from_key_with_format(self, msg_key: str, **kwargs):        
+        return format_str_jinja2(self.get_message_from_key(msg_key), **kwargs)
+        
     def print_in_terminal(self, msg_key: str, style: str = None,**kwargs):     
         try:
-            if style:
+            if style:                
                 self.console.print(format_str_jinja2(self.get_message_from_key(msg_key),**kwargs), style=style)
             else:
                 self.console.print(format_str_jinja2(self.get_message_from_key(msg_key),**kwargs))

auto_coder-0.1.349/src/autocoder/common/run_cmd.py

@@ -0,0 +1,247 @@
+import os
+import platform
+import subprocess
+import sys
+from io import BytesIO
+
+import pexpect
+import psutil
+
+
+def run_cmd(command, verbose=False, error_print=None, cwd=None):
+    """
+    执行一条命令，根据不同系统和环境选择最合适的执行方式（交互式或非交互式）。
+
+    适用场景：
+    - 需要跨平台运行命令，自动判断是否使用pexpect（支持交互式）还是subprocess。
+    - 希望获得命令的执行状态及输出内容。
+    - 在CLI工具、自动化脚本、REPL中执行shell命令。
+
+    参数：
+    - command (str): 需要执行的命令字符串。
+    - verbose (bool): 是否打印详细调试信息，默认为False。
+    - error_print (callable|None): 自定义错误打印函数，默认为None，使用print。
+    - cwd (str|None): 指定命令的工作目录，默认为None。
+
+    返回：
+    - tuple: (exit_code, output)，其中exit_code为整型退出码，output为命令输出内容。
+
+    异常：
+    - 捕获OSError异常，返回错误信息。
+    """
+    try:
+        if sys.stdin.isatty() and hasattr(pexpect, "spawn") and platform.system() != "Windows":
+            return run_cmd_pexpect(command, verbose, cwd)
+
+        return run_cmd_subprocess(command, verbose, cwd)
+    except OSError as e:
+        error_message = f"Error occurred while running command '{command}': {str(e)}"
+        if error_print is None:
+            print(error_message)
+        else:
+            error_print(error_message)
+        return 1, error_message
+
+
+def get_windows_parent_process_name():
+    """
+    获取当前进程的父进程名（仅在Windows系统下有意义）。
+
+    适用场景：
+    - 判断命令是否由PowerShell或cmd.exe启动，以便调整命令格式。
+    - 在Windows平台上进行父进程分析。
+
+    参数：
+    - 无
+
+    返回：
+    - str|None: 父进程名（小写字符串，如"powershell.exe"或"cmd.exe"），如果无法获取则为None。
+
+    异常：
+    - 捕获所有异常，返回None。
+    """
+    try:
+        current_process = psutil.Process()
+        while True:
+            parent = current_process.parent()
+            if parent is None:
+                break
+            parent_name = parent.name().lower()
+            if parent_name in ["powershell.exe", "cmd.exe"]:
+                return parent_name
+            current_process = parent
+        return None
+    except Exception:
+        return None
+
+
+def run_cmd_subprocess(command, verbose=False, cwd=None, encoding=sys.stdout.encoding):
+    if verbose:
+        print("Using run_cmd_subprocess:", command)
+
+    try:
+        shell = os.environ.get("SHELL", "/bin/sh")
+        parent_process = None
+
+        # Determine the appropriate shell
+        if platform.system() == "Windows":
+            parent_process = get_windows_parent_process_name()
+            if parent_process == "powershell.exe":
+                command = f"powershell -Command {command}"
+
+        if verbose:
+            print("Running command:", command)
+            print("SHELL:", shell)
+            if platform.system() == "Windows":
+                print("Parent process:", parent_process)
+
+        process = subprocess.Popen(
+            command,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            text=True,
+            shell=True,
+            encoding=encoding,
+            errors="replace",
+            bufsize=0,  # Set bufsize to 0 for unbuffered output
+            universal_newlines=True,
+            cwd=cwd,
+        )
+
+        output = []
+        while True:
+            chunk = process.stdout.read(1)
+            if not chunk:
+                break
+            print(chunk, end="", flush=True)  # Print the chunk in real-time
+            output.append(chunk)  # Store the chunk for later use
+
+        process.wait()
+        return process.returncode, "".join(output)
+    except Exception as e:
+        return 1, str(e)
+
+def run_cmd_subprocess_generator(command, verbose=False, cwd=None, encoding=sys.stdout.encoding):
+    """
+    使用subprocess运行命令，将命令输出逐步以生成器方式yield出来。
+
+    适用场景：
+    - 运行无需交互的命令。
+    - 希望实时逐步处理命令输出（如日志打印、进度监控）。
+    - 在Linux、macOS、Windows等多平台环境下安全运行命令。
+
+    参数：
+    - command (str): 需要执行的命令字符串。
+    - verbose (bool): 是否打印详细调试信息，默认为False。
+    - cwd (str|None): 指定命令的工作目录，默认为None。
+    - encoding (str): 输出解码使用的字符编码，默认为当前stdout编码。
+
+    返回：
+    - 生成器: 逐块yield命令的输出字符串。
+
+    异常：
+    - 捕获所有异常，yield错误信息字符串。
+    """
+    if verbose:
+        print("Using run_cmd_subprocess:", command)
+
+    try:
+        shell = os.environ.get("SHELL", "/bin/sh")
+        parent_process = None
+
+        # Windows下调整命令
+        if platform.system() == "Windows":
+            parent_process = get_windows_parent_process_name()
+            if parent_process == "powershell.exe":
+                command = f"powershell -Command {command}"
+
+        if verbose:
+            print("Running command:", command)
+            print("SHELL:", shell)
+            if platform.system() == "Windows":
+                print("Parent process:", parent_process)
+
+        process = subprocess.Popen(
+            command,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            text=True,
+            shell=True,
+            encoding=encoding,
+            errors="replace",
+            bufsize=0,
+            universal_newlines=True,
+            cwd=cwd,
+        )
+
+        while True:
+            chunk = process.stdout.read(1)
+            if not chunk:
+                break            
+            # 确保始终yield字符串，避免因字节或其他类型导致异常
+            if not isinstance(chunk, str):
+                chunk = str(chunk)
+            yield chunk
+
+        process.wait()
+    except Exception as e:
+        # 出错时yield异常信息，也可以raise
+        yield f"[run_cmd_subprocess error]: {str(e)}"
+
+
+def run_cmd_pexpect(command, verbose=False, cwd=None):
+    """
+    使用pexpect以交互方式运行命令，捕获完整输出。
+
+    适用场景：
+    - 执行需要用户交互的命令（如登录、密码输入等）。
+    - 在Linux、macOS等Unix系统下模拟终端操作。
+    - 希望完整捕获交互式命令的输出。
+
+    参数：
+    - command (str): 需要执行的命令字符串。
+    - verbose (bool): 是否打印详细调试信息，默认为False。
+    - cwd (str|None): 指定命令的工作目录，默认为None。
+
+    返回：
+    - tuple: (exit_code, output)，exit_code为退出状态码，output为命令完整输出内容。
+
+    异常：
+    - 捕获pexpect相关异常，返回错误信息。
+    """
+    if verbose:
+        print("Using run_cmd_pexpect:", command)
+
+    output = BytesIO()
+
+    def output_callback(b):
+        output.write(b)
+        return b
+
+    try:
+        # Use the SHELL environment variable, falling back to /bin/sh if not set
+        shell = os.environ.get("SHELL", "/bin/sh")
+        if verbose:
+            print("With shell:", shell)
+
+        if os.path.exists(shell):
+            # Use the shell from SHELL environment variable
+            if verbose:
+                print("Running pexpect.spawn with shell:", shell)
+            child = pexpect.spawn(shell, args=["-i", "-c", command], encoding="utf-8", cwd=cwd)
+        else:
+            # Fall back to spawning the command directly
+            if verbose:
+                print("Running pexpect.spawn without shell.")
+            child = pexpect.spawn(command, encoding="utf-8", cwd=cwd)
+
+        # Transfer control to the user, capturing output
+        child.interact(output_filter=output_callback)
+
+        # Wait for the command to finish and get the exit status
+        child.close()
+        return child.exitstatus, output.getvalue().decode("utf-8", errors="replace")
+
+    except (pexpect.ExceptionPexpect, TypeError, ValueError) as e:
+        error_msg = f"Error running command {command}: {e}"
+        return 1, error_msg

auto_coder-0.1.349/src/autocoder/common/test_run_cmd.py

@@ -0,0 +1,110 @@
+
+import sys
+import platform
+from unittest import mock
+import io
+
+import pytest
+
+from autocoder.common.run_cmd import (
+    run_cmd,
+    run_cmd_subprocess,
+    run_cmd_subprocess_generator,
+    run_cmd_pexpect,
+    get_windows_parent_process_name,
+)
+
+def test_run_cmd_basic():
+    """
+    测试run_cmd函数，确保其正确执行命令并返回预期结果。
+    """
+    cmd = "echo hello"
+    exit_code, output = run_cmd(cmd)
+    assert exit_code == 0, f"命令退出码非零: {exit_code}"
+    assert "hello" in output, f"输出不包含hello: {output}"
+
+def test_run_cmd_subprocess_normal():
+    """
+    测试run_cmd_subprocess正常执行命令，逐步输出。
+    """
+    cmd = "echo hello_subprocess"
+    gen = run_cmd_subprocess_generator(cmd)
+    output = ""
+    try:
+        for chunk in gen:
+            output += chunk
+    except Exception as e:
+        pytest.fail(f"run_cmd_subprocess异常: {e}")
+    assert "hello_subprocess" in output
+
+def test_run_cmd_subprocess_error():
+    """
+    测试run_cmd_subprocess执行错误命令时能否正确返回异常信息。
+    """
+    cmd = "non_existing_command_xyz"
+    gen = run_cmd_subprocess_generator(cmd)
+    output = ""
+    for chunk in gen:
+        output += chunk
+    # 应该包含错误提示
+    assert "[run_cmd_subprocess error]" in output or "not found" in output or "无法" in output or "未找到" in output
+
+def test_run_cmd_pexpect_mock():
+    """
+    测试run_cmd_pexpect函数，mock pexpect交互行为。
+    """
+    with mock.patch("pexpect.spawn") as mock_spawn:
+        mock_child = mock.MagicMock()
+        mock_child.exitstatus = 0
+        mock_child.interact.side_effect = lambda output_filter=None: output_filter(b"mock output\n")
+        mock_child.close.return_value = None
+        mock_child.exitstatus = 0
+        mock_child.getvalue = lambda: b"mock output\n"
+        mock_spawn.return_value = mock_child
+
+        # 由于run_cmd_pexpect内部会decode BytesIO内容
+        exit_code, output = run_cmd_pexpect("echo hello", verbose=False)
+        assert exit_code == 0
+        assert "mock output" in output
+
+def test_get_windows_parent_process_name_mocked():
+    """
+    测试get_windows_parent_process_name，模拟不同父进程
+    """
+    if platform.system() != "Windows":
+        # 非Windows系统跳过
+        return
+
+    # 构造mock进程树
+    class FakeProcess:
+        def __init__(self, name, parent=None):
+            self._name = name
+            self._parent = parent
+
+        def name(self):
+            return self._name
+
+        def parent(self):
+            return self._parent
+
+    powershell_proc = FakeProcess("powershell.exe")
+    cmd_proc = FakeProcess("cmd.exe")
+    other_proc = FakeProcess("python.exe")
+
+    # 模拟powershell父进程
+    with mock.patch("psutil.Process") as MockProcess:
+        MockProcess.return_value = FakeProcess("python.exe", powershell_proc)
+        assert get_windows_parent_process_name() == "powershell.exe"
+
+    # 模拟cmd父进程
+    with mock.patch("psutil.Process") as MockProcess:
+        MockProcess.return_value = FakeProcess("python.exe", cmd_proc)
+        assert get_windows_parent_process_name() == "cmd.exe"
+
+    # 模拟无匹配父进程
+    with mock.patch("psutil.Process") as MockProcess:
+        MockProcess.return_value = FakeProcess("python.exe", other_proc)
+        assert get_windows_parent_process_name() is None
+
+if __name__ == "__main__":
+    sys.exit(pytest.main([__file__]))