Refactor MCP and non-MCP connects in Dash

Author: antontruly

dash/pages/mcp_connect.py

@@ -352,13 +352,13 @@ def send_external_request(n_clicks, connection, method, body, auth_type):
         return html.Div([html.P("Please fill in all required fields: Connection and Method", className="text-danger")])
 
     try:
-        headers = {}
+        request_headers = {"Content-Type": "application/json"}
 
         # Parse body JSON
-        body_data = None
+        request_data = None
         if body and body.strip():
             try:
-                body_data = json.loads(body)
+                request_data = json.loads(body)
             except json.JSONDecodeError:
                 return html.Div([html.P("❌ Invalid JSON in body", className="text-danger")])
         w = get_workspace_client(auth_type)
@@ -399,18 +399,19 @@ def send_external_request(n_clicks, connection, method, body, auth_type):
                             return html.Div([html.P(f"❌ MCP Initialization Error: {error}", className="text-danger")])
                     else:
                         return html.Div([html.P(f"❌ MCP Initialization Error: {error}", className="text-danger")])
+                
                 mcp_session_id = session_id
 
                 # Add MCP session ID to headers
-                headers["Mcp-Session-Id"] = mcp_session_id
+                request_headers["Mcp-Session-Id"] = mcp_session_id
 
                 # Use json parameter for MCP requests
                 response = w.serving_endpoints.http_request(
                     conn=connection, 
                     method=method_enum, 
                     path=request_path, 
-                    headers=headers, 
-                    json=body_data
+                    headers=request_headers if request_headers else None, 
+                    json=request_data if request_data else {},
                 )
             else:
                 # Regular requests
@@ -419,15 +420,16 @@ def send_external_request(n_clicks, connection, method, body, auth_type):
                         conn=connection, 
                         method=method_enum, 
                         path=request_path, 
-                        headers=headers, 
-                        json=body_data
+                        headers=request_headers if request_headers else None, 
+                        json=request_data if request_data else {},
                     )
                 else:
                     response = w.serving_endpoints.http_request(
                         conn=connection, 
                         method=method_enum, 
                         path=request_path, 
-                        headers=headers
+                        headers=request_headers if request_headers else None, 
+                        json=request_data if request_data else {},
                     )
 
             response_json = response.json()

streamlit/views/external_connections.py

@@ -70,8 +70,6 @@ def get_client_obo() -> WorkspaceClient:
 
         http_method = getattr(ExternalFunctionRequestHttpMethod, http_method)
 
-        request_data = request_data if request_data else None
-
         response = w.serving_endpoints.http_request(
             conn=connection_name, 
             method=http_method, 

streamlit/views/mcp_connect.py

@@ -105,7 +105,7 @@ def is_connection_login_error(error: str):
             # TODO: Add OAuth Machine-to-Machine logic
             w = WorkspaceClient()
 
-        request_headers = {}
+        request_headers = {"Content-Type": "application/json"}
 
         if request_data and request_data.strip():
             try:
@@ -135,8 +135,6 @@ def is_connection_login_error(error: str):
 
         request_headers["Mcp-Session-Id"] = st.session_state.mcp_session_id
 
-        request_data = request_data if request_data else None
-
         response = w.serving_endpoints.http_request(
             conn=connection_name, 
             method=http_method,