π The fast, Pythonic way to build MCP servers and clients.
Use proper isinstance(Enum) check instead of hasattr
Jeremiah Lowine68fa0653bd5
diff --git a/src/fastmcp/utilities/openapi.py b/src/fastmcp/utilities/openapi.pyindex 4f2dd9ee8..59d558f72 100644--- a/src/fastmcp/utilities/openapi.py+++ b/src/fastmcp/utilities/openapi.py@@ -303,8 +303,10 @@ class OpenAPIParser(# Extract parameter info - handle both 3.0 and 3.1 parameter modelsparam_in = parameter.param_in # Both use param_in# Handle enum or string parameter locations+ from enum import Enum+param_in_str = (- param_in.value if hasattr(param_in, "value") else param_in+ param_in.value if isinstance(param_in, Enum) else param_in)param_location = self._convert_to_parameter_location(param_in_str)param_schema_obj = parameter.param_schema # Both use param_schemadiff --git a/tests/server/openapi/test_openapi_path_parameters.py b/tests/server/openapi/test_openapi_path_parameters.pyindex 56f20feca..7f977ea50 100644--- a/tests/server/openapi/test_openapi_path_parameters.py+++ b/tests/server/openapi/test_openapi_path_parameters.py@@ -459,24 +459,27 @@ async def test_array_query_parameter_exploded_format(mock_client):def test_parameter_location_enum_handling():"""Test that ParameterLocation enum values are handled correctly (issue #950)."""- from fastapi import FastAPI, Path, Query-- from fastmcp import FastMCP-- # Create FastAPI app with path and query parameters- app = FastAPI(title="Parameter Location Test")-- @app.get("/tenants/{tenant_id}/data")- async def get_tenant_data(- tenant_id: str = Path(..., description="The tenant ID"),- limit: int = Query(10, description="Data limit"),- ):- return {"tenant_id": tenant_id, "limit": limit}-- # This should not raise a validation error about ParameterLocation- mcp_server = FastMCP(- name="Test MCP", instructions="Test server for parameter location enum handling"- ).from_fastapi(app, name="Test MCP", tags={"test"})+ from enum import Enum++ # Create a mock ParameterLocation enum like the one from openapi_pydantic+ class MockParameterLocation(Enum):+ PATH = "path"+ QUERY = "query"+ HEADER = "header"+ COOKIE = "cookie"++ # Test the enum handling logic directly (reproduces the fix in openapi.py)+ test_cases = [+ (MockParameterLocation.PATH, "path"),+ (MockParameterLocation.QUERY, "query"),+ (MockParameterLocation.HEADER, "header"),+ (MockParameterLocation.COOKIE, "cookie"),+ ("path", "path"), # Also test that strings work+ ("query", "query"),+ ]- # Verify the server was created successfully- assert mcp_server is not None+ for param_in, expected_str in test_cases:+ # This is the enum handling logic from the fix+ param_in_str = param_in.value if isinstance(param_in, Enum) else param_in+ assert param_in_str == expected_str+ assert isinstance(param_in_str, str)