Updated

Author: djthorpe

cmd/cli/flags.go

@@ -2,8 +2,10 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"os"
-	"strings"
+	"path/filepath"
+	"strconv"
 	"time"
 
 	// Packages
@@ -31,7 +33,7 @@ func NewFlags(name string, args []string, register ...FlagsRegister) (*Flags, er
 	// Register flags
 	flags.Bool("debug", false, "Enable debug logging")
 	flags.Duration("timeout", 0, "Timeout")
-	flags.String("out", "", "Output format (text, csv, json) or file name (.txt, .csv, .tsv, .json)")
+	flags.String("out", "txt", "Output format (txt, csv, tsv, json) or file name (.txt, .csv, .tsv, .json)")
 	for _, fn := range register {
 		fn(flags)
 	}
@@ -61,7 +63,29 @@ func (flags *Flags) Timeout() time.Duration {
 
 func (flags *Flags) GetOut() string {
 	v, _ := flags.GetString("out")
-	return strings.ToLower(v)
+	return v
+}
+
+// Return a filename for output, returns an empty string if the output
+// argument is not a filename (it requires an extension)
+func (flags *Flags) GetOutFilename(def string, n uint) string {
+	filename := flags.GetOut()
+	if filename == "" {
+		filename = filepath.Base(def)
+	}
+	if filename == "" {
+		return ""
+	}
+	ext := filepath.Ext(filename)
+	if ext == "" {
+		return ""
+	}
+	if n > 0 {
+		filename = filename[:len(filename)-len(ext)] + "-" + fmt.Sprint(n) + ext
+	} else {
+		filename = filename[:len(filename)-len(ext)] + ext
+	}
+	return filepath.Clean(filename)
 }
 
 func (flags *Flags) GetString(key string) (string, error) {
@@ -72,6 +96,16 @@ func (flags *Flags) GetString(key string) (string, error) {
 	}
 }
 
+func (flags *Flags) GetUint(key string) (uint, error) {
+	if flag := flags.Lookup(key); flag == nil {
+		return 0, errors.ErrNotFound.With(key)
+	} else if v, err := strconv.ParseUint(os.ExpandEnv(flag.Value.String()), 10, 64); err != nil {
+		return 0, errors.ErrBadParameter.With(key)
+	} else {
+		return uint(v), nil
+	}
+}
+
 func (flags *Flags) Write(v any) error {
 	opts := []writer.TableOpt{}
 

cmd/cli/openai.go

@@ -2,6 +2,9 @@ package main
 
 import (
 	// Packages
+
+	"fmt"
+
 	"github.com/mutablelogic/go-client/pkg/client"
 	"github.com/mutablelogic/go-client/pkg/openai"
 
@@ -15,6 +18,7 @@ import (
 func OpenAIFlags(flags *Flags) {
 	flags.String("openai-api-key", "${OPENAI_API_KEY}", "OpenAI API key")
 	flags.String("openai-model", "", "OpenAI Model")
+	flags.Uint("openai-count", 0, "Number of results to return")
 }
 
 func OpenAIRegister(cmd []Client, opts []client.ClientOpt, flags *Flags) ([]Client, error) {
@@ -76,9 +80,16 @@ func openaiImage(client *openai.Client, flags *Flags) CommandFn {
 		opts := []openai.ImageOpt{
 			openai.OptImageModel("dall-e-3"),
 		}
-		if model, err := flags.GetString("openai-model"); err != nil && model != "" {
+		if model, err := flags.GetString("openai-model"); err != nil {
+			return err
+		} else if model != "" {
 			opts = append(opts, openai.OptImageModel(model))
 		}
+		if count, err := flags.GetUint("openai-count"); err != nil {
+			return err
+		} else if count > 0 {
+			opts = append(opts, openai.OptImageCount(int(count)))
+		}
 
 		// Call API
 		prompt := flags.Arg(2)
@@ -90,10 +101,16 @@ func openaiImage(client *openai.Client, flags *Flags) CommandFn {
 		}
 
 		// Write images out
-		for _, image := range images {
-			if _, err := image.Write(client, flags.Output()); err != nil {
+		for i, image := range images {
+			if filename, err := image.Filename(); err != nil {
 				return err
+			} else {
+				filename := flags.GetOutFilename(filename, uint(i))
+				fmt.Println(i, filename)
 			}
+			//if _, err := image.Write(client, flags.Output()); err != nil {
+			//	return err
+			//}
 		}
 		// Return success
 		return nil

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/djthorpe/go-errors v1.0.3
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.8.4
+	github.com/veandco/go-sdl2 v0.4.36
 	golang.org/x/exp v0.0.0-20231127185646-65229373498e
 	golang.org/x/term v0.15.0
 )

go.sum

@@ -8,6 +8,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/veandco/go-sdl2 v0.4.36 h1:Ltydev536rRQodmIrTWFZ3dRp5A+/6t5CYvbi4Kvia0=
+github.com/veandco/go-sdl2 v0.4.36/go.mod h1:OROqMhHD43nT4/i9crJukyVecjPNYYuCofep6SNiAjY=
 golang.org/x/exp v0.0.0-20231127185646-65229373498e h1:Gvh4YaCaXNs6dKTlfgismwWZKyjVZXwOPfIyUaqU3No=
 golang.org/x/exp v0.0.0-20231127185646-65229373498e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
 golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=

pkg/openai/image.go

@@ -4,6 +4,8 @@ import (
 	"encoding/base64"
 	"io"
 	"net/http"
+	"net/url"
+	"path/filepath"
 
 	// Packages
 	"github.com/mutablelogic/go-client/pkg/client"
@@ -86,6 +88,17 @@ func (c *Client) ImageGenerate(prompt string, opts ...ImageOpt) ([]Image, error)
 	return response.Data, nil
 }
 
+// Return the filename from the image
+func (i Image) Filename() (string, error) {
+	if i.Url == "" {
+		return "", ErrBadParameter.With("Missing URL in image")
+	} else if url, err := url.Parse(i.Url); err != nil {
+		return "", err
+	} else {
+		return filepath.Base(url.Path), nil
+	}
+}
+
 // Write an image to a writer object and return the mimetype
 func (i Image) Write(c *Client, w io.Writer) (string, error) {
 	var response imageWriter