highperfocused/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2025-07-28 18:15:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

consistent error handling for pull and generate

Browse Source
This commit is contained in:
Jeffrey Morgan
2023-07-10 21:34:15 -07:00
parent 407a5cabf4
commit a3ec1ec2a0
3 changed files with 42 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/routes.go
View File

@@ -54,7 +54,7 @@ func generate(c *gin.Context) {
}
if _, err := os.Stat(req.Model); err != nil {
if !errors.Is(err, os.ErrNotExist) {
c.JSON(http.StatusBadRequest, gin.H{"message": err.Error()})
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
req.Model = path.Join(cacheDir(), "models", req.Model+".bin")
@@ -136,7 +136,7 @@ func Serve(ln net.Listener) error {
r.POST("api/pull", func(c *gin.Context) {
var req api.PullRequest
if err := c.ShouldBindJSON(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"message": err.Error()})
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
@@ -146,16 +146,10 @@ func Serve(ln net.Listener) error {
if err := pull(req.Model, progressCh); err != nil {
var opError *net.OpError
if errors.As(err, &opError) {
result := api.PullProgress{
Error: api.Error{
Code: http.StatusBadGateway,
Message: "failed to get models from directory",
},
}
c.JSON(http.StatusBadGateway, result)
c.JSON(http.StatusBadGateway, gin.H{"error": err.Error()})
return
}
c.JSON(http.StatusBadRequest, gin.H{"message": err.Error()})
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
}()