highperfocused/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2025-11-13 00:07:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

server: serve original error for remote models

Browse Source
This commit is contained in:
jmorganca
2025-09-20 16:46:32 -07:00
parent 3677842ff1
commit 4ef2b2852d
1 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
server/routes.go
View File

@@ -29,7 +29,6 @@ import (
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
"github.com/ollama/ollama/api" "github.com/ollama/ollama/api"
"github.com/ollama/ollama/auth"
"github.com/ollama/ollama/discover" "github.com/ollama/ollama/discover"
"github.com/ollama/ollama/envconfig" "github.com/ollama/ollama/envconfig"
"github.com/ollama/ollama/format" "github.com/ollama/ollama/format"
@@ -251,18 +250,14 @@ func (s *Server) GenerateHandler(c *gin.Context) {
client := api.NewClient(remoteURL, http.DefaultClient) client := api.NewClient(remoteURL, http.DefaultClient)
err = client.Generate(c, &req, fn) err = client.Generate(c, &req, fn)
if err != nil { if err != nil {
var sErr api.AuthorizationError var authError api.AuthorizationError
if errors.As(err, &sErr) && sErr.StatusCode == http.StatusUnauthorized { if errors.As(err, &authError) {
pk, pkErr := auth.GetPublicKey() c.JSON(authError.StatusCode, gin.H{"error": "unauthorized", "public_key": authError.PublicKey})
if pkErr != nil {
slog.Error("couldn't get public key", "error", pkErr)
c.JSON(http.StatusUnauthorized, gin.H{"error": "error getting public key"})
return return
} }
c.JSON(http.StatusUnauthorized, gin.H{ var apiError api.StatusError
"error": "unauthorized", if errors.As(err, &apiError) {
"public_key": pk, c.JSON(apiError.StatusCode, apiError)
})
return return
} }
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
@@ -1813,18 +1808,14 @@ func (s *Server) ChatHandler(c *gin.Context) {
client := api.NewClient(remoteURL, http.DefaultClient) client := api.NewClient(remoteURL, http.DefaultClient)
err = client.Chat(c, &req, fn) err = client.Chat(c, &req, fn)
if err != nil { if err != nil {
var sErr api.AuthorizationError var authError api.AuthorizationError
if errors.As(err, &sErr) && sErr.StatusCode == http.StatusUnauthorized { if errors.As(err, &authError) {
pk, pkErr := auth.GetPublicKey() c.JSON(authError.StatusCode, gin.H{"error": "unauthorized", "public_key": authError.PublicKey})
if pkErr != nil {
slog.Error("couldn't get public key", "error", pkErr)
c.JSON(http.StatusUnauthorized, gin.H{"error": "error getting public key"})
return return
} }
c.JSON(http.StatusUnauthorized, gin.H{ var apiError api.StatusError
"error": "unauthorized", if errors.As(err, &apiError) {
"public_key": pk, c.JSON(apiError.StatusCode, apiError)
})
return return
} }
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})