auto-coder 0.1.392__tar.gz → 0.1.393__tar.gz

{auto_coder-0.1.392 → auto_coder-0.1.393}/PKG-INFO

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

{auto_coder-0.1.392 → auto_coder-0.1.393}/src/auto_coder.egg-info/PKG-INFO

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

{auto_coder-0.1.392 → auto_coder-0.1.393}/src/auto_coder.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ src/autocoder/command_args.py
 src/autocoder/command_parser.py
 src/autocoder/lang.py
 src/autocoder/models.py
+src/autocoder/rags.py
 src/autocoder/run_context.py
 src/autocoder/version.py
 src/autocoder/agent/__init__.py
@@ -167,6 +168,8 @@ src/autocoder/common/ignorefiles/test_ignore_file_utils.py
 src/autocoder/common/mcp_servers/__init__.py
 src/autocoder/common/mcp_servers/mcp_server_gpt4o_mini_search.py
 src/autocoder/common/mcp_servers/mcp_server_perplexity.py
+src/autocoder/common/rag_manager/__init__.py
+src/autocoder/common/rag_manager/rag_manager.py
 src/autocoder/common/rulefiles/__init__.py
 src/autocoder/common/rulefiles/autocoderrules_utils.py
 src/autocoder/common/v2/__init__.py
@@ -204,6 +207,7 @@ src/autocoder/common/v2/agent/agentic_edit_tools/test_execute_command_tool_resol
 src/autocoder/common/v2/agent/agentic_edit_tools/test_search_files_tool_resolver.py
 src/autocoder/common/v2/agent/agentic_edit_tools/test_write_to_file_tool_resolver.py
 src/autocoder/common/v2/agent/agentic_edit_tools/use_mcp_tool_resolver.py
+src/autocoder/common/v2/agent/agentic_edit_tools/use_rag_tool_resolver.py
 src/autocoder/common/v2/agent/agentic_edit_tools/write_to_file_tool_resolver.py
 src/autocoder/compilers/__init__.py
 src/autocoder/compilers/base_compiler.py

{auto_coder-0.1.392 → auto_coder-0.1.393}/src/autocoder/agent/base_agentic/tools/execute_command_tool_resolver.py

@@ -21,15 +21,7 @@ class ExecuteCommandToolResolver(BaseToolResolver):
     def resolve(self) -> ToolResult:
         command = self.tool.command
         requires_approval = self.tool.requires_approval
-        source_dir = self.args.source_dir or "."
-
-        # Basic security check (can be expanded)
-        if ";" in command or "&&" in command or "|" in command or "`" in command:
-             # Allow && for cd chaining, but be cautious
-             if not command.strip().startswith("cd ") and " && " in command:
-                 pass # Allow cd chaining like 'cd subdir && command'
-             else:
-                return ToolResult(success=False, message=f"Command '{command}' contains potentially unsafe characters.")
+        source_dir = self.args.source_dir or "."        
 
         # Approval mechanism (simplified)
         if requires_approval:

{auto_coder-0.1.392 → auto_coder-0.1.393}/src/autocoder/auto_coder_rag.py

@@ -35,6 +35,7 @@ import pkg_resources
 from autocoder.rag.token_counter import TokenCounter
 from autocoder.rag.types import RAGServiceInfo
 from autocoder.version import __version__
+from autocoder.rags import get_rag_config
 
 if platform.system() == "Windows":
     from colorama import init
@@ -169,6 +170,40 @@ def initialize_system(args):
     print_status(get_message("init_complete_final"), "success")
 
 
