auto-coder 0.1.348__py3-none-any.whl → 0.1.350__py3-none-any.whl

autocoder/common/v2/agent/agentic_edit_tools/execute_command_tool_resolver.py

@@ -1,6 +1,7 @@
 import subprocess
 import os
 from typing import Dict, Any, Optional
+from autocoder.common.run_cmd import run_cmd_subprocess
 from autocoder.common.v2.agent.agentic_edit_tools.base_tool_resolver import BaseToolResolver
 from autocoder.common.v2.agent.agentic_edit_types import ExecuteCommandTool, ToolResult # Import ToolResult from types
 from autocoder.common import shells
@@ -8,7 +9,8 @@ from autocoder.common.printer import Printer
 from loguru import logger
 import typing   
 from autocoder.common import AutoCoderArgs
-
+from autocoder.events.event_manager_singleton import get_event_manager
+from autocoder.run_context import get_run_context
 if typing.TYPE_CHECKING:
     from autocoder.common.v2.agent.agentic_edit import AgenticEdit
 
@@ -39,45 +41,28 @@ class ExecuteCommandToolResolver(BaseToolResolver):
              pass
 
         printer.print_str_in_terminal(f"Executing command: {command} in {os.path.abspath(source_dir)}")
-        try:
-            # Determine shell based on OS
-            shell = True
-            executable = None
-            if shells.is_windows():
-                # Decide between cmd and powershell if needed, default is cmd
-                pass # shell=True uses default shell
-            else:
-                # Use bash or zsh? Default is usually fine.
-                pass # shell=True uses default shell
-
-            # Execute the command
-            process = subprocess.Popen(
-                command,
-                shell=True,
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE,
-                cwd=source_dir,
-                text=True,
-                encoding=shells.get_terminal_encoding(),
-                errors='replace' # Handle potential decoding errors
-            )
-
-            stdout, stderr = process.communicate()
-            returncode = process.returncode
+        try:            
+            # 使用封装的run_cmd方法执行命令
+            if get_run_context().is_web():
+                answer = get_event_manager(
+                    self.args.event_file).ask_user(prompt=f"Allow to execute the `{command}`?",options=["yes","no"])
+                if answer == "yes":
+                    pass
+                else:
+                    return ToolResult(success=False, message=f"Command '{command}' execution denied by user.")
+            
+            exit_code, output = run_cmd_subprocess(command, verbose=True, cwd=source_dir)
 
             logger.info(f"Command executed: {command}")
-            logger.info(f"Return Code: {returncode}")
-            if stdout:
-                logger.info(f"stdout:\n{stdout}")
-            if stderr:
-                logger.info(f"stderr:\n{stderr}")
-
+            logger.info(f"Return Code: {exit_code}")
+            if output:
+                logger.info(f"Output:\n{output}")
 
-            if returncode == 0:
-                return ToolResult(success=True, message="Command executed successfully.", content=stdout)
+            if exit_code == 0:
+                return ToolResult(success=True, message="Command executed successfully.", content=output)
             else:
-                error_message = f"Command failed with return code {returncode}.\nStderr:\n{stderr}\nStdout:\n{stdout}"
-                return ToolResult(success=False, message=error_message, content={"stdout": stdout, "stderr": stderr, "returncode": returncode})
+                error_message = f"Command failed with return code {exit_code}.\nOutput:\n{output}"
+                return ToolResult(success=False, message=error_message, content={"output": output, "returncode": exit_code})
 
         except FileNotFoundError:
             return ToolResult(success=False, message=f"Error: The command '{command.split()[0]}' was not found. Please ensure it is installed and in the system's PATH.")

autocoder/common/v2/agent/agentic_edit_tools/list_files_tool_resolver.py

@@ -6,7 +6,7 @@ from loguru import logger
 import typing
 from autocoder.common import AutoCoderArgs
 
-from autocoder.common.v2.agent.ignore_utils import load_ignore_spec, should_ignore, DEFAULT_IGNORED_DIRS
+from autocoder.ignorefiles.ignore_file_utils import should_ignore
 
 if typing.TYPE_CHECKING:
     from autocoder.common.v2.agent.agentic_edit import AgenticEdit
