fix: support ThreadMessage.Content as an array

FileIDs on ThreadMessage isn't supported anymore, but Content can be an array. Fixes: sashabaranov#773
adamdecaf · Aug 26, 2024 · d6c7739 · d6c7739
1 parent 6439e1f
commit d6c7739
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 11 deletions.
diff --git a/run_test.go b/run_test.go
@@ -204,15 +204,21 @@ func TestRun(t *testing.T) {
 	_, err = client.CancelRun(ctx, threadID, runID)
 	checks.NoError(t, err, "CancelRun error")
 
+	prompt := "Hello, World!"
 	_, err = client.CreateThreadAndRun(ctx, openai.CreateThreadAndRunRequest{
 		RunRequest: openai.RunRequest{
 			AssistantID: assistantID,
 		},
 		Thread: openai.ThreadRequest{
 			Messages: []openai.ThreadMessage{
 				{
-					Role:    openai.ThreadMessageRoleUser,
-					Content: "Hello, World!",
+					Role: openai.ThreadMessageRoleUser,
+					Content: []openai.ThreadMessageContent{
+						{
+							Type: "text",
+							Text: prompt,
+						},
+					},
 				},
 			},
 		},

diff --git a/thread.go b/thread.go
@@ -88,11 +88,21 @@ const (
 )
 
 type ThreadMessage struct {
-	Role        ThreadMessageRole  `json:"role"`
-	Content     string             `json:"content"`
-	FileIDs     []string           `json:"file_ids,omitempty"`
-	Attachments []ThreadAttachment `json:"attachments,omitempty"`
-	Metadata    map[string]any     `json:"metadata,omitempty"`
+	Role        ThreadMessageRole      `json:"role"`
+	Content     []ThreadMessageContent `json:"content"`
+	Attachments []ThreadAttachment     `json:"attachments,omitempty"`
+	Metadata    map[string]any         `json:"metadata,omitempty"`
+}
+
+type ThreadMessageContent struct {
+	Type      string                  `json:"type"`
+	ImageFile *ThreadMessageImageFile `json:"image_file,omitempty"`
+	Text      string                  `json:"text,omitempty"`
+}
+
+type ThreadMessageImageFile struct {
+	FileID string  `json:"file_id"`
+	Detail *string `json:"detail,omitempty"`
 }
 
 type ThreadAttachment struct {

diff --git a/thread_test.go b/thread_test.go
@@ -70,11 +70,17 @@ func TestThread(t *testing.T) {
 
 	ctx := context.Background()
 
+	prompt := "Hello, World!"
 	_, err := client.CreateThread(ctx, openai.ThreadRequest{
 		Messages: []openai.ThreadMessage{
 			{
-				Role:    openai.ThreadMessageRoleUser,
-				Content: "Hello, World!",
+				Role: openai.ThreadMessageRoleUser,
+				Content: []openai.ThreadMessageContent{
+					{
+						Type: "text",
+						Text: prompt,
+					},
+				},
 			},
 		},
 	})
@@ -153,11 +159,17 @@ func TestAzureThread(t *testing.T) {
 
 	ctx := context.Background()
 
+	prompt := "Hello, World!"
 	_, err := client.CreateThread(ctx, openai.ThreadRequest{
 		Messages: []openai.ThreadMessage{
 			{
-				Role:    openai.ThreadMessageRoleUser,
-				Content: "Hello, World!",
+				Role: openai.ThreadMessageRoleUser,
+				Content: []openai.ThreadMessageContent{
+					{
+						Type: "text",
+						Text: prompt,
+					},
+				},
 			},
 		},
 	})