ceos/fastmcp
1
0
Fork 0
mirror of https://github.com/PrefectHQ/fastmcp.git synced 2026-08-23 05:54:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

Let FastMCPError propagate unchanged from managers (#2697)

Browse source
This commit is contained in:
Jeremiah Lowin 2025-12-23 18:29:36 -05:00 • committed by GitHub
commit 7a46e2130b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/fastmcp/prompts/prompt_manager.py
View file

@ -7,7 +7,7 @@ from typing import Any
from mcp import GetPromptResult
from fastmcp import settings
from fastmcp.exceptions import NotFoundError, PromptError
from fastmcp.exceptions import FastMCPError, NotFoundError, PromptError
from fastmcp.prompts.prompt import FunctionPrompt, Prompt, PromptResult
from fastmcp.settings import DuplicateBehavior
from fastmcp.utilities.logging import get_logger
@ -107,9 +107,8 @@ class PromptManager:
try:
messages = await prompt.render(arguments)
return GetPromptResult(description=prompt.description, messages=messages)
except PromptError as e:
logger.exception(f"Error rendering prompt {name!r}")
raise e
except FastMCPError:
raise
except Exception as e:
logger.exception(f"Error rendering prompt {name!r}")
if self.mask_error_details:

23
src/fastmcp/resources/resource_manager.py
View file

@ -10,7 +10,7 @@ from typing import Any
from pydantic import AnyUrl
from fastmcp import settings
from fastmcp.exceptions import NotFoundError, ResourceError
from fastmcp.exceptions import FastMCPError, NotFoundError, ResourceError
from fastmcp.resources.resource import Resource
from fastmcp.resources.template import (
ResourceTemplate,
@ -268,10 +268,9 @@ class ResourceManager:
uri_str,
params=params,
)
# Pass through ResourceErrors as-is
except ResourceError as e:
logger.error(f"Error creating resource from template: {e}")
raise e
# Pass through FastMCPErrors as-is
except FastMCPError:
raise
# Handle other exceptions
except Exception as e:
logger.error(f"Error creating resource from template: {e}")
@ -299,10 +298,9 @@ class ResourceManager:
try:
return await resource.read()
# raise ResourceErrors as-is
except ResourceError as e:
logger.exception(f"Error reading resource {uri_str!r}")
raise e
# raise FastMCPErrors as-is
except FastMCPError:
raise
# Handle other exceptions
except Exception as e:
@ -322,11 +320,8 @@ class ResourceManager:
try:
resource = await template.create_resource(uri_str, params=params)
return await resource.read()
except ResourceError as e:
logger.exception(
f"Error reading resource from template {uri_str!r}"
)
raise e
except FastMCPError:
raise
except Exception as e:
logger.exception(
f"Error reading resource from template {uri_str!r}"

12
src/fastmcp/tools/tool_manager.py
View file

@ -8,7 +8,7 @@ from mcp.types import ToolAnnotations
from pydantic import ValidationError
from fastmcp import settings
from fastmcp.exceptions import NotFoundError, ToolError
from fastmcp.exceptions import FastMCPError, NotFoundError, ToolError
from fastmcp.settings import DuplicateBehavior
from fastmcp.tools.tool import Tool, ToolResult
from fastmcp.tools.tool_transform import (
@ -158,12 +158,10 @@ class ToolManager:
tool = await self.get_tool(key)
try:
return await tool.run(arguments)
except ValidationError as e:
logger.exception(f"Error validating tool {key!r}: {e}")
raise e
except ToolError as e:
logger.exception(f"Error calling tool {key!r}")
raise e
except FastMCPError:
raise
except ValidationError:
raise
except Exception as e:
logger.exception(f"Error calling tool {key!r}")
if self.mask_error_details: