Updated tests

Author: djthorpe

pkg/openai/chat.go

@@ -104,7 +104,14 @@ func (c *Client) Chat(ctx context.Context, messages []*schema.Message, opts ...O
 	// Return all choices
 	var result []*schema.Content
 	for _, choice := range response.Choices {
-		if choice.Message == nil || choice.Message.Content == nil {
+		// A choice must have a message, content and/or tool calls
+		if choice.Message == nil || choice.Message.Content == nil && len(choice.Message.ToolCalls) == 0 {
+			continue
+		}
+		for _, tool := range choice.Message.ToolCalls {
+			result = append(result, schema.ToolUse(tool))
+		}
+		if choice.Message.Content == nil {
 			continue
 		}
 		switch v := choice.Message.Content.(type) {

pkg/openai/chat_test.go

@@ -65,7 +65,9 @@ func Test_chat_003(t *testing.T) {
 	assert.NotNil(client)
 
 	message := schema.NewMessage("user", "What is in this image")
-	//		.AppendImageUrl("https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg")
+	image, err := schema.ImageUrl("https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg", "auto")
+	assert.NoError(err)
+	assert.NotNil(message.Add(image))
 	response, err := client.Chat(context.Background(), []*schema.Message{message}, openai.OptModel("gpt-4-vision-preview"))
 	assert.NoError(err)
 	assert.NotNil(response)

pkg/openai/schema/message.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"io"
 	"net/http"
+	"net/url"
 	"os"
 	"reflect"
 	"strings"
@@ -31,6 +32,9 @@ type Message struct {
 	// object or an array of content objects
 	Content any `json:"content,omitempty"`
 
+	// Any tool calls
+	ToolCalls []ToolCall `json:"tool_calls,omitempty"`
+
 	// Time the message was created, in unix seconds
 	Created int64 `json:"created,omitempty"`
 }
@@ -72,8 +76,12 @@ type Content struct {
 	Type   string         `json:"type" writer:",width:4"`
 	Text   string         `json:"text,omitempty" writer:",width:60,wrap"`
 	Source *contentSource `json:"source,omitempty"`
+	Url    *contentImage  `json:"image_url,omitempty"`
+
+	// Tool Function Call
 	toolUse
 
+	// Tool Result
 	ToolId string `json:"tool_use_id,omitempty"`
 	Result string `json:"content,omitempty"`
 }
@@ -85,6 +93,25 @@ type contentSource struct {
 	Data      string `json:"data,omitempty"`
 }
 
+// Image Source
+type contentImage struct {
+	Url    string `json:"url,omitempty"`
+	Detail string `json:"detail,omitempty"`
+}
+
+// Tool Call
+type ToolCall struct {
+	Id       string       `json:"id,omitempty"`
+	Type     string       `json:"type,omitempty"`
+	Function ToolFunction `json:"function,omitempty"`
+}
+
+// Tool Function and Arguments
+type ToolFunction struct {
+	Name      string `json:"name,omitempty"`
+	Arguments string `json:"arguments,omitempty"`
+}
+
 // Tool call
 type toolUse struct {
 	Name  string         `json:"name,omitempty"`
@@ -148,6 +175,46 @@ func ImageData(path string) (*Content, error) {
 	return Image(r)
 }
 
+// Return a new content object of type image, from a Url
+func ImageUrl(v, detail string) (*Content, error) {
+	url, err := url.Parse(v)
+	if err != nil {
+		return nil, err
+	}
+	if url.Scheme != "https" {
+		return nil, ErrBadParameter.With("ImageUrl: not an https url")
+	}
+	return &Content{
+		Type: "image_url",
+		Url: &contentImage{
+			Url:    url.String(),
+			Detail: detail,
+		},
+	}, nil
+}
+
+// Return tool usage
+func ToolUse(t ToolCall) *Content {
+	var input map[string]any
+
+	// Decode the arguments
+	if t.Function.Arguments != "" {
+		if err := json.Unmarshal([]byte(t.Function.Arguments), &input); err != nil {
+			return nil
+		}
+	}
+
+	// Return the content
+	return &Content{
+		Type: t.Type,
+		Id:   t.Id,
+		toolUse: toolUse{
+			Name:  t.Function.Name,
+			Input: input,
+		},
+	}
+}
+
 // Return a tool result
 func ToolResult(id string, result string) *Content {
 	return &Content{Type: "tool_result", ToolId: id, Result: result}

pkg/openai/schema/tool.go

@@ -18,7 +18,7 @@ type Tool struct {
 	Name        string          `json:"name"`
 	Description string          `json:"description"`
 	Type        string          `json:"type,omitempty"`
-	Parameters  *toolParameters `json:"input_schema,omitempty"`
+	Parameters  *toolParameters `json:"parameters,omitempty"`
 }
 
 // Tool function parameters