Updates

Author: djthorpe

cmd/cli/elevenlabs.go

@@ -0,0 +1,125 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"regexp"
+	"strings"
+
+	// Package imports
+	"github.com/mutablelogic/go-client/pkg/client"
+	"github.com/mutablelogic/go-client/pkg/elevenlabs"
+)
+
+/////////////////////////////////////////////////////////////////////
+// TYPES
+
+type result struct {
+	Path  string `json:"path"`
+	Bytes int64  `json:"bytes_written"`
+	Mime  string `json:"mime_type,omitempty"`
+}
+
+/////////////////////////////////////////////////////////////////////
+// GLOBALS
+
+var (
+	reVoiceId = regexp.MustCompile("^[a-zA-Z0-9]{20}$")
+)
+
+/////////////////////////////////////////////////////////////////////
+// REGISTER FUNCTIONS
+
+func ElevenlabsFlags(flags *Flags) {
+	flags.String("elevenlabs-api-key", "${ELEVENLABS_API_KEY}", "ElevenLabs API key")
+}
+
+func ElevenlabsRegister(cmd []Client, opts []client.ClientOpt, flags *Flags) ([]Client, error) {
+	elevenlabs, err := elevenlabs.New(flags.GetString("elevenlabs-api-key"), opts...)
+	if err != nil {
+		return nil, err
+	}
+
+	// Register commands
+	cmd = append(cmd, Client{
+		ns: "elevenlabs",
+		cmd: []Command{
+			{Name: "voices", Description: "Return registered voices", MinArgs: 2, MaxArgs: 2, Fn: elVoices(elevenlabs, flags)},
+			{Name: "voice", Description: "Return voice information", Syntax: "<voice-id>", MinArgs: 3, MaxArgs: 3, Fn: elVoice(elevenlabs, flags)},
+			{Name: "speak", Description: "Create speech from a prompt", Syntax: "<voice> <prompt>", MinArgs: 4, MaxArgs: 4, Fn: elSpeak(elevenlabs, flags)},
+		},
+	})
+
+	// Return success
+	return cmd, nil
+}
+
+/////////////////////////////////////////////////////////////////////
+// API CALL FUNCTIONS
+
+func elVoices(client *elevenlabs.Client, flags *Flags) CommandFn {
+	return func() error {
+		if voices, err := client.Voices(); err != nil {
+			return err
+		} else {
+			return flags.Write(voices)
+		}
+	}
+}
+
+func elVoice(client *elevenlabs.Client, flags *Flags) CommandFn {
+	return func() error {
+		if voice, err := client.Voice(flags.Arg(2)); err != nil {
+			return err
+		} else {
+			return flags.Write(voice)
+		}
+	}
+}
+
+func elSpeak(client *elevenlabs.Client, flags *Flags) CommandFn {
+	return func() error {
+		voice, err := elGetVoiceId(client, flags.Arg(2))
+		if err != nil {
+			return err
+		}
+
+		// Set options
+		opts := []elevenlabs.Opt{}
+
+		// Create the audio
+		out := flags.GetOutFilename("speech.mp3", 0)
+		file, err := os.Create(out)
+		if err != nil {
+			return err
+		}
+		defer file.Close()
+		if n, err := client.TextToSpeech(file, voice, flags.Arg(3), opts...); err != nil {
+			return err
+		} else if err := flags.Write(result{Path: out, Bytes: n}); err != nil {
+			return err
+		}
+
+		// Return success
+		return nil
+	}
+}
+
+/////////////////////////////////////////////////////////////////////
+// PRIVATE METHODS
+
+// return a voice-id given a parameter, which can be a voice-id or name
+func elGetVoiceId(client *elevenlabs.Client, voice string) (string, error) {
+	if reVoiceId.MatchString(voice) {
+		return voice, nil
+	} else if voices, err := client.Voices(); err != nil {
+		return "", err
+	} else {
+		for _, v := range voices {
+			if strings.EqualFold(v.Name, voice) || v.Id == voice {
+				return v.Id, nil
+			}
+		}
+	}
+	return "", fmt.Errorf("voice not found: %q", voice)
+}

cmd/cli/main.go

