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

autocoder/commands/auto_command.py

@@ -20,19 +20,21 @@ from autocoder.common import detect_env
 from autocoder.common import shells
 from loguru import logger
 from autocoder.utils import llms as llms_utils
-from autocoder.rag.token_counter import count_tokens
+from autocoder.common.tokens import count_string_tokens as count_tokens
 from autocoder.common.global_cancel import global_cancel,CancelRequestedException
 from autocoder.common.auto_configure import config_readme
 from autocoder.utils.auto_project_type import ProjectTypeAnalyzer
 from rich.text import Text
-from autocoder.common.mcp_server import get_mcp_server, McpServerInfoRequest
+from autocoder.common.mcp_tools.server import get_mcp_server, McpServerInfoRequest
 from autocoder.common.action_yml_file_manager import ActionYmlFileManager
 from autocoder.events.event_manager_singleton import get_event_manager
 from autocoder.events import event_content as EventContentCreator
 from autocoder.events.event_types import Event, EventType, EventMetadata
 from autocoder.run_context import get_run_context
 from autocoder.common.stream_out_type import AutoCommandStreamOutType
-from autocoder.common.rulefiles.autocoderrules_utils import get_rules
+from autocoder.common.rulefiles import get_rules
+from autocoder.common.autocoderargs_parser import AutoCoderArgsParser
+
 class CommandSuggestion(BaseModel):
     command: str
     parameters: Dict[str, Any]
@@ -99,6 +101,7 @@ class CommandAutoTuner:
         self.tools = AutoCommandTools(args=args, llm=self.llm)
         self.project_type_analyzer = ProjectTypeAnalyzer(
             args=args, llm=self.llm)
