linting and formatting

Author: beaterblank

src/mcp/server/fastmcp/resources/templates.py

@@ -5,13 +5,13 @@
 import inspect
 import re
 from collections.abc import Callable
-from typing import TYPE_CHECKING, Any, Dict, List
+from typing import TYPE_CHECKING, Any
 
 from pydantic import BaseModel, Field, validate_call
 
 from mcp.server.fastmcp.resources.types import FunctionResource, Resource
 from mcp.server.fastmcp.utilities.context_injection import find_context_parameter, inject_context
-from mcp.server.fastmcp.utilities.convertors import Convertor,CONVERTOR_TYPES
+from mcp.server.fastmcp.utilities.convertors import CONVERTOR_TYPES, Convertor
 from mcp.server.fastmcp.utilities.func_metadata import func_metadata
 from mcp.types import Icon
 
@@ -83,8 +83,8 @@ def matches(self, uri: str) -> dict[str, Any] | None:
         uri = str(uri)
 
         parts = uriTemplate.strip("/").split("/")
-        pattern_parts: List[str] = []
-        converters: Dict[str, Convertor[Any]] = {}
+        pattern_parts: list[str] = []
+        converters: dict[str, Convertor[Any]] = {}
         # generate the regex pattern
         for i, part in enumerate(parts):
             match = re.fullmatch(r"\{(\w+)(?::(\w+))?\}", part)
@@ -112,18 +112,17 @@ def matches(self, uri: str) -> dict[str, Any] | None:
         match = regex.match(uri.strip("/"))
         if not match:
             return None
-        
+
         # try to convert them into respective types
-        result: Dict[str, Any] = {}
+        result: dict[str, Any] = {}
         for name, conv in converters.items():
             raw_value = match.group(name)
             try:
                 result[name] = conv.convert(raw_value)
             except Exception:
                 return None
 
-        return result       
-
+        return result
 
     async def create_resource(
         self,

src/mcp/server/fastmcp/utilities/convertors.py

@@ -3,15 +3,15 @@
 import math
 import uuid
 from typing import (
-    Any, 
-    ClassVar, 
-    Dict,
-    Generic, 
-    TypeVar, 
+    Any,
+    ClassVar,
+    Generic,
+    TypeVar,
 )
 
 T = TypeVar("T")
 
+
 class Convertor(Generic[T]):
     regex: ClassVar[str] = ""
 
@@ -74,7 +74,7 @@ def to_string(self, value: float) -> str:
         assert value >= 0.0, "Negative floats are not supported"
         assert not math.isnan(value), "NaN values are not supported"
         assert not math.isinf(value), "Infinite values are not supported"
-        return ("%0.20f" % value).rstrip("0").rstrip(".")
+        return f"{value:.20f}".rstrip("0").rstrip(".")
 
 
 class UUIDConvertor(Convertor[uuid.UUID]):
@@ -89,10 +89,11 @@ def convert(self, value: str) -> uuid.UUID:
     def to_string(self, value: uuid.UUID) -> str:
         return str(value)
 
-CONVERTOR_TYPES: Dict[str, Convertor[Any]] = {
+
+CONVERTOR_TYPES: dict[str, Convertor[Any]] = {
     "str": StringConvertor(),
     "path": PathConvertor(),
     "int": IntegerConvertor(),
     "float": FloatConvertor(),
     "uuid": UUIDConvertor(),
-}
+}

tests/server/fastmcp/resources/test_resource_template.py

@@ -59,12 +59,11 @@ def my_func(a: int, b: float, name: str) -> dict[str, Any]:
         )
 
         params = template.matches("calc://10/3.14/foo")
-        
+
         assert params == {"a": 10, "b": 3.14, "name": "foo"}
         assert template.matches("calc://x/3.14/foo") is None
         assert template.matches("calc://10/bar/foo") is None
 
-    
     def test_template_matches_with_path(self):
         """Test matching URIs with {path:path} placeholder."""