mirror of
https://github.com/ollama/ollama.git
synced 2025-05-11 02:16:36 +02:00
return error in generate response
This commit is contained in:
parent
2d49197b3b
commit
edba935d67
4 changed files with 38 additions and 7 deletions
|
@ -5,6 +5,7 @@ import (
|
|||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
|
@ -25,6 +26,18 @@ func NewClient(hosts ...string) *Client {
|
|||
}
|
||||
}
|
||||
|
||||
func StatusError(status int, message ...string) error {
|
||||
if status < 400 {
|
||||
return nil
|
||||
}
|
||||
|
||||
if len(message) > 0 && len(message[0]) > 0 {
|
||||
return fmt.Errorf("%d %s: %s", status, http.StatusText(status), message[0])
|
||||
}
|
||||
|
||||
return fmt.Errorf("%d %s", status, http.StatusText(status))
|
||||
}
|
||||
|
||||
type options struct {
|
||||
requestBody io.Reader
|
||||
responseFunc func(bts []byte) error
|
||||
|
@ -70,7 +83,20 @@ func (c *Client) stream(ctx context.Context, method, path string, fns ...func(*o
|
|||
if opts.responseFunc != nil {
|
||||
scanner := bufio.NewScanner(response.Body)
|
||||
for scanner.Scan() {
|
||||
if err := opts.responseFunc(scanner.Bytes()); err != nil {
|
||||
var errorResponse struct {
|
||||
Error string `json:"error"`
|
||||
}
|
||||
|
||||
bts := scanner.Bytes()
|
||||
if err := json.Unmarshal(bts, &errorResponse); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := StatusError(response.StatusCode, errorResponse.Error); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := opts.responseFunc(bts); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue