Updated image

Author: djthorpe

pkg/client/transport.go

@@ -107,8 +107,8 @@ func (transport *logtransport) RoundTrip(req *http.Request) (*http.Response, err
 ///////////////////////////////////////////////////////////////////////////////
 // PRIVATE METHODS
 
-func (w *readwrapper) Read(b []byte) (n int, err error) {
-	n, err = w.r.Read(b)
+func (w *readwrapper) Read(b []byte) (int, error) {
+	n, err := w.r.Read(b)
 	if err == nil {
 		_, err = w.data.Write(b[:n])
 	}

pkg/openai/image.go

@@ -3,6 +3,7 @@ package openai
 import (
 	"encoding/base64"
 	"io"
+	"net/http"
 
 	// Packages
 	"github.com/mutablelogic/go-client/pkg/client"
@@ -61,7 +62,52 @@ func (c *Client) WriteImage(w io.Writer, image *Image) (int, error) {
 		} else {
 			return n, nil
 		}
+	case image.Url != "":
+		var resp reqUrl
+		if req, err := http.NewRequest(http.MethodGet, image.Url, nil); err != nil {
+			return 0, err
+		} else if err := c.Request(req, &resp, client.OptToken(client.Token{})); err != nil {
+			return 0, err
+		} else {
+			return 0, ErrNotImplemented.With("WriteImage")
+		}
 	default:
 		return 0, ErrNotImplemented.With("WriteImage")
 	}
 }
+
+///////////////////////////////////////////////////////////////////////////////
+// PRIVATE METHODS
+
+type reqUrl struct {
+	w io.Writer
+	n int
+}
+
+func (i *reqUrl) Unmarshal(mimetype string, r io.Reader) error {
+	defer func() {
+		// Close the reader if it's an io.ReadCloser
+		if closer, ok := r.(io.ReadCloser); ok {
+			closer.Close()
+		}
+	}()
+
+	buffer := make([]byte, 1024)
+	for {
+		// Read data from the reader into the buffer
+		bytesRead, err := r.Read(buffer)
+		if err == io.EOF {
+			// If we've reached EOF, break out of the loop
+			break
+		} else if err != nil {
+			return err
+		} else if n, err := i.w.Write(buffer[:bytesRead]); err != nil {
+			return err
+		} else {
+			i.n += n
+		}
+	}
+
+	// Return success
+	return nil
+}

pkg/openai/image_test.go

@@ -39,7 +39,36 @@ func Test_image_002(t *testing.T) {
 
 	// Output images
 	for n, image := range images {
-		filename := filepath.Join(os.TempDir(), fmt.Sprintf("test-%d.png", n))
+		filename := filepath.Join(t.TempDir(), fmt.Sprintf("%s-%d.png", t.Name(), n))
+		if w, err := os.Create(filename); err != nil {
+			t.Error(err)
+		} else {
+			defer w.Close()
+			t.Log("Writing", w.Name())
+			n, err := client.WriteImage(w, image)
+			assert.NoError(err)
+			assert.NotZero(n)
+		}
+	}
+
+}
+
+func Test_image_003(t *testing.T) {
+	assert := assert.New(t)
+	client, err := openai.New(GetApiKey(t), opts.OptTrace(os.Stderr, true))
+	assert.NoError(err)
+	assert.NotNil(client)
+
+	// Create one image
+	images, err := client.CreateImages("A painting of a cat in the style of Van Gogh", openai.OptResponseFormat("url"), openai.OptCount(1))
+	assert.NoError(err)
+	assert.NotNil(images)
+	assert.NotEmpty(images)
+	assert.Len(images, 1)
+
+	// Output images
+	for n, image := range images {
+		filename := filepath.Join(t.TempDir(), fmt.Sprintf("%s-%d.png", t.Name(), n))
 		if w, err := os.Create(filename); err != nil {
 			t.Error(err)
 		} else {