fastmcp 0.4.0__tar.gz → 1.0__tar.gz

{fastmcp-0.4.0 → fastmcp-1.0}/PKG-INFO

@@ -1,9 +1,10 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: fastmcp
-Version: 0.4.0
+Version: 1.0
 Summary: A more ergonomic interface for MCP servers
 Author: Jeremiah Lowin
-License: Apache-2.0
+License: MIT
+License-File: LICENSE
 Requires-Python: >=3.10
 Requires-Dist: httpx>=0.26.0
 Requires-Dist: mcp<2.0.0,>=1.0.0
@@ -32,11 +33,27 @@ Requires-Dist: pytest>=8.3.3; extra == 'tests'
 Requires-Dist: ruff; extra == 'tests'
 Description-Content-Type: text/markdown
 
-<!-- omit in toc -->
-# FastMCP 🚀
+<div align="center">
+
+### 🎉 FastMCP has been added to the official MCP SDK! 🎉
+
+You can now find FastMCP as part of the official Model Context Protocol Python SDK:
+
+👉 [github.com/modelcontextprotocol/python-sdk](https://github.com/modelcontextprotocol/python-sdk)
+
+*Please note: this repository is no longer maintained.*
+
+---
+
+
+</br></br></br>
+
+</div>
 
 <div align="center">
 
+<!-- omit in toc -->
+# FastMCP 🚀
 <strong>The fast, Pythonic way to build MCP servers.</strong>
 
 [![PyPI - Version](https://img.shields.io/pypi/v/fastmcp.svg)](https://pypi.org/project/fastmcp)

{fastmcp-0.4.0 → fastmcp-1.0}/README.md

@@ -1,8 +1,24 @@
-<!-- omit in toc -->
-# FastMCP 🚀
+<div align="center">
+
+### 🎉 FastMCP has been added to the official MCP SDK! 🎉
+
+You can now find FastMCP as part of the official Model Context Protocol Python SDK:
+
+👉 [github.com/modelcontextprotocol/python-sdk](https://github.com/modelcontextprotocol/python-sdk)
+
+*Please note: this repository is no longer maintained.*
+
+---
+
+
+</br></br></br>
+
+</div>
 
 <div align="center">
 
+<!-- omit in toc -->
+# FastMCP 🚀
 <strong>The fast, Pythonic way to build MCP servers.</strong>
 
 [![PyPI - Version](https://img.shields.io/pypi/v/fastmcp.svg)](https://pypi.org/project/fastmcp)

{fastmcp-0.4.0 → fastmcp-1.0}/pyproject.toml

@@ -13,7 +13,7 @@ dependencies = [
 ]
 requires-python = ">=3.10"
 readme = "README.md"
-license = { text = "Apache-2.0" }
+license = { text = "MIT" }
 
 [project.scripts]
 fastmcp = "fastmcp.cli:app"

{fastmcp-0.4.0 → fastmcp-1.0}/src/fastmcp/server.py

@@ -6,7 +6,7 @@ import inspect
 import json
 import re
 from itertools import chain
-from typing import Any, Callable, Dict, Literal, Sequence
+from typing import Any, Callable, Dict, Literal, Sequence, TypeVar, ParamSpec
 
 import pydantic_core
 from pydantic import Field
@@ -40,6 +40,7 @@ from pydantic_settings import BaseSettings, SettingsConfigDict
 
 from fastmcp.exceptions import ResourceError
 from fastmcp.prompts import Prompt, PromptManager
+from fastmcp.prompts.base import PromptResult
 from fastmcp.resources import FunctionResource, Resource, ResourceManager
 from fastmcp.tools import ToolManager
 from fastmcp.utilities.logging import configure_logging, get_logger
@@ -47,6 +48,10 @@ from fastmcp.utilities.types import Image
 
 logger = get_logger(__name__)
 
+P = ParamSpec("P")
+R = TypeVar("R")
+R_PromptResult = TypeVar("R_PromptResult", bound=PromptResult)
+
 
 class Settings(BaseSettings):
     """FastMCP server settings.
@@ -222,7 +227,9 @@ class FastMCP:
         """
         self._tool_manager.add_tool(fn, name=name, description=description)
 
-    def tool(self, name: str | None = None, description: str | None = None) -> Callable:
+    def tool(
+        self, name: str | None = None, description: str | None = None
+    ) -> Callable[[Callable[P, R]], Callable[P, R]]:
         """Decorator to register a tool.
 
         Tools can optionally request a Context object by adding a parameter with the Context type annotation.
@@ -254,7 +261,7 @@ class FastMCP:
                 "Did you forget to call it? Use @tool() instead of @tool"
             )
 
-        def decorator(fn: Callable) -> Callable:
+        def decorator(fn: Callable[P, R]) -> Callable[P, R]:
             self.add_tool(fn, name=name, description=description)
             return fn
 
@@ -275,7 +282,7 @@ class FastMCP:
         name: str | None = None,
         description: str | None = None,
         mime_type: str | None = None,
-    ) -> Callable:
+    ) -> Callable[[Callable[P, R]], Callable[P, R]]:
         """Decorator to register a function as a resource.
 
         The function will be called when the resource is read to generate its content.
@@ -309,9 +316,9 @@ class FastMCP:
                 "Did you forget to call it? Use @resource('uri') instead of @resource"
             )
 
-        def decorator(fn: Callable) -> Callable:
+        def decorator(fn: Callable[P, R]) -> Callable[P, R]:
             @functools.wraps(fn)
-            def wrapper(*args: Any, **kwargs: Any) -> Any:
+            def wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
                 return fn(*args, **kwargs)
 
             # Check if this should be a template
@@ -361,7 +368,7 @@ class FastMCP:
 
     def prompt(
         self, name: str | None = None, description: str | None = None
-    ) -> Callable:
+    ) -> Callable[[Callable[P, R_PromptResult]], Callable[P, R_PromptResult]]:
         """Decorator to register a prompt.
 
         Args:
@@ -402,7 +409,7 @@ class FastMCP:
                 "Did you forget to call it? Use @prompt() instead of @prompt"
             )
 
-        def decorator(func: Callable) -> Callable:
+        def decorator(func: Callable[P, R_PromptResult]) -> Callable[P, R_PromptResult]:
             prompt = Prompt.from_function(func, name=name, description=description)
             self.add_prompt(prompt)
             return func
@@ -421,9 +428,9 @@ class FastMCP:
     async def run_sse_async(self) -> None:
         """Run the server using SSE transport."""
         from starlette.applications import Starlette
-        from starlette.routing import Route
+        from starlette.routing import Route, Mount
 
-        sse = SseServerTransport("/messages")
+        sse = SseServerTransport("/messages/")
 
         async def handle_sse(request):
             async with sse.connect_sse(
@@ -435,14 +442,11 @@ class FastMCP:
                     self._mcp_server.create_initialization_options(),
                 )
 
-        async def handle_messages(request):
-            await sse.handle_post_message(request.scope, request.receive, request._send)
-
         starlette_app = Starlette(
             debug=self.settings.debug,
             routes=[
                 Route("/sse", endpoint=handle_sse),
-                Route("/messages", endpoint=handle_messages, methods=["POST"]),
+                Mount("/messages/", app=sse.handle_post_message),
             ],
         )
 

{fastmcp-0.4.0 → fastmcp-1.0}/src/fastmcp/utilities/func_metadata.py

@@ -8,7 +8,7 @@ from typing import (
 )
 from pydantic import Field
 from fastmcp.exceptions import InvalidSignature
-from pydantic._internal._typing_extra import try_eval_type
+from pydantic._internal._typing_extra import eval_type_lenient
 import json
 from pydantic import BaseModel
 from pydantic.fields import FieldInfo
@@ -91,7 +91,7 @@ class FuncMetadata(BaseModel):
                     pre_parsed = json.loads(data[field_name])
                 except json.JSONDecodeError:
                     continue  # Not JSON - skip
-                if isinstance(pre_parsed, str):
+                if isinstance(pre_parsed, (str, int, float)):
                     # This is likely that the raw value is e.g. `"hello"` which we
                     # Should really be parsed as '"hello"' in Python - but if we parse
                     # it as JSON it'll turn into just 'hello'. So we skip it.
@@ -178,12 +178,7 @@ def func_metadata(func: Callable, skip_names: Sequence[str] = ()) -> FuncMetadat
 def _get_typed_annotation(annotation: Any, globalns: Dict[str, Any]) -> Any:
     if isinstance(annotation, str):
         annotation = ForwardRef(annotation)
-        annotation, status = try_eval_type(annotation, globalns, globalns)
-
-        # This check and raise could perhaps be skipped, and we (FastMCP) just call
-        # model_rebuild right before using it 🤷
-        if status is False:
-            raise InvalidSignature(f"Unable to evaluate type annotation {annotation}")
+        annotation = eval_type_lenient(annotation, globalns, globalns)
 
     return annotation
 

{fastmcp-0.4.0 → fastmcp-1.0}/tests/test_func_metadata.py

@@ -174,6 +174,21 @@ def test_str_vs_list_str():
     assert result["str_or_list"] == ["hello", "world"]
 
 
+def test_str_vs_int():
+    """
+    Test that string values are kept as strings even when they contain numbers,
+    while numbers are parsed correctly.
+    """
+
+    def func_with_str_and_int(a: str, b: int):
+        return a
+
+    meta = func_metadata(func_with_str_and_int)
+    result = meta.pre_parse_json({"a": "123", "b": 123})
+    assert result["a"] == "123"
+    assert result["b"] == 123
+
+
 def test_skip_names():
     """Test that skipped parameters are not included in the model"""