tidy up

Author: davemssavage

src/mcp/server/fastmcp/server.py

@@ -236,7 +236,7 @@ def run(
     def _setup_handlers(self) -> None:
         """Set up core MCP protocol handlers."""
         self._mcp_server.list_tools()(self.list_tools)
-        self._mcp_server.call_tool()(self.call_tool, self._get_schema)
+        self._mcp_server.call_tool()(self.call_tool, self._tool_manager.get_schema)
         self._mcp_server.list_resources()(self.list_resources)
         self._mcp_server.read_resource()(self.read_resource)
         self._mcp_server.list_prompts()(self.list_prompts)
@@ -277,9 +277,6 @@ async def call_tool(
         converted_result = _convert_to_content(result)
         return converted_result
 
-    def _get_schema(self, name: str) -> dict[str, Any] | None:
-        return self._tool_manager.get_schema(name)
-
     async def list_resources(self) -> list[MCPResource]:
         """List all available resources."""
 

src/mcp/server/fastmcp/tools/base.py

@@ -94,14 +94,13 @@ async def run(
     ) -> Any:
         """Run the tool with arguments."""
         try:
-            result = await self.fn_metadata.call_fn_with_arg_validation(
+            return await self.fn_metadata.call_fn_with_arg_validation(
                 self.fn,
                 self.is_async,
                 arguments,
                 {self.context_kwarg: context}
                 if self.context_kwarg is not None
                 else None,
             )
-            return result
         except Exception as e:
             raise ToolError(f"Error executing tool {self.name}: {e}") from e

src/mcp/server/lowlevel/server.py

@@ -486,7 +486,6 @@ def handle_error(e: Exception):
                 )
 
             if schema_func is None:
-
                 async def handler(req: types.CallToolRequest):
                     try:
                         result = await func(
@@ -495,9 +494,7 @@ async def handler(req: types.CallToolRequest):
                         return handle_result_without_schema(req, result)
                     except Exception as e:
                         return handle_error(e)
-
             else:
-
                 async def handler(req: types.CallToolRequest):
                     try:
                         result = await func(