Merge pull request #1 from metatool-ai/server-name-sanitize

0.0.2 attempt to better handle server names in routing

Author: zhjch05

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mcp-server-metatool"
-version = "0.0.1"
+version = "0.0.2"
 description = "Metatool MCP Server"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -19,6 +19,10 @@ dependencies = [
     "mcp",
 ]
 
+[project.urls]
+homepage = "https://github.com/metatool-ai/mcp-server-metatool"
+repository = "https://github.com/metatool-ai/mcp-server-metatool"
+
 [tool.uv]
 dev-dependencies = [
   "build",

setup.py

@@ -0,0 +1,25 @@
+from setuptools import setup, find_packages
+
+setup(
+    name="mcp-server-metatool",
+    version="0.0.2",
+    author="James Zhang",
+    author_email="[email protected]",
+    description="Metatool MCP Server",
+    long_description=open("README.md").read(),
+    long_description_content_type="text/markdown",
+    python_requires=">=3.10",
+    packages=find_packages(where="src"),
+    package_dir={"": "src"},
+    classifiers=[
+        "Programming Language :: Python :: 3.10",
+    ],
+    install_requires=["mcp", "requests"],
+    extras_require={
+        "dev": [
+            "pytest",
+            "twine",
+            "wheel",
+        ],
+    },
+)

src/mcp_server_metatool/__init__.py

@@ -2,7 +2,7 @@
 Metatool MCP Server
 """
 
-__version__ = "0.0.1"
+__version__ = "0.0.2"
 
 from .server import serve
 

src/mcp_server_metatool/__main__.py

@@ -1,3 +1,4 @@
+# __main__.py
 
 from mcp_server_metatool import main
 

src/mcp_server_metatool/server.py

@@ -7,13 +7,21 @@
 from mcp.server import Server, NotificationOptions
 import httpx
 import os
+import re
+
+
+def sanitize_name(name: str) -> str:
+    """Sanitize the name to only contain allowed characters."""
+    return re.sub(r"[^a-zA-Z0-9_-]", "", name)
 
 
 # Create and run the proxy server with the list of sessions
 server = Server("mcp-server-metatool")
 
 
-METATOOL_API_BASE_URL = os.environ.get("METATOOL_API_BASE_URL", "http://localhost:12005")
+METATOOL_API_BASE_URL = os.environ.get(
+    "METATOOL_API_BASE_URL", "http://localhost:12005"
+)
 
 
 async def get_mcp_servers() -> list[StdioServerParameters]:
@@ -64,7 +72,9 @@ async def handle_list_tools() -> list[types.Tool]:
                     response = await session_data["session"].list_tools()
                     for tool in response.tools:
                         tool_copy = tool.copy()
-                        tool_copy.name = f"{session_data['name']}0{tool.name}"
+                        tool_copy.name = (
+                            f"{sanitize_name(session_data['name'])}__{tool.name}"
+                        )
                         all_tools.append(tool_copy)
 
     return all_tools
@@ -77,10 +87,10 @@ async def handle_call_tool(
     try:
         # Split the prefixed name into server name and tool name
         try:
-            server_name, tool_name = name.split("0", 1)
+            server_name, tool_name = name.split("__", 1)
         except ValueError:
             raise ValueError(
-                f"Invalid tool name format: {name}. Expected format: server_name0tool_name"
+                f"Invalid tool name format: {name}. Expected format: server_name__tool_name"
             )
 
         # Get all server parameters
@@ -91,7 +101,7 @@ async def handle_call_tool(
             async with stdio_client(params) as (read, write):
                 async with ClientSession(read, write) as session:
                     session_data = await initialize_session(session)
-                    if session_data["name"] == server_name:
+                    if sanitize_name(session_data["name"]) == server_name:
                         result = await session.call_tool(
                             tool_name,
                             (arguments or {}),