auto-coder 0.1.400__py3-none-any.whl → 1.0.0__py3-none-any.whl

autocoder/common/v2/agent/runner/tool_display.py

@@ -0,0 +1,191 @@
+"""
+工具显示模块，提供格式化工具调用信息的功能。
+
+这个模块负责生成用户友好的、国际化的工具调用显示信息，
+主要用于终端运行器中展示工具调用的详细信息。
+"""
+
+import json
+from typing import Dict, Callable, Type
+
+from autocoder.common.auto_coder_lang import get_system_language, format_str_jinja2
+from autocoder.common.v2.agent.agentic_edit_types import (
+    BaseTool,
+    ReadFileTool, WriteToFileTool, ReplaceInFileTool, ExecuteCommandTool,
+    ListFilesTool, SearchFilesTool, ListCodeDefinitionNamesTool,
+    AskFollowupQuestionTool, UseMcpTool, AttemptCompletionTool
+)
+
+# Define message templates for each tool in English and Chinese
+TOOL_DISPLAY_MESSAGES: Dict[Type[BaseTool], Dict[str, str]] = {
+    ReadFileTool: {
+        "en": "AutoCoder wants to read this file:\n[bold cyan]{{ path }}[/]",
+        "zh": "AutoCoder 想要读取此文件：\n[bold cyan]{{ path }}[/]"
+    },
+    WriteToFileTool: {
+        "en": (
+            "AutoCoder wants to write to this file:\n[bold cyan]{{ path }}[/]\n\n"
+            "[dim]Content Snippet:[/dim]\n{{ content_snippet }}{{ ellipsis }}"
+        ),
+        "zh": (
+            "AutoCoder 想要写入此文件：\n[bold cyan]{{ path }}[/]\n\n"
+            "[dim]内容片段：[/dim]\n{{ content_snippet }}{{ ellipsis }}"
+        )
+    },
+    ReplaceInFileTool: {
+        "en": (
+            "AutoCoder wants to replace content in this file:\n[bold cyan]{{ path }}[/]\n\n"
+            "[dim]Diff Snippet:[/dim]\n{{ diff_snippet }}{{ ellipsis }}"
+        ),
+        "zh": (
+            "AutoCoder 想要替换此文件中的内容：\n[bold cyan]{{ path }}[/]\n\n"
+            "[dim]差异片段：[/dim]\n{{ diff_snippet }}{{ ellipsis }}"
+        )
+    },
+    ExecuteCommandTool: {
+        "en": (
+            "AutoCoder wants to execute this command:\n[bold yellow]{{ command }}[/]\n"
+            "[dim](Requires Approval: {{ requires_approval }})[/]"
+        ),
+        "zh": (
+            "AutoCoder 想要执行此命令：\n[bold yellow]{{ command }}[/]\n"
+            "[dim](需要批准：{{ requires_approval }})[/]"
+        )
+    },
+    ListFilesTool: {
+        "en": (
+            "AutoCoder wants to list files in:\n[bold green]{{ path }}[/] "
+            "{{ recursive_text }}"
+        ),
+        "zh": (
+            "AutoCoder 想要列出此目录中的文件：\n[bold green]{{ path }}[/] "
+            "{{ recursive_text }}"
+        )
+    },
+    SearchFilesTool: {
+        "en": (
+            "AutoCoder wants to search files in:\n[bold green]{{ path }}[/]\n"
+            "[dim]File Pattern:[/dim] [yellow]{{ file_pattern }}[/]\n"
+            "[dim]Regex:[/dim] [yellow]{{ regex }}[/]"
+        ),
+        "zh": (
+            "AutoCoder 想要在此目录中搜索文件：\n[bold green]{{ path }}[/]\n"
+            "[dim]文件模式：[/dim] [yellow]{{ file_pattern }}[/]\n"
+            "[dim]正则表达式：[/dim] [yellow]{{ regex }}[/]"
+        )
+    },
+    ListCodeDefinitionNamesTool: {
+        "en": "AutoCoder wants to list definitions in:\n[bold green]{{ path }}[/]",
+        "zh": "AutoCoder 想要列出此路径中的定义：\n[bold green]{{ path }}[/]"
+    },
+    AskFollowupQuestionTool: {
+        "en": (
+            "AutoCoder is asking a question:\n[bold magenta]{{ question }}[/]\n"
+            "{{ options_text }}"
+        ),
+        "zh": (
+            "AutoCoder 正在提问：\n[bold magenta]{{ question }}[/]\n"
+            "{{ options_text }}"
+        )
+    },
+    UseMcpTool: {
+        "en": (
+            "AutoCoder wants to use an MCP tool:\n"
+            "[dim]Server:[/dim] [blue]{{ server_name }}[/]\n"
+            "[dim]Tool:[/dim] [blue]{{ tool_name }}[/]\n"
+            "[dim]Args:[/dim] {{ arguments_snippet }}{{ ellipsis }}"
+        ),
+        "zh": (
+            "AutoCoder 想要使用 MCP 工具：\n"
+            "[dim]服务器：[/dim] [blue]{{ server_name }}[/]\n"
+            "[dim]工具：[/dim] [blue]{{ tool_name }}[/]\n"
+            "[dim]参数：[/dim] {{ arguments_snippet }}{{ ellipsis }}"
+        )
+    }
+}
+
+def get_tool_display_message(tool: BaseTool) -> str:
+    """
+    生成工具调用的用户友好、国际化的字符串表示。
+
+    Args:
+        tool: 工具实例（Pydantic模型）。
+
+    Returns:
+        用于在终端中显示的格式化字符串。
+    """
+    lang = get_system_language()
+    tool_type = type(tool)
+
+    if tool_type not in TOOL_DISPLAY_MESSAGES:
+        # 未知工具的回退处理
+        return f"未知工具类型: {tool_type.__name__}\n数据: {tool.model_dump_json(indent=2)}"
+
+    templates = TOOL_DISPLAY_MESSAGES[tool_type]
+    template = templates.get(lang, templates.get("en", "工具显示模板未找到")) # 回退到英文
+
+    # 准备特定于每种工具类型的上下文
+    context = {}
+    if isinstance(tool, ReadFileTool):
+        context = {"path": tool.path}
+    elif isinstance(tool, WriteToFileTool):
+        snippet = tool.content[:150]
+        context = {
+            "path": tool.path,
+            "content_snippet": snippet,
+            "ellipsis": '...' if len(tool.content) > 150 else ''
+        }
+    elif isinstance(tool, ReplaceInFileTool):
+        snippet = tool.diff
+        context = {
+            "path": tool.path,
+            "diff_snippet": snippet,
+            "ellipsis": ''
+        }
+    elif isinstance(tool, ExecuteCommandTool):
+        context = {"command": tool.command, "requires_approval": tool.requires_approval}
+    elif isinstance(tool, ListFilesTool):
+        rec_text_en = '(Recursively)' if tool.recursive else '(Top Level)'
+        rec_text_zh = '（递归）' if tool.recursive else '（顶层）'
+        context = {
+            "path": tool.path,
+            "recursive_text": rec_text_zh if lang == 'zh' else rec_text_en
+        }
+    elif isinstance(tool, SearchFilesTool):
+        context = {
+            "path": tool.path,
+            "file_pattern": tool.file_pattern or '*',
+            "regex": tool.regex
+        }
+    elif isinstance(tool, ListCodeDefinitionNamesTool):
+        context = {"path": tool.path}
+    elif isinstance(tool, AskFollowupQuestionTool):
+        options_text_en = ""
+        options_text_zh = ""
+        if tool.options:
+            options_list_en = "\n".join([f"- {opt}" for opt in tool.options])
+            options_list_zh = "\n".join([f"- {opt}" for opt in tool.options]) # 假设选项足够简单，不需要翻译
+            options_text_en = f"[dim]Options:[/dim]\n{options_list_en}"
+            options_text_zh = f"[dim]选项：[/dim]\n{options_list_zh}"
+        context = {
+            "question": tool.question,
+            "options_text": options_text_zh if lang == 'zh' else options_text_en
+        }
+    elif isinstance(tool, UseMcpTool):
+        args_str = tool.query
+        snippet = args_str[:100]
+        context = {
+            "server_name": tool.server_name,
+            "tool_name": tool.tool_name,
+            "arguments_snippet": snippet,
+            "ellipsis": '...' if len(args_str) > 100 else ''
+        }    
+    else:
+        # 未专门处理的工具的通用上下文
+        context = tool.model_dump()
+
+    try:
+        return format_str_jinja2(template, **context)
+    except Exception as e:
+        # 格式化错误时的回退处理
+        return f"格式化 {tool_type.__name__} 的显示时出错: {e}\n模板: {template}\n上下文: {context}"

