highperfocused/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2025-09-28 19:37:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

server: add unauthorized error to remote chat handler (#12338)

Browse Source
This commit is contained in:
Jeffrey Morgan
2025-09-18 19:40:31 -03:00
committed by GitHub
parent 0c3d0e7533
commit 22ccdd74c2
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/routes.go
View File

@@ -259,7 +259,10 @@ func (s *Server) GenerateHandler(c *gin.Context) {
c.JSON(http.StatusUnauthorized, gin.H{"error": "error getting public key"})
return
}
c.JSON(http.StatusUnauthorized, gin.H{"public_key": pk})
c.JSON(http.StatusUnauthorized, gin.H{
"error": "unauthorized",
"public_key": pk,
})
return
}
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
@@ -1810,6 +1813,20 @@ func (s *Server) ChatHandler(c *gin.Context) {
client := api.NewClient(remoteURL, http.DefaultClient)
err = client.Chat(c, &req, fn)
if err != nil {
var sErr api.AuthorizationError
if errors.As(err, &sErr) && sErr.StatusCode == http.StatusUnauthorized {
pk, pkErr := auth.GetPublicKey()
if pkErr != nil {
slog.Error("couldn't get public key", "error", pkErr)
c.JSON(http.StatusUnauthorized, gin.H{"error": "error getting public key"})
return
}
c.JSON(http.StatusUnauthorized, gin.H{
"error": "unauthorized",
"public_key": pk,
})
return
}
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}