+def merge_args_with_config(args, config, arg_class, parser):
+    """
+    合并命令行参数和配置文件参数，优先级如下：
+    1. 命令行参数非默认值，以命令行为准
+    2. 命令行参数为默认值，且配置文件有值，以配置文件为准
+    3. 否则用命令行参数
+    """
+    merged = {}
+    for arg in vars(arg_class()):
+        # 获取默认值
+        try:
+            default = parser.get_default(arg)
+        except Exception:
+            default = None
+
+                
+        if not hasattr(args,arg) and arg not in config:            
+            continue
+            
+        cli_value = getattr(args, arg, None)
+        config_value = config.get(arg, None)
+
+        
+        # 判断优先级
+        if cli_value != default:
+            merged[arg] = cli_value
+        elif config_value is not None:
+            merged[arg] = config_value
+        else:
+            merged[arg] = cli_value
+    
+    return arg_class(**merged)
+
+
 def main(input_args: Optional[List[str]] = None):
     print(
         f"""
@@ -297,6 +332,7 @@ def main(input_args: Optional[List[str]] = None):
     serve_parser.add_argument("--source_dir", default=".", help="")
     serve_parser.add_argument("--host", default="", help="")
     serve_parser.add_argument("--port", type=int, default=8000, help="")
+    serve_parser.add_argument("--name", default="", help="RAG服务的名称（可选）")
     serve_parser.add_argument("--workers", type=int, default=4, help="")
     serve_parser.add_argument("--uvicorn_log_level", default="info", help="")
     serve_parser.add_argument("--allow_credentials", action="store_true", help="")
@@ -565,29 +601,40 @@ def main(input_args: Optional[List[str]] = None):
             benchmark_byzerllm(args.model, args.parallel, args.rounds, args.query)
 
     elif args.command == "serve":
-         # Handle lite/pro flags
-        if args.lite:
-            args.product_mode = "lite"
-        elif args.pro:
+        # 如果用户传递了 --name 参数，则加载已保存的配置并与命令行参数合并
+        server_args_config = {}
+        auto_coder_args_config = {}
+        if args.name:
+            saved_config = get_rag_config(args.name)
+            if saved_config:
+                logger.info(f"加载已保存的RAG配置: {args.name}")
+                # 将保存的配置合并到 args 中（命令行参数优先）
+                for key, value in saved_config.items():
+                    # 跳过一些不应该被合并的字段
+                    skip_fields = {'name', 'status', 'created_at', 'updated_at', 'process_id', 'stdout_fd', 'stderr_fd', 'cache_build_task_id'}
+                    if key in skip_fields:
+                        continue 
+                    server_args_config[key] = value
+                # 特殊处理 infer_params 字段
+                if 'infer_params' in saved_config and saved_config['infer_params']:
+                    for infer_key, infer_value in saved_config['infer_params'].items():
+                        auto_coder_args_config[infer_key] = infer_value
+                logger.info(f"配置合并完成，使用文档目录: {getattr(args, 'doc_dir', 'N/A')}")
+            else:
+                logger.warning(f"未找到名为 '{args.name}' 的RAG配置")
+        
+        # Handle lite/pro flags
+        if args.pro:
             args.product_mode = "pro"
-
+        else:
+            args.product_mode = "lite"
+        
         if not args.quick:
             initialize_system(args)
-       
-        server_args = ServerArgs(
-            **{
-                arg: getattr(args, arg)
-                for arg in vars(ServerArgs())
-                if hasattr(args, arg)
-            }
-        )
-        auto_coder_args = AutoCoderArgs(
-            **{
-                arg: getattr(args, arg)
-                for arg in vars(AutoCoderArgs())
-                if hasattr(args, arg)
-            }
-        )
+        
+        # 使用新的合并逻辑
+        server_args = merge_args_with_config(args, server_args_config, ServerArgs, serve_parser)
+        auto_coder_args = merge_args_with_config(args, server_args_config, AutoCoderArgs, serve_parser)
         # 设置本地图床的地址
         if args.enable_local_image_host:
             host = server_args.host or "127.0.0.1"

{auto_coder-0.1.392 → auto_coder-0.1.393}/src/autocoder/common/llm_friendly_package.py

@@ -178,6 +178,41 @@ class LLMFriendlyPackageManager:
         
         return docs
     
+    def get_package_path(self, package_name: str) -> Optional[str]:
+        """
+        Get the full path of a package by its name
+        
+        Args:
+            package_name: Package name (can be just lib_name or username/lib_name)
+            
+        Returns:
+            Full path to the package directory, or None if not found
+        """
+        if not os.path.exists(self.llm_friendly_packages_dir):
+            return None
+        
+        for domain in os.listdir(self.llm_friendly_packages_dir):
+            domain_path = os.path.join(self.llm_friendly_packages_dir, domain)
+            if not os.path.isdir(domain_path):
+                continue
+                
+            for username in os.listdir(domain_path):
+                username_path = os.path.join(domain_path, username)
+                if not os.path.isdir(username_path):
+                    continue
+                    
+                for lib_name in os.listdir(username_path):
+                    lib_path = os.path.join(username_path, lib_name)
+                    if not os.path.isdir(lib_path):
+                        continue
+                    
+                    # Check if this matches the requested package
+                    if (lib_name == package_name or 
+                        package_name == os.path.join(username, lib_name)):
+                        return lib_path
+        
+        return None
+    
     def list_added_libraries(self) -> List[str]:
         """List all added libraries"""
         memory = self._load_memory()
@@ -405,6 +440,4 @@ class LLMFriendlyPackageManager:
         table.add_column("File Path", style="cyan")
         
         for doc in docs:
-            table.add_row(doc)
-        
-        self.console.print(table) 
+            table.add_row(doc) 

auto_coder-0.1.393/src/autocoder/common/rag_manager/__init__.py

@@ -0,0 +1,4 @@
+# flake8: noqa
+from .rag_manager import RAGManager
+
+__all__ = ["RAGManager"] 

auto_coder-0.1.393/src/autocoder/common/rag_manager/rag_manager.py

@@ -0,0 +1,144 @@
+import os
+import json
+from typing import List, Dict, Any, Optional
+from pydantic import BaseModel
+from autocoder.common import AutoCoderArgs
+from loguru import logger
+
+
+class RAGConfig(BaseModel):
+    """RAG 配置项模型"""
+    name: str
+    server_name: str  # 实际的服务器地址，如 http://127.0.0.1:8107/v1
+    api_key: Optional[str] = None
+    description: Optional[str] = None
+
+
+class RAGManager:
+    """RAG 管理器，用于读取和管理 RAG 服务器配置"""
+    
+    def __init__(self, args: AutoCoderArgs):
+        self.args = args
+        self.configs: List[RAGConfig] = []
+        self._load_configs()
+    
+    def _load_configs(self):
+        """加载 RAG 配置，优先从项目配置，然后从全局配置"""
+        # 优先读取项目级别配置
+        project_config_path = os.path.join(
+            self.args.source_dir, 
+            ".auto-coder", 
+            "auto-coder.web", 
+            "rags", 
+            "rags.json"
+        )
+        
+        if os.path.exists(project_config_path):
+            logger.info(f"正在加载项目级别 RAG 配置: {project_config_path}")
+            self._load_project_config(project_config_path)
+        else:
+            logger.info("未找到项目级别 RAG 配置，尝试加载全局配置")
+            # 读取全局配置
+            global_config_path = os.path.expanduser("~/.auto-coder/keys/rags.json")
+            if os.path.exists(global_config_path):
+                logger.info(f"正在加载全局 RAG 配置: {global_config_path}")
+                self._load_global_config(global_config_path)
+            else:
+                logger.warning("未找到任何 RAG 配置文件")
+    
+    def _load_project_config(self, config_path: str):
+        """加载项目级别的 RAG 配置"""
+        try:
+            with open(config_path, 'r', encoding='utf-8') as f:
+                config_data = json.load(f)
+            
+            if "data" in config_data and isinstance(config_data["data"], list):
+                for item in config_data["data"]:
+                    try:
+                        rag_config = RAGConfig(
+                            name=item.get("name", ""),
+                            server_name=item.get("base_url", ""),
+                            api_key=item.get("api_key"),
+                            description=item.get("description")
+                        )
+                        self.configs.append(rag_config)
+                        logger.info(f"已加载 RAG 配置: {rag_config.name} -> {rag_config.server_name}")
+                    except Exception as e:
+                        logger.error(f"解析项目级别 RAG 配置项时出错: {e}, 配置项: {item}")
+            else:
+                logger.error(f"项目级别 RAG 配置格式错误，缺少 'data' 字段或 'data' 不是列表")
+                
+        except json.JSONDecodeError as e:
+            logger.error(f"项目级别 RAG 配置文件 JSON 格式错误: {e}")
+        except Exception as e:
+            logger.error(f"读取项目级别 RAG 配置文件时出错: {e}")
+    
+    def _load_global_config(self, config_path: str):
+        """加载全局级别的 RAG 配置"""
+        try:
+            with open(config_path, 'r', encoding='utf-8') as f:
+                config_data = json.load(f)
+            
+            for key, item in config_data.items():
+                try:
+                    # 构造 server_name: http://host:port/v1
+                    host = item.get("host", "127.0.0.1")
+                    port = item.get("port", 8080)
+                    server_name = f"http://{host}:{port}/v1"
+                    
+                    rag_config = RAGConfig(
+                        name=item.get("name", key),
+                        server_name=server_name,
+                        api_key=None,  # 全局配置中没有 api_key
+                        description=item.get("description", f"{key} RAG 服务")
+                    )
+                    self.configs.append(rag_config)
+                    logger.info(f"已加载 RAG 配置: {rag_config.name} -> {rag_config.server_name}")
+                except Exception as e:
+                    logger.error(f"解析全局 RAG 配置项时出错: {e}, 配置项: {item}")
+                    
+        except json.JSONDecodeError as e:
+            logger.error(f"全局 RAG 配置文件 JSON 格式错误: {e}")
+        except Exception as e:
+            logger.error(f"读取全局 RAG 配置文件时出错: {e}")
+    
+    def get_all_configs(self) -> List[RAGConfig]:
+        """获取所有 RAG 配置"""
+        return self.configs
+    
+    def get_config_by_name(self, name: str) -> Optional[RAGConfig]:
+        """根据名称获取特定的 RAG 配置"""
+        for config in self.configs:
+            if config.name == name:
+                return config
+        return None
+    
+    def get_server_names(self) -> List[str]:
+        """获取所有服务器名称列表"""
+        return [config.server_name for config in self.configs]
+    
+    def get_config_info(self) -> str:
+        """获取格式化的配置信息，用于显示"""
+        if not self.configs:
+            return "未找到可用的 RAG 服务器配置"
+        
+        info_lines = []
+        info_lines.append("可用的 RAG 服务器配置")
+        
+        for i, config in enumerate(self.configs, 1):
+            info_lines.append(f"\n{i}. 配置名称: {config.name}")
+            info_lines.append(f"   服务器地址: {config.server_name}")
+            
+            if config.description:
+                info_lines.append(f"   描述信息: {config.description}")
+            else:
+                info_lines.append(f"   描述信息: 无")                           
+                
+            if i < len(self.configs):
+                info_lines.append("-" * 30)
+                
+        return "\n".join(info_lines)
+    
+    def has_configs(self) -> bool:
+        """检查是否有可用的配置"""
+        return len(self.configs) > 0 

{auto_coder-0.1.392 → auto_coder-0.1.393}/src/autocoder/common/v2/agent/agentic_edit.py

@@ -10,6 +10,10 @@ from rich.panel import Panel
 from pydantic import SkipValidation
 from byzerllm.utils.types import SingleOutputMeta
 
+from byzerllm.utils import (        
+    format_str_jinja2
+)
+
 from autocoder.common import AutoCoderArgs, git_utils, SourceCodeList, SourceCode
 from autocoder.common.global_cancel import global_cancel
 from autocoder.common import detect_env
@@ -56,7 +60,7 @@ from autocoder.common.v2.agent.agentic_edit_tools import (  # Import specific re
     ReplaceInFileToolResolver, SearchFilesToolResolver, ListFilesToolResolver,
     ListCodeDefinitionNamesToolResolver, AskFollowupQuestionToolResolver,
     AttemptCompletionToolResolver, PlanModeRespondToolResolver, UseMcpToolResolver,
-    ListPackageInfoToolResolver
+    UseRAGToolResolver, ListPackageInfoToolResolver
 )
 from autocoder.common.llm_friendly_package import LLMFriendlyPackageManager
 from autocoder.common.rulefiles.autocoderrules_utils import get_rules,auto_select_rules,get_required_and_index_rules
@@ -69,7 +73,7 @@ from autocoder.common.v2.agent.agentic_edit_types import (AgenticEditRequest, To
                                                           ListFilesTool,
                                                           ListCodeDefinitionNamesTool, AskFollowupQuestionTool,
                                                           AttemptCompletionTool, PlanModeRespondTool, UseMcpTool,
-                                                          ListPackageInfoTool,
+                                                          UseRAGTool, ListPackageInfoTool,
                                                           TOOL_MODEL_MAP,
                                                           # Event Types
                                                           LLMOutputEvent, LLMThinkingEvent, ToolCallEvent,
@@ -80,7 +84,7 @@ from autocoder.common.v2.agent.agentic_edit_types import (AgenticEditRequest, To
                                                           ListFilesTool, SearchFilesTool, ListCodeDefinitionNamesTool,
                                                           AskFollowupQuestionTool, UseMcpTool, AttemptCompletionTool
                                                           )
-
+from autocoder.common.rag_manager import RAGManager
 from autocoder.rag.token_counter import count_tokens
 
 # Map Pydantic Tool Models to their Resolver Classes
@@ -96,7 +100,8 @@ TOOL_RESOLVER_MAP: Dict[Type[BaseTool], Type[BaseToolResolver]] = {
     AskFollowupQuestionTool: AskFollowupQuestionToolResolver,
     AttemptCompletionTool: AttemptCompletionToolResolver,  # Will stop the loop anyway
     PlanModeRespondTool: PlanModeRespondToolResolver,
-    UseMcpTool: UseMcpToolResolver
+    UseMcpTool: UseMcpToolResolver,
+    UseRAGTool: UseRAGToolResolver
 }
 
 
@@ -161,12 +166,25 @@ class AgenticEdit:
         except Exception as e:
             logger.error(f"Error getting MCP server info: {str(e)}")
 
+        # 初始化 RAG 管理器并获取服务器信息
+        self.rag_server_info = ""
+        try:
+            self.rag_manager = RAGManager(args)
+            if self.rag_manager.has_configs():
+                self.rag_server_info = self.rag_manager.get_config_info()
+                logger.info(f"RAG manager initialized with {len(self.rag_manager.get_all_configs())} configurations")
+            else:
+                logger.info("No RAG configurations found")
+        except Exception as e:
+            logger.error(f"Error initializing RAG manager: {str(e)}")
+            self.rag_manager = None
+
         # 变更跟踪信息
         # 格式: { file_path: FileChangeEntry(...) }
         self.file_changes: Dict[str, FileChangeEntry] = {}
 
     @byzerllm.prompt()
-    def generate_library_docs_prompt(self, libraries: List[str], docs_content: str) -> Dict[str, Any]:
+    def generate_library_docs_prompt(self, libraries_with_paths: List[Dict[str, str]], docs_content: str) -> Dict[str, Any]:
         """
         ====
 
@@ -187,8 +205,15 @@ class AgenticEdit:
         4. You need to understand the API or usage patterns of these libraries
         ====
         """
+        # 格式化库列表，包含名称和路径
+        libraries_list = []
+        for lib_info in libraries_with_paths:
+            name = lib_info.get('name', '')
+            path = lib_info.get('path', 'Path not found')
+            libraries_list.append(f"{name} (路径: {path})")
+        
         return {
-            "libraries_list": ", ".join(libraries),
+            "libraries_list": ", ".join(libraries_list),
             "combined_docs": docs_content
         }
 
@@ -442,6 +467,22 @@ class AgenticEdit:
         {{mcp_server_info}}
         {%endif%}
 
+        ## rag_tool
+        Description: Request to query the RAG server for information. Use this when you need to query the RAG server for information.
+        Parameters:
+        - server_name: (required) The url of the RAG server to use.
+        - query: (required) The query to pass to the tool.
+        Usage:
+        <use_rag_tool>
+        <server_name>xxx</server_name>
+        <query>Your query here</query>
+        </use_rag_tool>
+
+        {%if rag_server_info %}
+        ### RAG_SERVER_LIST
+        {{rag_server_info}}
+        {%endif%}
+
         # Tool Use Examples
 
         ## Example 1: Requesting to execute a command
@@ -688,6 +729,7 @@ class AgenticEdit:
         - It is critical you wait for the user's response after each tool use, in order to confirm the success of the tool use. For example, if asked to make a todo app, you would create a file, wait for the user's response it was created successfully, then create another file if needed, wait for the user's response it was created successfully, etc.        
         - To display LaTeX formulas, use a single dollar sign to wrap inline formulas, like `$E=mc^2$`, and double dollar signs to wrap block-level formulas, like `$$\frac{d}{dx}e^x = e^x$$`.
         - To include flowcharts or diagrams, you can use Mermaid syntax.
+        - If you come across some unknown or unfamiliar concepts or terms, or if the user is asking a question, you can try using appropriate MCP or RAG services to obtain the information.
 
         
         {% if extra_docs %}  
@@ -769,6 +811,7 @@ class AgenticEdit:
             "home_dir": os.path.expanduser("~"),
             "files": self.files.to_str(),
             "mcp_server_info": self.mcp_server_info,
+            "rag_server_info": self.rag_server_info,
             "enable_active_context_in_generate": self.args.enable_active_context_in_generate,
             "extra_docs": extra_docs,
             "file_paths_str": file_paths_str,
@@ -842,6 +885,15 @@ class AgenticEdit:
             added_libraries = package_manager.list_added_libraries()
             
             if added_libraries:
+                # Build libraries with paths information
+                libraries_with_paths = []
+                for lib_name in added_libraries:
+                    lib_path = package_manager.get_package_path(lib_name)
+                    libraries_with_paths.append({
+                        'name': lib_name,
+                        'path': lib_path if lib_path else 'Path not found'
+                    })
+                
                 # Get documentation content for all added libraries
                 docs_content = package_manager.get_docs(return_paths=False)
                 
@@ -851,9 +903,9 @@ class AgenticEdit:
                     
                     # Generate library documentation prompt using decorator
                     library_docs_prompt = self.generate_library_docs_prompt.prompt(
-                        libraries=added_libraries,
+                        libraries_with_paths=libraries_with_paths,
                         docs_content=combined_docs
-                    )
+                    )                    
                     
                     conversations.append({
                         "role": "user", 

{auto_coder-0.1.392 → auto_coder-0.1.393}/src/autocoder/common/v2/agent/agentic_edit_tools/__init__.py

@@ -11,6 +11,7 @@ from .ask_followup_question_tool_resolver import AskFollowupQuestionToolResolver
 from .attempt_completion_tool_resolver import AttemptCompletionToolResolver
 from .plan_mode_respond_tool_resolver import PlanModeRespondToolResolver
 from .use_mcp_tool_resolver import UseMcpToolResolver
+from .use_rag_tool_resolver import UseRAGToolResolver
 from .list_package_info_tool_resolver import ListPackageInfoToolResolver
 
 __all__ = [
@@ -26,5 +27,6 @@ __all__ = [
     "AttemptCompletionToolResolver",
     "PlanModeRespondToolResolver",
     "UseMcpToolResolver",
+    "UseRAGToolResolver",
     "ListPackageInfoToolResolver",
 ]

auto_coder-0.1.393/src/autocoder/common/v2/agent/agentic_edit_tools/use_rag_tool_resolver.py

@@ -0,0 +1,91 @@
+from typing import Dict, Any, Optional
+import typing
+import openai
+from autocoder.common import AutoCoderArgs
+from autocoder.common.v2.agent.agentic_edit_tools.base_tool_resolver import BaseToolResolver
+from autocoder.common.v2.agent.agentic_edit_types import UseRAGTool, ToolResult
+from autocoder.common.rag_manager import RAGManager
+from loguru import logger
+
+if typing.TYPE_CHECKING:
+    from autocoder.common.v2.agent.agentic_edit import AgenticEdit
+
+
+class UseRAGToolResolver(BaseToolResolver):
+    def __init__(self, agent: Optional['AgenticEdit'], tool: UseRAGTool, args: AutoCoderArgs):
+        super().__init__(agent, tool, args)
+        self.tool: UseRAGTool = tool  # For type hinting
+        self.rag_manager = RAGManager(args)
+
+    def resolve(self) -> ToolResult:
+        """
+        通过 OpenAI SDK 访问 RAG server 来执行查询。
+        """
+        server_name = self.tool.server_name
+        query = self.tool.query
+
+        logger.info(f"正在解析 UseRAGTool: Server='{server_name}', Query='{query}'")
+
+        # 检查是否有可用的 RAG 配置
+        if not self.rag_manager.has_configs():
+            error_msg = "未找到可用的 RAG 服务器配置，请确保配置文件存在并格式正确"
+            logger.error(error_msg)
+            return ToolResult(success=False, message=error_msg)
+
+        try:
+            # 查找指定的 RAG 配置
+            rag_config = None
+            if server_name:
+                # 尝试通过名称查找
+                rag_config = self.rag_manager.get_config_by_name(server_name)
+                # 如果按名称找不到，尝试直接使用 server_name 作为 URL
+                if not rag_config:
+                    # 检查是否是直接的 URL
+                    if server_name.startswith('http'):
+                        # 使用提供的 server_name 作为 base_url
+                        base_url = server_name
+                        api_key = "dummy-key"
+                    else:
+                        error_msg = f"未找到名为 '{server_name}' 的 RAG 服务器配置\n\n{self.rag_manager.get_config_info()}"
+                        logger.error(error_msg)
+                        return ToolResult(success=False, message=error_msg)
+                else:
+                    base_url = rag_config.server_name
+                    api_key = rag_config.api_key or "dummy-key"
+            else:
+                # 如果没有指定 server_name，使用第一个可用的配置
+                rag_config = self.rag_manager.get_all_configs()[0]
+                base_url = rag_config.server_name
+                api_key = rag_config.api_key or "dummy-key"
+                logger.info(f"未指定服务器名称，使用默认配置: {rag_config.name}")
+
+            logger.info(f"使用 RAG 服务器: {base_url}")
+            
+            # 使用 OpenAI SDK 访问 RAG server
+            client = openai.OpenAI(
+                base_url=base_url,
+                api_key=api_key
+            )
+            
+            response = client.chat.completions.create(
+                model="default",
+                messages=[
+                    {
+                        "role": "user",
+                        "content": query
+                    }
+                ],
+                max_tokens=8024
+            )
+            
+            result_content = response.choices[0].message.content
+            logger.info(f"RAG server 响应成功，内容长度: {len(result_content)}")
+            
+            return ToolResult(success=True, message=result_content)
+            
+        except Exception as e:
+            error_msg = f"访问 RAG server 时出错: {str(e)}"
+            if not self.rag_manager.has_configs():
+                error_msg += f"\n\n{self.rag_manager.get_config_info()}"
+            logger.error(error_msg)
+            return ToolResult(success=False, message=error_msg) 

{auto_coder-0.1.392 → auto_coder-0.1.393}/src/autocoder/common/v2/agent/agentic_edit_types.py

@@ -56,6 +56,10 @@ class UseMcpTool(BaseTool):
     tool_name: str
     query:str
 
+class UseRAGTool(BaseTool):
+    server_name: str
+    query: str
+
 class ListPackageInfoTool(BaseTool):
     path: str  # 源码包目录，相对路径或绝对路径
 
@@ -118,6 +122,7 @@ TOOL_MODEL_MAP: Dict[str, Type[BaseTool]] = {
     "attempt_completion": AttemptCompletionTool,
     "plan_mode_respond": PlanModeRespondTool,
     "use_mcp_tool": UseMcpTool,
+    "use_rag_tool": UseRAGTool,
     "list_package_info": ListPackageInfoTool,    
 }