Added some elevenlabs methods

Author: djthorpe

go.mod

@@ -4,7 +4,6 @@ go 1.20
 
 require (
 	github.com/djthorpe/go-errors v1.0.3
-	github.com/mutablelogic/go-server v1.1.16
 	github.com/stretchr/testify v1.8.4
 )
 

go.sum

@@ -2,8 +2,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/djthorpe/go-errors v1.0.3 h1:GZeMPkC1mx2vteXLI/gvxZS0Ee9zxzwD1mcYyKU5jD0=
 github.com/djthorpe/go-errors v1.0.3/go.mod h1:HtfrZnMd6HsX75Mtbv9Qcnn0BqOrrFArvCaj3RMnZhY=
-github.com/mutablelogic/go-server v1.1.16 h1:in897acxmw/WIdxoafDQFcJ5mpRaLriCK5bXUy3JYt0=
-github.com/mutablelogic/go-server v1.1.16/go.mod h1:R9jcFJzVKtduwmWazGaBX5EBRqlQ0BCpmAxUrlWRZLs=
 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/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=

pkg/client/client.go

@@ -33,13 +33,13 @@ type Client struct {
 	sync.Mutex
 	*http.Client
 
-	endpoint   *url.URL
-	ua         string
-	rate       float32 // number of requests allowed per second
-	strict     bool
-	token      Token // token for authentication on requests
-	ts         time.Time
-	skipverify bool
+	endpoint *url.URL
+	ua       string
+	rate     float32 // number of requests allowed per second
+	strict   bool
+	token    Token             // token for authentication on requests
+	headers  map[string]string // Headers for every request
+	ts       time.Time
 }
 
 type ClientOpt func(*Client) error
@@ -50,7 +50,7 @@ type RequestOpt func(*http.Request) error
 
 const (
 	DefaultTimeout            = time.Second * 10
-	DefaultUserAgent          = "github.com/mutablelogic/go-server"
+	DefaultUserAgent          = "github.com/mutablelogic/go-client"
 	PathSeparator             = string(os.PathSeparator)
 	ContentTypeJson           = "application/json"
 	ContentTypeTextXml        = "text/xml"
@@ -195,6 +195,17 @@ func (client *Client) request(method, accept, mimetype string, body io.Reader) (
 		r.Header.Set("User-Agent", client.ua)
 	}
 
+	// If there are headers, add them
+	if len(client.headers) > 0 {
+		for k, v := range client.headers {
+			if v == "" {
+				r.Header.Del(k)
+			} else {
+				r.Header.Set(k, v)
+			}
+		}
+	}
+
 	// Return success
 	return r, nil
 }

pkg/client/client_test.go

@@ -3,7 +3,7 @@ package client_test
 import (
 	"testing"
 
-	"github.com/mutablelogic/go-server/pkg/client"
+	"github.com/mutablelogic/go-client/pkg/client"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/client/clientopts.go

@@ -99,3 +99,17 @@ func OptSkipVerify() ClientOpt {
 		return nil
 	}
 }
+
+// OptHeader appends a custom header to each request
+func OptHeader(key, value string) ClientOpt {
+	return func(client *Client) error {
+		if client.headers == nil {
+			client.headers = make(map[string]string, 1)
+		}
+		if key == "" {
+			return ErrBadParameter.With("OptHeader")
+		}
+		client.headers[key] = value
+		return nil
+	}
+}

pkg/client/token.go

