baalajimaestro/ollama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #147 from jmorganca/brucemacd/cli-err-display

Browse source 
Improve CLI error display
This commit is contained in:
Bruce MacDonald 2023-07-21 16:10:19 +02:00 committed by GitHub
commit 7ba1308595
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
api/client.go
View file

@ -27,7 +27,7 @@ func checkError(resp *http.Response, body []byte) error {
err := json.Unmarshal(body, &apiError) err := json.Unmarshal(body, &apiError)
if err != nil { if err != nil {
// Use the full body as the message if we fail to decode a response. // Use the full body as the message if we fail to decode a response.
apiError.Message = string(body) apiError.ErrorMessage = string(body)
} }
return apiError return apiError
@ -92,7 +92,6 @@ func (c *Client) do(ctx context.Context, method, path string, reqData, respData
} }
} }
return nil return nil
} }
func (c *Client) stream(ctx context.Context, method, path string, data any, fn func([]byte) error) error { func (c *Client) stream(ctx context.Context, method, path string, data any, fn func([]byte) error) error {
@ -137,9 +136,9 @@ func (c *Client) stream(ctx context.Context, method, path string, data any, fn f
if response.StatusCode >= 400 { if response.StatusCode >= 400 {
return StatusError{ return StatusError{
StatusCode: response.StatusCode, StatusCode: response.StatusCode,
Status: response.Status, Status: response.Status,
Message: errorResponse.Error, ErrorMessage: errorResponse.Error,
} }
} }

19
api/types.go
View file

@ -8,16 +8,23 @@ import (
) )
type StatusError struct { type StatusError struct {
StatusCode int StatusCode int
Status string Status string
Message string ErrorMessage string `json:"error"`
} }
func (e StatusError) Error() string { func (e StatusError) Error() string {
if e.Message != "" { switch {
return fmt.Sprintf("%s: %s", e.Status, e.Message) case e.Status != "" && e.ErrorMessage != "":
return fmt.Sprintf("%s: %s", e.Status, e.ErrorMessage)
case e.Status != "":
return e.Status
case e.ErrorMessage != "":
return e.ErrorMessage
default:
// this should not happen
return "something went wrong, please see the ollama server logs for details"
} }
return e.Status
} }
type GenerateRequest struct { type GenerateRequest struct {

5
server/routes.go
View file

@ -2,6 +2,7 @@ package server
import ( import (
"encoding/json" "encoding/json"
"errors"
"io" "io"
"log" "log"
"net" "net"
@ -178,6 +179,10 @@ func ListModelsHandler(c *gin.Context) {
} }
err = filepath.Walk(fp, func(path string, info os.FileInfo, err error) error { err = filepath.Walk(fp, func(path string, info os.FileInfo, err error) error {
if err != nil { if err != nil {
if errors.Is(err, os.ErrNotExist) {
log.Printf("manifest file does not exist: %s", fp)
return nil
}
return err return err
} }
if !info.IsDir() { if !info.IsDir() {