perf: update mcp client request

Author: ibuler

backend/open_webui/jms/wisp/protobuf/common_pb2.py

@@ -262,8 +262,10 @@ async def verify_tool_servers_config(
             else:
                 try:
                     client = MCPClient()
-                    headers = None
-
+                    headers = {}
+                    print("Cookies: ", request.cookies)
+                    cookies_str = '; '.join([f'{key}={value}' for key, value in request.cookies.items()])
+                    headers.update({'cookie': cookies_str})
                     token = None
                     if form_data.auth_type == "bearer":
                         token = form_data.key
@@ -282,8 +284,9 @@ async def verify_tool_servers_config(
                         except Exception as e:
                             pass
 
+
                     if token:
-                        headers = {"Authorization": f"Bearer {token}"}
+                        headers["Authorization"] = f"Bearer {token}"
 
                     await client.connect(form_data.url, headers=headers)
                     specs = await client.list_tool_specs()

backend/open_webui/jms/wisp/protobuf/common_pb2.pyi

@@ -104,7 +104,9 @@ async def read_resource(self, uri: str) -> Optional[dict]:
 
     async def disconnect(self):
         # Clean up and close the session
-        await self.exit_stack.aclose()
+        if self.exit_stack is not None:
+            await self.exit_stack.aclose()
+            self.exit_stack = None
 
     async def __aenter__(self):
         await self.exit_stack.__aenter__()

backend/open_webui/jms/wisp/protobuf/service_pb2.pyi

@@ -1324,6 +1324,9 @@ async def process_chat_payload(request, form_data, user, metadata, model):
                     auth_type = mcp_server_connection.get("auth_type", "")
 
                     headers = {}
+                    cookie = '; '.join([f'{key}={value}' for key, value in request.cookies.items()])
+                    headers.update({'cookie': cookie})
+
                     if auth_type == "bearer":
                         headers["Authorization"] = (
                             f"Bearer {mcp_server_connection.get('key', '')}"
@@ -1333,7 +1336,7 @@ async def process_chat_payload(request, form_data, user, metadata, model):
                         pass
                     elif auth_type == "session":
                         headers["Authorization"] = (
-                            f"Bearer {request.state.token.credentials}"
+                            f"Bearer jms-{request.cookies.get('jms_sessionid', '')}"
                         )
                     elif auth_type == "system_oauth":
                         oauth_token = extra_params.get("__oauth_token__", None)
@@ -1397,11 +1400,12 @@ async def tool_function(**kwargs):
                                 "type": "chat:message:error",
                                 "data": {
                                     "error": {
-                                        "content": f"Failed to connect to MCP server '{server_id}'"
+                                        "content": f"Failed to connect to MCP server '{server_id}-{mcp_server_connection.get('url', '')}'"
                                     }
                                 },
                             }
                         )
+                        raise e
                     continue
 
         tools_dict = await get_tools(

backend/open_webui/routers/configs.py

@@ -333,6 +333,14 @@
 				$config?.features?.enable_direct_connections && ($settings?.directConnections ?? null)
 			)
 		);
+
+		console.log('Items: ');
+		console.log(items);
+
+		if (!selectedModel) {
+			selectedModel = items[0];
+			value = selectedModel.value;
+		}
 	});
 
 	$: if (show) {
@@ -404,7 +412,7 @@
 			}}
 		>
 			{#if selectedModel}
-				{selectedModel.label}
+				{selectedModel.label.split('/').slice(-1)}
 			{:else}
 				{placeholder}
 			{/if}

backend/open_webui/utils/mcp/client.py

@@ -59,8 +59,8 @@
 							</div>
 
 							<!-- <div slot="content">
-							{JSON.stringify(tool, null, 2)}
-						</div> -->
+								{JSON.stringify(tool, null, 2)}
+							</div> -->
 						</Collapsible>
 					{/each}
 				</div>