Add ContentParts to ChatCompletionMessageListDatum

api/OpenAI.net8.0.cs

@@ -1605,6 +1605,7 @@ public class ChatCompletionMessageCollectionOptions : IJsonModel<ChatCompletionM
     public class ChatCompletionMessageListDatum : IJsonModel<ChatCompletionMessageListDatum>, IPersistableModel<ChatCompletionMessageListDatum> {
         public IReadOnlyList<ChatMessageAnnotation> Annotations { get; }
         public string Content { get; }
+        public IList<ChatMessageContentPart> ContentParts { get; }
         public string Id { get; }
         public ChatOutputAudio OutputAudio { get; }
         public string Refusal { get; }
@@ -2132,7 +2133,7 @@ public class FunctionChatMessage : ChatMessage, IJsonModel<FunctionChatMessage>,
     }
     public static class OpenAIChatModelFactory {
         [Experimental("OPENAI001")]
-        public static ChatCompletion ChatCompletion(string id = null, ChatFinishReason finishReason = ChatFinishReason.Stop, ChatMessageContent content = null, string refusal = null, IEnumerable<ChatToolCall> toolCalls = null, ChatMessageRole role = ChatMessageRole.System, ChatFunctionCall functionCall = null, IEnumerable<ChatTokenLogProbabilityDetails> contentTokenLogProbabilities = null, IEnumerable<ChatTokenLogProbabilityDetails> refusalTokenLogProbabilities = null, DateTimeOffset createdAt = default, string model = null, ChatServiceTier? serviceTier = null, string systemFingerprint = null, ChatTokenUsage usage = null, ChatOutputAudio outputAudio = null, IEnumerable<ChatMessageAnnotation> messageAnnotations = null);
+        public static ChatCompletion ChatCompletion(string id = null, ChatFinishReason finishReason = ChatFinishReason.Stop, ChatMessageContent content = null, string refusal = null, IEnumerable<ChatToolCall> toolCalls = null, ChatMessageRole role = ChatMessageRole.System, ChatFunctionCall functionCall = null, IEnumerable<ChatTokenLogProbabilityDetails> contentTokenLogProbabilities = null, IEnumerable<ChatTokenLogProbabilityDetails> refusalTokenLogProbabilities = null, DateTimeOffset createdAt = default, string model = null, ChatServiceTier? serviceTier = null, string systemFingerprint = null, ChatTokenUsage usage = null, ChatOutputAudio outputAudio = null, IEnumerable<ChatMessageAnnotation> messageAnnotations = null, IEnumerable<ChatMessageContentPart> contentParts = null);
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static ChatCompletion ChatCompletion(string id, ChatFinishReason finishReason, ChatMessageContent content, string refusal, IEnumerable<ChatToolCall> toolCalls, ChatMessageRole role, ChatFunctionCall functionCall, IEnumerable<ChatTokenLogProbabilityDetails> contentTokenLogProbabilities, IEnumerable<ChatTokenLogProbabilityDetails> refusalTokenLogProbabilities, DateTimeOffset createdAt, string model, string systemFingerprint, ChatTokenUsage usage);
         public static ChatInputTokenUsageDetails ChatInputTokenUsageDetails(int audioTokenCount = 0, int cachedTokenCount = 0);

api/OpenAI.netstandard2.0.cs

@@ -1422,6 +1422,7 @@ public class ChatCompletionMessageCollectionOptions : IJsonModel<ChatCompletionM
     public class ChatCompletionMessageListDatum : IJsonModel<ChatCompletionMessageListDatum>, IPersistableModel<ChatCompletionMessageListDatum> {
         public IReadOnlyList<ChatMessageAnnotation> Annotations { get; }
         public string Content { get; }
+        public IList<ChatMessageContentPart> ContentParts { get; }
         public string Id { get; }
         public ChatOutputAudio OutputAudio { get; }
         public string Refusal { get; }
@@ -1850,7 +1851,7 @@ public class FunctionChatMessage : ChatMessage, IJsonModel<FunctionChatMessage>,
         protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
     }
     public static class OpenAIChatModelFactory {
-        public static ChatCompletion ChatCompletion(string id = null, ChatFinishReason finishReason = ChatFinishReason.Stop, ChatMessageContent content = null, string refusal = null, IEnumerable<ChatToolCall> toolCalls = null, ChatMessageRole role = ChatMessageRole.System, ChatFunctionCall functionCall = null, IEnumerable<ChatTokenLogProbabilityDetails> contentTokenLogProbabilities = null, IEnumerable<ChatTokenLogProbabilityDetails> refusalTokenLogProbabilities = null, DateTimeOffset createdAt = default, string model = null, ChatServiceTier? serviceTier = null, string systemFingerprint = null, ChatTokenUsage usage = null, ChatOutputAudio outputAudio = null, IEnumerable<ChatMessageAnnotation> messageAnnotations = null);
+        public static ChatCompletion ChatCompletion(string id = null, ChatFinishReason finishReason = ChatFinishReason.Stop, ChatMessageContent content = null, string refusal = null, IEnumerable<ChatToolCall> toolCalls = null, ChatMessageRole role = ChatMessageRole.System, ChatFunctionCall functionCall = null, IEnumerable<ChatTokenLogProbabilityDetails> contentTokenLogProbabilities = null, IEnumerable<ChatTokenLogProbabilityDetails> refusalTokenLogProbabilities = null, DateTimeOffset createdAt = default, string model = null, ChatServiceTier? serviceTier = null, string systemFingerprint = null, ChatTokenUsage usage = null, ChatOutputAudio outputAudio = null, IEnumerable<ChatMessageAnnotation> messageAnnotations = null, IEnumerable<ChatMessageContentPart> contentParts = null);
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static ChatCompletion ChatCompletion(string id, ChatFinishReason finishReason, ChatMessageContent content, string refusal, IEnumerable<ChatToolCall> toolCalls, ChatMessageRole role, ChatFunctionCall functionCall, IEnumerable<ChatTokenLogProbabilityDetails> contentTokenLogProbabilities, IEnumerable<ChatTokenLogProbabilityDetails> refusalTokenLogProbabilities, DateTimeOffset createdAt, string model, string systemFingerprint, ChatTokenUsage usage);
         public static ChatInputTokenUsageDetails ChatInputTokenUsageDetails(int audioTokenCount = 0, int cachedTokenCount = 0);

specification/base/typespec/chat/models.tsp

@@ -719,6 +719,8 @@ model ChatCompletionResponseMessage {
   /** The contents of the message. */
   content: string | null;
 
+  content_parts?: ChatCompletionRequestMessageContentPart[] | null;
+
   /** The refusal message generated by the model. */
   refusal: string | null;
 

src/Custom/Chat/OpenAIChatModelFactory.cs

@@ -61,22 +61,25 @@ public static ChatCompletion ChatCompletion(
         string systemFingerprint = null,
         ChatTokenUsage usage = default,
         ChatOutputAudio outputAudio = default,
-        IEnumerable<ChatMessageAnnotation> messageAnnotations = default)
+        IEnumerable<ChatMessageAnnotation> messageAnnotations = default,
+        IEnumerable<ChatMessageContentPart> contentParts = default)
     {
         content ??= new ChatMessageContent();
         toolCalls ??= new List<ChatToolCall>();
         contentTokenLogProbabilities ??= new List<ChatTokenLogProbabilityDetails>();
         refusalTokenLogProbabilities ??= new List<ChatTokenLogProbabilityDetails>();
         messageAnnotations ??= new List<ChatMessageAnnotation>();
+        contentParts ??= new List<ChatMessageContentPart>();
 
         InternalChatCompletionResponseMessage message = new(
+            content: content,
+            contentParts: contentParts.ToList(),
             refusal: refusal,
             toolCalls: toolCalls.ToList(),
             annotations: messageAnnotations.ToList(),
-            audio: outputAudio,
             role: role,
-            content: content,
             functionCall: functionCall,
+            audio: outputAudio,
             additionalBinaryDataProperties: null);
 
         InternalCreateChatCompletionResponseChoiceLogprobs logprobs = new InternalCreateChatCompletionResponseChoiceLogprobs(

src/Generated/Models/Chat/ChatCompletionMessageListDatum.Serialization.cs

@@ -12,7 +12,7 @@ namespace OpenAI.Chat
 {
     public partial class ChatCompletionMessageListDatum : IJsonModel<ChatCompletionMessageListDatum>
     {
-        internal ChatCompletionMessageListDatum() : this(null, null, null, null, default, null, null, null, null)
+        internal ChatCompletionMessageListDatum() : this(null, null, null, null, null, default, null, null, null, null)
         {
         }
 
@@ -42,6 +42,16 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                     writer.WriteNull("content"u8);
                 }
             }
+            if (Optional.IsCollectionDefined(ContentParts) && _additionalBinaryDataProperties?.ContainsKey("content_parts") != true)
+            {
+                writer.WritePropertyName("content_parts"u8);
+                writer.WriteStartArray();
+                foreach (ChatMessageContentPart item in ContentParts)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
             if (_additionalBinaryDataProperties?.ContainsKey("refusal") != true)
             {
                 if (Optional.IsDefined(Refusal))
@@ -138,6 +148,7 @@ internal static ChatCompletionMessageListDatum DeserializeChatCompletionMessageL
                 return null;
             }
             string content = default;
+            IList<ChatMessageContentPart> contentParts = default;
             string refusal = default;
             IReadOnlyList<ChatToolCall> toolCalls = default;
             IReadOnlyList<ChatMessageAnnotation> annotations = default;
@@ -158,6 +169,20 @@ internal static ChatCompletionMessageListDatum DeserializeChatCompletionMessageL
                     content = prop.Value.GetString();
                     continue;
                 }
+                if (prop.NameEquals("content_parts"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<ChatMessageContentPart> array = new List<ChatMessageContentPart>();
+                    foreach (var item in prop.Value.EnumerateArray())
+                    {
+                        array.Add(ChatMessageContentPart.DeserializeChatMessageContentPart(item, options));
+                    }
+                    contentParts = array;
+                    continue;
+                }
                 if (prop.NameEquals("refusal"u8))
                 {
                     if (prop.Value.ValueKind == JsonValueKind.Null)
@@ -230,6 +255,7 @@ internal static ChatCompletionMessageListDatum DeserializeChatCompletionMessageL
             }
             return new ChatCompletionMessageListDatum(
                 content,
+                contentParts ?? new ChangeTrackingList<ChatMessageContentPart>(),
                 refusal,
                 toolCalls ?? new ChangeTrackingList<ChatToolCall>(),
                 annotations ?? new ChangeTrackingList<ChatMessageAnnotation>(),

src/Generated/Models/Chat/ChatCompletionMessageListDatum.cs

@@ -17,17 +17,19 @@ public partial class ChatCompletionMessageListDatum
         internal ChatCompletionMessageListDatum(string content, string refusal, ChatMessageRole role, string id)
         {
             Content = content;
+            ContentParts = new ChangeTrackingList<ChatMessageContentPart>();
             Refusal = refusal;
             ToolCalls = new ChangeTrackingList<ChatToolCall>();
             Annotations = new ChangeTrackingList<ChatMessageAnnotation>();
             Role = role;
             Id = id;
         }
 
-        internal ChatCompletionMessageListDatum(string content, string refusal, IReadOnlyList<ChatToolCall> toolCalls, IReadOnlyList<ChatMessageAnnotation> annotations, ChatMessageRole role, InternalChatCompletionResponseMessageFunctionCall functionCall, ChatOutputAudio outputAudio, string id, IDictionary<string, BinaryData> additionalBinaryDataProperties)
+        internal ChatCompletionMessageListDatum(string content, IList<ChatMessageContentPart> contentParts, string refusal, IReadOnlyList<ChatToolCall> toolCalls, IReadOnlyList<ChatMessageAnnotation> annotations, ChatMessageRole role, InternalChatCompletionResponseMessageFunctionCall functionCall, ChatOutputAudio outputAudio, string id, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             // Plugin customization: ensure initialization of collections
             Content = content;
+            ContentParts = contentParts ?? new ChangeTrackingList<ChatMessageContentPart>();
             Refusal = refusal;
             ToolCalls = toolCalls ?? new ChangeTrackingList<ChatToolCall>();
             Annotations = annotations ?? new ChangeTrackingList<ChatMessageAnnotation>();
@@ -40,6 +42,8 @@ internal ChatCompletionMessageListDatum(string content, string refusal, IReadOnl
 
         public string Content { get; }
 
+        public IList<ChatMessageContentPart> ContentParts { get; }
+
         public string Refusal { get; }
 
         public IReadOnlyList<ChatToolCall> ToolCalls { get; }

src/Generated/Models/Chat/InternalChatCompletionRequestMessageContentPartAudio.cs

@@ -22,6 +22,6 @@ internal InternalChatCompletionRequestMessageContentPartAudio(IDictionary<string
             InputAudio = inputAudio;
         }
 
-        internal InternalChatCompletionRequestMessageContentPartAudioInputAudio InputAudio { get; }
+        internal InternalChatCompletionRequestMessageContentPartAudioInputAudio InputAudio { get; set; }
     }
 }

src/Generated/Models/Chat/InternalChatCompletionRequestMessageContentPartAudioInputAudio.cs

@@ -27,9 +27,9 @@ internal InternalChatCompletionRequestMessageContentPartAudioInputAudio(BinaryDa
             _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
-        public BinaryData Data { get; }
+        public BinaryData Data { get; set; }
 
-        public ChatInputAudioFormat Format { get; }
+        public ChatInputAudioFormat Format { get; set; }
 
         internal IDictionary<string, BinaryData> SerializedAdditionalRawData
         {

src/Generated/Models/Chat/InternalChatCompletionRequestMessageContentPartFile.cs

@@ -22,6 +22,6 @@ internal InternalChatCompletionRequestMessageContentPartFile(IDictionary<string,
             File = @file;
         }
 
-        internal InternalChatCompletionRequestMessageContentPartFileFile File { get; }
+        internal InternalChatCompletionRequestMessageContentPartFileFile File { get; set; }
     }
 }

src/Generated/Models/Chat/InternalChatCompletionRequestMessageContentPartImage.cs

@@ -22,6 +22,6 @@ internal InternalChatCompletionRequestMessageContentPartImage(IDictionary<string
             ImageUrl = imageUrl;
         }
 
-        internal InternalChatCompletionRequestMessageContentPartImageImageUrl ImageUrl { get; }
+        internal InternalChatCompletionRequestMessageContentPartImageImageUrl ImageUrl { get; set; }
     }
 }

src/Generated/Models/Chat/InternalChatCompletionResponseMessage.Serialization.cs

@@ -12,7 +12,7 @@ namespace OpenAI.Chat
 {
     internal partial class InternalChatCompletionResponseMessage : IJsonModel<InternalChatCompletionResponseMessage>
     {
-        internal InternalChatCompletionResponseMessage() : this(null, null, null, null, default, null, null, null)
+        internal InternalChatCompletionResponseMessage() : this(null, null, null, null, null, default, null, null, null)
         {
         }
 
@@ -42,6 +42,16 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                     writer.WriteNull("content"u8);
                 }
             }
+            if (Optional.IsCollectionDefined(ContentParts) && _additionalBinaryDataProperties?.ContainsKey("content_parts") != true)
+            {
+                writer.WritePropertyName("content_parts"u8);
+                writer.WriteStartArray();
+                foreach (ChatMessageContentPart item in ContentParts)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
             if (_additionalBinaryDataProperties?.ContainsKey("refusal") != true)
             {
                 if (Optional.IsDefined(Refusal))
@@ -133,6 +143,7 @@ internal static InternalChatCompletionResponseMessage DeserializeInternalChatCom
                 return null;
             }
             ChatMessageContent content = default;
+            IList<ChatMessageContentPart> contentParts = default;
             string refusal = default;
             IReadOnlyList<ChatToolCall> toolCalls = default;
             IReadOnlyList<ChatMessageAnnotation> annotations = default;
@@ -147,6 +158,20 @@ internal static InternalChatCompletionResponseMessage DeserializeInternalChatCom
                     DeserializeContentValue(prop, ref content);
                     continue;
                 }
+                if (prop.NameEquals("content_parts"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<ChatMessageContentPart> array = new List<ChatMessageContentPart>();
+                    foreach (var item in prop.Value.EnumerateArray())
+                    {
+                        array.Add(ChatMessageContentPart.DeserializeChatMessageContentPart(item, options));
+                    }
+                    contentParts = array;
+                    continue;
+                }
                 if (prop.NameEquals("refusal"u8))
                 {
                     if (prop.Value.ValueKind == JsonValueKind.Null)
@@ -214,6 +239,7 @@ internal static InternalChatCompletionResponseMessage DeserializeInternalChatCom
             }
             return new InternalChatCompletionResponseMessage(
                 content,
+                contentParts ?? new ChangeTrackingList<ChatMessageContentPart>(),
                 refusal,
                 toolCalls ?? new ChangeTrackingList<ChatToolCall>(),
                 annotations ?? new ChangeTrackingList<ChatMessageAnnotation>(),

src/Generated/Models/Chat/InternalChatCompletionResponseMessage.cs

@@ -16,16 +16,18 @@ internal InternalChatCompletionResponseMessage(ChatMessageContent content, strin
         {
             // Plugin customization: ensure initialization of collections
             Content = content ?? new ChatMessageContent();
+            ContentParts = new ChangeTrackingList<ChatMessageContentPart>();
             Refusal = refusal;
             ToolCalls = new ChangeTrackingList<ChatToolCall>();
             Annotations = new ChangeTrackingList<ChatMessageAnnotation>();
             Role = role;
         }
 
-        internal InternalChatCompletionResponseMessage(ChatMessageContent content, string refusal, IReadOnlyList<ChatToolCall> toolCalls, IReadOnlyList<ChatMessageAnnotation> annotations, ChatMessageRole role, ChatFunctionCall functionCall, ChatOutputAudio audio, IDictionary<string, BinaryData> additionalBinaryDataProperties)
+        internal InternalChatCompletionResponseMessage(ChatMessageContent content, IList<ChatMessageContentPart> contentParts, string refusal, IReadOnlyList<ChatToolCall> toolCalls, IReadOnlyList<ChatMessageAnnotation> annotations, ChatMessageRole role, ChatFunctionCall functionCall, ChatOutputAudio audio, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             // Plugin customization: ensure initialization of collections
             Content = content ?? new ChatMessageContent();
+            ContentParts = contentParts ?? new ChangeTrackingList<ChatMessageContentPart>();
             Refusal = refusal;
             ToolCalls = toolCalls ?? new ChangeTrackingList<ChatToolCall>();
             Annotations = annotations ?? new ChangeTrackingList<ChatMessageAnnotation>();
@@ -35,6 +37,8 @@ internal InternalChatCompletionResponseMessage(ChatMessageContent content, strin
             _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
+        public IList<ChatMessageContentPart> ContentParts { get; }
+
         public string Refusal { get; }
 
         public IReadOnlyList<ChatToolCall> ToolCalls { get; }