clean up after review comments

Author: ihrpr

README.md

@@ -121,7 +121,7 @@ mcp = FastMCP("Demo")
 
 # Add an addition tool
 @mcp.tool()
-def add(a: int, b: int) -> int:
+def sum(a: int, b: int) -> int:
     """Add two numbers"""
     return a + b
 
@@ -246,13 +246,13 @@ from mcp.server.fastmcp import FastMCP
 mcp = FastMCP(name="Tool Example")
 
 
-@mcp.tool(description="Add two numbers")
-def add(a: int, b: int) -> int:
+@mcp.tool()
+def sum(a: int, b: int) -> int:
     """Add two numbers together."""
     return a + b
 
 
-@mcp.tool(description="Get weather for a city")
+@mcp.tool()
 def get_weather(city: str, unit: str = "celsius") -> str:
     """Get weather for a city."""
     # This would normally call a weather API
@@ -440,7 +440,7 @@ from mcp.server.fastmcp import Context, FastMCP
 mcp = FastMCP(name="Progress Example")
 
 
-@mcp.tool(description="Demonstrates progress reporting")
+@mcp.tool()
 async def long_running_task(task_name: str, ctx: Context, steps: int = 5) -> str:
     """Execute a task with progress updates."""
     await ctx.info(f"Starting: {task_name}")
@@ -567,7 +567,7 @@ class BookingPreferences(BaseModel):
     )
 
 
-@mcp.tool(description="Book a restaurant table")
+@mcp.tool()
 async def book_table(
     date: str,
     time: str,
@@ -612,7 +612,7 @@ from mcp.types import SamplingMessage, TextContent
 mcp = FastMCP(name="Sampling Example")
 
 
-@mcp.tool(description="Uses sampling to generate content")
+@mcp.tool()
 async def generate_poem(topic: str, ctx: Context) -> str:
     """Generate a poem using LLM sampling."""
     prompt = f"Write a short poem about {topic}"
@@ -645,9 +645,9 @@ from mcp.server.fastmcp import Context, FastMCP
 mcp = FastMCP(name="Notifications Example")
 
 
-@mcp.tool(description="Demonstrates logging at different levels")
+@mcp.tool()
 async def process_data(data: str, ctx: Context) -> str:
-    """Process data with comprehensive logging."""
+    """Process data with logging."""
     # Different log levels
     await ctx.debug(f"Debug: Processing '{data}'")
     await ctx.info("Info: Starting processing")
@@ -785,8 +785,9 @@ from mcp.server.fastmcp import FastMCP
 mcp = FastMCP(name="EchoServer", stateless_http=True)
 
 
-@mcp.tool(description="A simple echo tool")
+@mcp.tool()
 def echo(message: str) -> str:
+    """A simple echo tool"""
     return f"Echo: {message}"
 ```
 
@@ -797,8 +798,9 @@ from mcp.server.fastmcp import FastMCP
 mcp = FastMCP(name="MathServer", stateless_http=True)
 
 
-@mcp.tool(description="A simple add tool")
+@mcp.tool()
 def add_two(n: int) -> int:
+    """Tool to add two to the input"""
     return n + 2
 ```
 

examples/fastmcp/desktop.py

@@ -20,6 +20,6 @@ def desktop() -> list[str]:
 
 
 @mcp.tool()
-def add(a: int, b: int) -> int:
+def sum(a: int, b: int) -> int:
     """Add two numbers"""
     return a + b

examples/fastmcp/readme-quickstart.py

@@ -6,7 +6,7 @@
 
 # Add an addition tool
 @mcp.tool()
-def add(a: int, b: int) -> int:
+def sum(a: int, b: int) -> int:
     """Add two numbers"""
     return a + b
 

examples/snippets/pyproject.toml

@@ -15,11 +15,4 @@ build-backend = "setuptools.build_meta"
 packages = ["servers"]
 
 [project.scripts]
-basic-tool = "servers:run_basic_tool"
-basic-resource = "servers:run_basic_resource"
-basic-prompt = "servers:run_basic_prompt"
-tool-progress = "servers:run_tool_progress"
-sampling = "servers:run_sampling"  
-elicitation = "servers:run_elicitation"
-completion = "servers:run_completion"
-notifications = "servers:run_notifications"
+server = "servers:run_server"

examples/snippets/servers/__init__.py

@@ -2,66 +2,35 @@
 
 This package contains simple examples of MCP server features.
 Each server demonstrates a single feature and can be run as a standalone server.
+
+To run a server, use the command:
+    uv run server basic_tool sse
 """
 
 import importlib
 import sys
-from typing import Literal
-
-# Available snippet modules
-SNIPPET_MODULES = [
-    "basic_tool",
-    "basic_resource",
-    "basic_prompt",
-    "tool_progress",
-    "sampling",
-    "elicitation",
-    "completion",
-    "notifications",
-]
+from typing import Literal, cast
 
 
-def run_server(module_name: str, transport: Literal["stdio", "sse", "streamable-http"] | None = None) -> None:
-    """Run a snippet server with the specified transport.
+def run_server():
+    """Run a server by name with optional transport.
 
-    Args:
-        module_name: Name of the snippet module to run
-        transport: Transport to use (stdio, sse, streamable-http).
-                  If None, uses first command line arg or defaults to stdio.
+    Usage: server <server-name> [transport]
+    Example: server basic_tool sse
     """
-    # Validate module name
-    if module_name not in SNIPPET_MODULES:
-        raise ValueError(f"Unknown module: {module_name}. Available modules: {', '.join(SNIPPET_MODULES)}")
-
-    # Import the module dynamically
-    module = importlib.import_module(f".{module_name}", package=__name__)
-    mcp = module.mcp
-
-    # Determine transport
-    if transport is None:
-        transport_arg = sys.argv[1] if len(sys.argv) > 1 else "stdio"
-        # Validate and cast transport
-        if transport_arg not in ["stdio", "sse", "streamable-http"]:
-            raise ValueError(f"Invalid transport: {transport_arg}. Must be one of: stdio, sse, streamable-http")
-        transport = transport_arg  # type: ignore
-
-    # Run the server
-    print(f"Starting {module_name} server with {transport} transport...")
-    mcp.run(transport=transport)  # type: ignore
-
-
-# Create entry point functions dynamically
-def _create_run_function(module_name: str):
-    """Create a run function for a specific module."""
-
-    def run_function():
-        f"""Run the {module_name.replace('_', ' ')} example server."""
-        run_server(module_name)
-
-    return run_function
-
-
-# Generate entry points for each snippet
-for module in SNIPPET_MODULES:
-    func_name = f"run_{module}"
-    globals()[func_name] = _create_run_function(module)
+    if len(sys.argv) < 2:
+        print("Usage: server <server-name> [transport]")
+        print("Available servers: basic_tool, basic_resource, basic_prompt, tool_progress,")
+        print("                   sampling, elicitation, completion, notifications")
+        print("Available transports: stdio (default), sse, streamable-http")
+        sys.exit(1)
+
+    server_name = sys.argv[1]
+    transport = sys.argv[2] if len(sys.argv) > 2 else "stdio"
+
+    try:
+        module = importlib.import_module(f".{server_name}", package=__name__)
+        module.mcp.run(cast(Literal["stdio", "sse", "streamable-http"], transport))
+    except ImportError:
+        print(f"Error: Server '{server_name}' not found")
+        sys.exit(1)

examples/snippets/servers/basic_tool.py

@@ -3,13 +3,13 @@
 mcp = FastMCP(name="Tool Example")
 
 
-@mcp.tool(description="Add two numbers")
-def add(a: int, b: int) -> int:
+@mcp.tool()
+def sum(a: int, b: int) -> int:
     """Add two numbers together."""
     return a + b
 
 
-@mcp.tool(description="Get weather for a city")
+@mcp.tool()
 def get_weather(city: str, unit: str = "celsius") -> str:
     """Get weather for a city."""
     # This would normally call a weather API

examples/snippets/servers/elicitation.py

@@ -15,7 +15,7 @@ class BookingPreferences(BaseModel):
     )
 
 
