Elgato_dark/LocalAI
1
0
Fork 0
mirror of https://github.com/mudler/LocalAI synced 2026-04-21 13:27:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 29

Fixups

Browse source 
Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
This commit is contained in:
Ettore Di Giacinto 2025-11-10 16:20:15 +01:00
parent 0b5c2a5700
commit ab1b3d6da9
2 changed files with 38 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/http/endpoints/openai/mcp.go
View file

@ -72,12 +72,25 @@ func MCPCompletionEndpoint(cl *config.ModelConfigLoader, ml *model.ModelLoader,
fragment = fragment.AddMessage(message.Role, message.StringContent)
}
port := appConfig.APIAddress[strings.LastIndex(appConfig.APIAddress, ":")+1:]
// 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")
}
}
apiKey := ""
if appConfig.ApiKeys != nil {
if len(appConfig.ApiKeys) > 0 {
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)
@ -85,7 +98,7 @@ func MCPCompletionEndpoint(cl *config.ModelConfigLoader, ml *model.ModelLoader,
// 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, "http://127.0.0.1:"+port)
defaultLLM := cogito.NewOpenAILLM(config.Name, apiKey, baseURL)
cogitoOpts := []cogito.Option{
cogito.WithStatusCallback(func(s string) {
@ -127,7 +140,8 @@ func MCPCompletionEndpoint(cl *config.ModelConfigLoader, ml *model.ModelLoader,
cogitoOpts...,
)
if err != nil && !errors.Is(err, cogito.ErrNoToolSelected) {
return err
log.Error().Err(err).Msgf("[MCP] ExecuteTools failed for model %s", config.Name)
return fmt.Errorf("failed to execute tools: %w", err)
}
f, err = defaultLLM.Ask(ctx, f)

21
core/http/static/chat.js
View file

@ -435,9 +435,28 @@ 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'>Error: POST ${endpoint} ${response.status}</span>`,
`<span class='error'>${errorMessage}</span>`,
);
toggleLoader(false);
currentAbortController = null;