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

client request options

Browse source
This commit is contained in:
Michael Yang 2023-07-06 16:53:14 -07:00
parent b0618a466e
commit 291bb97e3d
1 changed files with 53 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
api/client.go
View file

@ -25,19 +25,35 @@ func NewClient(hosts ...string) *Client {
} }
} }
func (c *Client) stream(ctx context.Context, method string, path string, reqData any, fn func(bts []byte) error) error { type options struct {
var reqBody io.Reader requestBody io.Reader
var data []byte responseFunc func(bts []byte) error
var err error
if reqData != nil {
data, err = json.Marshal(reqData)
if err != nil {
return err
}
reqBody = bytes.NewReader(data)
} }
request, err := http.NewRequestWithContext(ctx, method, c.base.JoinPath(path).String(), reqBody) func OptionRequestBody(data any) func(*options) {
bts, err := json.Marshal(data)
if err != nil {
panic(err)
}
return func(opts *options) {
opts.requestBody = bytes.NewReader(bts)
}
}
func OptionResponseFunc(fn func([]byte) error) func(*options) {
return func(opts *options) {
opts.responseFunc = fn
}
}
func (c *Client) stream(ctx context.Context, method, path string, fns ...func(*options)) error {
var opts options
for _, fn := range fns {
fn(&opts)
}
request, err := http.NewRequestWithContext(ctx, method, c.base.JoinPath(path).String(), opts.requestBody)
if err != nil { if err != nil {
return err return err
} }
@ -51,12 +67,14 @@ func (c *Client) stream(ctx context.Context, method string, path string, reqData
} }
defer response.Body.Close() defer response.Body.Close()
if opts.responseFunc != nil {
scanner := bufio.NewScanner(response.Body) scanner := bufio.NewScanner(response.Body)
for scanner.Scan() { for scanner.Scan() {
if err := fn(scanner.Bytes()); err != nil { if err := opts.responseFunc(scanner.Bytes()); err != nil {
return err return err
} }
} }
}
return nil return nil
} }
@ -64,25 +82,31 @@ func (c *Client) stream(ctx context.Context, method string, path string, reqData
type GenerateResponseFunc func(GenerateResponse) error type GenerateResponseFunc func(GenerateResponse) error
func (c *Client) Generate(ctx context.Context, req *GenerateRequest, fn GenerateResponseFunc) error { func (c *Client) Generate(ctx context.Context, req *GenerateRequest, fn GenerateResponseFunc) error {
return c.stream(ctx, http.MethodPost, "/api/generate", req, func(bts []byte) error { return c.stream(ctx, http.MethodPost, "/api/generate",
OptionRequestBody(req),
OptionResponseFunc(func(bts []byte) error {
var resp GenerateResponse var resp GenerateResponse
if err := json.Unmarshal(bts, &resp); err != nil { if err := json.Unmarshal(bts, &resp); err != nil {
return err return err
} }
return fn(resp) return fn(resp)
}) }),
)
} }
type PullProgressFunc func(PullProgress) error type PullProgressFunc func(PullProgress) error
func (c *Client) Pull(ctx context.Context, req *PullRequest, fn PullProgressFunc) error { func (c *Client) Pull(ctx context.Context, req *PullRequest, fn PullProgressFunc) error {
return c.stream(ctx, http.MethodPost, "/api/pull", req, func(bts []byte) error { return c.stream(ctx, http.MethodPost, "/api/pull",
OptionRequestBody(req),
OptionResponseFunc(func(bts []byte) error {
var resp PullProgress var resp PullProgress
if err := json.Unmarshal(bts, &resp); err != nil { if err := json.Unmarshal(bts, &resp); err != nil {
return err return err
} }
return fn(resp) return fn(resp)
}) }),
)
} }