autocoder/index/entry.py

@@ -25,7 +25,7 @@ from autocoder.index.filter.normal_filter import NormalFilter
 from autocoder.index.index import IndexManager
 from loguru import logger
 from autocoder.common import SourceCodeList
-from autocoder.common.context_pruner import PruneContext
+from autocoder.common.pruner.context_pruner import PruneContext
 from autocoder.common.action_yml_file_manager import ActionYmlFileManager
 
 from autocoder.events.event_manager_singleton import get_event_manager

autocoder/plugins/token_helper_plugin.py

@@ -68,7 +68,7 @@ class TokenHelperPlugin(Plugin):
         return {
             "token/count": (self.count_tokens_in_project, "Count tokens in all project files"),
             "token/top": (self.show_top_token_files, "Show top N files by token count"),
-            "token/file": (self.count_tokens_in_file, "Count tokens in a specific file"),
+            "token/file": (self.count_tokens_in_file, "Count tokens in a specific file or directory"),
             "token/summary": (self.show_token_summary, "Show token count summary for the project"),
         }
 
@@ -274,17 +274,46 @@ class TokenHelperPlugin(Plugin):
             print(f"{token_count.tokens:<10,} {token_count.file_size:<15,} {relative_path}")
 
     def count_tokens_in_file(self, args: str) -> None:
-        """Count tokens in a specific file.
+        """Count tokens in a specific file or directory.
         
         Args:
-            args: Path to the file
+            args: Path to the file or directory. If starts with @, remove @ and treat as path.
         """
         if not args:
-            print("Please specify a file path.")
+            print("Please specify a file or directory path.")
             return
             
-        file_path = args.strip()
+        # Handle @ prefix - remove it and treat as path
+        path = args.strip()
+        if path.startswith('@'):
+            path = path[1:]
         
+        if not os.path.exists(path):
+            print(f"Error: Path '{path}' does not exist.")
+            return
+            
+        try:
+            if os.path.isfile(path):
+                # Handle single file
+                self._count_tokens_single_file(path)
+            elif os.path.isdir(path):
+                # Handle directory recursively
+                self._count_tokens_directory(path)
+            else:
+                print(f"Error: '{path}' is neither a file nor a directory.")
+                
+        except Exception as e:
+            print(f"Error counting tokens: {str(e)}")
+    
+    def _count_tokens_single_file(self, file_path: str) -> int:
+        """Count tokens in a single file and display results.
+        
+        Args:
+            file_path: Path to the file
+            
+        Returns:
+            Number of tokens in the file
+        """
         try:
             with open(file_path, 'r', encoding='utf-8') as f:
                 content = f.read()
@@ -293,10 +322,81 @@ class TokenHelperPlugin(Plugin):
             print(f"\nFile: {file_path}")
             print(f"Tokens: {tokens:,}")
             print(f"File size: {len(content):,} bytes")
-            print(f"Avg bytes per token: {len(content)/tokens:.2f}")
+            if tokens > 0:
+                print(f"Avg bytes per token: {len(content)/tokens:.2f}")
+            
+            return tokens
             
+        except UnicodeDecodeError:
+            print(f"Warning: Skipping binary file '{file_path}'")
+            return 0
         except Exception as e:
-            print(f"Error counting tokens in file: {str(e)}")
+            print(f"Error reading file '{file_path}': {str(e)}")
+            return 0
+    
+    def _count_tokens_directory(self, dir_path: str) -> None:
+        """Count tokens in all files within a directory recursively.
+        
+        Args:
+            dir_path: Path to the directory
+        """
+        total_tokens = 0
+        file_count = 0
+        processed_files = []
+        
+        print(f"\nScanning directory: {dir_path}")
+        
+        for root, dirs, files in os.walk(dir_path):
+            # Skip common ignore directories
+            dirs[:] = [d for d in dirs if not d.startswith('.') and d not in ['__pycache__', 'node_modules', 'dist', 'build']]
+            
+            for file in files:
+                # Skip hidden files and common binary/generated files
+                if file.startswith('.') or file.endswith(('.pyc', '.pyo', '.so', '.dll', '.exe', '.bin')):
+                    continue
+                    
+                file_path = os.path.join(root, file)
+                relative_path = os.path.relpath(file_path, dir_path)
+                
+                try:
+                    with open(file_path, 'r', encoding='utf-8') as f:
+                        content = f.read()
+                        
+                    tokens = count_tokens(content)
+                    total_tokens += tokens
+                    file_count += 1
+                    
+                    processed_files.append({
+                        'path': relative_path,
+                        'tokens': tokens,
+                        'size': len(content)
+                    })
+                    
+                except (UnicodeDecodeError, PermissionError):
+                    # Skip binary files and files without permission
+                    continue
+                except Exception as e:
+                    print(f"Warning: Error processing '{relative_path}': {str(e)}")
+                    continue
+        
+        # Display results
+        print(f"\nDirectory scan complete!")
+        print(f"Total files processed: {file_count}")
+        print(f"Total tokens: {total_tokens:,}")
+        
+        if file_count > 0:
+            avg_tokens = total_tokens / file_count
+            print(f"Average tokens per file: {avg_tokens:.2f}")
+            
+            # Show top 10 files by token count
+            if len(processed_files) > 1:
+                print(f"\nTop files by token count:")
+                sorted_files = sorted(processed_files, key=lambda x: x['tokens'], reverse=True)
+                print(f"{'Tokens':>8} {'Size':>8} {'File'}")
+                print(f"{'-'*8} {'-'*8} {'-'*50}")
+                
+                for file_info in sorted_files[:10]:
+                    print(f"{file_info['tokens']:>8,} {file_info['size']:>8} {file_info['path']}")
 
     def show_token_summary(self, args: str) -> None:
         """Show token count summary by file type.