@@ -25,9 +25,6 @@ class ListFilesToolResolver(BaseToolResolver):
         absolute_source_dir = os.path.abspath(source_dir)
         absolute_list_path = os.path.abspath(os.path.join(source_dir, list_path_str))
 
-        # Load ignore spec from .autocoderignore if exists
-        ignore_spec = load_ignore_spec(absolute_source_dir)
-
         # Security check: Allow listing outside source_dir IF the original path is outside?
         is_outside_source = not absolute_list_path.startswith(absolute_source_dir)
         if is_outside_source:
@@ -59,10 +56,10 @@ class ListFilesToolResolver(BaseToolResolver):
                 if recursive:
                     for root, dirs, files in os.walk(base_dir):
                         # Modify dirs in-place to skip ignored dirs early
-                        dirs[:] = [d for d in dirs if not should_ignore(os.path.join(root, d), ignore_spec, DEFAULT_IGNORED_DIRS, absolute_source_dir)]
+                        dirs[:] = [d for d in dirs if not should_ignore(os.path.join(root, d))]
                         for name in files:
                             full_path = os.path.join(root, name)
-                            if should_ignore(full_path, ignore_spec, DEFAULT_IGNORED_DIRS, absolute_source_dir):
+                            if should_ignore(full_path):
                                 continue
                             display_path = os.path.relpath(full_path, source_dir) if not is_outside_source else full_path
                             result.add(display_path)
@@ -73,7 +70,7 @@ class ListFilesToolResolver(BaseToolResolver):
                 else:
                     for item in os.listdir(base_dir):
                         full_path = os.path.join(base_dir, item)
-                        if should_ignore(full_path, ignore_spec, DEFAULT_IGNORED_DIRS, absolute_source_dir):
+                        if should_ignore(full_path):
                             continue
                         display_path = os.path.relpath(full_path, source_dir) if not is_outside_source else full_path
                         if os.path.isdir(full_path):

autocoder/common/v2/agent/agentic_edit_tools/search_files_tool_resolver.py

@@ -9,7 +9,7 @@ from loguru import logger
 from autocoder.common import AutoCoderArgs
 import typing
 
-from autocoder.common.v2.agent.ignore_utils import load_ignore_spec, should_ignore, DEFAULT_IGNORED_DIRS
+from autocoder.ignorefiles.ignore_file_utils import should_ignore
 
 if typing.TYPE_CHECKING:
     from autocoder.common.v2.agent.agentic_edit import AgenticEdit  
@@ -29,9 +29,6 @@ class SearchFilesToolResolver(BaseToolResolver):
         absolute_source_dir = os.path.abspath(source_dir)
         absolute_search_path = os.path.abspath(os.path.join(source_dir, search_path_str))
 
-        # Load ignore spec from .autocoderignore if exists
-        ignore_spec = load_ignore_spec(absolute_source_dir)
-
         # Security check
         if not absolute_search_path.startswith(absolute_source_dir):
             return ToolResult(success=False, message=f"Error: Access denied. Attempted to search outside the project directory: {search_path_str}")
@@ -65,7 +62,7 @@ class SearchFilesToolResolver(BaseToolResolver):
 
             for filepath in glob.glob(search_glob_pattern, recursive=True):
                 abs_path = os.path.abspath(filepath)
-                if should_ignore(abs_path, ignore_spec, DEFAULT_IGNORED_DIRS, absolute_source_dir):
+                if should_ignore(abs_path):
                     continue
 
                 if os.path.isfile(filepath):

autocoder/helper/rag_doc_creator.py

@@ -0,0 +1,141 @@
+
+import os
+from loguru import logger
+
+def create_sample_files(base_dir: str):
+    """创建示例代码文件用于演示"""
+    os.makedirs(base_dir, exist_ok=True)
+
+    calculator_content = """
+class Calculator:
+    def __init__(self):
+        self.history = []
+        
+    def add(self, a: int, b: int) -> int:
+        '''加法函数'''
+        result = a + b
+        self.history.append(f"{a} + {b} = {result}")
+        return result
+        
+    def subtract(self, a: int, b: int) -> int:
+        '''减法函数'''
+        result = a - b
+        self.history.append(f"{a} - {b} = {result}")
+        return result
+        
+    def multiply(self, a: int, b: int) -> int:
+        '''乘法函数'''
+        result = a * b
+        self.history.append(f"{a} * {b} = {result}")
+        return result
+        
+    def divide(self, a: int, b: int) -> float:
+        '''除法函数'''
+        if b == 0:
+            raise ValueError("Cannot divide by zero")
+        result = a / b
+        self.history.append(f"{a} / {b} = {result}")
+        return result
+"""
+
+    string_processor_content = """
+class StringProcessor:
+    @staticmethod
+    def reverse(text: str) -> str:
+        '''反转字符串'''
+        return text[::-1]
+    
+    @staticmethod
+    def capitalize(text: str) -> str:
+        '''首字母大写'''
+        return text.capitalize()
+    
+    @staticmethod
+    def count_words(text: str) -> int:
+        '''计算单词数量'''
+        return len(text.split())
+    
+    @staticmethod
+    def format_name(first_name: str, last_name: str) -> str:
+        '''格式化姓名'''
+        return f"{last_name}, {first_name}"
+"""
+
+    data_processor_content = """
+import statistics
+from typing import List, Dict, Any
+
+class DataProcessor:
+    @staticmethod
+    def calculate_average(numbers: List[float]) -> float:
+        '''计算平均值'''
+        return sum(numbers) / len(numbers)
+    
+    @staticmethod
+    def find_median(numbers: List[float]) -> float:
+        '''计算中位数'''
+        sorted_numbers = sorted(numbers)
+        n = len(sorted_numbers)
+        if n % 2 == 0:
+            return (sorted_numbers[n//2-1] + sorted_numbers[n//2]) / 2
+        else:
+            return sorted_numbers[n//2]
+    
+    @staticmethod
+    def find_mode(numbers: List[float]) -> List[float]:
+        '''查找众数'''
+        try:
+            return statistics.mode(numbers)
+        except statistics.StatisticsError:
+            # 没有唯一众数的情况
+            count_dict = {}
+            for num in numbers:
+                if num in count_dict:
+                    count_dict[num] += 1
+                else:
+                    count_dict[num] = 1
+            max_count = max(count_dict.values())
+            return [num for num, count in count_dict.items() if count == max_count]
+"""
+
+    with open(os.path.join(base_dir, "calculator.py"), "w", encoding="utf-8") as f:
+        f.write(calculator_content)
+
+    with open(os.path.join(base_dir, "string_processor.py"), "w", encoding="utf-8") as f:
+        f.write(string_processor_content)
+
+    with open(os.path.join(base_dir, "data_processor.py"), "w", encoding="utf-8") as f:
+        f.write(data_processor_content)
+
+    logger.info(f"示例代码文件已创建在: {base_dir}")
+
+
+def update_sample_file(base_dir: str, filename: str, content: str):
+    """更新指定示例文件内容"""
+    file_path = os.path.join(base_dir, filename)
+    if not os.path.exists(file_path):
+        logger.warning(f"文件 {file_path} 不存在，无法更新")
+        return
+    with open(file_path, "w", encoding="utf-8") as f:
+        f.write(content)
+    logger.info(f"已更新文件: {file_path}")
+
+
+def add_sample_file(base_dir: str, filename: str, content: str):
+    """新增示例文件，若存在则覆盖"""
+    file_path = os.path.join(base_dir, filename)
+    with open(file_path, "w", encoding="utf-8") as f:
+        f.write(content)
+    logger.info(f"已新增文件: {file_path}")
+
+
+def delete_sample_file(base_dir: str, filename: str):
+    """删除指定示例文件"""
+    file_path = os.path.join(base_dir, filename)
+    try:
+        os.remove(file_path)
+        logger.info(f"已删除文件: {file_path}")
+    except FileNotFoundError:
+        logger.warning(f"文件 {file_path} 不存在，无法删除")
+    except Exception as e:
+        logger.error(f"删除文件 {file_path} 失败: {e}")

autocoder/ignorefiles/__init__.py

@@ -0,0 +1,4 @@
+
+from .ignore_file_utils import should_ignore
+
+__all__ = ["should_ignore"]

autocoder/ignorefiles/ignore_file_utils.py

@@ -0,0 +1,63 @@
+
+import os
+from pathlib import Path
+from threading import Lock
+import pathspec
+
+DEFAULT_EXCLUDES = [
+    '.git', '.auto-coder', 'node_modules', '.mvn', '.idea',
+    '__pycache__', '.venv', 'venv', 'dist', 'build', '.gradle',".next"
+]
+
+
+class IgnoreFileManager:
+    _instance = None
+    _lock = Lock()
+
+    def __new__(cls):
+        if not cls._instance:
+            with cls._lock:
+                if not cls._instance:
+                    cls._instance = super(IgnoreFileManager, cls).__new__(cls)
+                    cls._instance._initialized = False
+        return cls._instance
+
+    def __init__(self):
+        if self._initialized:
+            return
+        self._initialized = True
+        self._spec = None
+        self._load_ignore_spec()
+
+    def _load_ignore_spec(self):
+        ignore_patterns = []
+        project_root = Path(os.getcwd())
+
+        ignore_file_paths = [
+            project_root / '.autocoderignore',
+            project_root / '.auto-coder' / '.autocoderignore'
+        ]
+
+        for ignore_file in ignore_file_paths:
+            if ignore_file.is_file():
+                with open(ignore_file, 'r', encoding='utf-8') as f:
+                    ignore_patterns = f.read().splitlines()
+                break
+
+        # 添加默认排除目录
+        ignore_patterns.extend(DEFAULT_EXCLUDES)
+
+        self._spec = pathspec.PathSpec.from_lines('gitwildmatch', ignore_patterns)
+
+    def should_ignore(self, path: str) -> bool:
+        rel_path = os.path.relpath(path, os.getcwd())
+        # 标准化分隔符
+        rel_path = rel_path.replace(os.sep, '/')
+        return self._spec.match_file(rel_path)
+
+
+# 对外提供单例
+_ignore_manager = IgnoreFileManager()
+
+def should_ignore(path: str) -> bool:
+    return _ignore_manager.should_ignore(path)

autocoder/ignorefiles/test_ignore_file_utils.py

@@ -0,0 +1,91 @@
+
+import os
+import shutil
+from pathlib import Path
+
+import pytest
+
+from src.autocoder.ignorefiles import ignore_file_utils
+
+@pytest.fixture(autouse=True)
+def cleanup_ignore_manager(monkeypatch):
+    """
+    在每个测试前后清理 IgnoreFileManager 的单例状态，保证测试隔离
+    """
+    # 备份原始实例
+    original_instance = ignore_file_utils._ignore_manager
+    # 强制重新加载忽略规则
+    def reset_ignore_manager():
+        ignore_file_utils.IgnoreFileManager._instance = None
+        return ignore_file_utils.IgnoreFileManager()
+
+    monkeypatch.setattr(ignore_file_utils, "_ignore_manager", reset_ignore_manager())
+    yield
+    # 恢复原始实例
+    ignore_file_utils._ignore_manager = original_instance
+
+
+def test_default_excludes(tmp_path, monkeypatch):
+    # 切换当前工作目录
+    monkeypatch.chdir(tmp_path)
+
+    # 不创建任何 .autocoderignore 文件，使用默认排除规则
+    # 创建默认排除目录
+    for dirname in ignore_file_utils.DEFAULT_EXCLUDES:
+        (tmp_path / dirname).mkdir(parents=True, exist_ok=True)
+        # 应该被忽略
+        assert ignore_file_utils.should_ignore(str(tmp_path / dirname)) is True
+
+    # 创建不会被忽略的文件
+    normal_file = tmp_path / "myfile.txt"
+    normal_file.write_text("hello")
+    assert ignore_file_utils.should_ignore(str(normal_file)) is False
+
+
+def test_custom_ignore_file(tmp_path, monkeypatch):
+    monkeypatch.chdir(tmp_path)
+
+    # 创建自定义忽略文件
+    ignore_file = tmp_path / ".autocoderignore"
+    ignore_file.write_text("data/**\nsecret.txt")
+
+    # 重新初始化忽略管理器以加载新规则
+    ignore_file_utils.IgnoreFileManager._instance = None
+    ignore_file_utils._ignore_manager = ignore_file_utils.IgnoreFileManager()
+
+    # 符合忽略规则的路径
+    ignored_dir = tmp_path / "data" / "subdir"
+    ignored_dir.mkdir(parents=True)
+    ignored_file = tmp_path / "secret.txt"
+    ignored_file.write_text("secret")
+
+    assert ignore_file_utils.should_ignore(str(ignored_dir)) is True
+    assert ignore_file_utils.should_ignore(str(ignored_file)) is True
+
+    # 不应被忽略的文件
+    normal_file = tmp_path / "keepme.txt"
+    normal_file.write_text("keep me")
+    assert ignore_file_utils.should_ignore(str(normal_file)) is False
+
+
+def test_nested_ignore_file(tmp_path, monkeypatch):
+    monkeypatch.chdir(tmp_path)
+
+    # 没有根目录的.ignore，创建.auto-coder/.autocoderignore
+    nested_dir = tmp_path / ".auto-coder"
+    nested_dir.mkdir()
+
+    ignore_file = nested_dir / ".autocoderignore"
+    ignore_file.write_text("logs/**")
+
+    # 重新初始化忽略管理器以加载新规则
+    ignore_file_utils.IgnoreFileManager._instance = None
+    ignore_file_utils._ignore_manager = ignore_file_utils.IgnoreFileManager()
+
+    ignored_dir = tmp_path / "logs" / "2024"
+    ignored_dir.mkdir(parents=True)
+    assert ignore_file_utils.should_ignore(str(ignored_dir)) is True
+
+    normal_file = tmp_path / "main.py"
+    normal_file.write_text("# main")
+    assert ignore_file_utils.should_ignore(str(normal_file)) is False

autocoder/models.py

@@ -8,7 +8,7 @@ MODELS_JSON = os.path.expanduser("~/.auto-coder/keys/models.json")
 # Default built-in models
 default_models_list = [
     {
-        "name": "deepseek_r1_chat",
+        "name": "deepseek/r1",
         "description": "DeepSeek Reasoner is for design/review",
         "model_name": "deepseek-reasoner",
         "model_type": "saas/openai",
@@ -21,7 +21,7 @@ default_models_list = [
         "max_output_tokens": 8096
     },    
     {
-        "name": "deepseek_chat",
+        "name": "deepseek/v3",
         "description": "DeepSeek Chat is for coding",
         "model_name": "deepseek-chat",
         "model_type": "saas/openai",
@@ -34,16 +34,56 @@ default_models_list = [
         "max_output_tokens": 8096
     },
     {
-        "name":"o1",
-        "description": "o1 is for design/review",
-        "model_name": "o1-2024-12-17",
+        "name": "ark/deepseek-v3-250324",
+        "description": "DeepSeek Chat is for coding",
+        "model_name": "deepseek-v3-250324",
         "model_type": "saas/openai",
-        "base_url": "https://api.openai.com/v1",
+        "base_url": "https://ark.cn-beijing.volces.com/api/v3",
+        "api_key_path": "",
+        "is_reasoning": False,
+        "input_price": 2.0,
+        "output_price": 8.0,
+        "average_speed": 0.0,
+        "max_output_tokens": 8096
+    },    
+    {
+        "name": "ark/deepseek-r1-250120",
+        "description": "DeepSeek Reasoner is for design/review",
+        "model_name": "deepseek-r1-250120",
+        "model_type": "saas/openai",
+        "base_url": "https://ark.cn-beijing.volces.com/api/v3",
         "api_key_path": "",
         "is_reasoning": True,
+        "input_price": 4.0,
+        "output_price": 16.0,
+        "average_speed": 0.0,
+        "max_output_tokens": 8096
+    },    
+    {
+        "name": "openrouter/quasar-alpha",
+        "description": "",
+        "model_name": "openrouter/quasar-alpha",
+        "model_type": "saas/openai",
+        "base_url": "https://openrouter.ai/api/v1",
+        "api_key_path": "",
+        "is_reasoning": False,
+        "input_price": 0.0,
+        "output_price": 0.0,
+        "average_speed": 0.0,
+        "max_output_tokens": 8096*2
+    },    
+    {
+        "name": "openrouter/google/gemini-2.5-pro-preview-03-25",
+        "description": "",
+        "model_name": "google/gemini-2.5-pro-preview-03-25",
+        "model_type": "saas/openai",
+        "base_url": "https://openrouter.ai/api/v1",
+        "api_key_path": "",
+        "is_reasoning": False,
         "input_price": 0.0,
         "output_price": 0.0,
-        "average_speed": 0.0
+        "average_speed": 0.0,
+        "max_output_tokens": 8096*2
     }
 ]
 
@@ -263,7 +303,7 @@ def update_model_with_api_key(name: str, api_key: str) -> Dict:
     if not found_model:
         return None
             
-    api_key_path = name
+    api_key_path = name.replace("/", "_")  # 替换 / 为 _，保证文件名合法
     if api_key_path:
         found_model["api_key_path"] = api_key_path
         

autocoder/rag/cache/byzer_storage_cache.py

@@ -1,3 +1,4 @@
+from token import OP
 from autocoder.rag.cache.base_cache import (
     BaseCacheManager,
     DeleteEvent,
@@ -31,6 +32,8 @@ from pydantic import BaseModel
 from autocoder.rag.cache.cache_result_merge import CacheResultMerger, MergeStrategy
 from .failed_files_utils import save_failed_files, load_failed_files
 import time
+from byzerllm import ByzerLLM, SimpleByzerLLM
+from autocoder.utils.llms import get_llm_names
 
 if platform.system() != "Windows":
     import fcntl
@@ -66,8 +69,8 @@ class ByzerStorageCache(BaseCacheManager):
         ignore_spec,
         required_exts,
         extra_params: Optional[AutoCoderArgs] = None,
-        args=None,
-        llm=None,
+        args:Optional[AutoCoderArgs]=None,
+        llm:Optional[Union[ByzerLLM,SimpleByzerLLM,str]]=None,
     ):
         """
         初始化基于云端 Byzer Storage 的 RAG 缓存管理器。
@@ -78,6 +81,7 @@ class ByzerStorageCache(BaseCacheManager):
         self.extra_params = extra_params
         self.args = args
         self.llm = llm
+        self.product_mode = self.args.product_mode
         self.rag_build_name = extra_params.rag_build_name
         self.storage = ByzerStorage("byzerai_store", "rag", self.rag_build_name)
         self.queue = []
@@ -218,6 +222,8 @@ class ByzerStorageCache(BaseCacheManager):
         from autocoder.rag.token_counter import initialize_tokenizer
 
         logger.info("[BUILD CACHE] Starting parallel file processing...")
+        llm_name = get_llm_names(self.llm)[0] if self.llm else None
+        product_mode = self.product_mode
         start_time = time.time()
         with Pool(
             processes=os.cpu_count(),
@@ -227,7 +233,7 @@ class ByzerStorageCache(BaseCacheManager):
             target_files_to_process = []
             for file_info in files_to_process:
                 target_files_to_process.append(self.fileinfo_to_tuple(file_info))
-            results = pool.map(process_file_in_multi_process, target_files_to_process)
+            results = pool.map(process_file_in_multi_process, target_files_to_process, llm=llm_name, product_mode=product_mode)
         processing_time = time.time() - start_time
         logger.info(f"[BUILD CACHE] File processing completed, time elapsed: {processing_time:.2f}s")
 
@@ -417,7 +423,7 @@ class ByzerStorageCache(BaseCacheManager):
                 for file_info in file_list.file_infos:
                     logger.info(f"[QUEUE PROCESSING] Processing file update: {file_info.file_path}")
                     try:
-                        content = process_file_local(self.fileinfo_to_tuple(file_info))
+                        content = process_file_local(self.fileinfo_to_tuple(file_info), llm=self.llm, product_mode=self.product_mode)
                         if content:
                             self.cache[file_info.file_path] = CacheItem(
                                 file_path=file_info.file_path,