Revert "Fixups"

This reverts commit ab1b3d6.

Author: mudler

core/http/endpoints/openai/mcp.go

@@ -72,33 +72,20 @@ func MCPCompletionEndpoint(cl *config.ModelConfigLoader, ml *model.ModelLoader,
 			fragment = fragment.AddMessage(message.Role, message.StringContent)
 		}
 
-		// Extract port from APIAddress (format: ":8080" or "127.0.0.1:8080" or "0.0.0.0:8080")
-		port := "8080" // default
-		if appConfig.APIAddress != "" {
-			lastColon := strings.LastIndex(appConfig.APIAddress, ":")
-			if lastColon >= 0 && lastColon+1 < len(appConfig.APIAddress) {
-				port = appConfig.APIAddress[lastColon+1:]
-			} else {
-				log.Warn().Str("APIAddress", appConfig.APIAddress).Msg("[MCP] Could not extract port from APIAddress, using default 8080")
-			}
-		}
-
+		port := appConfig.APIAddress[strings.LastIndex(appConfig.APIAddress, ":")+1:]
 		apiKey := ""
-		if len(appConfig.ApiKeys) > 0 {
+		if appConfig.ApiKeys != nil {
 			apiKey = appConfig.ApiKeys[0]
 		}
 
-		baseURL := "http://127.0.0.1:" + port
-		log.Debug().Str("baseURL", baseURL).Str("model", config.Name).Msg("[MCP] Creating OpenAI LLM client for internal API calls")
-
 		ctxWithCancellation, cancel := context.WithCancel(ctx)
 		defer cancel()
 		handleConnectionCancellation(c, cancel, ctxWithCancellation)
 		// TODO: instead of connecting to the API, we should just wire this internally
 		// and act like completion.go.
 		// We can do this as cogito expects an interface and we can create one that
 		// we satisfy to just call internally ComputeChoices
-		defaultLLM := cogito.NewOpenAILLM(config.Name, apiKey, baseURL)
+		defaultLLM := cogito.NewOpenAILLM(config.Name, apiKey, "http://127.0.0.1:"+port)
 
 		cogitoOpts := []cogito.Option{
 			cogito.WithStatusCallback(func(s string) {
@@ -140,8 +127,7 @@ func MCPCompletionEndpoint(cl *config.ModelConfigLoader, ml *model.ModelLoader,
 			cogitoOpts...,
 		)
 		if err != nil && !errors.Is(err, cogito.ErrNoToolSelected) {
-			log.Error().Err(err).Msgf("[MCP] ExecuteTools failed for model %s", config.Name)
-			return fmt.Errorf("failed to execute tools: %w", err)
+			return err
 		}
 
 		f, err = defaultLLM.Ask(ctx, f)

core/http/static/chat.js

@@ -435,28 +435,9 @@ async function promptGPT(systemPrompt, input) {
   }
 
   if (!response.ok) {
-    // Try to get error details from response body
-    let errorMessage = `Error: POST ${endpoint} ${response.status}`;
-    try {
-      const errorData = await response.json();
-      if (errorData && errorData.error && errorData.error.message) {
-        errorMessage = `Error (${response.status}): ${errorData.error.message}`;
-      }
-    } catch (e) {
-      // If response is not JSON, try to get text
-      try {
-        const errorText = await response.text();
-        if (errorText) {
-          errorMessage = `Error (${response.status}): ${errorText.substring(0, 200)}`;
-        }
-      } catch (e2) {
-        // Ignore - use default error message
-      }
-    }
-    
     Alpine.store("chat").add(
       "assistant",
-      `<span class='error'>${errorMessage}</span>`,
+      `<span class='error'>Error: POST ${endpoint} ${response.status}</span>`,
     );
     toggleLoader(false);
     currentAbortController = null;