6f746c5225
* fix: handle Anthropic overloaded_error in streaming interfaces * fix: handle Unicode surrogates in OpenAI requests Sanitize Unicode surrogate pairs before sending requests to OpenAI API. Surrogate pairs (U+D800-U+DFFF) are UTF-16 encoding artifacts that cause UnicodeEncodeError when encoding to UTF-8. Fixes Datadog error: 'utf-8' codec can't encode character '\ud83c' in position 326605: surrogates not allowed * fix: handle UnicodeEncodeError from lone Unicode surrogates in OpenAI requests Improved sanitize_unicode_surrogates() to explicitly filter out lone surrogate characters (U+D800 to U+DFFF) which are invalid in UTF-8. Previous implementation used errors='ignore' which could still fail in edge cases. New approach directly checks Unicode code points and removes any surrogates before data reaches httpx encoding. Also added sanitization to stream_async_responses() method which was missing it. Fixes: 'utf-8' codec can't encode character '\ud83c' in position X: surrogates not allowed
52 lines
2.1 KiB
Python
52 lines
2.1 KiB
Python
from typing import Optional
|
|
|
|
from mcp import ClientSession
|
|
from mcp.client.auth import OAuthClientProvider
|
|
from mcp.client.sse import sse_client
|
|
|
|
from letta.functions.mcp_client.types import SSEServerConfig
|
|
from letta.log import get_logger
|
|
from letta.services.mcp.base_client import AsyncBaseMCPClient
|
|
from letta.settings import tool_settings
|
|
|
|
# see: https://modelcontextprotocol.io/quickstart/user
|
|
MCP_CONFIG_TOPLEVEL_KEY = "mcpServers"
|
|
|
|
logger = get_logger(__name__)
|
|
|
|
|
|
# TODO: Get rid of Async prefix on this class name once we deprecate old sync code
|
|
class AsyncSSEMCPClient(AsyncBaseMCPClient):
|
|
def __init__(
|
|
self, server_config: SSEServerConfig, oauth_provider: Optional[OAuthClientProvider] = None, agent_id: Optional[str] = None
|
|
):
|
|
super().__init__(server_config, oauth_provider, agent_id)
|
|
|
|
async def _initialize_connection(self, server_config: SSEServerConfig) -> None:
|
|
headers = {}
|
|
if server_config.custom_headers:
|
|
headers.update(server_config.custom_headers)
|
|
|
|
if server_config.auth_header and server_config.auth_token:
|
|
headers[server_config.auth_header] = server_config.auth_token
|
|
|
|
if self.agent_id:
|
|
headers[self.AGENT_ID_HEADER] = self.agent_id
|
|
|
|
# Use OAuth provider if available, otherwise use regular headers
|
|
# Pass timeout to prevent httpx.ReadTimeout errors on slow connections
|
|
timeout = tool_settings.mcp_connect_to_server_timeout
|
|
if self.oauth_provider:
|
|
sse_cm = sse_client(
|
|
url=server_config.server_url, headers=headers if headers else None, auth=self.oauth_provider, timeout=timeout
|
|
)
|
|
else:
|
|
sse_cm = sse_client(url=server_config.server_url, headers=headers if headers else None, timeout=timeout)
|
|
|
|
sse_transport = await self.exit_stack.enter_async_context(sse_cm)
|
|
self.stdio, self.write = sse_transport
|
|
|
|
# Create and enter the ClientSession context manager
|
|
session_cm = ClientSession(self.stdio, self.write)
|
|
self.session = await self.exit_stack.enter_async_context(session_cm)
|