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

autocoder/common/{mcp_server_types.py → mcp_tools/types.py}

@@ -1,3 +1,10 @@
+"""
+MCP Tools Types Module
+
+This module contains all the type definitions used in the MCP tools system,
+including request/response models, server configurations, and result types.
+"""
+
 from typing import List, Dict, Any, Optional, Union
 from pydantic import BaseModel, Field
 
@@ -13,39 +20,78 @@ class MarketplaceMCPServerItem(BaseModel):
     env: Dict[str, str] = Field(default_factory=dict)
     url: str = ""  # sse url
     
+
 class McpRequest(BaseModel):
+    """Base request for MCP operations"""
     query: str
     model: Optional[str] = None
     product_mode: Optional[str] = None
 
 
 class McpInstallRequest(BaseModel):
+    """Request to install an MCP server"""
     server_name_or_config: Optional[str] = None
-    market_install_item:Optional[MarketplaceMCPServerItem] = None
+    market_install_item: Optional[MarketplaceMCPServerItem] = None
 
 
 class McpRemoveRequest(BaseModel):
+    """Request to remove an MCP server"""
     server_name: str
 
 
 class McpListRequest(BaseModel):
     """Request to list all builtin MCP servers"""
-    path:str="/list"
+    path: str = "/list"
 
 
 class McpListRunningRequest(BaseModel):
     """Request to list all running MCP servers"""
-    path:str="/list/running"
+    path: str = "/list/running"
+
+
+class McpRefreshRequest(BaseModel):
+    """Request to refresh MCP server connections"""
+    name: Optional[str] = None
+
+
+class McpServerInfoRequest(BaseModel):
+    """Request to get MCP server info"""
+    model: Optional[str] = None
+    product_mode: Optional[str] = None
+
+
+class MarketplaceAddRequest(BaseModel):
+    """Request to add a new marketplace item"""
+    name: str
+    description: Optional[str] = ""
+    mcp_type: str = "command"  # command/sse
+    command: Optional[str] = ""  # npm/uvx/python/node/...
+    args: Optional[List[str]] = Field(default_factory=list)
+    env: Optional[Dict[str, str]] = Field(default_factory=dict)
+    url: Optional[str] = ""  # sse url
+
 
+class MarketplaceUpdateRequest(BaseModel):
+    """Request to update an existing marketplace item"""
+    name: str
+    description: Optional[str] = ""
+    mcp_type: str = "command"  # command/sse
+    command: Optional[str] = ""  # npm/uvx/python/node/...
+    args: Optional[List[str]] = Field(default_factory=list)
+    env: Optional[Dict[str, str]] = Field(default_factory=dict)
+    url: Optional[str] = ""  # sse url
 
-# Pydantic models for raw_result
+
+# Result types
 class ServerConfig(BaseModel):
+    """Server configuration"""
     command: str
     args: List[str] = Field(default_factory=list)
     env: Dict[str, str] = Field(default_factory=dict)
 
 
 class InstallResult(BaseModel):
+    """Result of server installation"""
     success: bool
     server_name: Optional[str] = None
     config: Optional[ServerConfig] = None
@@ -53,67 +99,75 @@ class InstallResult(BaseModel):
 
 
 class RemoveResult(BaseModel):
+    """Result of server removal"""
     success: bool
     server_name: Optional[str] = None
     error: Optional[str] = None
 
 
 class ExternalServerInfo(BaseModel):
+    """External server information"""
     name: str
     description: str
 
 
-
-
-
 class ListResult(BaseModel):
-    builtin_servers: List[MarketplaceMCPServerItem] = Field(
-        default_factory=list)
-    external_servers: List[MarketplaceMCPServerItem] = Field(
-        default_factory=list)
-    marketplace_items: List[MarketplaceMCPServerItem] = Field(
-        default_factory=list)
+    """Result of server listing"""
+    builtin_servers: List[MarketplaceMCPServerItem] = Field(default_factory=list)
+    external_servers: List[MarketplaceMCPServerItem] = Field(default_factory=list)
+    marketplace_items: List[MarketplaceMCPServerItem] = Field(default_factory=list)
     error: Optional[str] = None
 
 
 class ServerInfo(BaseModel):
+    """Server information"""
     name: str
 
 
 class ListRunningResult(BaseModel):
+    """Result of running servers listing"""
     servers: List[ServerInfo] = Field(default_factory=list)
     error: Optional[str] = None
 
 
 class RefreshResult(BaseModel):
+    """Result of server refresh"""
     success: bool
     name: Optional[str] = None
     error: Optional[str] = None
 
 
 class QueryResult(BaseModel):
+    """Result of MCP query"""
     success: bool
     results: Optional[List[Any]] = None
     error: Optional[str] = None
 
 
 class ErrorResult(BaseModel):
+    """Error result"""
     success: bool = False
     error: str
 
+
 class StringResult(BaseModel):
+    """String result"""
     success: bool = True
     result: str
 
-class McpRefreshRequest(BaseModel):
-    """Request to refresh MCP server connections"""
-    name: Optional[str] = None
+
+class MarketplaceAddResult(BaseModel):
+    """Result for marketplace add operation"""
+    success: bool
+    name: str
+    error: Optional[str] = None
 
 
-class McpServerInfoRequest(BaseModel):
-    """Request to get MCP server info"""
-    model: Optional[str] = None
-    product_mode: Optional[str] = None
+class MarketplaceUpdateResult(BaseModel):
+    """Result for marketplace update operation"""
+    success: bool
+    name: str
+    error: Optional[str] = None
 
 
 class McpExternalServer(BaseModel):
@@ -127,43 +181,62 @@ class McpExternalServer(BaseModel):
     runtime: str
 
 
-class MarketplaceAddRequest(BaseModel):
-    """Request to add a new marketplace item"""
+class McpResponse(BaseModel):
+    """MCP response containing result and optional error"""
+    result: str
+    error: Optional[str] = None
+    raw_result: Optional[Union[
+        InstallResult, MarketplaceAddResult, MarketplaceUpdateResult, 
+        RemoveResult, ListResult, ListRunningResult, RefreshResult, 
+        QueryResult, ErrorResult, StringResult
+    ]] = None
+
+
+# Tool and resource access types
+class McpTool(BaseModel):
+    """Represents an MCP tool configuration"""
     name: str
-    description: Optional[str] = ""
-    mcp_type: str = "command"  # command/sse
-    command: Optional[str] = ""  # npm/uvx/python/node/...
-    args: Optional[List[str]] = Field(default_factory=list)
-    env: Optional[Dict[str, str]] = Field(default_factory=dict)
-    url: Optional[str] = ""  # sse url
+    description: Optional[str] = None
+    input_schema: dict = Field(default_factory=dict)
 
 
-class MarketplaceAddResult(BaseModel):
-    """Result for marketplace add operation"""
-    success: bool
+class McpResource(BaseModel):
+    """Represents an MCP resource configuration"""
+    uri: str
     name: str
-    error: Optional[str] = None
+    description: Optional[str] = None
+    mime_type: Optional[str] = None
 
 
-class MarketplaceUpdateRequest(BaseModel):
-    """Request to update an existing marketplace item"""
+class McpResourceTemplate(BaseModel):
+    """Represents an MCP resource template"""
+    uri_template: str
     name: str
-    description: Optional[str] = ""
-    mcp_type: str = "command"  # command/sse
-    command: Optional[str] = ""  # npm/uvx/python/node/...
-    args: Optional[List[str]] = Field(default_factory=list)
-    env: Optional[Dict[str, str]] = Field(default_factory=dict)
-    url: Optional[str] = ""  # sse url
+    description: Optional[str] = None
+    mime_type: Optional[str] = None
 
 
-class MarketplaceUpdateResult(BaseModel):
-    """Result for marketplace update operation"""
-    success: bool
+class McpServer(BaseModel):
+    """Represents an MCP server configuration and status"""
     name: str
+    config: str  # JSON string of server config
+    status: str = "disconnected"  # connected, disconnected, connecting
     error: Optional[str] = None
+    tools: List[McpTool] = Field(default_factory=list)
+    resources: List[McpResource] = Field(default_factory=list)
+    resource_templates: List[McpResourceTemplate] = Field(default_factory=list)
 