-@mcp.tool(description="Book a restaurant table")
+@mcp.tool()
 async def book_table(
     date: str,
     time: str,

examples/snippets/servers/notifications.py

@@ -3,9 +3,9 @@
 mcp = FastMCP(name="Notifications Example")
 
 
-@mcp.tool(description="Demonstrates logging at different levels")
+@mcp.tool()
 async def process_data(data: str, ctx: Context) -> str:
-    """Process data with comprehensive logging."""
+    """Process data with logging."""
     # Different log levels
     await ctx.debug(f"Debug: Processing '{data}'")
     await ctx.info("Info: Starting processing")

examples/snippets/servers/sampling.py

@@ -4,7 +4,7 @@
 mcp = FastMCP(name="Sampling Example")
 
 
-@mcp.tool(description="Uses sampling to generate content")
+@mcp.tool()
 async def generate_poem(topic: str, ctx: Context) -> str:
     """Generate a poem using LLM sampling."""
     prompt = f"Write a short poem about {topic}"

examples/snippets/servers/tool_progress.py

@@ -3,7 +3,7 @@
 mcp = FastMCP(name="Progress Example")
 
 
-@mcp.tool(description="Demonstrates progress reporting")
+@mcp.tool()
 async def long_running_task(task_name: str, ctx: Context, steps: int = 5) -> str:
     """Execute a task with progress updates."""
     await ctx.info(f"Starting: {task_name}")