Updated ChatCompletionMessageParam to support Structured Messages and…

src/lib/AbstractChatCompletionRunner.ts

@@ -6,6 +6,8 @@
   type ChatCompletionMessageParam,
   type CompletionCreateParams,
   type ChatCompletionTool,
+  type ChatCompletionStructuredMessageText,
+  type ChatCompletionStructuredMessageImageURL,
 } from 'together-ai/resources/chat/completions';
 import { APIUserAbortError, TogetherError } from 'together-ai/error';
 import {
@@ -214,15 +216,15 @@
     return completion;
   }
 
-  #getFinalContent(): string | null {
+  #getFinalContent(): string | (ChatCompletionStructuredMessageText | ChatCompletionStructuredMessageImageURL)[] | null  {
     return this.#getFinalMessage().content ?? null;
   }
 
   /**
    * @returns a promise that resolves with the content of the final ChatCompletionMessage, or rejects
    * if an error occurred or the stream ended prematurely without producing a ChatCompletionMessage.
    */
-  async finalContent(): Promise<string | null> {
+  async finalContent(): Promise<string | (ChatCompletionStructuredMessageText | ChatCompletionStructuredMessageImageURL)[] | null> {
     await this.done();
     return this.#getFinalContent();
   }
@@ -270,7 +272,7 @@
     return this.#getFinalFunctionCall();
   }
 
-  #getFinalFunctionCallResult(): string | undefined {
+  #getFinalFunctionCallResult(): string | (ChatCompletionStructuredMessageText | ChatCompletionStructuredMessageImageURL)[] | undefined {
     for (let i = this.messages.length - 1; i >= 0; i--) {
       const message = this.messages[i];
       if (isFunctionMessage(message) && message.content != null) {
@@ -292,7 +294,7 @@
     return;
   }
 
-  async finalFunctionCallResult(): Promise<string | undefined> {
+  async finalFunctionCallResult(): Promise<string | (ChatCompletionStructuredMessageText | ChatCompletionStructuredMessageImageURL)[] | undefined> {
     await this.done();
     return this.#getFinalFunctionCallResult();
   }
@@ -674,12 +676,12 @@
   functionCall: (functionCall: ChatCompletionMessage.FunctionCall) => void;
   message: (message: ChatCompletionMessageParam) => void;
   chatCompletion: (completion: ChatCompletion) => void;
-  finalContent: (contentSnapshot: string) => void;
+  finalContent: (contentSnapshot: string | (ChatCompletionStructuredMessageText | ChatCompletionStructuredMessageImageURL)[]) => void;
   finalMessage: (message: ChatCompletionMessageParam) => void;
   finalChatCompletion: (completion: ChatCompletion) => void;
   finalFunctionCall: (functionCall: ChatCompletionMessage.FunctionCall) => void;
   functionCallResult: (content: string) => void;
-  finalFunctionCallResult: (content: string) => void;
+  finalFunctionCallResult: (content: string | (ChatCompletionStructuredMessageText | ChatCompletionStructuredMessageImageURL)[]) => void;
   error: (error: TogetherError) => void;
   abort: (error: APIUserAbortError) => void;
   end: () => void;

src/resources/chat/completions.ts

@@ -67,7 +67,13 @@ export namespace ChatCompletion {
 export interface ChatCompletionAssistantMessageParam {
   role: 'assistant';
 
-  content?: string | null;
+  content?:
+    | string
+    | Array<
+        | ChatCompletionsAPI.ChatCompletionStructuredMessageText
+        | ChatCompletionsAPI.ChatCompletionStructuredMessageImageURL
+      >
+    | null;
 
   /**
    * @deprecated
@@ -123,7 +129,13 @@ export namespace ChatCompletionChunk {
     export interface Delta {
       role: 'system' | 'user' | 'assistant' | 'function' | 'tool';
 
-      content?: string | null;
+      content?:
+        | string
+        | Array<
+            | ChatCompletionsAPI.ChatCompletionStructuredMessageText
+            | ChatCompletionsAPI.ChatCompletionStructuredMessageImageURL
+          >
+        | null;
 
       /**
        * @deprecated
@@ -160,7 +172,13 @@ export interface ChatCompletionFunctionMessageParam {
 }
 
 export interface ChatCompletionMessage {
-  content: string | null;
+  content:
+    | string
+    | Array<
+        | ChatCompletionsAPI.ChatCompletionStructuredMessageText
+        | ChatCompletionsAPI.ChatCompletionStructuredMessageImageURL
+      >
+    | null;
 
   role: 'assistant';
 
@@ -191,7 +209,12 @@ export type ChatCompletionMessageParam =
   | ChatCompletionFunctionMessageParam;
 
 export interface ChatCompletionSystemMessageParam {
-  content: string;
+  content:
+    | string
+    | Array<
+        | ChatCompletionsAPI.ChatCompletionStructuredMessageText
+        | ChatCompletionsAPI.ChatCompletionStructuredMessageImageURL
+      >;
 
   role: 'system';
 
@@ -215,7 +238,12 @@ export namespace ChatCompletionTool {
 }
 
 export interface ChatCompletionToolMessageParam {
-  content?: string;
+  content?:
+    | string
+    | Array<
+        | ChatCompletionsAPI.ChatCompletionStructuredMessageText
+        | ChatCompletionsAPI.ChatCompletionStructuredMessageImageURL
+      >;
 
   required?: unknown;
 
@@ -254,7 +282,12 @@ export interface ChatCompletionUsage {
 }
 
 export interface ChatCompletionUserMessageParam {
-  content: string;
+  content:
+    | string
+    | Array<
+        | ChatCompletionsAPI.ChatCompletionStructuredMessageText
+        | ChatCompletionsAPI.ChatCompletionStructuredMessageImageURL
+      >;
 
   role: 'user';