@@ -20,5 +20,10 @@ const (
 
 // Stringify the token value
 func (token Token) String() string {
+	// Set default
+	if token.Scheme == "" {
+		token.Scheme = Bearer
+	}
+	// Return token as a string
 	return token.Scheme + " " + token.Value
 }

pkg/client/token_test.go

@@ -0,0 +1,21 @@
+package client_test
+
+import (
+	"testing"
+
+	// Packages
+	"github.com/mutablelogic/go-client/pkg/client"
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_token_001(t *testing.T) {
+	assert := assert.New(t)
+	token := client.Token{Value: "test"}
+	assert.Equal("Bearer test", token.String())
+}
+
+func Test_token_002(t *testing.T) {
+	assert := assert.New(t)
+	token := client.Token{Scheme: "Other", Value: "test"}
+	assert.Equal("Other test", token.String())
+}

pkg/elevenlabs/client.go

@@ -0,0 +1,109 @@
+/*
+elevenlabs implements an API client for elevenlabs (https://elevenlabs.io/docs/api-reference/text-to-speech)
+*/
+package elevenlabs
+
+import (
+	"net/http"
+
+	// Packages
+	"github.com/mutablelogic/go-client/pkg/client"
+)
+
+///////////////////////////////////////////////////////////////////////////////
+// TYPES
+
+type Client struct {
+	*client.Client
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// GLOBALS
+
+const (
+	endPoint    = "https://api.elevenlabs.io/v1"
+	Sample64    = "mp3_44100_64"  // mp3 with 44.1kHz sample rate at 64kbps
+	Sample96    = "mp3_44100_96"  // mp3 with 44.1kHz sample rate at 96kbps
+	Sample128   = "mp3_44100_128" // default output format, mp3 with 44.1kHz sample rate at 128kbps
+	Sample192   = "mp3_44100_192" // mp3 with 44.1kHz sample rate at 192kbps
+	SamplePCM16 = "pcm_16000"     // PCM format (S16LE) with 16kHz sample rate
+	SamplePCM22 = "pcm_22050"     // PCM format (S16LE) with 22.05kHz sample rate
+	SamplePCM24 = "pcm_24000"     // PCM format (S16LE) with 24kHz sample rate
+	SamplePCM44 = "pcm_44100"     // PCM format (S16LE) with 44.1kHz sample rate
+	SampleU8    = "ulaw_8000"     // μ-law format (sometimes written mu-law, often approximated as u-law) with 8kHz sample rate
+)
+
+///////////////////////////////////////////////////////////////////////////////
+// SCHEMA
+
+type Request struct {
+	client.Payload `json:"-"`
+	Model          string `json:"model_id"`
+	Text           string `json:"text"`
+	VoiceSettings  struct {
+		SimilarityBoost float64 `json:"similarity_boost"`
+		Stability       float64 `json:"stability"`
+		Style           string  `json:"style,omitempty"`
+		UseSpeakerBoost bool    `json:"use_speaker_boost"`
+	} `json:"voice_settings"`
+}
+
+func (r Request) Method() string {
+	return http.MethodGet
+}
+
+func (r Request) Type() string {
+	return ""
+}
+
+func (r Request) Accept() string {
+	return client.ContentTypeJson
+}
+
+type VoicesResponse struct {
+	Voices []Voice `json:"voices"`
+}
+
+type Voice struct {
+	Id          string `json:"voice_id"`
+	Name        string `json:"name"`
+	Description string `json:"description,omitempty"`
+	PreviewUrl  string `json:"preview_url,omitempty"`
+	Category    string `json:"category,omitempty"`
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// LIFECYCLE
+
+func New(ApiKey string, opts ...client.ClientOpt) (*Client, error) {
+	// Create client
+	client, err := client.New(append(opts, client.OptEndpoint(endPoint), client.OptHeader("Xi-Api-Key", ApiKey))...)
+	if err != nil {
+		return nil, err
+	}
+
+	// Return the client
+	return &Client{client}, nil
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// PUBLIC METHODS
+
+// Return current set of voices
+func (c *Client) Voices() ([]Voice, error) {
+	var request Request
+	var response VoicesResponse
+	if err := c.Do(request, &response, client.OptPath("voices")); err != nil {
+		return nil, err
+	}
+	return response.Voices, nil
+}
+
+// Get returns the current IP address from the API
+func (c *Client) TextToSpeech(Text string) ([]byte, error) {
+	var request Request
+	if err := c.Do(request, nil, client.OptPath("text-to-speech", "test")); err != nil {
+		return nil, err
+	}
+	return nil, nil
+}

pkg/elevenlabs/client_test.go

@@ -0,0 +1,48 @@
+package elevenlabs_test
+
+import (
+	"encoding/json"
+	"os"
+	"testing"
+
+	// Packages
+	opts "github.com/mutablelogic/go-client/pkg/client"
+	elevenlabs "github.com/mutablelogic/go-client/pkg/elevenlabs"
+	assert "github.com/stretchr/testify/assert"
+)
+
+func Test_elevenlabs_001(t *testing.T) {
+	assert := assert.New(t)
+	client, err := elevenlabs.New(GetApiKey(t), opts.OptTrace(os.Stderr, true))
+	assert.NoError(err)
+	assert.NotNil(client)
+	response, err := client.Voices()
+	assert.NoError(err)
+	assert.NotEmpty(response)
+	data, err := json.MarshalIndent(response, "", "  ")
+	assert.NoError(err)
+	t.Log(string(data))
+}
+
+func XX_Test_elevenlabs_002(t *testing.T) {
+	assert := assert.New(t)
+	client, err := elevenlabs.New(GetApiKey(t), opts.OptTrace(os.Stderr, true))
+	assert.NoError(err)
+	assert.NotNil(client)
+	response, err := client.TextToSpeech("test")
+	assert.NoError(err)
+	assert.NotEmpty(response)
+	t.Log(response)
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// ENVIRONMENT
+
+func GetApiKey(t *testing.T) string {
+	key := os.Getenv("ELEVENLABS_API_KEY")
+	if key == "" {
+		t.Skip("ELEVENLABS_API_KEY not set")
+		t.SkipNow()
+	}
+	return ""
+}

pkg/ipify/client.go

@@ -0,0 +1,76 @@
+/*
+ipify implements a generic API client which parses a JSON response. Mostly used
+to test the client package.
+*/
+package ipify
+
+import (
+	"net/http"
+	"net/url"
+
+	// Packages
+	"github.com/mutablelogic/go-client/pkg/client"
+)
+
+///////////////////////////////////////////////////////////////////////////////
+// TYPES
+
+type Client struct {
+	*client.Client
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// GLOBALS
+
+const (
+	endPoint = "https://api.ipify.org/"
+)
+
+///////////////////////////////////////////////////////////////////////////////
+// SCHEMA
+
+type Request struct {
+	client.Payload `json:"-"`
+}
+
+type Response struct {
+	IP string `json:"ip"`
+}
+
+func (r Request) Method() string {
+	return http.MethodGet
+}
+
+func (r Request) Type() string {
+	return ""
+}
+
+func (r Request) Accept() string {
+	return client.ContentTypeJson
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// LIFECYCLE
+
+func New(opts ...client.ClientOpt) (*Client, error) {
+	// Create client
+	client, err := client.New(append(opts, client.OptEndpoint(endPoint))...)
+	if err != nil {
+		return nil, err
+	}
+
+	// Return the client
+	return &Client{client}, nil
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// PUBLIC METHODS
+
+// Get returns the current IP address from the API
+func (c *Client) Get() (string, error) {
+	var response Response
+	if err := c.Do(nil, &response, client.OptQuery(url.Values{"format": []string{"json"}})); err != nil {
+		return "", err
+	}
+	return response.IP, nil
+}