Updates

Author: djthorpe

go.mod

@@ -5,6 +5,7 @@ go 1.20
 require (
 	github.com/djthorpe/go-errors v1.0.3
 	github.com/stretchr/testify v1.8.4
+	github.com/veandco/go-sdl2 v0.4.36
 	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
 )
 

go.sum

@@ -6,6 +6,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-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
 golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

pkg/client/client.go

@@ -58,6 +58,7 @@ const (
 	ContentTypeTextPlain      = "text/plain"
 	ContentTypeTextHTML       = "text/html"
 	ContentTypeBinary         = "application/octet-stream"
+	ContentTypeForm           = "multipart/form-data"
 )
 
 ///////////////////////////////////////////////////////////////////////////////

pkg/elevenlabs/voice.go

@@ -34,6 +34,11 @@ type voiceDeleteRequest struct {
 	client.Payload `json:"-"`
 }
 
+type voiceAddRequest struct {
+	Name        string `json:"name,omitempty"`
+	Description string `json:"description,omitempty"`
+}
+
 type voicesResponse struct {
 	Voices []Voice `json:"voices"`
 }
@@ -81,7 +86,7 @@ func (c *Client) VoiceSettings(Id string) (VoiceSettings, error) {
 }
 
 // Delete a voice
-func (c *Client) VoiceDelete(Id string) error {
+func (c *Client) DeleteVoice(Id string) error {
 	var request voiceDeleteRequest
 	if Id == "" {
 		return errors.ErrBadParameter.With("Id")
@@ -92,6 +97,28 @@ func (c *Client) VoiceDelete(Id string) error {
 	return nil
 }
 
+// Add a voice
+func (c *Client) AddVoice(Name, Description string) error {
+	var request voiceAddRequest
+
+	// Check parameters
+	if Name == "" {
+		return errors.ErrBadParameter.With("Name")
+	}
+
+	// Set request
+	request.Name = Name
+	request.Description = Description
+
+	// Execute request
+	if err := c.Do(request, nil, client.OptPath("voices", "add")); err != nil {
+		return err
+	}
+
+	// Return success
+	return nil
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // PAYLOAD METHODS
 
@@ -106,3 +133,15 @@ func (voiceDeleteRequest) Type() string {
 func (voiceDeleteRequest) Accept() string {
 	return client.ContentTypeJson
 }
+
+func (voiceAddRequest) Method() string {
+	return http.MethodPost
+}
+
+func (voiceAddRequest) Type() string {
+	return client.ContentTypeBinary
+}
+
+func (voiceAddRequest) Accept() string {
+	return client.ContentTypeForm
+}

pkg/openai/chat_test.go

@@ -27,3 +27,21 @@ func Test_chat_001(t *testing.T) {
 	assert.NoError(err)
 	t.Log(string(data))
 }
+
+func Test_chat_002(t *testing.T) {
+	assert := assert.New(t)
+	client, err := openai.New(GetApiKey(t), opts.OptTrace(os.Stderr, true))
+	assert.NoError(err)
+	assert.NotNil(client)
+
+	response, err := client.ChatCompletions("gpt-4-vision-preview", []openai.Message{
+		openai.UserMessage("What's in this image?"),
+		openai.ImageUrlMessage("https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg"),
+	}, openai.OptMaxChoices(1), openai.OptMaxTokens(300))
+	assert.NoError(err)
+	assert.NotNil(response)
+
+	data, err := json.MarshalIndent(response, "", "  ")
+	assert.NoError(err)
+	t.Log(string(data))
+}

pkg/openai/image.go

@@ -16,8 +16,8 @@ import (
 // SCHEMA
 
 type Image struct {
-	Url  string `json:"url"`
-	Data string `json:"b64_json"`
+	Url  string `json:"url,omitempty"`
+	Data string `json:"b64_json,omitempty"`
 }
 
 ///////////////////////////////////////////////////////////////////////////////

pkg/openai/message.go

@@ -3,53 +3,71 @@ package openai
 ///////////////////////////////////////////////////////////////////////////////
 // TYPES
 
-// Represents a message for chat completion
+// Represents a message with a role for chat completion
 type Message interface {
 	Role() string
-	Type() string // Returns "text"
+	Content() []messageContent
 }
 
-type textMessage struct {
-	Role_    string `json:"role"`
-	Content_ string `json:"content"`
+// Represents message content, which can either be text or an image
+type messageContent struct {
+	Type     string `json:"type"`
+	Text     string `json:"text,omitempty"`
+	ImageUrl *Image `json:"image_url,omitempty"`
 }
 
-type imageUrlMessage struct {
-	Role_    string `json:"role"`
-	Content_ string `json:"content"`
+// Represents message content, which can either be text or an image
+type message struct {
+	Role_    string           `json:"role"`
+	Content_ []messageContent `json:"content"`
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CONSTRUCTOR
 
 func SystemMessage(text string) Message {
-	return textMessage{
-		Role_:    "system",
-		Content_: text,
+	return message{
+		Role_: "system",
+		Content_: []messageContent{
+			{Type: "text", Text: text},
+		},
 	}
 }
 
 func UserMessage(text string) Message {
-	return textMessage{
-		Role_:    "user",
-		Content_: text,
+	return message{
+		Role_: "user",
+		Content_: []messageContent{
+			{Type: "text", Text: text},
+		},
 	}
 }
 
 func AssistantMessage(text string) Message {
-	return textMessage{
-		Role_:    "assistant",
-		Content_: text,
+	return message{
+		Role_: "assistant",
+		Content_: []messageContent{
+			{Type: "text", Text: text},
+		},
+	}
+}
+
+func ImageUrlMessage(url string) Message {
+	return message{
+		Role_: "user",
+		Content_: []messageContent{
+			{Type: "image_url", ImageUrl: &Image{Url: url}},
+		},
 	}
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC METHODS
 
-func (m textMessage) Role() string {
+func (m message) Role() string {
 	return m.Role_
 }
 
-func (textMessage) Type() string {
-	return "text"
+func (m message) Content() []messageContent {
+	return m.Content_
 }