+        self.args_parser = AutoCoderArgsParser()
         try:
             self.mcp_server = get_mcp_server()
             mcp_server_info_response = self.mcp_server.send_request(McpServerInfoRequest(
@@ -110,6 +113,18 @@ class CommandAutoTuner:
             logger.error(f"Error getting MCP server info: {str(e)}")
             self.mcp_server_info = ""    
 
+    def _get_parsed_safe_zone_tokens(self) -> int:
+        """
+        解析 conversation_prune_safe_zone_tokens 参数，支持多种格式
+        
+        Returns:
+            解析后的 token 数量
+        """
+        return self.args_parser.parse_conversation_prune_safe_zone_tokens(
+            self.args.conversation_prune_safe_zone_tokens,
+            self.args.code_model
+        )
+
     @byzerllm.prompt()
     def _analyze(self, request: AutoCommandRequest) -> str:
         """
@@ -252,7 +267,7 @@ class CommandAutoTuner:
             "env_info": env_info,
             "shell_type": shell_type,
             "shell_encoding": shells.get_terminal_encoding(),
-            "conversation_safe_zone_tokens": self.args.conversation_prune_safe_zone_tokens,
+            "conversation_safe_zone_tokens": self._get_parsed_safe_zone_tokens(),
             "os_distribution": shells.get_os_distribution(),
             "current_user": shells.get_current_username(),
             "command_combination_readme": self._command_combination_readme.prompt(),
@@ -327,7 +342,7 @@ class CommandAutoTuner:
         '''
         return {
             "auto_command_max_iterations": self.args.auto_command_max_iterations,
-            "conversation_safe_zone_tokens": self.args.conversation_prune_safe_zone_tokens
+            "conversation_safe_zone_tokens": self._get_parsed_safe_zone_tokens()
         }
 
     def analyze(self, request: AutoCommandRequest) -> AutoCommandResponse:
@@ -440,7 +455,7 @@ class CommandAutoTuner:
         result_manager = ResultManager()
 
         while True:
-            global_cancel.check_and_raise(token=self.args.event_file)
+            global_cancel.check_and_raise(token=self.args.cancel_token)
             # 执行命令
             command = response.suggestions[0].command
             parameters = response.suggestions[0].parameters
@@ -536,14 +551,15 @@ class CommandAutoTuner:
                     conversations, ensure_ascii=False))
 
                 # 如果对话过长，使用默认策略进行修剪
-                if total_tokens > self.args.conversation_prune_safe_zone_tokens:
+                parsed_safe_zone_tokens = self._get_parsed_safe_zone_tokens()
+                if total_tokens > parsed_safe_zone_tokens:
                     self.printer.print_in_terminal(
                         "conversation_pruning_start",
                         style="yellow",
                         total_tokens=total_tokens,
-                        safe_zone=self.args.conversation_prune_safe_zone_tokens
+                        safe_zone=parsed_safe_zone_tokens
                     )
-                    from autocoder.common.conversation_pruner import ConversationPruner
+                    from autocoder.common.pruner.conversation_pruner import ConversationPruner
                     pruner = ConversationPruner(self.args, self.llm)
                     conversations = pruner.prune_conversations(conversations)
 
@@ -1094,6 +1110,7 @@ class CommandAutoTuner:
          使用例子：
          ask_user(question="请输入火山引擎的 R1 模型推理点")
 
+        </usage>
         </function>
 
         <function>

autocoder/commands/auto_web.py

@@ -794,7 +794,7 @@ class AutoWebTuner:
             logger.info(f"开始执行迭代 {iterations}/{max_iterations}")
 
             # 检查是否需要取消操作
-            global_cancel.check_and_raise(token=self.args.event_file)
+            global_cancel.check_and_raise(token=self.args.cancel_token)
 
             # 如果没有更多操作，认为任务完成
             if not plan.actions:

autocoder/commands/tools.py

@@ -5,33 +5,26 @@ from autocoder.pyproject import PyProject
 from autocoder.tsproject import TSProject
 from autocoder.suffixproject import SuffixProject
 from autocoder.common import AutoCoderArgs, SourceCode
+from autocoder.common.autocoderargs_parser import AutoCoderArgsParser
 from autocoder.common.interpreter import Interpreter
-from autocoder.common import ExecuteSteps, ExecuteStep, detect_env
-from autocoder.common import code_auto_execute
-from typing import List, Tuple,Dict
+from autocoder.common import ExecuteSteps, ExecuteStep
+from typing import List, Tuple, Dict
 import os
 import byzerllm
 import json
-from pydantic import BaseModel
 from byzerllm.types import Bool
 from contextlib import contextmanager
 from rich.console import Console
 from rich.panel import Panel
 from rich.text import Text
-from rich.prompt import Prompt
 from typing import Union
-from autocoder.utils.queue_communicate import (
-    queue_communicate,
-    CommunicateEvent,
-    CommunicateEventType,
-)
 import sys
 import io
 from autocoder.common import files as files_utils
 from autocoder.common.printer import Printer
 from prompt_toolkit import PromptSession
 from prompt_toolkit.styles import Style
-from autocoder.rag.token_counter import count_tokens
+from autocoder.common.tokens import count_string_tokens as count_tokens
 from autocoder.index.symbols_utils import (
     extract_symbols,
     SymbolType,
@@ -42,10 +35,9 @@ from autocoder.events.event_manager_singleton import get_event_manager
 from autocoder.events import event_content as EventContentCreator
 from autocoder.linters.linter_factory import LinterFactory, lint_file, lint_project, format_lint_result
 import traceback
-from autocoder.common.mcp_server import get_mcp_server
-from autocoder.common.mcp_server_types import (
-    McpRequest, McpInstallRequest, McpRemoveRequest, McpListRequest, 
-    McpListRunningRequest, McpRefreshRequest
+from autocoder.common.mcp_tools.server import get_mcp_server
+from autocoder.common.mcp_tools.types import (
+    McpRequest,
 )
 
 from autocoder.common.ignorefiles.ignore_file_utils import should_ignore
@@ -81,6 +73,19 @@ class AutoCommandTools:
         self.llm = llm
         self.result_manager = ResultManager()
         self.printer = Printer()
+        self.args_parser = AutoCoderArgsParser()
+
+    def _get_parsed_safe_zone_tokens(self) -> int:
+        """
+        解析 conversation_prune_safe_zone_tokens 参数，支持多种格式
+
+        Returns:
+            解析后的 token 数量
+        """
+        return self.args_parser.parse_conversation_prune_safe_zone_tokens(
+            self.args.conversation_prune_safe_zone_tokens,
+            self.args.code_model
+        )
 
     def execute_mcp_server(self, query: str) -> str:
         mcp_server = get_mcp_server()
@@ -156,7 +161,7 @@ class AutoCommandTools:
     def response_user(self, response: Union[str, Dict]):
         # 如果是在web模式下，则使用event_manager事件来询问用户
         if isinstance(response, dict):
-            response = json.dumps(response, ensure_ascii=False,indent=4)
+            response = json.dumps(response, ensure_ascii=False, indent=4)
 
         if get_run_context().is_web():
             try:
@@ -202,11 +207,11 @@ class AutoCommandTools:
         })
 
         return response
-    
+
     def output_result(self, response: Union[str, Dict]):
         # 如果是在web模式下，则使用event_manager事件来询问用户
         if isinstance(response, dict):
-            response = json.dumps(response, ensure_ascii=False,indent=4)
+            response = json.dumps(response, ensure_ascii=False, indent=4)
 
         if get_run_context().is_web():
             try:
@@ -400,7 +405,8 @@ class AutoCommandTools:
             if isinstance(file_paths, list):
                 file_path_list = file_paths
             elif isinstance(file_paths, str):
-                file_path_list = [path.strip() for path in file_paths.split(",")]
+                file_path_list = [path.strip()
+                                  for path in file_paths.split(",")]
             else:
                 file_path_list = [str(file_paths)]
 
@@ -422,7 +428,8 @@ class AutoCommandTools:
 
         v = json.dumps(final_result, ensure_ascii=False)
         tokens = count_tokens(v)
-        if tokens > self.args.conversation_prune_safe_zone_tokens/2.0:
+        parsed_safe_zone_tokens = self._get_parsed_safe_zone_tokens()
+        if tokens > parsed_safe_zone_tokens/2.0:
             result = f"The project map is too large to return. (tokens: {tokens}). Try to use another function."
             self.result_manager.add_result(content=result, meta={
                 "action": "get_project_map",
@@ -663,7 +670,7 @@ class AutoCommandTools:
         该工具用于列出指定目录下的所有文件（不包括子目录中的文件）。
         输入参数 path: 要列出文件的目录路径
         返回值是目录下所有文件的列表，以逗号分隔。
-        """        
+        """
         # 处理绝对路径和相对路径
         target_path = path
         if not os.path.isabs(path):
@@ -695,7 +702,7 @@ class AutoCommandTools:
         file_list = []
         for item in os.listdir(target_path):
             item_path = os.path.join(target_path, item)
-            file_list.append(item_path)                
+            file_list.append(item_path)
 
         # 生成以逗号分隔的文件列表
         result = "\n".join(file_list)
@@ -721,7 +728,8 @@ class AutoCommandTools:
         s = pp.get_tree_like_directory_structure()
 
         tokens = count_tokens(s)
-        if tokens > self.args.conversation_prune_safe_zone_tokens / 2.0:
+        parsed_safe_zone_tokens = self._get_parsed_safe_zone_tokens()
+        if tokens > parsed_safe_zone_tokens / 2.0:
             result = f"The project structure is too large to return. (tokens: {tokens}). Try to use another function."
             self.result_manager.add_result(content=result, meta={
                 "action": "get_project_structure",
@@ -749,7 +757,8 @@ class AutoCommandTools:
         matched_files = []
         for root, dirs, files in os.walk(self.args.source_dir):
             # 过滤忽略的目录，避免递归进入
-            dirs[:] = [d for d in dirs if not should_ignore(os.path.join(root, d))]
+            dirs[:] = [d for d in dirs if not should_ignore(
+                os.path.join(root, d))]
             for file in files:
                 file_path = os.path.join(root, file)
                 if should_ignore(file_path):
@@ -758,9 +767,10 @@ class AutoCommandTools:
                     matched_files.append(file_path)
 
         v = ",".join(matched_files)
-        
+
         tokens = count_tokens(v)
-        if tokens > self.args.conversation_prune_safe_zone_tokens / 2.0:
+        parsed_safe_zone_tokens = self._get_parsed_safe_zone_tokens()
+        if tokens > parsed_safe_zone_tokens / 2.0:
             result = f"The result is too large to return. (tokens: {tokens}). Try to use another function or use another keyword to search."
             self.result_manager.add_result(content=result, meta={
                 "action": "find_files_by_name",
@@ -805,31 +815,21 @@ class AutoCommandTools:
         如果结果过多，只返回前10个匹配项。
         搜索不区分大小写。
 
-        默认排除以下目录：['node_modules', '.git', '.venv', 'venv', '__pycache__', 'dist', 'build']
+        使用 ignorefiles 模块进行文件过滤，基于 .autocoderignore 配置文件和默认排除规则。
         """
-        # 需要排除的目录和文件模式
-        excluded_dirs = [
-            'node_modules', '.git', '.venv', 'venv', '__pycache__', 'dist', 'build',
-            '.DS_Store', '.idea', '.vscode', 'tmp', 'temp', 'cache', 'coverage',
-            'htmlcov', '.mypy_cache', '.pytest_cache', '.hypothesis',".auto-coder"
-        ]
-        excluded_file_patterns = [
-            '*.pyc', '*.pyo', '*.pyd', '*.egg-info', '*.log'
-        ]
-
         matched_files = []
 
         for root, dirs, files in os.walk(self.args.source_dir):
-            # 移除需要排除的目录
-            dirs[:] = [d for d in dirs if d not in excluded_dirs]
-
-            # 过滤掉需要排除的文件
-            files[:] = [f for f in files if not any(
-                f.endswith(pattern[1:]) for pattern in excluded_file_patterns
-            )]
+            # 使用 should_ignore 过滤目录
+            dirs[:] = [d for d in dirs if not should_ignore(os.path.join(root, d), self.args.source_dir)]
 
             for file in files:
                 file_path = os.path.join(root, file)
+                
+                # 使用 should_ignore 过滤文件
+                if should_ignore(file_path, self.args.source_dir):
+                    continue
+                
                 try:
                     content = files_utils.read_file(file_path)
                     if keyword.lower() in content.lower():