autocoder/run_context.py

@@ -10,6 +10,7 @@ class RunMode(Enum):
     TERMINAL = auto()
     WEB = auto()
     API = auto()
+    CLI = auto()
 
 
 class RunContext:
@@ -52,6 +53,14 @@ class RunContext:
         """Check if running in web mode."""
         return self._mode == RunMode.WEB
 
+    def is_cli(self) -> bool:
+        """Check if running in cli mode."""
+        return self._mode == RunMode.CLI
+        
+    def is_api(self) -> bool:
+        """Check if running in api mode."""
+        return self._mode == RunMode.API        
+
 
 def get_run_context() -> RunContext:
     """

autocoder/sdk/__init__.py

@@ -4,8 +4,7 @@ Auto-Coder SDK
 为第三方开发者提供的 Python SDK，允许通过命令行工具和 Python API 两种方式使用 Auto-Coder 的核心功能。
 """
 
-from typing import AsyncIterator, Optional, Dict, Any
-
+from typing import AsyncIterator, Iterator, Optional
 from .core.auto_coder_core import AutoCoderCore
 from .models.options import AutoCodeOptions
 from .models.messages import Message
@@ -19,33 +18,15 @@ from .exceptions import (
     BridgeError,
     ValidationError
 )
-
-__version__ = "1.0.0"
-__all__ = [
-    # 核心功能
-    "query",
-    "query_sync",
-    "modify_code",
-    "modify_code_stream",
-    
-    # 数据模型
-    "AutoCodeOptions",
-    "Message",
-    "StreamEvent",
-    "CodeModificationResult",
-    
-    # 会话管理
-    "Session",
-    "SessionManager",
-    
-    # 异常
-    "AutoCoderSDKError",
-    "SessionNotFoundError",
-    "InvalidOptionsError",
-    "BridgeError",
-    "ValidationError",
-]
-
+from autocoder.auto_coder_runner import init_project_if_required as init_project_if_required_buildin
+from autocoder.auto_coder_runner import (
+    configure as configure_buildin,
+    load_tokenizer,
+    start as start_engine,
+    commit as commit_buildin
+)
+from autocoder.rag.variable_holder import VariableHolder
+from autocoder.utils.llms import get_single_llm
 
 async def query(
     prompt: str, 
@@ -110,79 +91,131 @@ def query_sync(
     return core.query_sync(f"/new {prompt}", show_terminal)
 
 
-def modify_code(
-    prompt: str,
-    pre_commit: bool = False,
-    extra_args: Optional[Dict[str, Any]] = None,
+async def query_with_events(
+    prompt: str, 
     options: Optional[AutoCodeOptions] = None,
-    show_terminal: bool = True
-) -> CodeModificationResult:
+    show_terminal: bool = False
+) -> AsyncIterator[StreamEvent]:
     """
-    代码修改接口
+    异步流式查询接口，返回原始事件流
     
     Args:
-        prompt: 修改提示
-        pre_commit: 是否预提交
-        extra_args: 额外参数
+        prompt: 查询提示
         options: 配置选项
-        show_terminal: 是否在终端显示友好的渲染输出
+        show_terminal: 是否在终端显示友好的渲染输出（默认为False，避免重复显示）
         
-    Returns:
-        CodeModificationResult: 修改结果
+    Yields:
+        StreamEvent: 原始事件流，包含详细的执行过程信息
         
     Example:
-        >>> from autocoder.sdk import modify_code, AutoCodeOptions
+        >>> import asyncio
+        >>> from autocoder.sdk import query_with_events, AutoCodeOptions
         >>> 
-        >>> options = AutoCodeOptions(cwd="/path/to/project")
-        >>> result = modify_code(
-        ...     "Add error handling to the main function",
-        ...     pre_commit=False,
-        ...     options=options
-        ... )
+        >>> async def main():
+        ...     options = AutoCodeOptions(max_turns=3)
+        ...     async for event in query_with_events("Write a hello world function", options):
+        ...         print(f"[{event.event_type}] {event.data}")
         >>> 
-        >>> if result.success:
-        ...     print(f"Modified files: {result.modified_files}")
-        ... else:
-        ...     print(f"Error: {result.error_details}")
+        >>> asyncio.run(main())
     """
-    core = AutoCoderCore(options or AutoCodeOptions())
-    return core.modify_code(prompt, pre_commit, extra_args, show_terminal)
+    if options is None:
+        options = AutoCodeOptions()
+    core = AutoCoderCore(options)
+    
+    # 使用桥接层直接获取事件流
+    import asyncio
+    loop = asyncio.get_event_loop()
+    
+    # 在线程池中执行同步调用
+    event_stream = await loop.run_in_executor(
+        core._executor,
+        core._sync_run_auto_command,
+        f"/new {prompt}"
+    )
+    
+    # 直接返回事件流
+    for event in event_stream:
+        # 可选择性地渲染到终端
+        if show_terminal:
+            core._render_stream_event(event, show_terminal)
+        yield event
 
 
-async def modify_code_stream(
-    prompt: str,
-    pre_commit: bool = False,
-    extra_args: Optional[Dict[str, Any]] = None,
+def query_with_events_sync(
+    prompt: str, 
     options: Optional[AutoCodeOptions] = None,
-    show_terminal: bool = True
-) -> AsyncIterator[StreamEvent]:
+    show_terminal: bool = False
+) -> Iterator[StreamEvent]:
     """
-    异步流式代码修改接口
+    同步查询接口，返回原始事件流生成器
     
     Args:
-        prompt: 修改提示
-        pre_commit: 是否预提交
-        extra_args: 额外参数
+        prompt: 查询提示
         options: 配置选项
-        show_terminal: 是否在终端显示友好的渲染输出
+        show_terminal: 是否在终端显示友好的渲染输出（默认为False，避免重复显示）
         
-    Yields:
-        StreamEvent: 修改事件流
+    Returns:
+        Iterator[StreamEvent]: 原始事件流生成器，包含详细的执行过程信息
         
     Example:
-        >>> import asyncio
-        >>> from autocoder.sdk import modify_code_stream, AutoCodeOptions
+        >>> from autocoder.sdk import query_with_events_sync, AutoCodeOptions
         >>> 
-        >>> async def main():
-        ...     options = AutoCodeOptions(cwd="/path/to/project")
-        ...     async for event in modify_code_stream(
-        ...         "Refactor the user authentication module",
-        ...         options=options
-        ...     ):
-        ...         print(f"[{event.event_type}] {event.data}")
-        >>> 
-        >>> asyncio.run(main())
+        >>> options = AutoCodeOptions(max_turns=1)
+        >>> for event in query_with_events_sync("Write a simple calculator function", options):
+        ...     print(f"[{event.event_type}] {event.data}")
     """
-    core = AutoCoderCore(options or AutoCodeOptions())
-    async for event in core.modify_code_stream(prompt, pre_commit, extra_args, show_terminal):
+    if options is None:
+        options = AutoCodeOptions()
+    core = AutoCoderCore(options)
+    
+    # 直接调用同步方法获取事件流
+    event_stream = core._sync_run_auto_command(f"/new {prompt}")
+    
+    # 直接返回事件流
+    for event in event_stream:
+        # 可选择性地渲染到终端
+        if show_terminal:
+            core._render_stream_event(event, show_terminal)
         yield event
+
+
+def init_project_if_required(target_dir: str,project_type = ".py,.ts"):    
+    init_project_if_required_buildin(target_dir,project_type)
+    if not VariableHolder.TOKENIZER_MODEL:
+        load_tokenizer()
+    start_engine()
+
+
+def configure(key:str,value:str):
+    configure_buildin(f"{key}:{value}")
+
+
+def get_llm(model:str,product_mode:str="lite"):
+    return get_single_llm(model,product_mode)
+
+def commit(query: Optional[str] = None):
+    commit_buildin(query)
+
+
+__version__ = "1.0.0"
+__all__ = [
+    "query",
+    "query_sync",
+    "query_with_events",
+    "query_with_events_sync",
+    "get_llm",
+    "configure",
+    "init_project_if_required",
+    "AutoCodeOptions",
+    "Message",
+    "StreamEvent",
+    "CodeModificationResult",
+    "Session",
+    "SessionManager",
+    "AutoCoderSDKError",
+    "SessionNotFoundError",
+    "InvalidOptionsError",
+    "BridgeError",
+    "ValidationError",
+    "commit",
+]    

autocoder/sdk/cli/main.py

@@ -18,6 +18,11 @@ except ImportError:
 from .options import CLIOptions, CLIResult
 from .handlers import PrintModeHandler
 from ..exceptions import AutoCoderSDKError
+from autocoder.run_context import get_run_context,RunMode
+
+# 设置运行模式为终端模式
+get_run_context().set_mode(RunMode.CLI)
+
 
 
 class AutoCoderCLI: