feat: add search_mcp_servers tool with related demo and tests

Author: pengqun

.vscode/tasks.json

@@ -36,7 +36,7 @@
       "problemMatcher": []
     },
     {
-      "label": "uv run python demo.py",
+      "label": "uv run python demo.py --full",
       "detail": "Run demo.py",
       "type": "shell",
       "command": "uv",

README.md

@@ -11,10 +11,10 @@ A Model Context Protocol (MCP) server that integrates with [ModelScope](https://
 
 - 🔐 **User Authentication** - Retrieve information about the currently authenticated ModelScope user
 - 🎨 **AI Image Generation** - Generate images from text prompts or transform existing images using AIGC models (supports both text-to-image and image-to-image generation)
-- 🔍 **Model Search** - Search for machine learning models on ModelScope with advanced filtering options (task type, author, inference support, etc.)
-- 📚 **Research Paper Search** - Search for arXiv papers indexed in ModelScope with comprehensive metadata
+- 🔍 **Resource Discovery** - Search and discover ModelScope resources including machine learning models, research papers, and MCP servers with advanced filtering options
+- 📋 **Resource Details** _(Coming Soon)_ - Get comprehensive details for specific resources including model specifications, paper abstracts, and MCP server configurations
 - 📖 **Documentation Search** _(Coming Soon)_ - Semantic search for ModelScope documentation and articles
-- 🚀 **Gradio API Integration** _(Coming Soon)_ - Invoke Gradio APIs exposed by any pre-configured ModelScope studio
+- 🚀 **Gradio API Integration** _(Coming Soon)_ - Invoke Gradio APIs exposed by any pre-configured ModelScope studio (AI app)
 
 ## 🚀 Quick Start
 

demo.py

@@ -95,9 +95,41 @@ async def demo_search_papers(client: Client) -> None:
     print()
 
 
+async def demo_search_mcp_servers(client: Client) -> None:
+    """Demo: Search MCP servers using various parameters."""
+    print("4. 🛠️ Tool: search_mcp_servers")
+    print(
+        "   • Task: 🔍 Search MCP servers (keyword='Chrome', category='browser-automation', limit 3 results)"
+    )
+
+    result = await client.call_tool(
+        "search_mcp_servers",
+        {
+            "search": "Chrome",
+            "category": "browser-automation",
+            "limit": 3,
+        },
+    )
+
+    if result.content and len(result.content) > 0:
+        servers = json.loads(result.content[0].text)  # type: ignore
+        server_summary = []
+        for server in servers:
+            name = server.get("chinese_name", server.get("name", "N/A"))
+            publisher = server.get("publisher", "N/A")
+            views = server.get("view_count", 0)
+            server_summary.append(f"{name} by {publisher} (Views {views:,})")
+        print(
+            f"   • Result: Found {len(servers)} servers - {' | '.join(server_summary)}"
+        )
+    else:
+        print("   • Result: No MCP servers found")
+    print()
+
+
 async def demo_generate_image(client: Client) -> None:
     """Demo: Generate image URL from text prompt."""
-    print("4. 🛠️ Tool: generate_image")
+    print("5. 🛠️ Tool: generate_image")
     print(
         "   • Task: 🎨 Generate image (prompt='A curious cat wearing a tiny wizard hat in candy cloud kingdom')"
     )
@@ -152,6 +184,7 @@ async def main():
         await demo_get_current_user(client)
         await demo_search_models(client)
         await demo_search_papers(client)
+        await demo_search_mcp_servers(client)
 
         if args.full:
             await demo_generate_image(client)

src/modelscope_mcp_server/server.py

@@ -12,6 +12,7 @@
 from ._version import __version__
 from .settings import settings
 from .tools.aigc import register_aigc_tools
+from .tools.mcp import register_mcp_tools
 from .tools.model import register_model_tools
 from .tools.paper import register_paper_tools
 from .tools.user import register_user_tools
@@ -41,6 +42,7 @@ def create_mcp_server() -> FastMCP:
     register_user_tools(mcp)
     register_model_tools(mcp)
     register_paper_tools(mcp)
+    register_mcp_tools(mcp)
     register_aigc_tools(mcp)
 
     return mcp

src/modelscope_mcp_server/tools/mcp.py

@@ -0,0 +1,129 @@
+"""
+ModelScope MCP Server MCP tools.
+
+Provides tools for MCP-related operations in the ModelScope MCP Server, such as searching for MCP servers.
+"""
+
+from typing import Annotated, Literal
+
+import requests
+from fastmcp import FastMCP
+from fastmcp.utilities import logging
+from pydantic import Field
+
+from ..constants import MODELSCOPE_DOMAIN, MODELSCOPE_OPENAPI_ENDPOINT
+from ..types import McpServer
+
+logger = logging.get_logger(__name__)
+
+
+def register_mcp_tools(mcp: FastMCP) -> None:
+    """
+    Register all MCP-related tools with the MCP server.
+
+    Args:
+        mcp (FastMCP): The MCP server instance
+    """
+
+    @mcp.tool(
+        annotations={
+            "title": "Search MCP Servers",
+        }
+    )
+    async def search_mcp_servers(
+        search: Annotated[
+            str,
+            Field(description="Search keyword for MCP servers"),
+        ] = "",
+        category: Annotated[
+            (
+                Literal[
+                    "browser-automation",
+                    "search",
+                    "communication",
+                    "customer-and-marketing",
+                    "developer-tools",
+                    "entertainment-and-media",
+                    "file-systems",
+                    "finance",
+                    "knowledge-and-memory",
+                    "location-services",
+                    "art-and-culture",
+                    "research-and-data",
+                    "calendar-management",
+                    "other",
+                ]
+                | None
+            ),
+            Field(description=("Filter by category")),
+        ] = None,
+        is_hosted: Annotated[
+            bool | None,
+            Field(description="Filter by hosted status"),
+        ] = None,
+        limit: Annotated[
+            int, Field(description="Maximum number of servers to return", ge=1, le=100)
+        ] = 10,
+    ) -> list[McpServer]:
+        """
+        Search for MCP servers on ModelScope.
+        """
+        url = f"{MODELSCOPE_OPENAPI_ENDPOINT}/mcp/servers"
+
+        headers = {
+            "Content-Type": "application/json",
+            "User-Agent": "modelscope-mcp-server",
+        }
+
+        # Build filter object
+        filter_obj = {}
+        if category is not None:
+            filter_obj["category"] = category
+        if is_hosted is not None:
+            filter_obj["is_hosted"] = is_hosted
+
+        request_data = {
+            "filter": filter_obj,
+            "page_number": 1,
+            "page_size": limit,
+            "search": search,
+        }
+
+        try:
+            response = requests.put(url, json=request_data, headers=headers, timeout=10)
+        except requests.exceptions.Timeout:
+            raise TimeoutError("Request timeout - please try again later")
+
+        if response.status_code != 200:
+            raise Exception(
+                f"Server returned non-200 status code: {response.status_code} {response.text}"
+            )
+
+        data = response.json()
+
+        if data.get("code") != 200:
+            raise Exception(
+                f"Server returned error: {data.get('message', 'Unknown error')}"
+            )
+
+        result_data = data.get("data", {})
+        servers_data = result_data.get("mcp_server_list", [])
+
+        servers = []
+        for server_data in servers_data:
+            id = server_data.get("id", "")
+            modelscope_url = f"{MODELSCOPE_DOMAIN}/mcp/servers/{id}"
+
+            server = McpServer(
+                id=id,
+                modelscope_url=modelscope_url,
+                name=server_data.get("name", ""),
+                chinese_name=server_data.get("chinese_name", ""),
+                description=server_data.get("description", ""),
+                publisher=server_data.get("publisher", ""),
+                tags=server_data.get("tags", []),
+                view_count=server_data.get("view_count", 0),
+            )
+            servers.append(server)
+
+        return servers

src/modelscope_mcp_server/tools/model.py

@@ -50,7 +50,7 @@ async def search_models(
             Field(description="Sort order"),
         ] = "Default",
         limit: Annotated[
-            int, Field(description="Number of models to return", ge=1, le=30)
+            int, Field(description="Maximum number of models to return", ge=1, le=30)
         ] = 10,
     ) -> list[Model]:
         """

src/modelscope_mcp_server/tools/paper.py

@@ -38,7 +38,7 @@ async def search_papers(
             Field(description="Sort order"),
         ] = "default",
         limit: Annotated[
-            int, Field(description="Number of papers to return", ge=1, le=100)
+            int, Field(description="Maximum number of papers to return", ge=1, le=100)
         ] = 10,
     ) -> list[Paper]:
         """

src/modelscope_mcp_server/types.py

@@ -79,6 +79,24 @@ class Paper(BaseModel):
     comment_count: Annotated[int, Field(description="Comment count")] = 0
 
 
+class McpServer(BaseModel):
+    """MCP Server information."""
+
+    # Basic information
+    id: Annotated[str, Field(description="MCP Server ID")]
+    name: Annotated[str, Field(description="MCP Server name")]
+    chinese_name: Annotated[str, Field(description="Chinese name")]
+    description: Annotated[str, Field(description="Description")]
+    publisher: Annotated[str, Field(description="Publisher")]
+    tags: Annotated[list[str], Field(description="Tags")] = []
+
+    # Links
+    modelscope_url: Annotated[str, Field(description="ModelScope page URL")]
+
+    # Metrics
+    view_count: Annotated[int, Field(description="View count")] = 0
+
+
 class ImageGenerationResult(BaseModel):
     """Image generation result."""