phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-07-29 15:23:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup: remove mcp sse url optimization

Browse source 
Signed-off-by: Calum Murray <cmurray@redhat.com>
This commit is contained in:
Calum Murray 2025-07-02 10:45:31 -04:00
parent 5098d3f462
commit 8e5ab564b9
No known key found for this signature in database
GPG key ID: B67F01AEB13FE187
1 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
llama_stack/providers/utils/tools/mcp.py
View file

@ -6,9 +6,7 @@
from collections.abc import AsyncGenerator
from contextlib import _AsyncGeneratorContextManager, asynccontextmanager
from pathlib import PurePosixPath
from typing import Any, cast
from urllib.parse import unquote, urlparse
import httpx
from mcp import ClientSession
@ -70,17 +68,11 @@ async def streamable_http_client_wrapper(endpoint: str, headers: dict[str, str])
def get_client_wrapper(endpoint: str, headers: dict[str, str]) -> _AsyncGeneratorContextManager[ClientSession, Any]:
path = PurePosixPath(unquote(urlparse(endpoint).path))
if path.parts[-1] != "sse":
try:
return streamable_http_client_wrapper(endpoint, headers)
except AuthenticationRequiredError as e:
raise e # since this was an authentication error, we want to surface that instead of trying with SSE
except Exception:
return sse_client_wrapper(endpoint, headers)
else:
# most SSE MCP servers are served at endpoints ending in /sse, so default to the SSE client wrapper
# if the endpoint is explicitly an SSE endpoint
try:
return streamable_http_client_wrapper(endpoint, headers)
except AuthenticationRequiredError as e:
raise e # since this was an authentication error, we want to surface that instead of trying with SSE
except Exception:
return sse_client_wrapper(endpoint, headers)