-class McpResponse(BaseModel):
-    result: str
-    error: Optional[str] = None
-    raw_result: Optional[Union[InstallResult, MarketplaceAddResult, MarketplaceUpdateResult, RemoveResult,
-                               ListResult, ListRunningResult, RefreshResult, QueryResult, ErrorResult,StringResult]] = None
+
+class McpToolCall(BaseModel):
+    """Represents an MCP tool call"""
+    server_name: str = Field(..., description="The name of the MCP server")
+    tool_name: str = Field(..., description="The name of the tool to call")
+    arguments: Dict[str, Any] = Field(
+        default_factory=dict, description="The arguments to pass to the tool"
+    )
+
+
+class McpResourceAccess(BaseModel):
+    """Represents an MCP resource access"""
+    server_name: str = Field(..., description="The name of the MCP server")
+    uri: str = Field(..., description="The URI of the resource to access") 

autocoder/common/mcp_tools/verify_functionality.py

@@ -0,0 +1,202 @@
+#!/usr/bin/env python3
+"""
+功能验证脚本 - 验证MCP工具模块的核心功能
+"""
+
+import sys
+import traceback
+from pathlib import Path
+import tempfile
+import json
+
+def test_basic_imports():
+    """测试基本导入功能"""
+    print("1. 测试基本导入...")
+    try:
+        from autocoder.common.mcp_tools import (
+            McpHub, McpExecutor, McpServerInstaller, McpServer,
+            get_mcp_server, McpRequest, McpResponse, MarketplaceMCPServerItem
+        )
+        print("   ✓ 所有主要类都可以正常导入")
+        return True
+    except Exception as e:
+        print(f"   ✗ 导入失败: {e}")
+        traceback.print_exc()
+        return False
+
+def test_type_creation():
+    """测试类型创建功能"""
+    print("2. 测试类型创建...")
+    try:
+        from autocoder.common.mcp_tools.types import (
+            McpRequest, McpInstallRequest, MarketplaceMCPServerItem,
+            McpToolCall, McpResourceAccess
+        )
+        
+        # 测试McpRequest
+        request = McpRequest(query="test query")
+        assert request.query == "test query"
+        
+        # 测试MarketplaceMCPServerItem
+        item = MarketplaceMCPServerItem(
+            name="test-server",
+            description="Test server",
+            command="python"
+        )
+        assert item.name == "test-server"
+        
+        # 测试McpToolCall
+        tool_call = McpToolCall(
+            server_name="test-server",
+            tool_name="test-tool",
+            arguments={"param1": "value1"}
+        )
+        assert tool_call.server_name == "test-server"
+        
+        print("   ✓ 所有类型可以正常创建")
+        return True
+    except Exception as e:
+        print(f"   ✗ 类型创建失败: {e}")
+        traceback.print_exc()
+        return False
+
+def test_hub_functionality():
+    """测试Hub功能"""
+    print("3. 测试Hub功能...")
+    try:
+        from autocoder.common.mcp_tools import McpHub
+        
+        # 测试文件创建
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            settings_path = Path(tmp_dir) / "test_settings.json"
+            marketplace_path = Path(tmp_dir) / "test_marketplace.json"
+            
+            hub = McpHub(
+                settings_path=str(settings_path),
+                marketplace_path=str(marketplace_path)
+            )
+            
+            # 验证文件创建
+            assert settings_path.exists(), "Settings file not created"
+            assert marketplace_path.exists(), "Marketplace file not created"
+            
+            # 验证文件内容
+            with open(settings_path) as f:
+                settings_data = json.load(f)
+                assert "mcpServers" in settings_data
+            
+            with open(marketplace_path) as f:
+                marketplace_data = json.load(f)
+                assert "mcpServers" in marketplace_data
+            
+            print("   ✓ Hub功能正常工作")
+            return True
+    except Exception as e:
+        print(f"   ✗ Hub功能测试失败: {e}")
+        traceback.print_exc()
+        return False
+
+def test_server_templates():
+    """测试服务器模板功能"""
+    print("4. 测试服务器模板...")
+    try:
+        from autocoder.common.mcp_tools import McpHub
+        
+        templates = McpHub.get_server_templates()
+        assert isinstance(templates, dict)
+        
+        print(f"   ✓ 服务器模板获取成功，共有 {len(templates)} 个模板")
+        return True
+    except Exception as e:
+        print(f"   ✗ 服务器模板测试失败: {e}")
+        traceback.print_exc()
+        return False
+
+def test_server_singleton():
+    """测试服务器单例模式"""
+    print("5. 测试服务器单例...")
+    try:
+        from autocoder.common.mcp_tools import get_mcp_server
+        
+        server1 = get_mcp_server()
+        server2 = get_mcp_server()
+        
+        assert server1 is server2, "服务器不是单例"
+        
+        print("   ✓ 服务器单例模式正常工作")
+        return True
+    except Exception as e:
+        print(f"   ✗ 服务器单例测试失败: {e}")
+        traceback.print_exc()
+        return False
+
+def test_installer_functionality():
+    """测试安装器功能"""
+    print("6. 测试安装器功能...")
+    try:
+        from autocoder.common.mcp_tools import McpServerInstaller
+        
+        installer = McpServerInstaller()
+        
+        # 测试字典合并
+        dict1 = {"a": 1, "b": {"c": 2}}
+        dict2 = {"b": {"d": 3}, "e": 4}
+        result = installer.deep_merge_dicts(dict1, dict2)
+        expected = {"a": 1, "b": {"c": 2, "d": 3}, "e": 4}
+        assert result == expected, f"字典合并失败: {result} != {expected}"
+        
+        # 测试命令行参数解析
+        args = "--name test-server --command python --args -m test"
+        name, config = installer.parse_command_line_args(args)
+        assert name == "test-server"
+        assert config["command"] == "python"
+        assert config["args"] == ["-m", "test"]
+        
+        print("   ✓ 安装器功能正常工作")
+        return True
+    except Exception as e:
+        print(f"   ✗ 安装器功能测试失败: {e}")
+        traceback.print_exc()
+        return False
+
+def main():
+    """主函数"""
+    print("=== MCP工具模块功能验证 ===\n")
+    
+    tests = [
+        test_basic_imports,
+        test_type_creation,
+        test_hub_functionality,
+        test_server_templates,
+        test_server_singleton,
+        test_installer_functionality
+    ]
+    
+    passed = 0
+    failed = 0
+    
+    for test in tests:
+        try:
+            if test():
+                passed += 1
+            else:
+                failed += 1
+        except Exception as e:
+            print(f"   ✗ 测试执行失败: {e}")
+            failed += 1
+        print()
+    
+    print(f"=== 测试结果 ===")
+    print(f"通过: {passed}")
+    print(f"失败: {failed}")
+    print(f"总计: {passed + failed}")
+    
+    if failed == 0:
+        print("\n🎉 所有功能测试通过！MCP工具模块迁移成功！")
+        return 0
+    else:
+        print(f"\n❌ {failed} 个测试失败，需要进一步调试")
+        return 1
+
+if __name__ == "__main__":
+    sys.exit(main()) 

