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

Revert "fix issue #149 (#150)" (#151)

Browse Source 
This reverts commit 00eac3cb02.
This commit is contained in:
sashabaranov
2023-03-13 15:42:51 +04:00
committed by GitHub
parent 00eac3cb02
commit d911278514
2 changed files with 8 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
image.go
View File

@@ -86,17 +86,15 @@ func (c *Client) CreateEditImage(ctx context.Context, request ImageEditRequest)
return return
} }
// mask, it is optional // mask
if request.Mask != nil { mask, err := writer.CreateFormFile("mask", request.Mask.Name())
mask, err2 := writer.CreateFormFile("mask", request.Mask.Name()) if err != nil {
if err2 != nil {
return return
} }
_, err = io.Copy(mask, request.Mask) _, err = io.Copy(mask, request.Mask)
if err != nil { if err != nil {
return return
} }
}
err = writer.WriteField("prompt", request.Prompt) err = writer.WriteField("prompt", request.Prompt)
if err != nil { if err != nil {
@@ -121,45 +119,3 @@ func (c *Client) CreateEditImage(ctx context.Context, request ImageEditRequest)
err = c.sendRequest(req, &response) err = c.sendRequest(req, &response)
return return
} }
// ImageVariationRequest represents the request structure for the image API.
type ImageVariationRequest struct {
Image *os.File `json:"image,omitempty"`
N int `json:"n,omitempty"`
Size string `json:"size,omitempty"`
}
// ImageVariationRequest - API call to create an image variation. This is the main endpoint of the DALL-E API.
func (c *Client) CreateVariateImage(ctx context.Context, request ImageVariationRequest) (response ImageResponse, err error) {
body := &bytes.Buffer{}
writer := multipart.NewWriter(body)
// image
image, err := writer.CreateFormFile("image", request.Image.Name())
if err != nil {
return
}
_, err = io.Copy(image, request.Image)
if err != nil {
return
}
err = writer.WriteField("n", strconv.Itoa(request.N))
if err != nil {
return
}
err = writer.WriteField("size", request.Size)
if err != nil {
return
}
writer.Close()
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())
err = c.sendRequest(req, &response)
return
}

105
image_test.go
View File

@@ -132,43 +132,6 @@ func TestImageEdit(t *testing.T) {
} }
} }
func TestImageEditWithoutMask(t *testing.T) {
server := test.NewTestServer()
server.RegisterHandler("/v1/images/edits", handleEditImageEndpoint)
// create the test server
var err error
ts := server.OpenAITestServer()
ts.Start()
defer ts.Close()
config := DefaultConfig(test.GetTestToken())
config.BaseURL = ts.URL + "/v1"
client := NewClientWithConfig(config)
ctx := context.Background()
origin, err := os.Create("image.png")
if err != nil {
t.Error("open origin file error")
return
}
defer func() {
origin.Close()
os.Remove("image.png")
}()
req := ImageEditRequest{
Image: origin,
Prompt: "There is a turtle in the pool",
N: 3,
Size: CreateImageSize1024x1024,
}
_, err = client.CreateEditImage(ctx, req)
if err != nil {
t.Fatalf("CreateImage error: %v", err)
}
}
// handleEditImageEndpoint Handles the images endpoint by the test server. // handleEditImageEndpoint Handles the images endpoint by the test server.
func handleEditImageEndpoint(w http.ResponseWriter, r *http.Request) { func handleEditImageEndpoint(w http.ResponseWriter, r *http.Request) {
var resBytes []byte var resBytes []byte
@@ -199,71 +162,3 @@ func handleEditImageEndpoint(w http.ResponseWriter, r *http.Request) {
resBytes, _ = json.Marshal(responses) resBytes, _ = json.Marshal(responses)
fmt.Fprintln(w, string(resBytes)) fmt.Fprintln(w, string(resBytes))
} }
func TestImageVariation(t *testing.T) {
server := test.NewTestServer()
server.RegisterHandler("/v1/images/edits", handleVariateImageEndpoint)
// create the test server
var err error
ts := server.OpenAITestServer()
ts.Start()
defer ts.Close()
config := DefaultConfig(test.GetTestToken())
config.BaseURL = ts.URL + "/v1"
client := NewClientWithConfig(config)
ctx := context.Background()
origin, err := os.Create("image.png")
if err != nil {
t.Error("open origin file error")
return
}
defer func() {
origin.Close()
os.Remove("image.png")
}()
req := ImageVariationRequest{
Image: origin,
N: 3,
Size: CreateImageSize1024x1024,
}
_, err = client.CreateVariateImage(ctx, req)
if err != nil {
t.Fatalf("CreateImage error: %v", err)
}
}
// handleVariateImageEndpoint Handles the images endpoint by the test server.
func handleVariateImageEndpoint(w http.ResponseWriter, r *http.Request) {
var resBytes []byte
// imagess only accepts POST requests
if r.Method != "POST" {
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
}
responses := ImageResponse{
Created: time.Now().Unix(),
Data: []ImageResponseDataInner{
{
URL: "test-url1",
B64JSON: "",
},
{
URL: "test-url2",
B64JSON: "",
},
{
URL: "test-url3",
B64JSON: "",
},
},
}
resBytes, _ = json.Marshal(responses)
fmt.Fprintln(w, string(resBytes))
}