Emil_Shanaty/open-webui-ai4me
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refac

Browse Source
This commit is contained in:
Timothy Jaeryang Baek
2026-03-30 05:10:24 -05:00
parent 9cc3ffb4a9
commit 10b4b86ada
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/open_webui/utils/mcp/client.py
+23 -13
View File
@@ -9,22 +9,27 @@ from mcp.client.auth import OAuthClientProvider, TokenStorage
from mcp.client.streamable_http import streamablehttp_client from mcp.client.streamable_http import streamablehttp_client
from mcp.shared.auth import OAuthClientInformationFull, OAuthClientMetadata, OAuthToken from mcp.shared.auth import OAuthClientInformationFull, OAuthClientMetadata, OAuthToken
import httpx import httpx
from open_webui.env import AIOHTTP_CLIENT_SESSION_TOOL_SERVER_SSL from open_webui.env import AIOHTTP_CLIENT_SESSION_TOOL_SERVER_SSL, AIOHTTP_CLIENT_TIMEOUT_TOOL_SERVER
def create_insecure_httpx_client(headers=None, timeout=None, auth=None): def _build_httpx_client(headers=None, timeout=None, auth=None, verify=True):
"""Create an httpx AsyncClient with SSL verification disabled. """Create an httpx AsyncClient for MCP transport.
Note: verify=False must be passed at construction time because httpx Falls back to AIOHTTP_CLIENT_TIMEOUT_TOOL_SERVER when the caller
(i.e. the MCP SDK) does not supply an explicit timeout.
Note: verify must be passed at construction time because httpx
configures the SSL context during __init__. Setting client.verify = False configures the SSL context during __init__. Setting client.verify = False
after construction does not affect the underlying transport's SSL context. after construction does not affect the underlying transport's SSL context.
""" """
kwargs = { kwargs = {
'follow_redirects': True, 'follow_redirects': True,
'verify': False, 'verify': verify,
} }
if timeout is not None: if timeout is not None:
kwargs['timeout'] = timeout kwargs['timeout'] = timeout
elif AIOHTTP_CLIENT_TIMEOUT_TOOL_SERVER is not None:
kwargs['timeout'] = float(AIOHTTP_CLIENT_TIMEOUT_TOOL_SERVER)
if headers is not None: if headers is not None:
kwargs['headers'] = headers kwargs['headers'] = headers
if auth is not None: if auth is not None:
@@ -32,6 +37,14 @@ def create_insecure_httpx_client(headers=None, timeout=None, auth=None):
return httpx.AsyncClient(**kwargs) return httpx.AsyncClient(**kwargs)
def create_httpx_client(headers=None, timeout=None, auth=None):
return _build_httpx_client(headers=headers, timeout=timeout, auth=auth, verify=True)
def create_insecure_httpx_client(headers=None, timeout=None, auth=None):
return _build_httpx_client(headers=headers, timeout=timeout, auth=auth, verify=False)
class MCPClient: class MCPClient:
def __init__(self): def __init__(self):
self.session: Optional[ClientSession] = None self.session: Optional[ClientSession] = None
@@ -40,14 +53,11 @@ class MCPClient:
async def connect(self, url: str, headers: Optional[dict] = None): async def connect(self, url: str, headers: Optional[dict] = None):
async with AsyncExitStack() as exit_stack: async with AsyncExitStack() as exit_stack:
try: try:
if AIOHTTP_CLIENT_SESSION_TOOL_SERVER_SSL: self._streams_context = streamablehttp_client(
self._streams_context = streamablehttp_client(url, headers=headers) url,
else: headers=headers,
self._streams_context = streamablehttp_client( httpx_client_factory=create_httpx_client if AIOHTTP_CLIENT_SESSION_TOOL_SERVER_SSL else create_insecure_httpx_client,
url, )
headers=headers,
httpx_client_factory=create_insecure_httpx_client,
)
transport = await exit_stack.enter_async_context(self._streams_context) transport = await exit_stack.enter_async_context(self._streams_context)
read_stream, write_stream, _ = transport read_stream, write_stream, _ = transport