Skip to content

Fix 307 Temporary Redirect when use streamable_http #781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 36 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
0bf3521
Update streamable_http_path to /mcp/ to avoid 307 Temporary Redirect
chi2liu May 22, 2025
dd00227
Merge branch 'main' into fix-307-Temporary-Redirect
chi2liu May 23, 2025
d89e737
Streamable HTTP Trailing Slash Compatibility
chi2liu May 26, 2025
7d6e14f
Streamable HTTP Trailing Slash Compatibility
chi2liu May 26, 2025
a84399b
Streamable HTTP Trailing Slash Compatibility
chi2liu May 26, 2025
900c2dd
Merge branch 'main' into fix-307-Temporary-Redirect
chi2liu May 26, 2025
1a638ad
Streamable HTTP Trailing Slash Compatibility
chi2liu May 26, 2025
b3bf4c9
Streamable HTTP Trailing Slash Compatibility
chi2liu May 26, 2025
645e1ab
Streamable HTTP Trailing Slash Compatibility
chi2liu May 26, 2025
3e9e33f
Merge branch 'main' into fix-307-Temporary-Redirect
chi2liu May 27, 2025
7ef5f8d
Clean logic (#3)
vectorstain May 27, 2025
303cac8
Merge branch 'main' into fix-307-Temporary-Redirect
chi2liu May 27, 2025
0d05075
Merge branch 'main' into fix-307-Temporary-Redirect
chi2liu May 28, 2025
898fc88
add unit test for Streamable HTTP Trailing Slash Compatibility
May 28, 2025
45a5cd8
add unit test for Streamable HTTP Trailing Slash Compatibility
May 28, 2025
04f637c
Update test_streamable_http.py
chi2liu May 28, 2025
2377b70
add unit test for Streamable HTTP Trailing Slash Compatibility
May 28, 2025
09e403c
Merge branch 'fix-307-Temporary-Redirect' of https://github.com/chi2l…
May 28, 2025
a03c62e
add unit test for Streamable HTTP Trailing Slash Compatibility
May 28, 2025
10ccbbf
add unit test for Streamable HTTP Trailing Slash Compatibility
May 28, 2025
e102e7d
add unit test for Streamable HTTP Trailing Slash Compatibility
May 28, 2025
a72ffe8
Merge branch 'main' into fix-307-Temporary-Redirect
chi2liu May 29, 2025
6cf74f1
change Mount to Routers
May 29, 2025
2748a75
fix tests
May 29, 2025
b726c86
redirect_slashes to False
May 29, 2025
3b03b83
Update server.py
chi2liu May 29, 2025
d2ee4df
fix typo
May 29, 2025
355c882
Merge branch 'fix-307-Temporary-Redirect' of https://github.com/chi2l…
May 29, 2025
86da08d
fix typo
May 29, 2025
3d86e61
fix
May 29, 2025
cc9f3d9
Update server.py
chi2liu May 29, 2025
cce6d2f
Update test_server.py
chi2liu May 29, 2025
04c4bcf
Merge branch 'main' into fix-307-Temporary-Redirect
chi2liu May 29, 2025
1d9632b
Fix 307 temporary redirect refactor (#4)
vectorstain May 29, 2025
2761e8f
Merge branch 'main' into fix-307-Temporary-Redirect
chi2liu May 29, 2025
2aa0428
Update server.py
chi2liu May 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 23 additions & 8 deletions src/mcp/server/fastmcp/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ async def sse_endpoint(request: Request) -> Response:
def streamable_http_app(self) -> Starlette:
"""Return an instance of the StreamableHTTP server app."""
from starlette.middleware import Middleware
from starlette.routing import Mount
from starlette.routing import Mount, Router

# Create session manager on first call (lazy initialization)
if self._session_manager is None:
Expand All @@ -787,12 +787,24 @@ async def handle_streamable_http(
) -> None:
await self.session_manager.handle_request(scope, receive, send)

# Create routes
routes: list[Route | Mount] = []
async def streamable_http_endpoint(request: Request):
return await handle_streamable_http(request.scope, request.receive, request._send) # type: ignore[reportPrivateUsage]

# Normalize the main path (no trailing slash)
_main_path = self.settings.streamable_http_path.removesuffix("/")

streamable_router = Router(
routes=[
Route("/", endpoint=streamable_http_endpoint, methods=["GET", "POST"]),
],
redirect_slashes=False,
)

routes: list[Route | Mount ] = []
middleware: list[Middleware] = []
required_scopes = []

# Add auth endpoints if auth provider is configured
# Auth endpoints if auth provider is configured
if self._auth_server_provider:
assert self.settings.auth
from mcp.server.auth.routes import create_auth_routes
Expand All @@ -817,18 +829,21 @@ async def handle_streamable_http(
revocation_options=self.settings.auth.revocation_options,
)
)

routes.append(
Mount(
self.settings.streamable_http_path,
app=RequireAuthMiddleware(handle_streamable_http, required_scopes),
_main_path,
app=RequireAuthMiddleware(
streamable_router, required_scopes
),
)
)
else:
# Auth is disabled, no wrapper needed
routes.append(
Mount(
self.settings.streamable_http_path,
app=handle_streamable_http,
_main_path,
app=streamable_router,
)
)

Expand Down
14 changes: 14 additions & 0 deletions tests/server/fastmcp/test_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,20 @@ async def test_starlette_routes_with_mount_path(self):
mount_routes[0].path == "/messages"
), "Mount route path should be /messages"

mcp = FastMCP()
app = mcp.streamable_http_app()

# Find routes by type
streamable_routes = [r for r in app.routes if isinstance(r, Mount)]

# Verify routes exist
assert len(streamable_routes) == 1, "Should have two streamable routes"

# Verify path values
assert (
streamable_routes[0].path == "/mcp"
), "Streamable route path should be /mcp"

@pytest.mark.anyio
async def test_non_ascii_description(self):
"""Test that FastMCP handles non-ASCII characters in descriptions correctly"""
Expand Down
Loading