VaalaCat/go-openai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add form builder (#235)

Browse Source 
* add form builder

* cover VariImage

* test for closing errors

* simplify tests

* add audio api test coverage

* don't leak authToken when printed

* rename api->client

* fix test
This commit is contained in:
sashabaranov
2023-04-08 19:26:26 +04:00
committed by GitHub
parent 2f3700f4c5
commit 226ff328e2
8 changed files with 272 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
image.go
View File

@@ -3,8 +3,6 @@ package openai
import (
"bytes"
"context"
"io"
"mime/multipart"
"net/http"
"os"
"strconv"
@@ -67,50 +65,46 @@ type ImageEditRequest struct {
// CreateEditImage - API call to create an image. This is the main endpoint of the DALL-E API.
func (c *Client) CreateEditImage(ctx context.Context, request ImageEditRequest) (response ImageResponse, err error) {
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
builder := c.createFormBuilder(body)
// image
image, err := writer.CreateFormFile("image", request.Image.Name())
if err != nil {
return
}
_, err = io.Copy(image, request.Image)
err = builder.createFormFile("image", request.Image)
if err != nil {
return
}
// mask, it is optional
if request.Mask != nil {
mask, err2 := writer.CreateFormFile("mask", request.Mask.Name())
if err2 != nil {
return
}
_, err = io.Copy(mask, request.Mask)
err = builder.createFormFile("mask", request.Mask)
if err != nil {
return
}
}
err = writer.WriteField("prompt", request.Prompt)
err = builder.writeField("prompt", request.Prompt)
if err != nil {
return
}
err = writer.WriteField("n", strconv.Itoa(request.N))
err = builder.writeField("n", strconv.Itoa(request.N))
if err != nil {
return
}
err = writer.WriteField("size", request.Size)
err = builder.writeField("size", request.Size)
if err != nil {
return
}
writer.Close()
err = builder.close()
if err != nil {
return
}
urlSuffix := "/images/edits"
req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL(urlSuffix), body)
if err != nil {
return
}
req.Header.Set("Content-Type", writer.FormDataContentType())
req.Header.Set("Content-Type", builder.formDataContentType())
err = c.sendRequest(req, &response)
return
}
@@ -126,27 +120,27 @@ type ImageVariRequest struct {
// Use abbreviations(vari for variation) because ci-lint has a single-line length limit ...
func (c *Client) CreateVariImage(ctx context.Context, request ImageVariRequest) (response ImageResponse, err error) {
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
builder := c.createFormBuilder(body)
// image
image, err := writer.CreateFormFile("image", request.Image.Name())
if err != nil {
return
}
_, err = io.Copy(image, request.Image)
err = builder.createFormFile("image", request.Image)
if err != nil {
return
}
err = writer.WriteField("n", strconv.Itoa(request.N))
err = builder.writeField("n", strconv.Itoa(request.N))
if err != nil {
return
}
err = writer.WriteField("size", request.Size)
err = builder.writeField("size", request.Size)
if err != nil {
return
}
writer.Close()
err = builder.close()
if err != nil {
return
}
//https://platform.openai.com/docs/api-reference/images/create-variation
urlSuffix := "/images/variations"
req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL(urlSuffix), body)
@@ -154,7 +148,7 @@ func (c *Client) CreateVariImage(ctx context.Context, request ImageVariRequest)
return
}
req.Header.Set("Content-Type", writer.FormDataContentType())
req.Header.Set("Content-Type", builder.formDataContentType())
err = c.sendRequest(req, &response)
return
}