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

display gin api errors in cli

Browse source
This commit is contained in:
Bruce MacDonald 2023-07-20 20:45:12 +02:00
parent 6a19724d5f
commit ebaa33ac28
2 changed files with 21 additions and 15 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 {
@ -133,9 +132,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,
} }
} }

27
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 {
@ -44,10 +51,10 @@ type PullRequest struct {
} }
type ProgressResponse struct { type ProgressResponse struct {
Status string `json:"status"` Status string `json:"status"`
Digest string `json:"digest,omitempty"` Digest string `json:"digest,omitempty"`
Total int `json:"total,omitempty"` Total int `json:"total,omitempty"`
Completed int `json:"completed,omitempty"` Completed int `json:"completed,omitempty"`
} }
type PushRequest struct { type PushRequest struct {