@@ -6,13 +6,14 @@ import (
 	"os"
 	"path"
 
+	// Packages
 	"github.com/mutablelogic/go-client/pkg/client"
 	"github.com/pkg/errors"
 )
 
 func main() {
 	name := path.Base(os.Args[0])
-	flags, err := NewFlags(name, os.Args[1:], OpenAIFlags, HomeAssistantFlags)
+	flags, err := NewFlags(name, os.Args[1:], OpenAIFlags, ElevenlabsFlags, HomeAssistantFlags)
 	if err != nil {
 		if err != flag.ErrHelp {
 			fmt.Fprintln(os.Stderr, err)
@@ -33,21 +34,25 @@ func main() {
 
 	// Register commands
 	var cmd []Client
+
 	cmd, err = IpifyRegister(cmd, opts, flags)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
-	/*	cmd, err = ElevenlabsRegister(cmd, opts, flags)
-		if err != nil {
-			fmt.Fprintln(os.Stderr, err)
-			os.Exit(1)
-		}*/
+
+	cmd, err = ElevenlabsRegister(cmd, opts, flags)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, err)
+		os.Exit(1)
+	}
+
 	cmd, err = OpenAIRegister(cmd, opts, flags)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
+
 	cmd, err = HomeAssistantRegister(cmd, opts, flags)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)

cmd/cli/openai.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"errors"
-	"fmt"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -189,28 +188,25 @@ func openaiSpeak(client *openai.Client, flags *Flags) CommandFn {
 			prompt = flags.Arg(2)
 		}
 
-		// Determine the filename
+		// Determine the filename // TODO
 		w, err := os.Create("output.mp3")
 		if err != nil {
 			return err
 		}
 		defer w.Close()
 
 		// Create the audio
-		response, err := client.Speech(w, voice, prompt, opts...)
-		if err != nil {
+		if _, err := client.Speech(w, voice, prompt, opts...); err != nil {
 			return err
 		}
 
-		// Open images
+		// Open the audio
 		if flags.GetBool("open") {
 			if err := open("output.mp3"); err != nil {
 				return err
 			}
 		}
 
-		fmt.Println(response, "bytes written")
-
 		// Return any errors
 		return nil
 	}

go.mod

@@ -5,18 +5,12 @@ go 1.21.5
 require (
 	github.com/djthorpe/go-errors v1.0.3
 	github.com/djthorpe/go-tablewriter v0.0.0-20240507095049-af1f79a27517
-	github.com/mattn/go-runewidth v0.0.15
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.9.0
-	github.com/veandco/go-sdl2 v0.4.36
-	golang.org/x/exp v0.0.0-20231127185646-65229373498e
-	golang.org/x/term v0.15.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rivo/uniseg v0.2.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -4,24 +4,12 @@ github.com/djthorpe/go-errors v1.0.3 h1:GZeMPkC1mx2vteXLI/gvxZS0Ee9zxzwD1mcYyKU5
 github.com/djthorpe/go-errors v1.0.3/go.mod h1:HtfrZnMd6HsX75Mtbv9Qcnn0BqOrrFArvCaj3RMnZhY=
 github.com/djthorpe/go-tablewriter v0.0.0-20240507095049-af1f79a27517 h1:UOUbtOLKMmupwpbYq1YG28pXDHJOlrznNX2vavHGhKk=
 github.com/djthorpe/go-tablewriter v0.0.0-20240507095049-af1f79a27517/go.mod h1:M0TwrksgC73IdXcj9ZXtpuw2Tkl7jdQi/mFPOo1I/4M=
-github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
-github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-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=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
-golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

output.mp3

@@ -109,6 +109,9 @@ func (transport *logtransport) RoundTrip(req *http.Request) (*http.Response, err
 // PRIVATE METHODS
 
 func (w *readwrapper) Read(b []byte) (int, error) {
+	if w.r == nil {
+		return 0, io.EOF
+	}
 	n, err := w.r.Read(b)
 	if err == nil {
 		_, err = w.data.Write(b[:n])
@@ -117,7 +120,11 @@ func (w *readwrapper) Read(b []byte) (int, error) {
 }
 
 func (w *readwrapper) Close() error {
-	return w.r.Close()
+	if w.r != nil {
+		return w.r.Close()
+	} else {
+		return nil
+	}
 }
 
 func (w *readwrapper) as(mimetype string) ([]byte, error) {

pkg/client/transport.go

@@ -0,0 +1,31 @@
+package elevenlabs
+
+///////////////////////////////////////////////////////////////////////////////
+// TYPES
+
+type opts struct {
+	Model string `json:"model_id,omitempty"`
+	Seed  uint   `json:"seed,omitempty"`
+}
+
+// Opt is a function which can be used to set options on a request
+type Opt func(*opts) error
+
+///////////////////////////////////////////////////////////////////////////////
+// OPTIONS
+
+// Set the voice model
+func OptModel(v string) Opt {
+	return func(o *opts) error {
+		o.Model = v
+		return nil
+	}
+}
+
+// Set the deterministic seed
+func OptSeed(v uint) Opt {
+	return func(o *opts) error {
+		o.Seed = v
+		return nil
+	}
+}