autocoder/common/model_speed_tester.py

@@ -5,10 +5,10 @@ from rich.console import Console
 from rich.table import Table
 from rich.panel import Panel
 from autocoder.common.printer import Printer
-from autocoder import models as models_module
+from autocoder.common.llms import LLMManager
 from autocoder.utils.llms import get_single_llm
 import byzerllm
-import pkg_resources
+import importlib.resources as resources
 from concurrent.futures import ThreadPoolExecutor
 from typing import Dict, List, Tuple
 from pydantic import BaseModel
@@ -29,9 +29,7 @@ class SpeedTestResults(BaseModel):
 
 byzerllm_content = ""
 try:
-    byzerllm_conten_path = pkg_resources.resource_filename(
-        "autocoder", "data/byzerllm.md"
-    )
+    byzerllm_conten_path = str(resources.files("autocoder") / "data" / "byzerllm.md")
     with open(byzerllm_conten_path, "r",encoding="utf-8") as f:
         byzerllm_content = f.read()
 except FileNotFoundError:
@@ -51,23 +49,20 @@ def long_context_prompt() -> str:
     我想开发一个翻译程序，使用prompt 函数实现。
     </query>
     '''
-    return {
-        "content": byzerllm_content
-    }
+    return ""
 
 @byzerllm.prompt()
 def short_context_prompt() -> str:
     '''
     Hello, can you help me test the response speed?
     '''
-    return {}
+    return ""
 
 def test_model_speed(model_name: str, 
                     product_mode: str, 
                     test_rounds: int = 3,
                     enable_long_context: bool = False
                     ) -> Dict[str, Any]:
-    from autocoder.models import get_model_by_name
     """
     测试单个模型的速度
     
@@ -87,7 +82,14 @@ def test_model_speed(model_name: str,
     """
     try:
         llm = get_single_llm(model_name, product_mode)
-        model_info = get_model_by_name(model_name)
+        if llm is None:
+            raise ValueError(f"无法创建模型 {model_name} 的 LLM 实例")
+        
+        # 使用新的 LLMManager 获取模型信息
+        llm_manager = LLMManager()
+        model_info = llm_manager.get_model(model_name)
+        if not model_info:
+            raise ValueError(f"模型 {model_name} 不存在")
 
         times = []
         first_token_times = []
@@ -98,12 +100,12 @@ def test_model_speed(model_name: str,
         input_tokens_costs = []
         generated_tokens_costs = []
 
-        input_tokens_cost_per_m = model_info.get("input_price", 0.0) / 1000000
-        output_tokens_cost_per_m = model_info.get("output_price", 0.0) / 1000000
+        input_tokens_cost_per_m = model_info.input_price / 1000000
+        output_tokens_cost_per_m = model_info.output_price / 1000000
 
         test_query = short_context_prompt.prompt()
         if enable_long_context:
-            test_query = long_context_prompt.prompt()                
+            test_query = long_context_prompt.prompt(content=byzerllm_content)                
         
         content = ""
         for _ in range(test_rounds):
@@ -201,15 +203,16 @@ def run_speed_test(product_mode: str, test_rounds: int = 3, max_workers: Optiona
     Returns:
         SpeedTestResults: 包含所有模型测试结果的pydantic模型
     """
-    # 获取所有模型
-    models_data = models_module.load_models()
-    active_models = [m for m in models_data if "api_key" in m] if product_mode == "lite" else models_data
+    # 使用新的 LLMManager 获取模型
+    llm_manager = LLMManager()
+    models_data = list(llm_manager.get_all_models().values())
+    active_models = [m for m in models_data if m.has_api_key] if product_mode == "lite" else models_data
     
     if not active_models:
         return SpeedTestResults(results=[])
     
     # 准备测试参数
-    test_args = [(model["name"], product_mode, test_rounds, enable_long_context) for model in active_models]
+    test_args = [(model.name, product_mode, test_rounds, enable_long_context) for model in active_models]
     
     # 存储结果用于排序
     results_list = []
@@ -243,8 +246,10 @@ def run_speed_test(product_mode: str, test_rounds: int = 3, max_workers: Optiona
                         )
                     ))
                     try:
-                        # 更新模型的平均速度
-                        models_module.update_model_speed(model_name, results['tokens_per_second'])
+                        # 使用新的 LLMManager 更新模型速度
+                        # 注意：新的 LLMManager 中没有 update_model_speed 方法
+                        # 我们需要通过 update_model 方法来更新
+                        llm_manager.update_model(model_name, {"average_speed": results['tokens_per_second']})
                     except Exception:
                         pass
                 else:                    
@@ -295,9 +300,10 @@ def render_speed_test_in_terminal(product_mode: str, test_rounds: int = 3, max_w
     printer = Printer()
     console = Console()
     
-    # 获取所有模型
-    models_data = models_module.load_models()
-    active_models = [m for m in models_data if "api_key" in m] if product_mode == "lite" else models_data
+    # 使用新的 LLMManager 获取模型
+    llm_manager = LLMManager()
+    models_data = list(llm_manager.get_all_models().values())
+    active_models = [m for m in models_data if m.has_api_key] if product_mode == "lite" else models_data
     
     if not active_models:
         printer.print_in_terminal("models_no_active", style="yellow")
@@ -321,7 +327,7 @@ def render_speed_test_in_terminal(product_mode: str, test_rounds: int = 3, max_w
     table.add_column("Status", style="red", width=20)
     
     # 准备测试参数
-    test_args = [(model["name"], product_mode, test_rounds, enable_long_context) for model in active_models]
+    test_args = [(model.name, product_mode, test_rounds, enable_long_context) for model in active_models]
     
     # 存储结果用于排序
     results_list = []
@@ -355,8 +361,8 @@ def render_speed_test_in_terminal(product_mode: str, test_rounds: int = 3, max_w
                         results
                     ))                  
                     try:  
-                        # 更新模型的平均速度
-                        models_module.update_model_speed(model_name, results['tokens_per_second'])
+                        # 使用新的 LLMManager 更新模型速度
+                        llm_manager.update_model(model_name, {"average_speed": results['tokens_per_second']})
                     except Exception as e:
                         pass
                 else: