diff --git a/src/Custom/Assistants/AssistantResponseFormat.Serialization.cs b/src/Custom/Assistants/AssistantResponseFormat.Serialization.cs index 2dd18f018..19b3c5b01 100644 --- a/src/Custom/Assistants/AssistantResponseFormat.Serialization.cs +++ b/src/Custom/Assistants/AssistantResponseFormat.Serialization.cs @@ -34,7 +34,7 @@ internal static void SerializeAssistantResponseFormat(AssistantResponseFormat fo writer.WriteStartObject(); writer.WritePropertyName("type"u8); writer.WriteStringValue(formatInstance._objectType); - writer.WriteSerializedAdditionalRawData(formatInstance._serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(formatInstance.SerializedAdditionalRawData, options); writer.WriteEndObject(); } } diff --git a/src/Custom/Assistants/AssistantResponseFormat.cs b/src/Custom/Assistants/AssistantResponseFormat.cs index 76d257b4d..226fa31df 100644 --- a/src/Custom/Assistants/AssistantResponseFormat.cs +++ b/src/Custom/Assistants/AssistantResponseFormat.cs @@ -20,7 +20,7 @@ public partial class AssistantResponseFormat { private readonly string _plainTextValue; private readonly string _objectType; - private readonly IDictionary _serializedAdditionalRawData; + private readonly IDictionary SerializedAdditionalRawData; private const string AutoValue = "auto"; private const string TextValue = "text"; @@ -62,7 +62,7 @@ internal AssistantResponseFormat(string plainTextValue, string objectType, IDict { _plainTextValue = plainTextValue; _objectType = objectType; - _serializedAdditionalRawData = serializedAdditionalRawData ?? new ChangeTrackingDictionary(); + SerializedAdditionalRawData = serializedAdditionalRawData ?? new ChangeTrackingDictionary(); } /// diff --git a/src/Custom/Assistants/CodeInterpreterToolDefinition.Serialization.cs b/src/Custom/Assistants/CodeInterpreterToolDefinition.Serialization.cs index bbec0065f..6318e87c7 100644 --- a/src/Custom/Assistants/CodeInterpreterToolDefinition.Serialization.cs +++ b/src/Custom/Assistants/CodeInterpreterToolDefinition.Serialization.cs @@ -20,7 +20,7 @@ protected override void WriteCore(Utf8JsonWriter writer, ModelReaderWriterOption writer.WriteStartObject(); writer.WritePropertyName("type"u8); writer.WriteStringValue(Type); - writer.WriteSerializedAdditionalRawData(_serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(SerializedAdditionalRawData, options); writer.WriteEndObject(); } } \ No newline at end of file diff --git a/src/Custom/Assistants/FileSearchToolDefinition.Serialization.cs b/src/Custom/Assistants/FileSearchToolDefinition.Serialization.cs index b42426975..19cd98074 100644 --- a/src/Custom/Assistants/FileSearchToolDefinition.Serialization.cs +++ b/src/Custom/Assistants/FileSearchToolDefinition.Serialization.cs @@ -28,7 +28,7 @@ protected override void WriteCore(Utf8JsonWriter writer, ModelReaderWriterOption writer.WriteNumberValue(MaxResults.Value); writer.WriteEndObject(); } - writer.WriteSerializedAdditionalRawData(_serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(SerializedAdditionalRawData, options); writer.WriteEndObject(); } } diff --git a/src/Custom/Assistants/FunctionToolDefinition.Serialization.cs b/src/Custom/Assistants/FunctionToolDefinition.Serialization.cs index 7ef4df61c..701725671 100644 --- a/src/Custom/Assistants/FunctionToolDefinition.Serialization.cs +++ b/src/Custom/Assistants/FunctionToolDefinition.Serialization.cs @@ -22,7 +22,7 @@ protected override void WriteCore(Utf8JsonWriter writer, ModelReaderWriterOption writer.WriteObjectValue(_internalFunction, options); writer.WritePropertyName("type"u8); writer.WriteStringValue(Type); - writer.WriteSerializedAdditionalRawData(_serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(SerializedAdditionalRawData, options); writer.WriteEndObject(); } } \ No newline at end of file diff --git a/src/Custom/Assistants/Internal/GeneratorStubs.Internal.cs b/src/Custom/Assistants/Internal/GeneratorStubs.Internal.cs index c67b31497..71cd98b1b 100644 --- a/src/Custom/Assistants/Internal/GeneratorStubs.Internal.cs +++ b/src/Custom/Assistants/Internal/GeneratorStubs.Internal.cs @@ -343,9 +343,6 @@ internal readonly partial struct InternalCreateRunRequestModel { } [CodeGenModel("CreateRunRequestToolChoice")] internal readonly partial struct InternalCreateRunRequestToolChoice { } -[CodeGenModel("CreateThreadAndRunRequestModel")] -internal readonly partial struct InternalCreateThreadAndRunRequestModel { } - [CodeGenModel("CreateAssistantRequestResponseFormat1")] internal readonly partial struct InternalCreateAssistantRequestResponseFormat { } @@ -364,6 +361,15 @@ internal partial class InternalCreateAssistantRequestToolResourcesFileSearchVect [CodeGenModel("CreateAssistantRequestToolResourcesFileSearchVectorStoreIdReferences")] internal partial class InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreIdReferences { } +[CodeGenModel("CreateThreadAndRunRequestModel")] +internal readonly partial struct InternalCreateThreadAndRunRequestModel { } + +[CodeGenModel("CreateThreadAndRunRequestResponseFormat")] +internal readonly partial struct InternalCreateThreadAndRunRequestResponseFormat { } + +[CodeGenModel("CreateThreadAndRunRequestToolChoice")] +internal readonly partial struct InternalCreateThreadAndRunRequestToolChoice { } + [CodeGenModel("CreateThreadAndRunRequestToolResources")] internal partial class InternalCreateThreadAndRunRequestToolResources { } diff --git a/src/Custom/Assistants/Internal/InternalMessageImageFileContent.Serialization.cs b/src/Custom/Assistants/Internal/InternalMessageImageFileContent.Serialization.cs index b37fe1ce4..c6dd038a1 100644 --- a/src/Custom/Assistants/Internal/InternalMessageImageFileContent.Serialization.cs +++ b/src/Custom/Assistants/Internal/InternalMessageImageFileContent.Serialization.cs @@ -22,7 +22,7 @@ protected override void WriteCore(Utf8JsonWriter writer, ModelReaderWriterOption writer.WriteStringValue(_type); writer.WritePropertyName("image_file"u8); writer.WriteObjectValue(_imageFile, options); - writer.WriteSerializedAdditionalRawData(_serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(SerializedAdditionalRawData, options); writer.WriteEndObject(); } } diff --git a/src/Custom/Assistants/Internal/InternalMessageImageUrlContent.Serialization.cs b/src/Custom/Assistants/Internal/InternalMessageImageUrlContent.Serialization.cs index cb8938ca4..48d0f7751 100644 --- a/src/Custom/Assistants/Internal/InternalMessageImageUrlContent.Serialization.cs +++ b/src/Custom/Assistants/Internal/InternalMessageImageUrlContent.Serialization.cs @@ -22,7 +22,7 @@ protected override void WriteCore(Utf8JsonWriter writer, ModelReaderWriterOption writer.WriteStringValue(_type); writer.WritePropertyName("image_url"u8); writer.WriteObjectValue(_imageUrl, options); - writer.WriteSerializedAdditionalRawData(_serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(SerializedAdditionalRawData, options); writer.WriteEndObject(); } } \ No newline at end of file diff --git a/src/Custom/Assistants/Internal/InternalRequestMessageTextContent.Serialization.cs b/src/Custom/Assistants/Internal/InternalRequestMessageTextContent.Serialization.cs index 6bbb6e101..565c34ee4 100644 --- a/src/Custom/Assistants/Internal/InternalRequestMessageTextContent.Serialization.cs +++ b/src/Custom/Assistants/Internal/InternalRequestMessageTextContent.Serialization.cs @@ -22,7 +22,7 @@ protected override void WriteCore(Utf8JsonWriter writer, ModelReaderWriterOption writer.WriteStringValue(Type.ToString()); writer.WritePropertyName("text"u8); writer.WriteStringValue(InternalText); - writer.WriteSerializedAdditionalRawData(_serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(SerializedAdditionalRawData, options); writer.WriteEndObject(); } } diff --git a/src/Custom/Assistants/Internal/InternalResponseMessageTextContent.Serialization.cs b/src/Custom/Assistants/Internal/InternalResponseMessageTextContent.Serialization.cs index 9a3f93de7..d0415ca27 100644 --- a/src/Custom/Assistants/Internal/InternalResponseMessageTextContent.Serialization.cs +++ b/src/Custom/Assistants/Internal/InternalResponseMessageTextContent.Serialization.cs @@ -22,7 +22,7 @@ protected override void WriteCore(Utf8JsonWriter writer, ModelReaderWriterOption writer.WriteStringValue(_type); writer.WritePropertyName("text"u8); writer.WriteObjectValue(_text, options); - writer.WriteSerializedAdditionalRawData(_serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(SerializedAdditionalRawData, options); writer.WriteEndObject(); } } diff --git a/src/Custom/Assistants/Internal/UnknownAssistantToolDefinition.Serialization.cs b/src/Custom/Assistants/Internal/UnknownAssistantToolDefinition.Serialization.cs index 230b8df01..3a80df55e 100644 --- a/src/Custom/Assistants/Internal/UnknownAssistantToolDefinition.Serialization.cs +++ b/src/Custom/Assistants/Internal/UnknownAssistantToolDefinition.Serialization.cs @@ -20,7 +20,7 @@ protected override void WriteCore(Utf8JsonWriter writer, ModelReaderWriterOption writer.WriteStartObject(); writer.WritePropertyName("type"u8); writer.WriteStringValue(Type); - writer.WriteSerializedAdditionalRawData(_serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(SerializedAdditionalRawData, options); writer.WriteEndObject(); } } diff --git a/src/Custom/Assistants/MessageTextContentAnnotation.cs b/src/Custom/Assistants/MessageTextContentAnnotation.cs deleted file mode 100644 index 5903fc920..000000000 --- a/src/Custom/Assistants/MessageTextContentAnnotation.cs +++ /dev/null @@ -1,38 +0,0 @@ -namespace OpenAI.Assistants; - -public class MessageTextContentAnnotation -{ - private readonly MessageContentTextAnnotationsFileCitationObject _fileSearchCitation; - private readonly MessageContentTextAnnotationsFilePathObject _codeCitation; - - /// - /// The ID of the file cited by the file_search tool for this annotation. - /// - public string InputFileId => _fileSearchCitation?.FileCitation?.FileId; - - /// - /// The ID of the file that was generated by the code_interpreter tool for this citation. - /// - public string OutputFileId => _codeCitation?.FilePath?.FileId; - - /// - /// The index in the message content at which the citation begins. - /// - public int StartIndex => _fileSearchCitation?.StartIndex ?? _codeCitation?.StartIndex ?? -1; - - /// - /// The index in the message content at which the citation ends. - /// - public int EndIndex => _fileSearchCitation?.EndIndex ?? _codeCitation?.EndIndex ?? -1; - - /// - /// The text in the message content that should be replaced. - /// - public string TextToReplace => _fileSearchCitation?.Text ?? _codeCitation?.Text; - - internal MessageTextContentAnnotation(MessageContentTextObjectAnnotation internalAnnotation) - { - _fileSearchCitation = internalAnnotation as MessageContentTextAnnotationsFileCitationObject; - _codeCitation = internalAnnotation as MessageContentTextAnnotationsFilePathObject; ; - } -} \ No newline at end of file diff --git a/src/Custom/Assistants/RunStepToolCall.cs b/src/Custom/Assistants/RunStepToolCall.cs index 869e5b4b5..3cb729b12 100644 --- a/src/Custom/Assistants/RunStepToolCall.cs +++ b/src/Custom/Assistants/RunStepToolCall.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; namespace OpenAI.Assistants; @@ -5,7 +6,14 @@ namespace OpenAI.Assistants; [CodeGenModel("RunStepDetailsToolCallsObjectToolCallsObject")] public partial class RunStepToolCall { - public string ToolCallId => AsCodeInterpreter?.Id ?? AsFunction?.Id ?? AsFileSearch?.Id; + public string ToolCallId + => AsCodeInterpreter?.Id + ?? AsFunction?.Id + ?? AsFileSearch?.Id + ?? (SerializedAdditionalRawData?.TryGetValue("id", out BinaryData idData) == true + ? idData.ToString() + : null); + public string CodeInterpreterInput => AsCodeInterpreter?.Input; public IReadOnlyList CodeInterpreterOutputs => AsCodeInterpreter?.Outputs ?? []; diff --git a/src/Custom/Assistants/RunTruncationStrategy.cs b/src/Custom/Assistants/RunTruncationStrategy.cs index d2bdea5ff..324723a0c 100644 --- a/src/Custom/Assistants/RunTruncationStrategy.cs +++ b/src/Custom/Assistants/RunTruncationStrategy.cs @@ -38,7 +38,7 @@ public partial class RunTruncationStrategy /// /// /// - private IDictionary _serializedAdditionalRawData; + private IDictionary SerializedAdditionalRawData; /// The truncation strategy to use for the thread. The default is `auto`. If set to `last_messages`, the thread will be truncated to the n most recent messages in the thread. When set to `auto`, messages in the middle of the thread will be dropped to fit the context length of the model, `max_prompt_tokens`. [CodeGenMember("Type")] diff --git a/src/Custom/Assistants/Streaming/RunStepDetailsUpdate.cs b/src/Custom/Assistants/Streaming/RunStepDetailsUpdate.cs index 5cda68a85..588d3fd7b 100644 --- a/src/Custom/Assistants/Streaming/RunStepDetailsUpdate.cs +++ b/src/Custom/Assistants/Streaming/RunStepDetailsUpdate.cs @@ -1,3 +1,4 @@ +using System; using System.ClientModel.Primitives; using System.Collections.Generic; using System.Text.Json; @@ -9,7 +10,8 @@ namespace OpenAI.Assistants; /// public class RunStepDetailsUpdate : StreamingUpdate { - private readonly InternalRunStepDelta _delta; + internal readonly InternalRunStepDelta _delta; + internal readonly InternalRunStepDeltaStepDetailsToolCallsObjectToolCallsObject _toolCall; private readonly InternalRunStepDeltaStepDetailsMessageCreationObject _asMessageCreation; private readonly InternalRunStepDeltaStepDetailsToolCallsCodeObject _asCodeCall; private readonly InternalRunStepDeltaStepDetailsToolCallsFileSearchObject _asFileSearchCall; @@ -22,7 +24,13 @@ public class RunStepDetailsUpdate : StreamingUpdate public string CreatedMessageId => _asMessageCreation?.MessageCreation?.MessageId; /// - public string ToolCallId => _asCodeCall?.Id ?? _asFileSearchCall?.Id ?? _asFunctionCall?.Id; + public string ToolCallId + => _asCodeCall?.Id + ?? _asFileSearchCall?.Id + ?? _asFunctionCall?.Id + ?? (_toolCall?.SerializedAdditionalRawData?.TryGetValue("id", out BinaryData idData) == true + ? idData.ToString() + : null); /// public int? ToolCallIndex => _asCodeCall?.Index ?? _asFileSearchCall?.Index ?? _asFunctionCall?.Index; @@ -53,6 +61,7 @@ internal RunStepDetailsUpdate( _asFileSearchCall = toolCall as InternalRunStepDeltaStepDetailsToolCallsFileSearchObject; _asFunctionCall = toolCall as InternalRunStepDeltaStepDetailsToolCallsFunctionObject; _delta = stepDelta; + _toolCall = toolCall; } internal static IEnumerable DeserializeRunStepDetailsUpdates( diff --git a/src/Custom/Assistants/Streaming/TextAnnotationUpdate.cs b/src/Custom/Assistants/Streaming/TextAnnotationUpdate.cs index f36c388eb..79a86bf37 100644 --- a/src/Custom/Assistants/Streaming/TextAnnotationUpdate.cs +++ b/src/Custom/Assistants/Streaming/TextAnnotationUpdate.cs @@ -1,42 +1,66 @@ -namespace OpenAI.Assistants; +using System; + +namespace OpenAI.Assistants; public class TextAnnotationUpdate { /// /// The index of the content item that this annotation applies to. /// - public int ContentIndex => _fileSearchCitation?.Index ?? _codeCitation?.Index ?? -1; + public int ContentIndex + => _fileSearchCitation?.Index + ?? _codeCitation?.Index + ?? (_internalAnnotation?.SerializedAdditionalRawData.TryGetValue("index", out BinaryData indexData) == true + ? int.Parse(indexData.ToString()) + : -1); /// - /// The ID of the file cited by the file_search tool for this annotation. + /// The index in the message content at which the citation begins. /// - public string InputFileId => _fileSearchCitation?.FileCitation?.FileId; + public int? StartIndex + => _fileSearchCitation?.StartIndex + ?? _codeCitation?.StartIndex + ?? (_internalAnnotation?.SerializedAdditionalRawData.TryGetValue("start_index", out BinaryData indexData) == true + ? int.Parse(indexData.ToString()) + : null); /// - /// The ID of the file that was generated by the code_interpreter tool for this citation. + /// The index in the message content at which the citation ends. /// - public string OutputFileId => _codeCitation?.FilePath?.FileId; + public int? EndIndex + => _fileSearchCitation?.EndIndex + ?? _codeCitation?.EndIndex + ?? (_internalAnnotation?.SerializedAdditionalRawData.TryGetValue("start_index", out BinaryData indexData) == true + ? int.Parse(indexData.ToString()) + : null); /// - /// The index in the message content at which the citation begins. + /// The text in the message content that should be replaced. /// - public int? StartIndex => _fileSearchCitation?.StartIndex ?? _codeCitation?.StartIndex; + public string TextToReplace + => _fileSearchCitation?.Text + ?? _codeCitation?.Text + ?? (_internalAnnotation?.SerializedAdditionalRawData.TryGetValue("text", out BinaryData textData) == true + ? textData.ToString() + : null); /// - /// The index in the message content at which the citation ends. + /// The ID of the file cited by the file_search tool for this annotation. /// - public int? EndIndex => _fileSearchCitation?.EndIndex ?? _codeCitation?.EndIndex; + public string InputFileId => _fileSearchCitation?.FileCitation?.FileId; /// - /// The text in the message content that should be replaced. + /// The ID of the file that was generated by the code_interpreter tool for this citation. /// - public string TextToReplace => _fileSearchCitation?.Text ?? _codeCitation?.Text; + public string OutputFileId => _codeCitation?.FilePath?.FileId; + internal readonly MessageDeltaTextContentAnnotation _internalAnnotation; private readonly MessageDeltaContentTextAnnotationsFileCitationObject _fileSearchCitation; private readonly MessageDeltaContentTextAnnotationsFilePathObject _codeCitation; internal TextAnnotationUpdate(MessageDeltaTextContentAnnotation internalAnnotation) { + _internalAnnotation = internalAnnotation; _fileSearchCitation = internalAnnotation as MessageDeltaContentTextAnnotationsFileCitationObject; _codeCitation = internalAnnotation as MessageDeltaContentTextAnnotationsFilePathObject; } diff --git a/src/Custom/Assistants/TextAnnotation.cs b/src/Custom/Assistants/TextAnnotation.cs index 4a63f5d49..32b2c265f 100644 --- a/src/Custom/Assistants/TextAnnotation.cs +++ b/src/Custom/Assistants/TextAnnotation.cs @@ -1,37 +1,56 @@ -namespace OpenAI.Assistants; +using System; + +namespace OpenAI.Assistants; public class TextAnnotation { + internal readonly MessageContentTextObjectAnnotation _internalAnnotation; private readonly MessageContentTextAnnotationsFileCitationObject _fileSearchCitation; private readonly MessageContentTextAnnotationsFilePathObject _codeCitation; /// - /// The ID of the file cited by the file_search tool for this annotation. + /// The index in the message content at which the citation begins. /// - public string InputFileId => _fileSearchCitation?.FileCitation?.FileId; + public int StartIndex + => _fileSearchCitation?.StartIndex + ?? _codeCitation?.StartIndex + ?? (_internalAnnotation?.SerializedAdditionalRawData?.TryGetValue("start_index", out BinaryData indexData) == true + ? int.Parse(indexData.ToString()) + : -1); /// - /// The ID of the file that was generated by the code_interpreter tool for this citation. + /// The index in the message content at which the citation ends. /// - public string OutputFileId => _codeCitation?.FilePath?.FileId; + public int EndIndex => + _fileSearchCitation?.EndIndex + ?? _codeCitation?.EndIndex + ?? (_internalAnnotation?.SerializedAdditionalRawData?.TryGetValue("end_index", out BinaryData indexData) == true + ? int.Parse(indexData.ToString()) + : -1); /// - /// The index in the message content at which the citation begins. + /// The text in the message content that should be replaced. /// - public int StartIndex => _fileSearchCitation?.StartIndex ?? _codeCitation?.StartIndex ?? -1; + public string TextToReplace => + _fileSearchCitation?.Text + ?? _codeCitation?.Text + ?? (_internalAnnotation?.SerializedAdditionalRawData?.TryGetValue("text", out BinaryData textData) == true + ? textData.ToString() + : null); /// - /// The index in the message content at which the citation ends. + /// The ID of the file cited by the file_search tool for this annotation. /// - public int EndIndex => _fileSearchCitation?.EndIndex ?? _codeCitation?.EndIndex ?? -1; + public string InputFileId => _fileSearchCitation?.FileCitation?.FileId; /// - /// The text in the message content that should be replaced. + /// The ID of the file that was generated by the code_interpreter tool for this citation. /// - public string TextToReplace => _fileSearchCitation?.Text ?? _codeCitation?.Text; + public string OutputFileId => _codeCitation?.FilePath?.FileId; internal TextAnnotation(MessageContentTextObjectAnnotation internalAnnotation) { + _internalAnnotation = internalAnnotation; _fileSearchCitation = internalAnnotation as MessageContentTextAnnotationsFileCitationObject; _codeCitation = internalAnnotation as MessageContentTextAnnotationsFilePathObject; ; } diff --git a/src/Custom/Assistants/ToolConstraint.Serialization.cs b/src/Custom/Assistants/ToolConstraint.Serialization.cs index 174906626..7d2a335e4 100644 --- a/src/Custom/Assistants/ToolConstraint.Serialization.cs +++ b/src/Custom/Assistants/ToolConstraint.Serialization.cs @@ -42,7 +42,7 @@ internal static void SerializeToolConstraint(ToolConstraint instance, Utf8JsonWr writer.WriteStringValue(instance._objectFunctionName); writer.WriteEndObject(); } - writer.WriteSerializedAdditionalRawData(instance._serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(instance.SerializedAdditionalRawData, options); writer.WriteEndObject(); } } diff --git a/src/Custom/Assistants/ToolConstraint.cs b/src/Custom/Assistants/ToolConstraint.cs index c866a2e03..7175f32bb 100644 --- a/src/Custom/Assistants/ToolConstraint.cs +++ b/src/Custom/Assistants/ToolConstraint.cs @@ -10,7 +10,7 @@ public partial class ToolConstraint [CodeGenMember("Type")] private readonly string _objectType; private readonly string _objectFunctionName; - private readonly IDictionary _serializedAdditionalRawData; + private readonly IDictionary SerializedAdditionalRawData; // CUSTOM: Made internal. /// Gets or sets the function. @@ -38,7 +38,7 @@ public ToolConstraint(ToolDefinition toolDefinition) default: throw new ArgumentOutOfRangeException(nameof(toolDefinition)); } - _serializedAdditionalRawData = new ChangeTrackingDictionary(); + SerializedAdditionalRawData = new ChangeTrackingDictionary(); } internal ToolConstraint(string plainTextValue) @@ -50,6 +50,6 @@ internal ToolConstraint(string plainTextValue, string objectType, string objectF _plainTextValue = plainTextValue; _objectType = objectType; _objectFunctionName = objectFunctionName; - _serializedAdditionalRawData = serializedAdditionalRawData ?? new ChangeTrackingDictionary(); + SerializedAdditionalRawData = serializedAdditionalRawData ?? new ChangeTrackingDictionary(); } } diff --git a/src/Custom/Chat/AssistantChatMessage.Serialization.cs b/src/Custom/Chat/AssistantChatMessage.Serialization.cs index 8cc03e442..0fc3f137f 100644 --- a/src/Custom/Chat/AssistantChatMessage.Serialization.cs +++ b/src/Custom/Chat/AssistantChatMessage.Serialization.cs @@ -58,7 +58,7 @@ protected override void WriteCore(Utf8JsonWriter writer, ModelReaderWriterOption writer.WriteNull("content"); } } - writer.WriteSerializedAdditionalRawData(_serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(SerializedAdditionalRawData, options); writer.WriteEndObject(); } } diff --git a/src/Custom/Chat/ChatClient.cs b/src/Custom/Chat/ChatClient.cs index 72b9a5d7d..54c31bedb 100644 --- a/src/Custom/Chat/ChatClient.cs +++ b/src/Custom/Chat/ChatClient.cs @@ -125,7 +125,7 @@ public virtual ClientResult CompleteChat(params ChatMessage[] me /// history. /// /// - /// can be enumerated over using the await foreach pattern using the + /// can be enumerated over using the await foreach pattern using the /// interface. /// /// The messages to provide as input for chat completion. @@ -151,7 +151,7 @@ async Task getResultAsync() => /// history. /// /// - /// can be enumerated over using the await foreach pattern using the + /// can be enumerated over using the await foreach pattern using the /// interface. /// /// The messages to provide as input for chat completion. @@ -164,7 +164,7 @@ public virtual AsyncCollectionResult CompleteChat /// history. /// /// - /// can be enumerated over using the foreach pattern using the + /// can be enumerated over using the foreach pattern using the /// interface. /// /// The messages to provide as input for chat completion. @@ -188,7 +188,7 @@ public virtual CollectionResult CompleteChatStrea /// history. /// /// - /// can be enumerated over using the foreach pattern using the + /// can be enumerated over using the foreach pattern using the /// interface. /// /// The messages to provide as input for chat completion. diff --git a/src/Custom/Chat/ChatFunctionChoice.Serialization.cs b/src/Custom/Chat/ChatFunctionChoice.Serialization.cs index 92bee8a9a..6d39e2a51 100644 --- a/src/Custom/Chat/ChatFunctionChoice.Serialization.cs +++ b/src/Custom/Chat/ChatFunctionChoice.Serialization.cs @@ -22,7 +22,7 @@ internal static void SerializeChatFunctionChoice(ChatFunctionChoice instance, Ut writer.WriteStartObject(); writer.WritePropertyName("name"u8); writer.WriteStringValue(instance._function.Name); - writer.WriteSerializedAdditionalRawData(instance._serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(instance.SerializedAdditionalRawData, options); writer.WriteEndObject(); } } diff --git a/src/Custom/Chat/ChatFunctionChoice.cs b/src/Custom/Chat/ChatFunctionChoice.cs index 276a8cc78..5c9626e4c 100644 --- a/src/Custom/Chat/ChatFunctionChoice.cs +++ b/src/Custom/Chat/ChatFunctionChoice.cs @@ -42,7 +42,7 @@ internal ChatFunctionChoice(string functionName, IDictionary _function = new(functionName); _isPlainString = false; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } // CUSTOM: Added custom public constructor to handle the object representation. diff --git a/src/Custom/Chat/ChatMessageContentPart.Serialization.cs b/src/Custom/Chat/ChatMessageContentPart.Serialization.cs index 0700ed4c0..2c24a942f 100644 --- a/src/Custom/Chat/ChatMessageContentPart.Serialization.cs +++ b/src/Custom/Chat/ChatMessageContentPart.Serialization.cs @@ -29,7 +29,7 @@ internal static void WriteCoreContentPart(ChatMessageContentPart instance, Utf8J writer.WritePropertyName("image_url"u8); writer.WriteObjectValue(instance._imageUrl, options); } - writer.WriteSerializedAdditionalRawData(instance._serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(instance.SerializedAdditionalRawData, options); writer.WriteEndObject(); } diff --git a/src/Custom/Chat/ChatMessageContentPart.cs b/src/Custom/Chat/ChatMessageContentPart.cs index 901c80d25..603008327 100644 --- a/src/Custom/Chat/ChatMessageContentPart.cs +++ b/src/Custom/Chat/ChatMessageContentPart.cs @@ -56,7 +56,7 @@ internal ChatMessageContentPart(string kind, string text, InternalChatCompletion _kind = new ChatMessageContentPartKind(kind); _text = text; _imageUrl = imageUrl; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } /// diff --git a/src/Custom/Chat/ChatToolChoice.Serialization.cs b/src/Custom/Chat/ChatToolChoice.Serialization.cs index 893093809..5d8e275ab 100644 --- a/src/Custom/Chat/ChatToolChoice.Serialization.cs +++ b/src/Custom/Chat/ChatToolChoice.Serialization.cs @@ -24,7 +24,7 @@ internal static void SerializeChatToolChoice(ChatToolChoice instance, Utf8JsonWr writer.WriteStringValue(instance._type.ToString()); writer.WritePropertyName("function"u8); writer.WriteObjectValue(instance._function, options); - writer.WriteSerializedAdditionalRawData(instance._serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(instance.SerializedAdditionalRawData, options); writer.WriteEndObject(); } } diff --git a/src/Custom/Chat/ChatToolChoice.cs b/src/Custom/Chat/ChatToolChoice.cs index 4bf4e96fd..0fb3fa258 100644 --- a/src/Custom/Chat/ChatToolChoice.cs +++ b/src/Custom/Chat/ChatToolChoice.cs @@ -61,7 +61,7 @@ internal ChatToolChoice(string functionName, IDictionary ser _type = InternalChatCompletionNamedToolChoiceType.Function; _isPlainString = false; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } /// diff --git a/src/Custom/Chat/FunctionChatMessage.Serialization.cs b/src/Custom/Chat/FunctionChatMessage.Serialization.cs index be3f5cd35..b8749e951 100644 --- a/src/Custom/Chat/FunctionChatMessage.Serialization.cs +++ b/src/Custom/Chat/FunctionChatMessage.Serialization.cs @@ -35,7 +35,7 @@ protected override void WriteCore(Utf8JsonWriter writer, ModelReaderWriterOption writer.WriteNull("content"); } } - writer.WriteSerializedAdditionalRawData(_serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(SerializedAdditionalRawData, options); writer.WriteEndObject(); } diff --git a/src/Custom/Chat/Internal/InternalChatCompletionRequestMessageContentPartImageImageUrl.cs b/src/Custom/Chat/Internal/InternalChatCompletionRequestMessageContentPartImageImageUrl.cs index 7fe174011..be29738a8 100644 --- a/src/Custom/Chat/Internal/InternalChatCompletionRequestMessageContentPartImageImageUrl.cs +++ b/src/Custom/Chat/Internal/InternalChatCompletionRequestMessageContentPartImageImageUrl.cs @@ -69,7 +69,7 @@ internal InternalChatCompletionRequestMessageContentPartImageImageUrl(string url Url = url; Detail = detail; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public Uri ImageUri => _imageUri; diff --git a/src/Custom/Chat/Internal/InternalChatCompletionResponseMessage.Serialization.cs b/src/Custom/Chat/Internal/InternalChatCompletionResponseMessage.Serialization.cs index b178fed10..c8fd80d8e 100644 --- a/src/Custom/Chat/Internal/InternalChatCompletionResponseMessage.Serialization.cs +++ b/src/Custom/Chat/Internal/InternalChatCompletionResponseMessage.Serialization.cs @@ -56,7 +56,7 @@ internal static void SerializeInternalChatCompletionResponseMessage(InternalChat writer.WritePropertyName("function_call"u8); writer.WriteObjectValue(instance.FunctionCall, options); } - writer.WriteSerializedAdditionalRawData(instance._serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(instance.SerializedAdditionalRawData, options); writer.WriteEndObject(); } diff --git a/src/Custom/Chat/Internal/InternalChatCompletionStreamResponseDelta.Serialization.cs b/src/Custom/Chat/Internal/InternalChatCompletionStreamResponseDelta.Serialization.cs index ba50dcd34..0a4fa1ea1 100644 --- a/src/Custom/Chat/Internal/InternalChatCompletionStreamResponseDelta.Serialization.cs +++ b/src/Custom/Chat/Internal/InternalChatCompletionStreamResponseDelta.Serialization.cs @@ -59,7 +59,7 @@ internal static void SerializeInternalChatCompletionStreamResponseDelta(Internal writer.WritePropertyName("role"u8); writer.WriteStringValue(instance.Role.Value.ToSerialString()); } - writer.WriteSerializedAdditionalRawData(instance._serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(instance.SerializedAdditionalRawData, options); writer.WriteEndObject(); } diff --git a/src/Custom/Chat/Internal/InternalCreateChatCompletionStreamResponseChoice.Serialization.cs b/src/Custom/Chat/Internal/InternalCreateChatCompletionStreamResponseChoice.Serialization.cs index 6529d7c84..69b0c4c46 100644 --- a/src/Custom/Chat/Internal/InternalCreateChatCompletionStreamResponseChoice.Serialization.cs +++ b/src/Custom/Chat/Internal/InternalCreateChatCompletionStreamResponseChoice.Serialization.cs @@ -44,7 +44,7 @@ internal static void SerializeInternalCreateChatCompletionStreamResponseChoice(I } writer.WritePropertyName("index"u8); writer.WriteNumberValue(instance.Index); - writer.WriteSerializedAdditionalRawData(instance._serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(instance.SerializedAdditionalRawData, options); writer.WriteEndObject(); } diff --git a/src/Custom/Chat/Internal/UnknownChatMessage.Serialization.cs b/src/Custom/Chat/Internal/UnknownChatMessage.Serialization.cs index 6282e0945..b34b8afe9 100644 --- a/src/Custom/Chat/Internal/UnknownChatMessage.Serialization.cs +++ b/src/Custom/Chat/Internal/UnknownChatMessage.Serialization.cs @@ -31,7 +31,7 @@ protected override void WriteCore(Utf8JsonWriter writer, ModelReaderWriterOption } writer.WriteEndArray(); } - writer.WriteSerializedAdditionalRawData(_serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(SerializedAdditionalRawData, options); writer.WriteEndObject(); } diff --git a/src/Custom/Chat/SystemChatMessage.Serialization.cs b/src/Custom/Chat/SystemChatMessage.Serialization.cs index 8dd1d3c96..724c73de4 100644 --- a/src/Custom/Chat/SystemChatMessage.Serialization.cs +++ b/src/Custom/Chat/SystemChatMessage.Serialization.cs @@ -29,7 +29,7 @@ protected override void WriteCore(Utf8JsonWriter writer, ModelReaderWriterOption writer.WritePropertyName("content"u8); writer.WriteStringValue(Content[0].Text); } - writer.WriteSerializedAdditionalRawData(_serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(SerializedAdditionalRawData, options); writer.WriteEndObject(); } } \ No newline at end of file diff --git a/src/Custom/Chat/ToolChatMessage.Serialization.cs b/src/Custom/Chat/ToolChatMessage.Serialization.cs index fe153d8b0..ea25d94b9 100644 --- a/src/Custom/Chat/ToolChatMessage.Serialization.cs +++ b/src/Custom/Chat/ToolChatMessage.Serialization.cs @@ -26,7 +26,7 @@ protected override void WriteCore(Utf8JsonWriter writer, ModelReaderWriterOption writer.WritePropertyName("content"u8); writer.WriteStringValue(Content[0].Text); } - writer.WriteSerializedAdditionalRawData(_serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(SerializedAdditionalRawData, options); writer.WriteEndObject(); } } diff --git a/src/Custom/Chat/UserChatMessage.Serialization.cs b/src/Custom/Chat/UserChatMessage.Serialization.cs index ede30a237..f96b148e9 100644 --- a/src/Custom/Chat/UserChatMessage.Serialization.cs +++ b/src/Custom/Chat/UserChatMessage.Serialization.cs @@ -41,7 +41,7 @@ protected override void WriteCore(Utf8JsonWriter writer, ModelReaderWriterOption writer.WriteEndArray(); } } - writer.WriteSerializedAdditionalRawData(_serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(SerializedAdditionalRawData, options); writer.WriteEndObject(); } } \ No newline at end of file diff --git a/src/Custom/Embeddings/Embedding.cs b/src/Custom/Embeddings/Embedding.cs index 895ce953b..720057e47 100644 --- a/src/Custom/Embeddings/Embedding.cs +++ b/src/Custom/Embeddings/Embedding.cs @@ -77,7 +77,7 @@ internal Embedding(int index, BinaryData embeddingProperty, InternalEmbeddingObj Index = (int)index; EmbeddingProperty = embeddingProperty; Object = @object; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; // Handle additional custom properties. Vector = ConvertToVectorOfFloats(embeddingProperty); diff --git a/src/Custom/Embeddings/EmbeddingCollection.Serialization.cs b/src/Custom/Embeddings/EmbeddingCollection.Serialization.cs index 322325fbf..206cb09d8 100644 --- a/src/Custom/Embeddings/EmbeddingCollection.Serialization.cs +++ b/src/Custom/Embeddings/EmbeddingCollection.Serialization.cs @@ -10,7 +10,7 @@ public partial class EmbeddingCollection : IJsonModel { // CUSTOM: // - Serialized the Items property. - // - Recovered the deserialization of _serializedAdditionalRawData. See https://github.com/Azure/autorest.csharp/issues/4636. + // - Recovered the deserialization of SerializedAdditionalRawData. See https://github.com/Azure/autorest.csharp/issues/4636. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => CustomSerializationHelpers.SerializeInstance(this, SerializeEmbeddingCollection, writer, options); @@ -30,11 +30,11 @@ internal static void SerializeEmbeddingCollection(EmbeddingCollection instance, writer.WriteStringValue(instance.Object.ToString()); writer.WritePropertyName("usage"u8); writer.WriteObjectValue(instance.Usage, options); - writer.WriteSerializedAdditionalRawData(instance._serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(instance.SerializedAdditionalRawData, options); writer.WriteEndObject(); } - // CUSTOM: Recovered the deserialization of _serializedAdditionalRawData. See https://github.com/Azure/autorest.csharp/issues/4636. + // CUSTOM: Recovered the deserialization of SerializedAdditionalRawData. See https://github.com/Azure/autorest.csharp/issues/4636. internal static EmbeddingCollection DeserializeEmbeddingCollection(JsonElement element, ModelReaderWriterOptions options = null) { options ??= new ModelReaderWriterOptions("W"); diff --git a/src/Custom/Embeddings/EmbeddingCollection.cs b/src/Custom/Embeddings/EmbeddingCollection.cs index 9a19be86a..7fe4ff179 100644 --- a/src/Custom/Embeddings/EmbeddingCollection.cs +++ b/src/Custom/Embeddings/EmbeddingCollection.cs @@ -46,7 +46,7 @@ public partial class EmbeddingCollection : ReadOnlyCollection /// /// /// - private IDictionary _serializedAdditionalRawData; + private IDictionary SerializedAdditionalRawData; // CUSTOM: Set the inherited Items property via the base constructor in favor of the suppressed Data property. /// Initializes a new instance of . @@ -78,7 +78,7 @@ internal EmbeddingCollection(IReadOnlyList data, string model, Intern Model = model; Object = @object; Usage = usage; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } // CUSTOM: Set the inherited Items property via the base constructor in favor of the suppressed Data property. diff --git a/src/Custom/Files/OpenAIFileInfoCollection.Serialization.cs b/src/Custom/Files/OpenAIFileInfoCollection.Serialization.cs index 1a3f3a0c3..4702ff39b 100644 --- a/src/Custom/Files/OpenAIFileInfoCollection.Serialization.cs +++ b/src/Custom/Files/OpenAIFileInfoCollection.Serialization.cs @@ -10,7 +10,7 @@ public partial class OpenAIFileInfoCollection : IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => CustomSerializationHelpers.SerializeInstance(this, SerializeOpenAIFileInfoCollection, writer, options); @@ -26,11 +26,11 @@ internal static void SerializeOpenAIFileInfoCollection(OpenAIFileInfoCollection writer.WriteEndArray(); writer.WritePropertyName("object"u8); writer.WriteStringValue(instance.Object.ToString()); - writer.WriteSerializedAdditionalRawData(instance._serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(instance.SerializedAdditionalRawData, options); writer.WriteEndObject(); } - // CUSTOM: Recovered the deserialization of _serializedAdditionalRawData. See https://github.com/Azure/autorest.csharp/issues/4636. + // CUSTOM: Recovered the deserialization of SerializedAdditionalRawData. See https://github.com/Azure/autorest.csharp/issues/4636. internal static OpenAIFileInfoCollection DeserializeOpenAIFileInfoCollection(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; diff --git a/src/Custom/Files/OpenAIFileInfoCollection.cs b/src/Custom/Files/OpenAIFileInfoCollection.cs index 7add82853..9406205b1 100644 --- a/src/Custom/Files/OpenAIFileInfoCollection.cs +++ b/src/Custom/Files/OpenAIFileInfoCollection.cs @@ -45,7 +45,7 @@ public partial class OpenAIFileInfoCollection : ReadOnlyCollection /// /// - private IDictionary _serializedAdditionalRawData; + private IDictionary SerializedAdditionalRawData; /// Initializes a new instance of . /// @@ -64,7 +64,7 @@ internal OpenAIFileInfoCollection(IReadOnlyList data, InternalLi : base([.. data]) { Object = @object; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } /// Initializes a new instance of for deserialization. diff --git a/src/Custom/Images/GeneratedImageCollection.Serialization.cs b/src/Custom/Images/GeneratedImageCollection.Serialization.cs index a37e144c3..d45b940a9 100644 --- a/src/Custom/Images/GeneratedImageCollection.Serialization.cs +++ b/src/Custom/Images/GeneratedImageCollection.Serialization.cs @@ -10,7 +10,7 @@ public partial class GeneratedImageCollection : IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => CustomSerializationHelpers.SerializeInstance(this, SerializeGeneratedImageCollection, writer, options); @@ -26,11 +26,11 @@ internal static void SerializeGeneratedImageCollection(GeneratedImageCollection writer.WriteObjectValue(item, options); } writer.WriteEndArray(); - writer.WriteSerializedAdditionalRawData(instance._serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(instance.SerializedAdditionalRawData, options); writer.WriteEndObject(); } - // CUSTOM: Recovered the deserialization of _serializedAdditionalRawData. See https://github.com/Azure/autorest.csharp/issues/4636. + // CUSTOM: Recovered the deserialization of SerializedAdditionalRawData. See https://github.com/Azure/autorest.csharp/issues/4636. internal static GeneratedImageCollection DeserializeGeneratedImageCollection(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; diff --git a/src/Custom/Images/GeneratedImageCollection.cs b/src/Custom/Images/GeneratedImageCollection.cs index a183a643d..1cd14a3ab 100644 --- a/src/Custom/Images/GeneratedImageCollection.cs +++ b/src/Custom/Images/GeneratedImageCollection.cs @@ -44,7 +44,7 @@ public partial class GeneratedImageCollection : ReadOnlyCollection /// /// - private IDictionary _serializedAdditionalRawData; + private IDictionary SerializedAdditionalRawData; // CUSTOM: Set the inherited Items property via the base constructor in favor of the suppressed Data property. /// Initializes a new instance of . @@ -68,7 +68,7 @@ internal GeneratedImageCollection(DateTimeOffset created, IReadOnlyList.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => CustomSerializationHelpers.SerializeInstance(this, SerializeOpenAIModelInfoCollection, writer, options); @@ -29,11 +29,11 @@ internal static void SerializeOpenAIModelInfoCollection(OpenAIModelInfoCollectio writer.WriteObjectValue(item, options); } writer.WriteEndArray(); - writer.WriteSerializedAdditionalRawData(instance._serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(instance.SerializedAdditionalRawData, options); writer.WriteEndObject(); } - // CUSTOM: Recovered the deserialization of _serializedAdditionalRawData. See https://github.com/Azure/autorest.csharp/issues/4636. + // CUSTOM: Recovered the deserialization of SerializedAdditionalRawData. See https://github.com/Azure/autorest.csharp/issues/4636. internal static OpenAIModelInfoCollection DeserializeOpenAIModelInfoCollection(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; diff --git a/src/Custom/Models/OpenAIModelInfoCollection.cs b/src/Custom/Models/OpenAIModelInfoCollection.cs index 7092c9dfb..773bab8f9 100644 --- a/src/Custom/Models/OpenAIModelInfoCollection.cs +++ b/src/Custom/Models/OpenAIModelInfoCollection.cs @@ -49,7 +49,7 @@ public partial class OpenAIModelInfoCollection : ReadOnlyCollection /// /// - private IDictionary _serializedAdditionalRawData; + private IDictionary SerializedAdditionalRawData; /// Initializes a new instance of . /// @@ -68,7 +68,7 @@ internal OpenAIModelInfoCollection(InternalListModelsResponseObject @object, IRe : base([.. data]) { Object = @object; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } /// Initializes a new instance of for deserialization. diff --git a/src/Custom/Moderations/ModerationCollection.Serialization..cs b/src/Custom/Moderations/ModerationCollection.Serialization..cs index f1cb9d92e..0b248f352 100644 --- a/src/Custom/Moderations/ModerationCollection.Serialization..cs +++ b/src/Custom/Moderations/ModerationCollection.Serialization..cs @@ -14,7 +14,7 @@ public partial class ModerationCollection : IJsonModel { // CUSTOM: // - Serialized the Items property. - // - Recovered the deserialization of _serializedAdditionalRawData. See https://github.com/Azure/autorest.csharp/issues/4636. + // - Recovered the deserialization of SerializedAdditionalRawData. See https://github.com/Azure/autorest.csharp/issues/4636. void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => CustomSerializationHelpers.SerializeInstance(this, SerializeModerationCollection, writer, options); @@ -32,11 +32,11 @@ internal static void SerializeModerationCollection(ModerationCollection instance writer.WriteObjectValue(item, options); } writer.WriteEndArray(); - writer.WriteSerializedAdditionalRawData(instance._serializedAdditionalRawData, options); + writer.WriteSerializedAdditionalRawData(instance.SerializedAdditionalRawData, options); writer.WriteEndObject(); } - // CUSTOM: Recovered the deserialization of _serializedAdditionalRawData. See https://github.com/Azure/autorest.csharp/issues/4636. + // CUSTOM: Recovered the deserialization of SerializedAdditionalRawData. See https://github.com/Azure/autorest.csharp/issues/4636. internal static ModerationCollection DeserializeModerationCollection(JsonElement element, ModelReaderWriterOptions options = null) { options ??= ModelSerializationExtensions.WireOptions; diff --git a/src/Custom/Moderations/ModerationCollection.cs b/src/Custom/Moderations/ModerationCollection.cs index 60039634f..8c448d47d 100644 --- a/src/Custom/Moderations/ModerationCollection.cs +++ b/src/Custom/Moderations/ModerationCollection.cs @@ -41,7 +41,7 @@ public partial class ModerationCollection : ReadOnlyCollection /// /// /// - private IDictionary _serializedAdditionalRawData; + private IDictionary SerializedAdditionalRawData; /// Initializes a new instance of . /// The unique identifier for the moderation request. @@ -69,7 +69,7 @@ internal ModerationCollection(string id, string model, IReadOnlyList Initializes a new instance of for deserialization. diff --git a/src/Custom/VectorStores/VectorStoreExpirationPolicy.cs b/src/Custom/VectorStores/VectorStoreExpirationPolicy.cs index 486f36fee..c425cf43e 100644 --- a/src/Custom/VectorStores/VectorStoreExpirationPolicy.cs +++ b/src/Custom/VectorStores/VectorStoreExpirationPolicy.cs @@ -13,7 +13,7 @@ namespace OpenAI.VectorStores; [CodeGenSuppress(nameof(VectorStoreExpirationPolicy), typeof(VectorStoreExpirationAnchor), typeof(int), typeof(IDictionary))] public partial class VectorStoreExpirationPolicy { - private IDictionary _serializedAdditionalRawData; + private IDictionary SerializedAdditionalRawData; [CodeGenMember("Anchor")] private VectorStoreExpirationAnchor _anchor; @@ -46,7 +46,7 @@ public VectorStoreExpirationPolicy(VectorStoreExpirationAnchor anchor, int days) /// Initializes a new instance of . public VectorStoreExpirationPolicy() { - _serializedAdditionalRawData = new ChangeTrackingDictionary(); + SerializedAdditionalRawData = new ChangeTrackingDictionary(); } /// Initializes a new instance of . @@ -58,6 +58,6 @@ internal VectorStoreExpirationPolicy(VectorStoreExpirationAnchor anchor, int day { Anchor = anchor; Days = days; - _serializedAdditionalRawData = serializedAdditionalRawData ?? new ChangeTrackingDictionary(); + SerializedAdditionalRawData = serializedAdditionalRawData ?? new ChangeTrackingDictionary(); } } diff --git a/src/Generated/Internal/ModelSerializationExtensions.cs b/src/Generated/Internal/ModelSerializationExtensions.cs index adaa0de21..d1334d37b 100644 --- a/src/Generated/Internal/ModelSerializationExtensions.cs +++ b/src/Generated/Internal/ModelSerializationExtensions.cs @@ -15,6 +15,7 @@ namespace OpenAI internal static class ModelSerializationExtensions { internal static readonly ModelReaderWriterOptions WireOptions = new ModelReaderWriterOptions("W"); + internal static readonly BinaryData SentinelValue = BinaryData.FromObjectAsJson("__EMPTY__"); public static object GetObject(this JsonElement element) { @@ -249,6 +250,13 @@ public static void WriteObjectValue(this Utf8JsonWriter writer, object value, Mo writer.WriteObjectValue(value, options); } + internal static bool IsSentinelValue(BinaryData value) + { + ReadOnlySpan sentinelSpan = SentinelValue.ToMemory().Span; + ReadOnlySpan valueSpan = value.ToMemory().Span; + return sentinelSpan.SequenceEqual(valueSpan); + } + internal static class TypeFormatters { private const string RoundtripZFormat = "yyyy-MM-ddTHH:mm:ss.fffffffZ"; diff --git a/src/Generated/InternalAssistantMessageClient.cs b/src/Generated/InternalAssistantMessageClient.cs index 46099c201..5ad0ce023 100644 --- a/src/Generated/InternalAssistantMessageClient.cs +++ b/src/Generated/InternalAssistantMessageClient.cs @@ -24,6 +24,22 @@ protected InternalAssistantMessageClient() { } + public virtual async Task GetMessagesAsync(string threadId, int? limit, string order, string after, string before, RequestOptions options) + { + Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); + + using PipelineMessage message = CreateGetMessagesRequest(threadId, limit, order, after, before, options); + return ClientResult.FromResponse(await _pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); + } + + public virtual ClientResult GetMessages(string threadId, int? limit, string order, string after, string before, RequestOptions options) + { + Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); + + using PipelineMessage message = CreateGetMessagesRequest(threadId, limit, order, after, before, options); + return ClientResult.FromResponse(_pipeline.ProcessMessage(message, options)); + } + internal PipelineMessage CreateCreateMessageRequest(string threadId, BinaryContent content, RequestOptions options) { var message = _pipeline.CreateMessage(); diff --git a/src/Generated/InternalAssistantRunClient.cs b/src/Generated/InternalAssistantRunClient.cs index c8c207270..b079a8a5e 100644 --- a/src/Generated/InternalAssistantRunClient.cs +++ b/src/Generated/InternalAssistantRunClient.cs @@ -24,6 +24,40 @@ protected InternalAssistantRunClient() { } + public virtual async Task GetRunsAsync(string threadId, int? limit, string order, string after, string before, RequestOptions options) + { + Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); + + using PipelineMessage message = CreateGetRunsRequest(threadId, limit, order, after, before, options); + return ClientResult.FromResponse(await _pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); + } + + public virtual ClientResult GetRuns(string threadId, int? limit, string order, string after, string before, RequestOptions options) + { + Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); + + using PipelineMessage message = CreateGetRunsRequest(threadId, limit, order, after, before, options); + return ClientResult.FromResponse(_pipeline.ProcessMessage(message, options)); + } + + public virtual async Task GetRunStepsAsync(string threadId, string runId, int? limit, string order, string after, string before, RequestOptions options) + { + Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); + Argument.AssertNotNullOrEmpty(runId, nameof(runId)); + + using PipelineMessage message = CreateGetRunStepsRequest(threadId, runId, limit, order, after, before, options); + return ClientResult.FromResponse(await _pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); + } + + public virtual ClientResult GetRunSteps(string threadId, string runId, int? limit, string order, string after, string before, RequestOptions options) + { + Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); + Argument.AssertNotNullOrEmpty(runId, nameof(runId)); + + using PipelineMessage message = CreateGetRunStepsRequest(threadId, runId, limit, order, after, before, options); + return ClientResult.FromResponse(_pipeline.ProcessMessage(message, options)); + } + internal PipelineMessage CreateCreateThreadAndRunRequest(BinaryContent content, RequestOptions options) { var message = _pipeline.CreateMessage(); diff --git a/src/Generated/Models/Assistant.Serialization.cs b/src/Generated/Models/Assistant.Serialization.cs index 2b1582491..90cef00f3 100644 --- a/src/Generated/Models/Assistant.Serialization.cs +++ b/src/Generated/Models/Assistant.Serialization.cs @@ -21,49 +21,73 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("created_at"u8); - writer.WriteNumberValue(CreatedAt, "U"); - if (Name != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - writer.WritePropertyName("name"u8); - writer.WriteStringValue(Name); + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); } - else + if (SerializedAdditionalRawData?.ContainsKey("object") != true) { - writer.WriteNull("name"); + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); } - if (Description != null) + if (SerializedAdditionalRawData?.ContainsKey("created_at") != true) { - writer.WritePropertyName("description"u8); - writer.WriteStringValue(Description); + writer.WritePropertyName("created_at"u8); + writer.WriteNumberValue(CreatedAt, "U"); } - else + if (SerializedAdditionalRawData?.ContainsKey("name") != true) { - writer.WriteNull("description"); + if (Name != null) + { + writer.WritePropertyName("name"u8); + writer.WriteStringValue(Name); + } + else + { + writer.WriteNull("name"); + } } - writer.WritePropertyName("model"u8); - writer.WriteStringValue(Model); - if (Instructions != null) + if (SerializedAdditionalRawData?.ContainsKey("description") != true) { - writer.WritePropertyName("instructions"u8); - writer.WriteStringValue(Instructions); + if (Description != null) + { + writer.WritePropertyName("description"u8); + writer.WriteStringValue(Description); + } + else + { + writer.WriteNull("description"); + } + } + if (SerializedAdditionalRawData?.ContainsKey("model") != true) + { + writer.WritePropertyName("model"u8); + writer.WriteStringValue(Model); } - else + if (SerializedAdditionalRawData?.ContainsKey("instructions") != true) { - writer.WriteNull("instructions"); + if (Instructions != null) + { + writer.WritePropertyName("instructions"u8); + writer.WriteStringValue(Instructions); + } + else + { + writer.WriteNull("instructions"); + } } - writer.WritePropertyName("tools"u8); - writer.WriteStartArray(); - foreach (var item in Tools) + if (SerializedAdditionalRawData?.ContainsKey("tools") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("tools"u8); + writer.WriteStartArray(); + foreach (var item in Tools) + { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - if (Optional.IsDefined(ToolResources)) + if (SerializedAdditionalRawData?.ContainsKey("tool_resources") != true && Optional.IsDefined(ToolResources)) { if (ToolResources != null) { @@ -75,22 +99,25 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions writer.WriteNull("tool_resources"); } } - if (Metadata != null && Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true) { - writer.WritePropertyName("metadata"u8); - writer.WriteStartObject(); - foreach (var item in Metadata) + if (Metadata != null && Optional.IsCollectionDefined(Metadata)) { - writer.WritePropertyName(item.Key); - writer.WriteStringValue(item.Value); + writer.WritePropertyName("metadata"u8); + writer.WriteStartObject(); + foreach (var item in Metadata) + { + writer.WritePropertyName(item.Key); + writer.WriteStringValue(item.Value); + } + writer.WriteEndObject(); + } + else + { + writer.WriteNull("metadata"); } - writer.WriteEndObject(); - } - else - { - writer.WriteNull("metadata"); } - if (Optional.IsDefined(Temperature)) + if (SerializedAdditionalRawData?.ContainsKey("temperature") != true && Optional.IsDefined(Temperature)) { if (Temperature != null) { @@ -102,7 +129,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions writer.WriteNull("temperature"); } } - if (Optional.IsDefined(NucleusSamplingFactor)) + if (SerializedAdditionalRawData?.ContainsKey("top_p") != true && Optional.IsDefined(NucleusSamplingFactor)) { if (NucleusSamplingFactor != null) { @@ -114,7 +141,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions writer.WriteNull("top_p"); } } - if (Optional.IsDefined(ResponseFormat)) + if (SerializedAdditionalRawData?.ContainsKey("response_format") != true && Optional.IsDefined(ResponseFormat)) { if (ResponseFormat != null) { @@ -126,10 +153,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions writer.WriteNull("response_format"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -296,8 +327,9 @@ internal static Assistant DeserializeAssistant(JsonElement element, ModelReaderW responseFormat = AssistantResponseFormat.DeserializeAssistantResponseFormat(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/Assistant.cs b/src/Generated/Models/Assistant.cs index aeeae167f..26f4ce18a 100644 --- a/src/Generated/Models/Assistant.cs +++ b/src/Generated/Models/Assistant.cs @@ -10,8 +10,7 @@ namespace OpenAI.Assistants { public partial class Assistant { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal Assistant(string id, DateTimeOffset createdAt, string name, string description, string model, string instructions, IEnumerable tools, IReadOnlyDictionary metadata) { Argument.AssertNotNull(id, nameof(id)); @@ -43,7 +42,7 @@ internal Assistant(string id, InternalAssistantObjectObject @object, DateTimeOff Temperature = temperature; NucleusSamplingFactor = nucleusSamplingFactor; ResponseFormat = responseFormat; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal Assistant() diff --git a/src/Generated/Models/AssistantChatMessage.Serialization.cs b/src/Generated/Models/AssistantChatMessage.Serialization.cs index f0a4402f0..6e910e5e1 100644 --- a/src/Generated/Models/AssistantChatMessage.Serialization.cs +++ b/src/Generated/Models/AssistantChatMessage.Serialization.cs @@ -80,8 +80,9 @@ internal static AssistantChatMessage DeserializeAssistantChatMessage(JsonElement DeserializeContentValue(property, ref content); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/AssistantCreationOptions.Serialization.cs b/src/Generated/Models/AssistantCreationOptions.Serialization.cs index bd3c9e3a7..906335b7a 100644 --- a/src/Generated/Models/AssistantCreationOptions.Serialization.cs +++ b/src/Generated/Models/AssistantCreationOptions.Serialization.cs @@ -21,9 +21,12 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRead } writer.WriteStartObject(); - writer.WritePropertyName("model"u8); - writer.WriteStringValue(Model); - if (Optional.IsDefined(Name)) + if (SerializedAdditionalRawData?.ContainsKey("model") != true) + { + writer.WritePropertyName("model"u8); + writer.WriteStringValue(Model); + } + if (SerializedAdditionalRawData?.ContainsKey("name") != true && Optional.IsDefined(Name)) { if (Name != null) { @@ -35,7 +38,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRead writer.WriteNull("name"); } } - if (Optional.IsDefined(Description)) + if (SerializedAdditionalRawData?.ContainsKey("description") != true && Optional.IsDefined(Description)) { if (Description != null) { @@ -47,7 +50,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRead writer.WriteNull("description"); } } - if (Optional.IsDefined(Instructions)) + if (SerializedAdditionalRawData?.ContainsKey("instructions") != true && Optional.IsDefined(Instructions)) { if (Instructions != null) { @@ -59,7 +62,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRead writer.WriteNull("instructions"); } } - if (Optional.IsCollectionDefined(Tools)) + if (SerializedAdditionalRawData?.ContainsKey("tools") != true && Optional.IsCollectionDefined(Tools)) { writer.WritePropertyName("tools"u8); writer.WriteStartArray(); @@ -69,7 +72,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRead } writer.WriteEndArray(); } - if (Optional.IsDefined(ToolResources)) + if (SerializedAdditionalRawData?.ContainsKey("tool_resources") != true && Optional.IsDefined(ToolResources)) { if (ToolResources != null) { @@ -81,7 +84,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRead writer.WriteNull("tool_resources"); } } - if (Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true && Optional.IsCollectionDefined(Metadata)) { if (Metadata != null) { @@ -99,7 +102,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRead writer.WriteNull("metadata"); } } - if (Optional.IsDefined(Temperature)) + if (SerializedAdditionalRawData?.ContainsKey("temperature") != true && Optional.IsDefined(Temperature)) { if (Temperature != null) { @@ -111,7 +114,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRead writer.WriteNull("temperature"); } } - if (Optional.IsDefined(NucleusSamplingFactor)) + if (SerializedAdditionalRawData?.ContainsKey("top_p") != true && Optional.IsDefined(NucleusSamplingFactor)) { if (NucleusSamplingFactor != null) { @@ -123,7 +126,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRead writer.WriteNull("top_p"); } } - if (Optional.IsDefined(ResponseFormat)) + if (SerializedAdditionalRawData?.ContainsKey("response_format") != true && Optional.IsDefined(ResponseFormat)) { if (ResponseFormat != null) { @@ -135,10 +138,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRead writer.WriteNull("response_format"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -290,8 +297,9 @@ internal static AssistantCreationOptions DeserializeAssistantCreationOptions(Jso responseFormat = AssistantResponseFormat.DeserializeAssistantResponseFormat(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/AssistantCreationOptions.cs b/src/Generated/Models/AssistantCreationOptions.cs index f58beb0c2..d4881aacf 100644 --- a/src/Generated/Models/AssistantCreationOptions.cs +++ b/src/Generated/Models/AssistantCreationOptions.cs @@ -9,7 +9,7 @@ namespace OpenAI.Assistants { public partial class AssistantCreationOptions { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal AssistantCreationOptions(string model, string name, string description, string instructions, IList tools, ToolResources toolResources, IDictionary metadata, float? temperature, float? nucleusSamplingFactor, AssistantResponseFormat responseFormat, IDictionary serializedAdditionalRawData) { @@ -23,7 +23,7 @@ internal AssistantCreationOptions(string model, string name, string description, Temperature = temperature; NucleusSamplingFactor = nucleusSamplingFactor; ResponseFormat = responseFormat; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string Name { get; init; } public string Description { get; init; } diff --git a/src/Generated/Models/AssistantModificationOptions.Serialization.cs b/src/Generated/Models/AssistantModificationOptions.Serialization.cs index 84b66ead7..dac67ae72 100644 --- a/src/Generated/Models/AssistantModificationOptions.Serialization.cs +++ b/src/Generated/Models/AssistantModificationOptions.Serialization.cs @@ -21,12 +21,12 @@ void IJsonModel.Write(Utf8JsonWriter writer, Model } writer.WriteStartObject(); - if (Optional.IsDefined(Model)) + if (SerializedAdditionalRawData?.ContainsKey("model") != true && Optional.IsDefined(Model)) { writer.WritePropertyName("model"u8); writer.WriteStringValue(Model); } - if (Optional.IsDefined(Name)) + if (SerializedAdditionalRawData?.ContainsKey("name") != true && Optional.IsDefined(Name)) { if (Name != null) { @@ -38,7 +38,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Model writer.WriteNull("name"); } } - if (Optional.IsDefined(Description)) + if (SerializedAdditionalRawData?.ContainsKey("description") != true && Optional.IsDefined(Description)) { if (Description != null) { @@ -50,7 +50,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Model writer.WriteNull("description"); } } - if (Optional.IsDefined(Instructions)) + if (SerializedAdditionalRawData?.ContainsKey("instructions") != true && Optional.IsDefined(Instructions)) { if (Instructions != null) { @@ -62,7 +62,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Model writer.WriteNull("instructions"); } } - if (Optional.IsCollectionDefined(DefaultTools)) + if (SerializedAdditionalRawData?.ContainsKey("tools") != true && Optional.IsCollectionDefined(DefaultTools)) { writer.WritePropertyName("tools"u8); writer.WriteStartArray(); @@ -72,7 +72,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Model } writer.WriteEndArray(); } - if (Optional.IsDefined(ToolResources)) + if (SerializedAdditionalRawData?.ContainsKey("tool_resources") != true && Optional.IsDefined(ToolResources)) { if (ToolResources != null) { @@ -84,7 +84,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Model writer.WriteNull("tool_resources"); } } - if (Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true && Optional.IsCollectionDefined(Metadata)) { if (Metadata != null) { @@ -102,7 +102,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Model writer.WriteNull("metadata"); } } - if (Optional.IsDefined(Temperature)) + if (SerializedAdditionalRawData?.ContainsKey("temperature") != true && Optional.IsDefined(Temperature)) { if (Temperature != null) { @@ -114,7 +114,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Model writer.WriteNull("temperature"); } } - if (Optional.IsDefined(NucleusSamplingFactor)) + if (SerializedAdditionalRawData?.ContainsKey("top_p") != true && Optional.IsDefined(NucleusSamplingFactor)) { if (NucleusSamplingFactor != null) { @@ -126,7 +126,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Model writer.WriteNull("top_p"); } } - if (Optional.IsDefined(ResponseFormat)) + if (SerializedAdditionalRawData?.ContainsKey("response_format") != true && Optional.IsDefined(ResponseFormat)) { if (ResponseFormat != null) { @@ -138,10 +138,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, Model writer.WriteNull("response_format"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -293,8 +297,9 @@ internal static AssistantModificationOptions DeserializeAssistantModificationOpt responseFormat = AssistantResponseFormat.DeserializeAssistantResponseFormat(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/AssistantModificationOptions.cs b/src/Generated/Models/AssistantModificationOptions.cs index 2fba80ca0..4b74e9f0b 100644 --- a/src/Generated/Models/AssistantModificationOptions.cs +++ b/src/Generated/Models/AssistantModificationOptions.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public partial class AssistantModificationOptions { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } public AssistantModificationOptions() { DefaultTools = new ChangeTrackingList(); @@ -29,7 +28,7 @@ internal AssistantModificationOptions(string model, string name, string descript Temperature = temperature; NucleusSamplingFactor = nucleusSamplingFactor; ResponseFormat = responseFormat; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string Name { get; init; } public string Description { get; init; } diff --git a/src/Generated/Models/AssistantResponseFormat.cs b/src/Generated/Models/AssistantResponseFormat.cs index 3572d8982..da67ee999 100644 --- a/src/Generated/Models/AssistantResponseFormat.cs +++ b/src/Generated/Models/AssistantResponseFormat.cs @@ -11,7 +11,7 @@ public partial class AssistantResponseFormat { internal AssistantResponseFormat(IDictionary serializedAdditionalRawData) { - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } } } diff --git a/src/Generated/Models/AssistantThread.Serialization.cs b/src/Generated/Models/AssistantThread.Serialization.cs index 4cc94d921..9062e18d5 100644 --- a/src/Generated/Models/AssistantThread.Serialization.cs +++ b/src/Generated/Models/AssistantThread.Serialization.cs @@ -21,40 +21,59 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterO } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("created_at"u8); - writer.WriteNumberValue(CreatedAt, "U"); - if (ToolResources != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - writer.WritePropertyName("tool_resources"u8); - writer.WriteObjectValue(ToolResources, options); + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); } - else + if (SerializedAdditionalRawData?.ContainsKey("object") != true) { - writer.WriteNull("tool_resources"); + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); } - if (Metadata != null && Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("created_at") != true) { - writer.WritePropertyName("metadata"u8); - writer.WriteStartObject(); - foreach (var item in Metadata) + writer.WritePropertyName("created_at"u8); + writer.WriteNumberValue(CreatedAt, "U"); + } + if (SerializedAdditionalRawData?.ContainsKey("tool_resources") != true) + { + if (ToolResources != null) { - writer.WritePropertyName(item.Key); - writer.WriteStringValue(item.Value); + writer.WritePropertyName("tool_resources"u8); + writer.WriteObjectValue(ToolResources, options); + } + else + { + writer.WriteNull("tool_resources"); } - writer.WriteEndObject(); } - else + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true) { - writer.WriteNull("metadata"); + if (Metadata != null && Optional.IsCollectionDefined(Metadata)) + { + writer.WritePropertyName("metadata"u8); + writer.WriteStartObject(); + foreach (var item in Metadata) + { + writer.WritePropertyName(item.Key); + writer.WriteStringValue(item.Value); + } + writer.WriteEndObject(); + } + else + { + writer.WriteNull("metadata"); + } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -138,8 +157,9 @@ internal static AssistantThread DeserializeAssistantThread(JsonElement element, metadata = dictionary; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/AssistantThread.cs b/src/Generated/Models/AssistantThread.cs index 7267b09f4..0e58abd05 100644 --- a/src/Generated/Models/AssistantThread.cs +++ b/src/Generated/Models/AssistantThread.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public partial class AssistantThread { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal AssistantThread(string id, DateTimeOffset createdAt, ToolResources toolResources, IReadOnlyDictionary metadata) { Argument.AssertNotNull(id, nameof(id)); @@ -28,7 +27,7 @@ internal AssistantThread(string id, InternalThreadObjectObject @object, DateTime CreatedAt = createdAt; ToolResources = toolResources; Metadata = metadata; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal AssistantThread() diff --git a/src/Generated/Models/AudioTranscription.Serialization.cs b/src/Generated/Models/AudioTranscription.Serialization.cs index 5f5363441..f9dd68a11 100644 --- a/src/Generated/Models/AudioTranscription.Serialization.cs +++ b/src/Generated/Models/AudioTranscription.Serialization.cs @@ -21,15 +21,27 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit } writer.WriteStartObject(); - writer.WritePropertyName("task"u8); - writer.WriteStringValue(Task.ToString()); - writer.WritePropertyName("language"u8); - writer.WriteStringValue(Language); - writer.WritePropertyName("duration"u8); - writer.WriteNumberValue(Convert.ToDouble(Duration.Value.ToString("s\\.FFF"))); - writer.WritePropertyName("text"u8); - writer.WriteStringValue(Text); - if (Optional.IsCollectionDefined(Words)) + if (SerializedAdditionalRawData?.ContainsKey("task") != true) + { + writer.WritePropertyName("task"u8); + writer.WriteStringValue(Task.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("language") != true) + { + writer.WritePropertyName("language"u8); + writer.WriteStringValue(Language); + } + if (SerializedAdditionalRawData?.ContainsKey("duration") != true) + { + writer.WritePropertyName("duration"u8); + writer.WriteNumberValue(Convert.ToDouble(Duration.Value.ToString("s\\.FFF"))); + } + if (SerializedAdditionalRawData?.ContainsKey("text") != true) + { + writer.WritePropertyName("text"u8); + writer.WriteStringValue(Text); + } + if (SerializedAdditionalRawData?.ContainsKey("words") != true && Optional.IsCollectionDefined(Words)) { writer.WritePropertyName("words"u8); writer.WriteStartArray(); @@ -39,7 +51,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit } writer.WriteEndArray(); } - if (Optional.IsCollectionDefined(Segments)) + if (SerializedAdditionalRawData?.ContainsKey("segments") != true && Optional.IsCollectionDefined(Segments)) { writer.WritePropertyName("segments"u8); writer.WriteStartArray(); @@ -49,10 +61,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -145,8 +161,9 @@ internal static AudioTranscription DeserializeAudioTranscription(JsonElement ele segments = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/AudioTranscription.cs b/src/Generated/Models/AudioTranscription.cs index 98f452965..b97679028 100644 --- a/src/Generated/Models/AudioTranscription.cs +++ b/src/Generated/Models/AudioTranscription.cs @@ -9,8 +9,7 @@ namespace OpenAI.Audio { public partial class AudioTranscription { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal AudioTranscription(string language, TimeSpan? duration, string text) { Argument.AssertNotNull(language, nameof(language)); @@ -31,7 +30,7 @@ internal AudioTranscription(InternalCreateTranscriptionResponseVerboseJsonTask t Text = text; Words = words; Segments = segments; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal AudioTranscription() diff --git a/src/Generated/Models/AudioTranscriptionOptions.Serialization.cs b/src/Generated/Models/AudioTranscriptionOptions.Serialization.cs index e26134070..726c16fb6 100644 --- a/src/Generated/Models/AudioTranscriptionOptions.Serialization.cs +++ b/src/Generated/Models/AudioTranscriptionOptions.Serialization.cs @@ -22,38 +22,44 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRea } writer.WriteStartObject(); - writer.WritePropertyName("file"u8); + if (SerializedAdditionalRawData?.ContainsKey("file") != true) + { + writer.WritePropertyName("file"u8); #if NET6_0_OR_GREATER writer.WriteRawValue(File); #else - using (JsonDocument document = JsonDocument.Parse(File)) + using (JsonDocument document = JsonDocument.Parse(File)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + if (SerializedAdditionalRawData?.ContainsKey("model") != true) { - JsonSerializer.Serialize(writer, document.RootElement); + writer.WritePropertyName("model"u8); + writer.WriteStringValue(Model.ToString()); } -#endif - writer.WritePropertyName("model"u8); - writer.WriteStringValue(Model.ToString()); - if (Optional.IsDefined(Language)) + if (SerializedAdditionalRawData?.ContainsKey("language") != true && Optional.IsDefined(Language)) { writer.WritePropertyName("language"u8); writer.WriteStringValue(Language); } - if (Optional.IsDefined(Prompt)) + if (SerializedAdditionalRawData?.ContainsKey("prompt") != true && Optional.IsDefined(Prompt)) { writer.WritePropertyName("prompt"u8); writer.WriteStringValue(Prompt); } - if (Optional.IsDefined(ResponseFormat)) + if (SerializedAdditionalRawData?.ContainsKey("response_format") != true && Optional.IsDefined(ResponseFormat)) { writer.WritePropertyName("response_format"u8); writer.WriteStringValue(ResponseFormat.Value.ToSerialString()); } - if (Optional.IsDefined(Temperature)) + if (SerializedAdditionalRawData?.ContainsKey("temperature") != true && Optional.IsDefined(Temperature)) { writer.WritePropertyName("temperature"u8); writer.WriteNumberValue(Temperature.Value); } - if (Optional.IsCollectionDefined(TimestampGranularities)) + if (SerializedAdditionalRawData?.ContainsKey("timestamp_granularities") != true && Optional.IsCollectionDefined(TimestampGranularities)) { writer.WritePropertyName("timestamp_granularities"u8); writer.WriteStartArray(); @@ -75,10 +81,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRea } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -183,8 +193,9 @@ internal static AudioTranscriptionOptions DeserializeAudioTranscriptionOptions(J timestampGranularities = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/AudioTranscriptionOptions.cs b/src/Generated/Models/AudioTranscriptionOptions.cs index 2d2184341..6459d6f44 100644 --- a/src/Generated/Models/AudioTranscriptionOptions.cs +++ b/src/Generated/Models/AudioTranscriptionOptions.cs @@ -9,7 +9,7 @@ namespace OpenAI.Audio { public partial class AudioTranscriptionOptions { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal AudioTranscriptionOptions(BinaryData file, InternalCreateTranscriptionRequestModel model, string language, string prompt, AudioTranscriptionFormat? responseFormat, float? temperature, IList timestampGranularities, IDictionary serializedAdditionalRawData) { @@ -20,7 +20,7 @@ internal AudioTranscriptionOptions(BinaryData file, InternalCreateTranscriptionR ResponseFormat = responseFormat; Temperature = temperature; TimestampGranularities = timestampGranularities; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string Language { get; init; } public string Prompt { get; init; } diff --git a/src/Generated/Models/AudioTranslation.Serialization.cs b/src/Generated/Models/AudioTranslation.Serialization.cs index 85212880e..adb60c980 100644 --- a/src/Generated/Models/AudioTranslation.Serialization.cs +++ b/src/Generated/Models/AudioTranslation.Serialization.cs @@ -21,15 +21,27 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriter } writer.WriteStartObject(); - writer.WritePropertyName("task"u8); - writer.WriteStringValue(Task.ToString()); - writer.WritePropertyName("language"u8); - writer.WriteStringValue(Language); - writer.WritePropertyName("duration"u8); - writer.WriteNumberValue(Convert.ToDouble(Duration.Value.ToString("s\\.FFF"))); - writer.WritePropertyName("text"u8); - writer.WriteStringValue(Text); - if (Optional.IsCollectionDefined(Segments)) + if (SerializedAdditionalRawData?.ContainsKey("task") != true) + { + writer.WritePropertyName("task"u8); + writer.WriteStringValue(Task.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("language") != true) + { + writer.WritePropertyName("language"u8); + writer.WriteStringValue(Language); + } + if (SerializedAdditionalRawData?.ContainsKey("duration") != true) + { + writer.WritePropertyName("duration"u8); + writer.WriteNumberValue(Convert.ToDouble(Duration.Value.ToString("s\\.FFF"))); + } + if (SerializedAdditionalRawData?.ContainsKey("text") != true) + { + writer.WritePropertyName("text"u8); + writer.WriteStringValue(Text); + } + if (SerializedAdditionalRawData?.ContainsKey("segments") != true && Optional.IsCollectionDefined(Segments)) { writer.WritePropertyName("segments"u8); writer.WriteStartArray(); @@ -39,10 +51,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriter } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -120,8 +136,9 @@ internal static AudioTranslation DeserializeAudioTranslation(JsonElement element segments = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/AudioTranslation.cs b/src/Generated/Models/AudioTranslation.cs index 4374b408e..768e83cc6 100644 --- a/src/Generated/Models/AudioTranslation.cs +++ b/src/Generated/Models/AudioTranslation.cs @@ -9,8 +9,7 @@ namespace OpenAI.Audio { public partial class AudioTranslation { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal AudioTranslation(string language, TimeSpan? duration, string text) { Argument.AssertNotNull(language, nameof(language)); @@ -29,7 +28,7 @@ internal AudioTranslation(InternalCreateTranslationResponseVerboseJsonTask task, Duration = duration; Text = text; Segments = segments; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal AudioTranslation() diff --git a/src/Generated/Models/AudioTranslationOptions.Serialization.cs b/src/Generated/Models/AudioTranslationOptions.Serialization.cs index 215f27d36..1efc834a1 100644 --- a/src/Generated/Models/AudioTranslationOptions.Serialization.cs +++ b/src/Generated/Models/AudioTranslationOptions.Serialization.cs @@ -22,36 +22,46 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReade } writer.WriteStartObject(); - writer.WritePropertyName("file"u8); + if (SerializedAdditionalRawData?.ContainsKey("file") != true) + { + writer.WritePropertyName("file"u8); #if NET6_0_OR_GREATER writer.WriteRawValue(File); #else - using (JsonDocument document = JsonDocument.Parse(File)) + using (JsonDocument document = JsonDocument.Parse(File)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + if (SerializedAdditionalRawData?.ContainsKey("model") != true) { - JsonSerializer.Serialize(writer, document.RootElement); + writer.WritePropertyName("model"u8); + writer.WriteStringValue(Model.ToString()); } -#endif - writer.WritePropertyName("model"u8); - writer.WriteStringValue(Model.ToString()); - if (Optional.IsDefined(Prompt)) + if (SerializedAdditionalRawData?.ContainsKey("prompt") != true && Optional.IsDefined(Prompt)) { writer.WritePropertyName("prompt"u8); writer.WriteStringValue(Prompt); } - if (Optional.IsDefined(ResponseFormat)) + if (SerializedAdditionalRawData?.ContainsKey("response_format") != true && Optional.IsDefined(ResponseFormat)) { writer.WritePropertyName("response_format"u8); writer.WriteStringValue(ResponseFormat.Value.ToSerialString()); } - if (Optional.IsDefined(Temperature)) + if (SerializedAdditionalRawData?.ContainsKey("temperature") != true && Optional.IsDefined(Temperature)) { writer.WritePropertyName("temperature"u8); writer.WriteNumberValue(Temperature.Value); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -128,8 +138,9 @@ internal static AudioTranslationOptions DeserializeAudioTranslationOptions(JsonE temperature = property.Value.GetSingle(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/AudioTranslationOptions.cs b/src/Generated/Models/AudioTranslationOptions.cs index 9307af749..e5916f1f9 100644 --- a/src/Generated/Models/AudioTranslationOptions.cs +++ b/src/Generated/Models/AudioTranslationOptions.cs @@ -9,7 +9,7 @@ namespace OpenAI.Audio { public partial class AudioTranslationOptions { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal AudioTranslationOptions(BinaryData file, InternalCreateTranslationRequestModel model, string prompt, AudioTranslationFormat? responseFormat, float? temperature, IDictionary serializedAdditionalRawData) { @@ -18,7 +18,7 @@ internal AudioTranslationOptions(BinaryData file, InternalCreateTranslationReque Prompt = prompt; ResponseFormat = responseFormat; Temperature = temperature; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string Prompt { get; init; } public AudioTranslationFormat? ResponseFormat { get; init; } diff --git a/src/Generated/Models/ChatCompletion.Serialization.cs b/src/Generated/Models/ChatCompletion.Serialization.cs index 0e31c8ff9..b07410ff8 100644 --- a/src/Generated/Models/ChatCompletion.Serialization.cs +++ b/src/Generated/Models/ChatCompletion.Serialization.cs @@ -21,35 +21,54 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOp } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("choices"u8); - writer.WriteStartArray(); - foreach (var item in Choices) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); } - writer.WriteEndArray(); - writer.WritePropertyName("created"u8); - writer.WriteNumberValue(CreatedAt, "U"); - writer.WritePropertyName("model"u8); - writer.WriteStringValue(Model); - if (Optional.IsDefined(SystemFingerprint)) + if (SerializedAdditionalRawData?.ContainsKey("choices") != true) + { + writer.WritePropertyName("choices"u8); + writer.WriteStartArray(); + foreach (var item in Choices) + { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + if (SerializedAdditionalRawData?.ContainsKey("created") != true) + { + writer.WritePropertyName("created"u8); + writer.WriteNumberValue(CreatedAt, "U"); + } + if (SerializedAdditionalRawData?.ContainsKey("model") != true) + { + writer.WritePropertyName("model"u8); + writer.WriteStringValue(Model); + } + if (SerializedAdditionalRawData?.ContainsKey("system_fingerprint") != true && Optional.IsDefined(SystemFingerprint)) { writer.WritePropertyName("system_fingerprint"u8); writer.WriteStringValue(SystemFingerprint); } - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - if (Optional.IsDefined(Usage)) + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("usage") != true && Optional.IsDefined(Usage)) { writer.WritePropertyName("usage"u8); writer.WriteObjectValue(Usage, options); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -139,8 +158,9 @@ internal static ChatCompletion DeserializeChatCompletion(JsonElement element, Mo usage = ChatTokenUsage.DeserializeChatTokenUsage(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ChatCompletion.cs b/src/Generated/Models/ChatCompletion.cs index f279528aa..f4aee8767 100644 --- a/src/Generated/Models/ChatCompletion.cs +++ b/src/Generated/Models/ChatCompletion.cs @@ -10,8 +10,7 @@ namespace OpenAI.Chat { public partial class ChatCompletion { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal ChatCompletion(string id, IEnumerable choices, DateTimeOffset createdAt, string model) { Argument.AssertNotNull(id, nameof(id)); @@ -33,7 +32,7 @@ internal ChatCompletion(string id, IReadOnlyList.Write(Utf8JsonWriter writer, ModelReaderW } writer.WriteStartObject(); - writer.WritePropertyName("messages"u8); - writer.WriteStartArray(); - foreach (var item in Messages) + if (SerializedAdditionalRawData?.ContainsKey("messages") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("messages"u8); + writer.WriteStartArray(); + foreach (var item in Messages) + { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - writer.WritePropertyName("model"u8); - writer.WriteStringValue(Model.ToString()); - if (Optional.IsDefined(FrequencyPenalty)) + if (SerializedAdditionalRawData?.ContainsKey("model") != true) + { + writer.WritePropertyName("model"u8); + writer.WriteStringValue(Model.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("frequency_penalty") != true && Optional.IsDefined(FrequencyPenalty)) { if (FrequencyPenalty != null) { @@ -42,7 +48,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("frequency_penalty"); } } - if (Optional.IsCollectionDefined(LogitBiases)) + if (SerializedAdditionalRawData?.ContainsKey("logit_bias") != true && Optional.IsCollectionDefined(LogitBiases)) { if (LogitBiases != null) { @@ -54,7 +60,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("logit_bias"); } } - if (Optional.IsDefined(IncludeLogProbabilities)) + if (SerializedAdditionalRawData?.ContainsKey("logprobs") != true && Optional.IsDefined(IncludeLogProbabilities)) { if (IncludeLogProbabilities != null) { @@ -66,7 +72,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("logprobs"); } } - if (Optional.IsDefined(TopLogProbabilityCount)) + if (SerializedAdditionalRawData?.ContainsKey("top_logprobs") != true && Optional.IsDefined(TopLogProbabilityCount)) { if (TopLogProbabilityCount != null) { @@ -78,7 +84,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("top_logprobs"); } } - if (Optional.IsDefined(MaxTokens)) + if (SerializedAdditionalRawData?.ContainsKey("max_tokens") != true && Optional.IsDefined(MaxTokens)) { if (MaxTokens != null) { @@ -90,7 +96,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("max_tokens"); } } - if (Optional.IsDefined(N)) + if (SerializedAdditionalRawData?.ContainsKey("n") != true && Optional.IsDefined(N)) { if (N != null) { @@ -102,7 +108,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("n"); } } - if (Optional.IsDefined(PresencePenalty)) + if (SerializedAdditionalRawData?.ContainsKey("presence_penalty") != true && Optional.IsDefined(PresencePenalty)) { if (PresencePenalty != null) { @@ -114,12 +120,12 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("presence_penalty"); } } - if (Optional.IsDefined(ResponseFormat)) + if (SerializedAdditionalRawData?.ContainsKey("response_format") != true && Optional.IsDefined(ResponseFormat)) { writer.WritePropertyName("response_format"u8); writer.WriteObjectValue(ResponseFormat, options); } - if (Optional.IsDefined(Seed)) + if (SerializedAdditionalRawData?.ContainsKey("seed") != true && Optional.IsDefined(Seed)) { if (Seed != null) { @@ -131,7 +137,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("seed"); } } - if (Optional.IsCollectionDefined(StopSequences)) + if (SerializedAdditionalRawData?.ContainsKey("stop") != true && Optional.IsCollectionDefined(StopSequences)) { if (StopSequences != null) { @@ -143,7 +149,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("stop"); } } - if (Optional.IsDefined(Stream)) + if (SerializedAdditionalRawData?.ContainsKey("stream") != true && Optional.IsDefined(Stream)) { if (Stream != null) { @@ -155,7 +161,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("stream"); } } - if (Optional.IsDefined(StreamOptions)) + if (SerializedAdditionalRawData?.ContainsKey("stream_options") != true && Optional.IsDefined(StreamOptions)) { if (StreamOptions != null) { @@ -167,7 +173,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("stream_options"); } } - if (Optional.IsDefined(Temperature)) + if (SerializedAdditionalRawData?.ContainsKey("temperature") != true && Optional.IsDefined(Temperature)) { if (Temperature != null) { @@ -179,7 +185,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("temperature"); } } - if (Optional.IsDefined(TopP)) + if (SerializedAdditionalRawData?.ContainsKey("top_p") != true && Optional.IsDefined(TopP)) { if (TopP != null) { @@ -191,7 +197,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("top_p"); } } - if (Optional.IsCollectionDefined(Tools)) + if (SerializedAdditionalRawData?.ContainsKey("tools") != true && Optional.IsCollectionDefined(Tools)) { writer.WritePropertyName("tools"u8); writer.WriteStartArray(); @@ -201,27 +207,27 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW } writer.WriteEndArray(); } - if (Optional.IsDefined(ToolChoice)) + if (SerializedAdditionalRawData?.ContainsKey("tool_choice") != true && Optional.IsDefined(ToolChoice)) { writer.WritePropertyName("tool_choice"u8); writer.WriteObjectValue(ToolChoice, options); } - if (Optional.IsDefined(ParallelToolCallsEnabled)) + if (SerializedAdditionalRawData?.ContainsKey("parallel_tool_calls") != true && Optional.IsDefined(ParallelToolCallsEnabled)) { writer.WritePropertyName("parallel_tool_calls"u8); writer.WriteBooleanValue(ParallelToolCallsEnabled.Value); } - if (Optional.IsDefined(User)) + if (SerializedAdditionalRawData?.ContainsKey("user") != true && Optional.IsDefined(User)) { writer.WritePropertyName("user"u8); writer.WriteStringValue(User); } - if (Optional.IsDefined(FunctionChoice)) + if (SerializedAdditionalRawData?.ContainsKey("function_call") != true && Optional.IsDefined(FunctionChoice)) { writer.WritePropertyName("function_call"u8); writer.WriteObjectValue(FunctionChoice, options); } - if (Optional.IsCollectionDefined(Functions)) + if (SerializedAdditionalRawData?.ContainsKey("functions") != true && Optional.IsCollectionDefined(Functions)) { writer.WritePropertyName("functions"u8); writer.WriteStartArray(); @@ -231,10 +237,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -499,8 +509,9 @@ internal static ChatCompletionOptions DeserializeChatCompletionOptions(JsonEleme functions = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ChatCompletionOptions.cs b/src/Generated/Models/ChatCompletionOptions.cs index c4ac90b93..824092d01 100644 --- a/src/Generated/Models/ChatCompletionOptions.cs +++ b/src/Generated/Models/ChatCompletionOptions.cs @@ -10,7 +10,7 @@ namespace OpenAI.Chat { public partial class ChatCompletionOptions { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal ChatCompletionOptions(IList messages, InternalCreateChatCompletionRequestModel model, float? frequencyPenalty, IDictionary logitBiases, bool? includeLogProbabilities, int? topLogProbabilityCount, int? maxTokens, int? n, float? presencePenalty, ChatResponseFormat responseFormat, long? seed, IList stopSequences, bool? stream, InternalChatCompletionStreamOptions streamOptions, float? temperature, float? topP, IList tools, ChatToolChoice toolChoice, bool? parallelToolCallsEnabled, string user, ChatFunctionChoice functionChoice, IList functions, IDictionary serializedAdditionalRawData) { @@ -36,7 +36,7 @@ internal ChatCompletionOptions(IList messages, InternalCreateChatCo User = user; FunctionChoice = functionChoice; Functions = functions; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public float? FrequencyPenalty { get; init; } public int? MaxTokens { get; init; } diff --git a/src/Generated/Models/ChatFunction.Serialization.cs b/src/Generated/Models/ChatFunction.Serialization.cs index 628c04f50..c94f62df1 100644 --- a/src/Generated/Models/ChatFunction.Serialization.cs +++ b/src/Generated/Models/ChatFunction.Serialization.cs @@ -21,14 +21,17 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOpti } writer.WriteStartObject(); - if (Optional.IsDefined(FunctionDescription)) + if (SerializedAdditionalRawData?.ContainsKey("description") != true && Optional.IsDefined(FunctionDescription)) { writer.WritePropertyName("description"u8); writer.WriteStringValue(FunctionDescription); } - writer.WritePropertyName("name"u8); - writer.WriteStringValue(FunctionName); - if (Optional.IsDefined(FunctionParameters)) + if (SerializedAdditionalRawData?.ContainsKey("name") != true) + { + writer.WritePropertyName("name"u8); + writer.WriteStringValue(FunctionName); + } + if (SerializedAdditionalRawData?.ContainsKey("parameters") != true && Optional.IsDefined(FunctionParameters)) { writer.WritePropertyName("parameters"u8); #if NET6_0_OR_GREATER @@ -40,10 +43,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOpti } #endif } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -104,8 +111,9 @@ internal static ChatFunction DeserializeChatFunction(JsonElement element, ModelR parameters = BinaryData.FromString(property.Value.GetRawText()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ChatFunction.cs b/src/Generated/Models/ChatFunction.cs index 926c13031..d1f07610f 100644 --- a/src/Generated/Models/ChatFunction.cs +++ b/src/Generated/Models/ChatFunction.cs @@ -10,14 +10,14 @@ namespace OpenAI.Chat [Obsolete("This field is marked as deprecated.")] public partial class ChatFunction { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal ChatFunction(string functionDescription, string functionName, BinaryData functionParameters, IDictionary serializedAdditionalRawData) { FunctionDescription = functionDescription; FunctionName = functionName; FunctionParameters = functionParameters; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal ChatFunction() diff --git a/src/Generated/Models/ChatFunctionCall.Serialization.cs b/src/Generated/Models/ChatFunctionCall.Serialization.cs index 0621c88ab..c04cf6d17 100644 --- a/src/Generated/Models/ChatFunctionCall.Serialization.cs +++ b/src/Generated/Models/ChatFunctionCall.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriter } writer.WriteStartObject(); - writer.WritePropertyName("arguments"u8); - writer.WriteStringValue(FunctionArguments); - writer.WritePropertyName("name"u8); - writer.WriteStringValue(FunctionName); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("arguments") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("arguments"u8); + writer.WriteStringValue(FunctionArguments); + } + if (SerializedAdditionalRawData?.ContainsKey("name") != true) + { + writer.WritePropertyName("name"u8); + writer.WriteStringValue(FunctionName); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static ChatFunctionCall DeserializeChatFunctionCall(JsonElement element name = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ChatFunctionCall.cs b/src/Generated/Models/ChatFunctionCall.cs index 6b8bedbab..646960545 100644 --- a/src/Generated/Models/ChatFunctionCall.cs +++ b/src/Generated/Models/ChatFunctionCall.cs @@ -9,13 +9,13 @@ namespace OpenAI.Chat { public partial class ChatFunctionCall { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal ChatFunctionCall(string functionArguments, string functionName, IDictionary serializedAdditionalRawData) { FunctionArguments = functionArguments; FunctionName = functionName; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal ChatFunctionCall() diff --git a/src/Generated/Models/ChatFunctionChoice.cs b/src/Generated/Models/ChatFunctionChoice.cs index 0121466a8..a953278a3 100644 --- a/src/Generated/Models/ChatFunctionChoice.cs +++ b/src/Generated/Models/ChatFunctionChoice.cs @@ -9,6 +9,6 @@ namespace OpenAI.Chat { public partial class ChatFunctionChoice { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } } } diff --git a/src/Generated/Models/ChatMessage.cs b/src/Generated/Models/ChatMessage.cs index 440751032..3213165aa 100644 --- a/src/Generated/Models/ChatMessage.cs +++ b/src/Generated/Models/ChatMessage.cs @@ -9,8 +9,7 @@ namespace OpenAI.Chat { public abstract partial class ChatMessage { - private protected IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } protected ChatMessage() { Content = new ChangeTrackingList(); @@ -20,7 +19,7 @@ internal ChatMessage(string role, IList content, IDictio { Role = role; Content = content; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal string Role { get; init; } diff --git a/src/Generated/Models/ChatMessageContentPart.cs b/src/Generated/Models/ChatMessageContentPart.cs index 17d640bcd..1761b239f 100644 --- a/src/Generated/Models/ChatMessageContentPart.cs +++ b/src/Generated/Models/ChatMessageContentPart.cs @@ -9,6 +9,6 @@ namespace OpenAI.Chat { public partial class ChatMessageContentPart { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } } } diff --git a/src/Generated/Models/ChatResponseFormat.Serialization.cs b/src/Generated/Models/ChatResponseFormat.Serialization.cs index 21949133c..1f7449da7 100644 --- a/src/Generated/Models/ChatResponseFormat.Serialization.cs +++ b/src/Generated/Models/ChatResponseFormat.Serialization.cs @@ -21,15 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit } writer.WriteStartObject(); - if (Optional.IsDefined(Type)) + if (SerializedAdditionalRawData?.ContainsKey("type") != true && Optional.IsDefined(Type)) { writer.WritePropertyName("type"u8); writer.WriteStringValue(Type.Value.ToString()); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -78,8 +82,9 @@ internal static ChatResponseFormat DeserializeChatResponseFormat(JsonElement ele type = new InternalCreateChatCompletionRequestResponseFormatType(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ChatResponseFormat.cs b/src/Generated/Models/ChatResponseFormat.cs index c9b72ccdb..5a38939fa 100644 --- a/src/Generated/Models/ChatResponseFormat.cs +++ b/src/Generated/Models/ChatResponseFormat.cs @@ -9,12 +9,12 @@ namespace OpenAI.Chat { public partial class ChatResponseFormat { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal ChatResponseFormat(InternalCreateChatCompletionRequestResponseFormatType? type, IDictionary serializedAdditionalRawData) { Type = type; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } } } diff --git a/src/Generated/Models/ChatTokenLogProbabilityInfo.Serialization.cs b/src/Generated/Models/ChatTokenLogProbabilityInfo.Serialization.cs index 5bb42970c..ff21b6e01 100644 --- a/src/Generated/Models/ChatTokenLogProbabilityInfo.Serialization.cs +++ b/src/Generated/Models/ChatTokenLogProbabilityInfo.Serialization.cs @@ -21,35 +21,51 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelR } writer.WriteStartObject(); - writer.WritePropertyName("token"u8); - writer.WriteStringValue(Token); - writer.WritePropertyName("logprob"u8); - writer.WriteNumberValue(LogProbability); - if (Utf8ByteValues != null && Optional.IsCollectionDefined(Utf8ByteValues)) + if (SerializedAdditionalRawData?.ContainsKey("token") != true) { - writer.WritePropertyName("bytes"u8); - writer.WriteStartArray(); - foreach (var item in Utf8ByteValues) - { - writer.WriteNumberValue(item); - } - writer.WriteEndArray(); + writer.WritePropertyName("token"u8); + writer.WriteStringValue(Token); } - else + if (SerializedAdditionalRawData?.ContainsKey("logprob") != true) { - writer.WriteNull("bytes"); + writer.WritePropertyName("logprob"u8); + writer.WriteNumberValue(LogProbability); } - writer.WritePropertyName("top_logprobs"u8); - writer.WriteStartArray(); - foreach (var item in TopLogProbabilities) + if (SerializedAdditionalRawData?.ContainsKey("bytes") != true) { - writer.WriteObjectValue(item, options); + if (Utf8ByteValues != null && Optional.IsCollectionDefined(Utf8ByteValues)) + { + writer.WritePropertyName("bytes"u8); + writer.WriteStartArray(); + foreach (var item in Utf8ByteValues) + { + writer.WriteNumberValue(item); + } + writer.WriteEndArray(); + } + else + { + writer.WriteNull("bytes"); + } } - writer.WriteEndArray(); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("top_logprobs") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("top_logprobs"u8); + writer.WriteStartArray(); + foreach (var item in TopLogProbabilities) { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) + { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -127,8 +143,9 @@ internal static ChatTokenLogProbabilityInfo DeserializeChatTokenLogProbabilityIn topLogprobs = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ChatTokenLogProbabilityInfo.cs b/src/Generated/Models/ChatTokenLogProbabilityInfo.cs index ccaa73bf3..5e4db7805 100644 --- a/src/Generated/Models/ChatTokenLogProbabilityInfo.cs +++ b/src/Generated/Models/ChatTokenLogProbabilityInfo.cs @@ -10,8 +10,7 @@ namespace OpenAI.Chat { public partial class ChatTokenLogProbabilityInfo { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal ChatTokenLogProbabilityInfo(string token, float logProbability, IEnumerable utf8ByteValues, IEnumerable topLogProbabilities) { Argument.AssertNotNull(token, nameof(token)); @@ -29,7 +28,7 @@ internal ChatTokenLogProbabilityInfo(string token, float logProbability, IReadOn LogProbability = logProbability; Utf8ByteValues = utf8ByteValues; TopLogProbabilities = topLogProbabilities; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal ChatTokenLogProbabilityInfo() diff --git a/src/Generated/Models/ChatTokenTopLogProbabilityInfo.Serialization.cs b/src/Generated/Models/ChatTokenTopLogProbabilityInfo.Serialization.cs index 5f72617ec..e070bfd93 100644 --- a/src/Generated/Models/ChatTokenTopLogProbabilityInfo.Serialization.cs +++ b/src/Generated/Models/ChatTokenTopLogProbabilityInfo.Serialization.cs @@ -21,28 +21,41 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mod } writer.WriteStartObject(); - writer.WritePropertyName("token"u8); - writer.WriteStringValue(Token); - writer.WritePropertyName("logprob"u8); - writer.WriteNumberValue(LogProbability); - if (Utf8ByteValues != null && Optional.IsCollectionDefined(Utf8ByteValues)) + if (SerializedAdditionalRawData?.ContainsKey("token") != true) { - writer.WritePropertyName("bytes"u8); - writer.WriteStartArray(); - foreach (var item in Utf8ByteValues) - { - writer.WriteNumberValue(item); - } - writer.WriteEndArray(); + writer.WritePropertyName("token"u8); + writer.WriteStringValue(Token); } - else + if (SerializedAdditionalRawData?.ContainsKey("logprob") != true) { - writer.WriteNull("bytes"); + writer.WritePropertyName("logprob"u8); + writer.WriteNumberValue(LogProbability); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("bytes") != true) { - foreach (var item in _serializedAdditionalRawData) + if (Utf8ByteValues != null && Optional.IsCollectionDefined(Utf8ByteValues)) { + writer.WritePropertyName("bytes"u8); + writer.WriteStartArray(); + foreach (var item in Utf8ByteValues) + { + writer.WriteNumberValue(item); + } + writer.WriteEndArray(); + } + else + { + writer.WriteNull("bytes"); + } + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) + { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -109,8 +122,9 @@ internal static ChatTokenTopLogProbabilityInfo DeserializeChatTokenTopLogProbabi bytes = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ChatTokenTopLogProbabilityInfo.cs b/src/Generated/Models/ChatTokenTopLogProbabilityInfo.cs index 5a3dc2b52..0bb304905 100644 --- a/src/Generated/Models/ChatTokenTopLogProbabilityInfo.cs +++ b/src/Generated/Models/ChatTokenTopLogProbabilityInfo.cs @@ -10,8 +10,7 @@ namespace OpenAI.Chat { public partial class ChatTokenTopLogProbabilityInfo { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal ChatTokenTopLogProbabilityInfo(string token, float logProbability, IEnumerable utf8ByteValues) { Argument.AssertNotNull(token, nameof(token)); @@ -26,7 +25,7 @@ internal ChatTokenTopLogProbabilityInfo(string token, float logProbability, IRea Token = token; LogProbability = logProbability; Utf8ByteValues = utf8ByteValues; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal ChatTokenTopLogProbabilityInfo() diff --git a/src/Generated/Models/ChatTokenUsage.Serialization.cs b/src/Generated/Models/ChatTokenUsage.Serialization.cs index c28619920..7fdb944f0 100644 --- a/src/Generated/Models/ChatTokenUsage.Serialization.cs +++ b/src/Generated/Models/ChatTokenUsage.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOp } writer.WriteStartObject(); - writer.WritePropertyName("completion_tokens"u8); - writer.WriteNumberValue(OutputTokens); - writer.WritePropertyName("prompt_tokens"u8); - writer.WriteNumberValue(InputTokens); - writer.WritePropertyName("total_tokens"u8); - writer.WriteNumberValue(TotalTokens); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("completion_tokens") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("completion_tokens"u8); + writer.WriteNumberValue(OutputTokens); + } + if (SerializedAdditionalRawData?.ContainsKey("prompt_tokens") != true) + { + writer.WritePropertyName("prompt_tokens"u8); + writer.WriteNumberValue(InputTokens); + } + if (SerializedAdditionalRawData?.ContainsKey("total_tokens") != true) + { + writer.WritePropertyName("total_tokens"u8); + writer.WriteNumberValue(TotalTokens); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static ChatTokenUsage DeserializeChatTokenUsage(JsonElement element, Mo totalTokens = property.Value.GetInt32(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ChatTokenUsage.cs b/src/Generated/Models/ChatTokenUsage.cs index 2977134d7..0dcca0863 100644 --- a/src/Generated/Models/ChatTokenUsage.cs +++ b/src/Generated/Models/ChatTokenUsage.cs @@ -9,8 +9,7 @@ namespace OpenAI.Chat { public partial class ChatTokenUsage { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal ChatTokenUsage(int outputTokens, int inputTokens, int totalTokens) { OutputTokens = outputTokens; @@ -23,7 +22,7 @@ internal ChatTokenUsage(int outputTokens, int inputTokens, int totalTokens, IDic OutputTokens = outputTokens; InputTokens = inputTokens; TotalTokens = totalTokens; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal ChatTokenUsage() diff --git a/src/Generated/Models/ChatTool.Serialization.cs b/src/Generated/Models/ChatTool.Serialization.cs index 85bd29311..382fe5c93 100644 --- a/src/Generated/Models/ChatTool.Serialization.cs +++ b/src/Generated/Models/ChatTool.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Kind.ToString()); - writer.WritePropertyName("function"u8); - writer.WriteObjectValue(Function, options); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Kind.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("function") != true) + { + writer.WritePropertyName("function"u8); + writer.WriteObjectValue(Function, options); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static ChatTool DeserializeChatTool(JsonElement element, ModelReaderWri function = InternalFunctionDefinition.DeserializeInternalFunctionDefinition(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ChatTool.cs b/src/Generated/Models/ChatTool.cs index b7a1c0c9c..e48430bbb 100644 --- a/src/Generated/Models/ChatTool.cs +++ b/src/Generated/Models/ChatTool.cs @@ -9,13 +9,13 @@ namespace OpenAI.Chat { public partial class ChatTool { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal ChatTool(ChatToolKind kind, InternalFunctionDefinition function, IDictionary serializedAdditionalRawData) { Kind = kind; Function = function; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal ChatTool() diff --git a/src/Generated/Models/ChatToolCall.Serialization.cs b/src/Generated/Models/ChatToolCall.Serialization.cs index ca4ccca13..09be7a3fd 100644 --- a/src/Generated/Models/ChatToolCall.Serialization.cs +++ b/src/Generated/Models/ChatToolCall.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOpti } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Kind.ToString()); - writer.WritePropertyName("function"u8); - writer.WriteObjectValue(Function, options); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Kind.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("function") != true) + { + writer.WritePropertyName("function"u8); + writer.WriteObjectValue(Function, options); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static ChatToolCall DeserializeChatToolCall(JsonElement element, ModelR function = InternalChatCompletionMessageToolCallFunction.DeserializeInternalChatCompletionMessageToolCallFunction(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ChatToolCall.cs b/src/Generated/Models/ChatToolCall.cs index 5f3419a8f..dc6b9b1fa 100644 --- a/src/Generated/Models/ChatToolCall.cs +++ b/src/Generated/Models/ChatToolCall.cs @@ -9,14 +9,14 @@ namespace OpenAI.Chat { public partial class ChatToolCall { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal ChatToolCall(string id, ChatToolCallKind kind, InternalChatCompletionMessageToolCallFunction function, IDictionary serializedAdditionalRawData) { Id = id; Kind = kind; Function = function; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal ChatToolCall() diff --git a/src/Generated/Models/ChatToolChoice.cs b/src/Generated/Models/ChatToolChoice.cs index 96a88653b..912006cd0 100644 --- a/src/Generated/Models/ChatToolChoice.cs +++ b/src/Generated/Models/ChatToolChoice.cs @@ -9,6 +9,6 @@ namespace OpenAI.Chat { public partial class ChatToolChoice { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } } } diff --git a/src/Generated/Models/CodeInterpreterToolDefinition.Serialization.cs b/src/Generated/Models/CodeInterpreterToolDefinition.Serialization.cs index 185798328..c4944d3b1 100644 --- a/src/Generated/Models/CodeInterpreterToolDefinition.Serialization.cs +++ b/src/Generated/Models/CodeInterpreterToolDefinition.Serialization.cs @@ -42,8 +42,9 @@ internal static CodeInterpreterToolDefinition DeserializeCodeInterpreterToolDefi type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/CodeInterpreterToolResources.Serialization.cs b/src/Generated/Models/CodeInterpreterToolResources.Serialization.cs index e6a59a8d8..a1cc1f9cb 100644 --- a/src/Generated/Models/CodeInterpreterToolResources.Serialization.cs +++ b/src/Generated/Models/CodeInterpreterToolResources.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Model } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(FileIds)) + if (SerializedAdditionalRawData?.ContainsKey("file_ids") != true && Optional.IsCollectionDefined(FileIds)) { writer.WritePropertyName("file_ids"u8); writer.WriteStartArray(); @@ -31,10 +31,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, Model } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -88,8 +92,9 @@ internal static CodeInterpreterToolResources DeserializeCodeInterpreterToolResou fileIds = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/CodeInterpreterToolResources.cs b/src/Generated/Models/CodeInterpreterToolResources.cs index e6f5624c6..881a314a9 100644 --- a/src/Generated/Models/CodeInterpreterToolResources.cs +++ b/src/Generated/Models/CodeInterpreterToolResources.cs @@ -9,12 +9,12 @@ namespace OpenAI.Assistants { public partial class CodeInterpreterToolResources { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal CodeInterpreterToolResources(IList fileIds, IDictionary serializedAdditionalRawData) { FileIds = fileIds; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } } } diff --git a/src/Generated/Models/Embedding.Serialization.cs b/src/Generated/Models/Embedding.Serialization.cs index 2d9c3694e..d46185eb7 100644 --- a/src/Generated/Models/Embedding.Serialization.cs +++ b/src/Generated/Models/Embedding.Serialization.cs @@ -21,23 +21,36 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions } writer.WriteStartObject(); - writer.WritePropertyName("index"u8); - writer.WriteNumberValue(Index); - writer.WritePropertyName("embedding"u8); + if (SerializedAdditionalRawData?.ContainsKey("index") != true) + { + writer.WritePropertyName("index"u8); + writer.WriteNumberValue(Index); + } + if (SerializedAdditionalRawData?.ContainsKey("embedding") != true) + { + writer.WritePropertyName("embedding"u8); #if NET6_0_OR_GREATER writer.WriteRawValue(EmbeddingProperty); #else - using (JsonDocument document = JsonDocument.Parse(EmbeddingProperty)) + using (JsonDocument document = JsonDocument.Parse(EmbeddingProperty)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) { - JsonSerializer.Serialize(writer, document.RootElement); + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); } -#endif - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -94,8 +107,9 @@ internal static Embedding DeserializeEmbedding(JsonElement element, ModelReaderW @object = new InternalEmbeddingObject(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/Embedding.cs b/src/Generated/Models/Embedding.cs index 5dffb1ed6..22a7f7e0e 100644 --- a/src/Generated/Models/Embedding.cs +++ b/src/Generated/Models/Embedding.cs @@ -9,7 +9,7 @@ namespace OpenAI.Embeddings { public partial class Embedding { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal Embedding() { diff --git a/src/Generated/Models/EmbeddingGenerationOptions.Serialization.cs b/src/Generated/Models/EmbeddingGenerationOptions.Serialization.cs index 37c75c0e7..ef5571de1 100644 --- a/src/Generated/Models/EmbeddingGenerationOptions.Serialization.cs +++ b/src/Generated/Models/EmbeddingGenerationOptions.Serialization.cs @@ -21,36 +21,46 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe } writer.WriteStartObject(); - writer.WritePropertyName("input"u8); + if (SerializedAdditionalRawData?.ContainsKey("input") != true) + { + writer.WritePropertyName("input"u8); #if NET6_0_OR_GREATER writer.WriteRawValue(Input); #else - using (JsonDocument document = JsonDocument.Parse(Input)) + using (JsonDocument document = JsonDocument.Parse(Input)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + if (SerializedAdditionalRawData?.ContainsKey("model") != true) { - JsonSerializer.Serialize(writer, document.RootElement); + writer.WritePropertyName("model"u8); + writer.WriteStringValue(Model.ToString()); } -#endif - writer.WritePropertyName("model"u8); - writer.WriteStringValue(Model.ToString()); - if (Optional.IsDefined(EncodingFormat)) + if (SerializedAdditionalRawData?.ContainsKey("encoding_format") != true && Optional.IsDefined(EncodingFormat)) { writer.WritePropertyName("encoding_format"u8); writer.WriteStringValue(EncodingFormat.Value.ToString()); } - if (Optional.IsDefined(Dimensions)) + if (SerializedAdditionalRawData?.ContainsKey("dimensions") != true && Optional.IsDefined(Dimensions)) { writer.WritePropertyName("dimensions"u8); writer.WriteNumberValue(Dimensions.Value); } - if (Optional.IsDefined(User)) + if (SerializedAdditionalRawData?.ContainsKey("user") != true && Optional.IsDefined(User)) { writer.WritePropertyName("user"u8); writer.WriteStringValue(User); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -127,8 +137,9 @@ internal static EmbeddingGenerationOptions DeserializeEmbeddingGenerationOptions user = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/EmbeddingGenerationOptions.cs b/src/Generated/Models/EmbeddingGenerationOptions.cs index 0b2afe9a8..36be8592d 100644 --- a/src/Generated/Models/EmbeddingGenerationOptions.cs +++ b/src/Generated/Models/EmbeddingGenerationOptions.cs @@ -9,7 +9,7 @@ namespace OpenAI.Embeddings { public partial class EmbeddingGenerationOptions { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal EmbeddingGenerationOptions(BinaryData input, InternalCreateEmbeddingRequestModel model, InternalCreateEmbeddingRequestEncodingFormat? encodingFormat, int? dimensions, string user, IDictionary serializedAdditionalRawData) { @@ -18,7 +18,7 @@ internal EmbeddingGenerationOptions(BinaryData input, InternalCreateEmbeddingReq EncodingFormat = encodingFormat; Dimensions = dimensions; User = user; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public int? Dimensions { get; init; } public string User { get; init; } diff --git a/src/Generated/Models/EmbeddingTokenUsage.Serialization.cs b/src/Generated/Models/EmbeddingTokenUsage.Serialization.cs index 739eb4b1e..44652bfae 100644 --- a/src/Generated/Models/EmbeddingTokenUsage.Serialization.cs +++ b/src/Generated/Models/EmbeddingTokenUsage.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWri } writer.WriteStartObject(); - writer.WritePropertyName("prompt_tokens"u8); - writer.WriteNumberValue(InputTokens); - writer.WritePropertyName("total_tokens"u8); - writer.WriteNumberValue(TotalTokens); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("prompt_tokens") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("prompt_tokens"u8); + writer.WriteNumberValue(InputTokens); + } + if (SerializedAdditionalRawData?.ContainsKey("total_tokens") != true) + { + writer.WritePropertyName("total_tokens"u8); + writer.WriteNumberValue(TotalTokens); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static EmbeddingTokenUsage DeserializeEmbeddingTokenUsage(JsonElement e totalTokens = property.Value.GetInt32(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/EmbeddingTokenUsage.cs b/src/Generated/Models/EmbeddingTokenUsage.cs index 2dff5a9cf..1241b8589 100644 --- a/src/Generated/Models/EmbeddingTokenUsage.cs +++ b/src/Generated/Models/EmbeddingTokenUsage.cs @@ -9,8 +9,7 @@ namespace OpenAI.Embeddings { public partial class EmbeddingTokenUsage { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal EmbeddingTokenUsage(int inputTokens, int totalTokens) { InputTokens = inputTokens; @@ -21,7 +20,7 @@ internal EmbeddingTokenUsage(int inputTokens, int totalTokens, IDictionary.Write(Utf8JsonWriter writer, ModelReaderWr } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); diff --git a/src/Generated/Models/FileChunkingStrategy.cs b/src/Generated/Models/FileChunkingStrategy.cs index 60538187f..067370ecc 100644 --- a/src/Generated/Models/FileChunkingStrategy.cs +++ b/src/Generated/Models/FileChunkingStrategy.cs @@ -9,8 +9,7 @@ namespace OpenAI.VectorStores { public abstract partial class FileChunkingStrategy { - private protected IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } protected FileChunkingStrategy() { } @@ -18,7 +17,7 @@ protected FileChunkingStrategy() internal FileChunkingStrategy(string type, IDictionary serializedAdditionalRawData) { Type = type; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal string Type { get; init; } diff --git a/src/Generated/Models/FileSearchToolDefinition.Serialization.cs b/src/Generated/Models/FileSearchToolDefinition.Serialization.cs index 7adf16913..928639cbf 100644 --- a/src/Generated/Models/FileSearchToolDefinition.Serialization.cs +++ b/src/Generated/Models/FileSearchToolDefinition.Serialization.cs @@ -52,8 +52,9 @@ internal static FileSearchToolDefinition DeserializeFileSearchToolDefinition(Jso type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/FileSearchToolResources.Serialization.cs b/src/Generated/Models/FileSearchToolResources.Serialization.cs index ab1632384..ec8fe8292 100644 --- a/src/Generated/Models/FileSearchToolResources.Serialization.cs +++ b/src/Generated/Models/FileSearchToolResources.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReade } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(VectorStoreIds)) + if (SerializedAdditionalRawData?.ContainsKey("vector_store_ids") != true && Optional.IsCollectionDefined(VectorStoreIds)) { writer.WritePropertyName("vector_store_ids"u8); writer.WriteStartArray(); @@ -31,15 +31,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReade } writer.WriteEndArray(); } - if (true && Optional.IsCollectionDefined(NewVectorStores)) + if (SerializedAdditionalRawData?.ContainsKey("vector_stores") != true && Optional.IsCollectionDefined(NewVectorStores)) { writer.WritePropertyName("vector_stores"u8); SerializeNewVectorStores(writer, options); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -108,8 +112,9 @@ internal static FileSearchToolResources DeserializeFileSearchToolResources(JsonE vectorStores = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/FileSearchToolResources.cs b/src/Generated/Models/FileSearchToolResources.cs index 69fd6b639..972bc4bc8 100644 --- a/src/Generated/Models/FileSearchToolResources.cs +++ b/src/Generated/Models/FileSearchToolResources.cs @@ -9,13 +9,13 @@ namespace OpenAI.Assistants { public partial class FileSearchToolResources { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal FileSearchToolResources(IList vectorStoreIds, IList newVectorStores, IDictionary serializedAdditionalRawData) { VectorStoreIds = vectorStoreIds; NewVectorStores = newVectorStores; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } } } diff --git a/src/Generated/Models/FunctionToolDefinition.Serialization.cs b/src/Generated/Models/FunctionToolDefinition.Serialization.cs index 4c7ea47dd..1509eb7ca 100644 --- a/src/Generated/Models/FunctionToolDefinition.Serialization.cs +++ b/src/Generated/Models/FunctionToolDefinition.Serialization.cs @@ -48,8 +48,9 @@ internal static FunctionToolDefinition DeserializeFunctionToolDefinition(JsonEle type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/GeneratedImage.Serialization.cs b/src/Generated/Models/GeneratedImage.Serialization.cs index 3a89f3081..1d906252b 100644 --- a/src/Generated/Models/GeneratedImage.Serialization.cs +++ b/src/Generated/Models/GeneratedImage.Serialization.cs @@ -21,25 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOp } writer.WriteStartObject(); - if (Optional.IsDefined(ImageBytes)) + if (SerializedAdditionalRawData?.ContainsKey("b64_json") != true && Optional.IsDefined(ImageBytes)) { writer.WritePropertyName("b64_json"u8); writer.WriteBase64StringValue(ImageBytes.ToArray(), "D"); } - if (Optional.IsDefined(ImageUri)) + if (SerializedAdditionalRawData?.ContainsKey("url") != true && Optional.IsDefined(ImageUri)) { writer.WritePropertyName("url"u8); writer.WriteStringValue(ImageUri.AbsoluteUri); } - if (Optional.IsDefined(RevisedPrompt)) + if (SerializedAdditionalRawData?.ContainsKey("revised_prompt") != true && Optional.IsDefined(RevisedPrompt)) { writer.WritePropertyName("revised_prompt"u8); writer.WriteStringValue(RevisedPrompt); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -104,8 +108,9 @@ internal static GeneratedImage DeserializeGeneratedImage(JsonElement element, Mo revisedPrompt = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/GeneratedImage.cs b/src/Generated/Models/GeneratedImage.cs index 45f344b54..8d7fe6178 100644 --- a/src/Generated/Models/GeneratedImage.cs +++ b/src/Generated/Models/GeneratedImage.cs @@ -9,8 +9,7 @@ namespace OpenAI.Images { public partial class GeneratedImage { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal GeneratedImage() { } @@ -20,7 +19,7 @@ internal GeneratedImage(BinaryData imageBytes, Uri imageUri, string revisedPromp ImageBytes = imageBytes; ImageUri = imageUri; RevisedPrompt = revisedPrompt; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string RevisedPrompt { get; } } diff --git a/src/Generated/Models/ImageEditOptions.Serialization.cs b/src/Generated/Models/ImageEditOptions.Serialization.cs index e7bf6472b..2216f87dc 100644 --- a/src/Generated/Models/ImageEditOptions.Serialization.cs +++ b/src/Generated/Models/ImageEditOptions.Serialization.cs @@ -22,18 +22,24 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriter } writer.WriteStartObject(); - writer.WritePropertyName("image"u8); + if (SerializedAdditionalRawData?.ContainsKey("image") != true) + { + writer.WritePropertyName("image"u8); #if NET6_0_OR_GREATER writer.WriteRawValue(Image); #else - using (JsonDocument document = JsonDocument.Parse(Image)) + using (JsonDocument document = JsonDocument.Parse(Image)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + if (SerializedAdditionalRawData?.ContainsKey("prompt") != true) { - JsonSerializer.Serialize(writer, document.RootElement); + writer.WritePropertyName("prompt"u8); + writer.WriteStringValue(Prompt); } -#endif - writer.WritePropertyName("prompt"u8); - writer.WriteStringValue(Prompt); - if (Optional.IsDefined(Mask)) + if (SerializedAdditionalRawData?.ContainsKey("mask") != true && Optional.IsDefined(Mask)) { writer.WritePropertyName("mask"u8); #if NET6_0_OR_GREATER @@ -45,7 +51,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriter } #endif } - if (Optional.IsDefined(Model)) + if (SerializedAdditionalRawData?.ContainsKey("model") != true && Optional.IsDefined(Model)) { if (Model != null) { @@ -57,7 +63,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriter writer.WriteNull("model"); } } - if (Optional.IsDefined(N)) + if (SerializedAdditionalRawData?.ContainsKey("n") != true && Optional.IsDefined(N)) { if (N != null) { @@ -69,7 +75,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriter writer.WriteNull("n"); } } - if (Optional.IsDefined(Size)) + if (SerializedAdditionalRawData?.ContainsKey("size") != true && Optional.IsDefined(Size)) { if (Size != null) { @@ -81,7 +87,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriter writer.WriteNull("size"); } } - if (Optional.IsDefined(ResponseFormat)) + if (SerializedAdditionalRawData?.ContainsKey("response_format") != true && Optional.IsDefined(ResponseFormat)) { if (ResponseFormat != null) { @@ -93,15 +99,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriter writer.WriteNull("response_format"); } } - if (Optional.IsDefined(User)) + if (SerializedAdditionalRawData?.ContainsKey("user") != true && Optional.IsDefined(User)) { writer.WritePropertyName("user"u8); writer.WriteStringValue(User); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -212,8 +222,9 @@ internal static ImageEditOptions DeserializeImageEditOptions(JsonElement element user = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ImageEditOptions.cs b/src/Generated/Models/ImageEditOptions.cs index 71f2a2933..f2c0b5032 100644 --- a/src/Generated/Models/ImageEditOptions.cs +++ b/src/Generated/Models/ImageEditOptions.cs @@ -9,7 +9,7 @@ namespace OpenAI.Images { public partial class ImageEditOptions { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal ImageEditOptions(BinaryData image, string prompt, BinaryData mask, InternalCreateImageEditRequestModel? model, long? n, GeneratedImageSize? size, GeneratedImageFormat? responseFormat, string user, IDictionary serializedAdditionalRawData) { @@ -21,7 +21,7 @@ internal ImageEditOptions(BinaryData image, string prompt, BinaryData mask, Inte Size = size; ResponseFormat = responseFormat; User = user; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string User { get; init; } } diff --git a/src/Generated/Models/ImageGenerationOptions.Serialization.cs b/src/Generated/Models/ImageGenerationOptions.Serialization.cs index b3d5ce7c9..60d14b4e3 100644 --- a/src/Generated/Models/ImageGenerationOptions.Serialization.cs +++ b/src/Generated/Models/ImageGenerationOptions.Serialization.cs @@ -21,9 +21,12 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReader } writer.WriteStartObject(); - writer.WritePropertyName("prompt"u8); - writer.WriteStringValue(Prompt); - if (Optional.IsDefined(Model)) + if (SerializedAdditionalRawData?.ContainsKey("prompt") != true) + { + writer.WritePropertyName("prompt"u8); + writer.WriteStringValue(Prompt); + } + if (SerializedAdditionalRawData?.ContainsKey("model") != true && Optional.IsDefined(Model)) { if (Model != null) { @@ -35,7 +38,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReader writer.WriteNull("model"); } } - if (Optional.IsDefined(N)) + if (SerializedAdditionalRawData?.ContainsKey("n") != true && Optional.IsDefined(N)) { if (N != null) { @@ -47,12 +50,12 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReader writer.WriteNull("n"); } } - if (Optional.IsDefined(Quality)) + if (SerializedAdditionalRawData?.ContainsKey("quality") != true && Optional.IsDefined(Quality)) { writer.WritePropertyName("quality"u8); writer.WriteStringValue(Quality.Value.ToSerialString()); } - if (Optional.IsDefined(ResponseFormat)) + if (SerializedAdditionalRawData?.ContainsKey("response_format") != true && Optional.IsDefined(ResponseFormat)) { if (ResponseFormat != null) { @@ -64,7 +67,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReader writer.WriteNull("response_format"); } } - if (Optional.IsDefined(Size)) + if (SerializedAdditionalRawData?.ContainsKey("size") != true && Optional.IsDefined(Size)) { if (Size != null) { @@ -76,7 +79,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReader writer.WriteNull("size"); } } - if (Optional.IsDefined(Style)) + if (SerializedAdditionalRawData?.ContainsKey("style") != true && Optional.IsDefined(Style)) { if (Style != null) { @@ -88,15 +91,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReader writer.WriteNull("style"); } } - if (Optional.IsDefined(User)) + if (SerializedAdditionalRawData?.ContainsKey("user") != true && Optional.IsDefined(User)) { writer.WritePropertyName("user"u8); writer.WriteStringValue(User); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -212,8 +219,9 @@ internal static ImageGenerationOptions DeserializeImageGenerationOptions(JsonEle user = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ImageGenerationOptions.cs b/src/Generated/Models/ImageGenerationOptions.cs index 9fdec26c2..8326bc17f 100644 --- a/src/Generated/Models/ImageGenerationOptions.cs +++ b/src/Generated/Models/ImageGenerationOptions.cs @@ -9,7 +9,7 @@ namespace OpenAI.Images { public partial class ImageGenerationOptions { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal ImageGenerationOptions(string prompt, InternalCreateImageRequestModel? model, long? n, GeneratedImageQuality? quality, GeneratedImageFormat? responseFormat, GeneratedImageSize? size, GeneratedImageStyle? style, string user, IDictionary serializedAdditionalRawData) { @@ -21,7 +21,7 @@ internal ImageGenerationOptions(string prompt, InternalCreateImageRequestModel? Size = size; Style = style; User = user; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public GeneratedImageQuality? Quality { get; init; } public GeneratedImageFormat? ResponseFormat { get; init; } diff --git a/src/Generated/Models/ImageVariationOptions.Serialization.cs b/src/Generated/Models/ImageVariationOptions.Serialization.cs index 1c3888db9..f08b54dde 100644 --- a/src/Generated/Models/ImageVariationOptions.Serialization.cs +++ b/src/Generated/Models/ImageVariationOptions.Serialization.cs @@ -22,16 +22,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW } writer.WriteStartObject(); - writer.WritePropertyName("image"u8); + if (SerializedAdditionalRawData?.ContainsKey("image") != true) + { + writer.WritePropertyName("image"u8); #if NET6_0_OR_GREATER writer.WriteRawValue(Image); #else - using (JsonDocument document = JsonDocument.Parse(Image)) - { - JsonSerializer.Serialize(writer, document.RootElement); - } + using (JsonDocument document = JsonDocument.Parse(Image)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } #endif - if (Optional.IsDefined(Model)) + } + if (SerializedAdditionalRawData?.ContainsKey("model") != true && Optional.IsDefined(Model)) { if (Model != null) { @@ -43,7 +46,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("model"); } } - if (Optional.IsDefined(N)) + if (SerializedAdditionalRawData?.ContainsKey("n") != true && Optional.IsDefined(N)) { if (N != null) { @@ -55,7 +58,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("n"); } } - if (Optional.IsDefined(ResponseFormat)) + if (SerializedAdditionalRawData?.ContainsKey("response_format") != true && Optional.IsDefined(ResponseFormat)) { if (ResponseFormat != null) { @@ -67,7 +70,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("response_format"); } } - if (Optional.IsDefined(Size)) + if (SerializedAdditionalRawData?.ContainsKey("size") != true && Optional.IsDefined(Size)) { if (Size != null) { @@ -79,15 +82,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("size"); } } - if (Optional.IsDefined(User)) + if (SerializedAdditionalRawData?.ContainsKey("user") != true && Optional.IsDefined(User)) { writer.WritePropertyName("user"u8); writer.WriteStringValue(User); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -182,8 +189,9 @@ internal static ImageVariationOptions DeserializeImageVariationOptions(JsonEleme user = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ImageVariationOptions.cs b/src/Generated/Models/ImageVariationOptions.cs index 35ebbc6a1..f474d3f2f 100644 --- a/src/Generated/Models/ImageVariationOptions.cs +++ b/src/Generated/Models/ImageVariationOptions.cs @@ -9,7 +9,7 @@ namespace OpenAI.Images { public partial class ImageVariationOptions { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal ImageVariationOptions(BinaryData image, InternalCreateImageVariationRequestModel? model, long? n, GeneratedImageFormat? responseFormat, GeneratedImageSize? size, string user, IDictionary serializedAdditionalRawData) { @@ -19,7 +19,7 @@ internal ImageVariationOptions(BinaryData image, InternalCreateImageVariationReq ResponseFormat = responseFormat; Size = size; User = user; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string User { get; init; } } diff --git a/src/Generated/Models/InternalAssistantToolsFileSearchFileSearch.Serialization.cs b/src/Generated/Models/InternalAssistantToolsFileSearchFileSearch.Serialization.cs index 3d285d4aa..26881bc3f 100644 --- a/src/Generated/Models/InternalAssistantToolsFileSearchFileSearch.Serialization.cs +++ b/src/Generated/Models/InternalAssistantToolsFileSearchFileSearch.Serialization.cs @@ -21,15 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter } writer.WriteStartObject(); - if (Optional.IsDefined(InternalMaxNumResults)) + if (SerializedAdditionalRawData?.ContainsKey("max_num_results") != true && Optional.IsDefined(InternalMaxNumResults)) { writer.WritePropertyName("max_num_results"u8); writer.WriteNumberValue(InternalMaxNumResults.Value); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -78,8 +82,9 @@ internal static InternalAssistantToolsFileSearchFileSearch DeserializeInternalAs maxNumResults = property.Value.GetInt32(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalAssistantToolsFileSearchFileSearch.cs b/src/Generated/Models/InternalAssistantToolsFileSearchFileSearch.cs index 1d922c770..b65ac169e 100644 --- a/src/Generated/Models/InternalAssistantToolsFileSearchFileSearch.cs +++ b/src/Generated/Models/InternalAssistantToolsFileSearchFileSearch.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalAssistantToolsFileSearchFileSearch { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalAssistantToolsFileSearchFileSearch() { } @@ -18,7 +17,7 @@ public InternalAssistantToolsFileSearchFileSearch() internal InternalAssistantToolsFileSearchFileSearch(int? internalMaxNumResults, IDictionary serializedAdditionalRawData) { InternalMaxNumResults = internalMaxNumResults; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } } } diff --git a/src/Generated/Models/InternalAssistantToolsFileSearchTypeOnly.Serialization.cs b/src/Generated/Models/InternalAssistantToolsFileSearchTypeOnly.Serialization.cs index 7e1084aba..882893ecf 100644 --- a/src/Generated/Models/InternalAssistantToolsFileSearchTypeOnly.Serialization.cs +++ b/src/Generated/Models/InternalAssistantToolsFileSearchTypeOnly.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter w } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type.ToString()); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type.ToString()); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static InternalAssistantToolsFileSearchTypeOnly DeserializeInternalAssi type = new InternalAssistantToolsFileSearchTypeOnlyType(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalAssistantToolsFileSearchTypeOnly.cs b/src/Generated/Models/InternalAssistantToolsFileSearchTypeOnly.cs index c23b48b6c..607f7fb44 100644 --- a/src/Generated/Models/InternalAssistantToolsFileSearchTypeOnly.cs +++ b/src/Generated/Models/InternalAssistantToolsFileSearchTypeOnly.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalAssistantToolsFileSearchTypeOnly { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalAssistantToolsFileSearchTypeOnly() { } @@ -18,7 +17,7 @@ public InternalAssistantToolsFileSearchTypeOnly() internal InternalAssistantToolsFileSearchTypeOnly(InternalAssistantToolsFileSearchTypeOnlyType type, IDictionary serializedAdditionalRawData) { Type = type; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public InternalAssistantToolsFileSearchTypeOnlyType Type { get; } = InternalAssistantToolsFileSearchTypeOnlyType.FileSearch; diff --git a/src/Generated/Models/InternalAssistantsApiResponseFormat.Serialization.cs b/src/Generated/Models/InternalAssistantsApiResponseFormat.Serialization.cs index 97b3e54a1..c3ec44702 100644 --- a/src/Generated/Models/InternalAssistantsApiResponseFormat.Serialization.cs +++ b/src/Generated/Models/InternalAssistantsApiResponseFormat.Serialization.cs @@ -21,15 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer } writer.WriteStartObject(); - if (Optional.IsDefined(Type)) + if (SerializedAdditionalRawData?.ContainsKey("type") != true && Optional.IsDefined(Type)) { writer.WritePropertyName("type"u8); writer.WriteStringValue(Type.Value.ToString()); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -78,8 +82,9 @@ internal static InternalAssistantsApiResponseFormat DeserializeInternalAssistant type = new InternalAssistantsApiResponseFormatType(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalAssistantsApiResponseFormat.cs b/src/Generated/Models/InternalAssistantsApiResponseFormat.cs index 55a4102ed..9333fb55c 100644 --- a/src/Generated/Models/InternalAssistantsApiResponseFormat.cs +++ b/src/Generated/Models/InternalAssistantsApiResponseFormat.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalAssistantsApiResponseFormat { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalAssistantsApiResponseFormat() { } @@ -18,7 +17,7 @@ public InternalAssistantsApiResponseFormat() internal InternalAssistantsApiResponseFormat(InternalAssistantsApiResponseFormatType? type, IDictionary serializedAdditionalRawData) { Type = type; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public InternalAssistantsApiResponseFormatType? Type { get; set; } diff --git a/src/Generated/Models/InternalAssistantsNamedToolChoiceFunction.Serialization.cs b/src/Generated/Models/InternalAssistantsNamedToolChoiceFunction.Serialization.cs index f9f5f9539..09f0a21c9 100644 --- a/src/Generated/Models/InternalAssistantsNamedToolChoiceFunction.Serialization.cs +++ b/src/Generated/Models/InternalAssistantsNamedToolChoiceFunction.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter } writer.WriteStartObject(); - writer.WritePropertyName("name"u8); - writer.WriteStringValue(Name); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("name") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("name"u8); + writer.WriteStringValue(Name); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static InternalAssistantsNamedToolChoiceFunction DeserializeInternalAss name = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalAssistantsNamedToolChoiceFunction.cs b/src/Generated/Models/InternalAssistantsNamedToolChoiceFunction.cs index c43e00667..88e7c6d17 100644 --- a/src/Generated/Models/InternalAssistantsNamedToolChoiceFunction.cs +++ b/src/Generated/Models/InternalAssistantsNamedToolChoiceFunction.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalAssistantsNamedToolChoiceFunction { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalAssistantsNamedToolChoiceFunction(string name) { Argument.AssertNotNull(name, nameof(name)); @@ -21,7 +20,7 @@ public InternalAssistantsNamedToolChoiceFunction(string name) internal InternalAssistantsNamedToolChoiceFunction(string name, IDictionary serializedAdditionalRawData) { Name = name; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalAssistantsNamedToolChoiceFunction() diff --git a/src/Generated/Models/InternalAutoChunkingStrategy.Serialization.cs b/src/Generated/Models/InternalAutoChunkingStrategy.Serialization.cs index 5ec907836..917db7e29 100644 --- a/src/Generated/Models/InternalAutoChunkingStrategy.Serialization.cs +++ b/src/Generated/Models/InternalAutoChunkingStrategy.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, Model } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static InternalAutoChunkingStrategy DeserializeInternalAutoChunkingStra type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalAutoChunkingStrategyRequestParam.Serialization.cs b/src/Generated/Models/InternalAutoChunkingStrategyRequestParam.Serialization.cs index e9c4669f3..5488cd2bd 100644 --- a/src/Generated/Models/InternalAutoChunkingStrategyRequestParam.Serialization.cs +++ b/src/Generated/Models/InternalAutoChunkingStrategyRequestParam.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter w } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static InternalAutoChunkingStrategyRequestParam DeserializeInternalAuto type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalBatchError.Serialization.cs b/src/Generated/Models/InternalBatchError.Serialization.cs index 244a1f826..ae3fd87d4 100644 --- a/src/Generated/Models/InternalBatchError.Serialization.cs +++ b/src/Generated/Models/InternalBatchError.Serialization.cs @@ -21,17 +21,17 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit } writer.WriteStartObject(); - if (Optional.IsDefined(Code)) + if (SerializedAdditionalRawData?.ContainsKey("code") != true && Optional.IsDefined(Code)) { writer.WritePropertyName("code"u8); writer.WriteStringValue(Code); } - if (Optional.IsDefined(Message)) + if (SerializedAdditionalRawData?.ContainsKey("message") != true && Optional.IsDefined(Message)) { writer.WritePropertyName("message"u8); writer.WriteStringValue(Message); } - if (Optional.IsDefined(Param)) + if (SerializedAdditionalRawData?.ContainsKey("param") != true && Optional.IsDefined(Param)) { if (Param != null) { @@ -43,7 +43,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit writer.WriteNull("param"); } } - if (Optional.IsDefined(Line)) + if (SerializedAdditionalRawData?.ContainsKey("line") != true && Optional.IsDefined(Line)) { if (Line != null) { @@ -55,10 +55,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit writer.WriteNull("line"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -131,8 +135,9 @@ internal static InternalBatchError DeserializeInternalBatchError(JsonElement ele line = property.Value.GetInt32(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalBatchError.cs b/src/Generated/Models/InternalBatchError.cs index 95c0f9a19..411b48c42 100644 --- a/src/Generated/Models/InternalBatchError.cs +++ b/src/Generated/Models/InternalBatchError.cs @@ -9,8 +9,7 @@ namespace OpenAI.Batch { internal partial class InternalBatchError { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalBatchError() { } @@ -21,7 +20,7 @@ internal InternalBatchError(string code, string message, string param, int? line Message = message; Param = param; Line = line; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string Code { get; } diff --git a/src/Generated/Models/InternalBatchErrors.Serialization.cs b/src/Generated/Models/InternalBatchErrors.Serialization.cs index 298936965..8f3d349c5 100644 --- a/src/Generated/Models/InternalBatchErrors.Serialization.cs +++ b/src/Generated/Models/InternalBatchErrors.Serialization.cs @@ -21,12 +21,12 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWri } writer.WriteStartObject(); - if (Optional.IsDefined(Object)) + if (SerializedAdditionalRawData?.ContainsKey("object") != true && Optional.IsDefined(Object)) { writer.WritePropertyName("object"u8); writer.WriteStringValue(Object.Value.ToString()); } - if (Optional.IsCollectionDefined(Data)) + if (SerializedAdditionalRawData?.ContainsKey("data") != true && Optional.IsCollectionDefined(Data)) { writer.WritePropertyName("data"u8); writer.WriteStartArray(); @@ -36,10 +36,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWri } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -103,8 +107,9 @@ internal static InternalBatchErrors DeserializeInternalBatchErrors(JsonElement e data = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalBatchErrors.cs b/src/Generated/Models/InternalBatchErrors.cs index 34a202a56..ef20e9e07 100644 --- a/src/Generated/Models/InternalBatchErrors.cs +++ b/src/Generated/Models/InternalBatchErrors.cs @@ -9,8 +9,7 @@ namespace OpenAI.Batch { internal partial class InternalBatchErrors { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalBatchErrors() { Data = new ChangeTrackingList(); @@ -20,7 +19,7 @@ internal InternalBatchErrors(InternalBatchErrorsObject? @object, IReadOnlyList.Write(Utf8JsonWriter writer, ModelReaderWriter } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("endpoint"u8); - writer.WriteStringValue(Endpoint); - if (Optional.IsDefined(Errors)) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) + { + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("endpoint") != true) + { + writer.WritePropertyName("endpoint"u8); + writer.WriteStringValue(Endpoint); + } + if (SerializedAdditionalRawData?.ContainsKey("errors") != true && Optional.IsDefined(Errors)) { writer.WritePropertyName("errors"u8); writer.WriteObjectValue(Errors, options); } - writer.WritePropertyName("input_file_id"u8); - writer.WriteStringValue(InputFileId); - writer.WritePropertyName("completion_window"u8); - writer.WriteStringValue(CompletionWindow); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - if (Optional.IsDefined(OutputFileId)) + if (SerializedAdditionalRawData?.ContainsKey("input_file_id") != true) + { + writer.WritePropertyName("input_file_id"u8); + writer.WriteStringValue(InputFileId); + } + if (SerializedAdditionalRawData?.ContainsKey("completion_window") != true) + { + writer.WritePropertyName("completion_window"u8); + writer.WriteStringValue(CompletionWindow); + } + if (SerializedAdditionalRawData?.ContainsKey("status") != true) + { + writer.WritePropertyName("status"u8); + writer.WriteStringValue(Status.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("output_file_id") != true && Optional.IsDefined(OutputFileId)) { writer.WritePropertyName("output_file_id"u8); writer.WriteStringValue(OutputFileId); } - if (Optional.IsDefined(ErrorFileId)) + if (SerializedAdditionalRawData?.ContainsKey("error_file_id") != true && Optional.IsDefined(ErrorFileId)) { writer.WritePropertyName("error_file_id"u8); writer.WriteStringValue(ErrorFileId); } - writer.WritePropertyName("created_at"u8); - writer.WriteNumberValue(CreatedAt, "U"); - if (Optional.IsDefined(InProgressAt)) + if (SerializedAdditionalRawData?.ContainsKey("created_at") != true) + { + writer.WritePropertyName("created_at"u8); + writer.WriteNumberValue(CreatedAt, "U"); + } + if (SerializedAdditionalRawData?.ContainsKey("in_progress_at") != true && Optional.IsDefined(InProgressAt)) { writer.WritePropertyName("in_progress_at"u8); writer.WriteNumberValue(InProgressAt.Value, "U"); } - if (Optional.IsDefined(ExpiresAt)) + if (SerializedAdditionalRawData?.ContainsKey("expires_at") != true && Optional.IsDefined(ExpiresAt)) { writer.WritePropertyName("expires_at"u8); writer.WriteNumberValue(ExpiresAt.Value, "U"); } - if (Optional.IsDefined(FinalizingAt)) + if (SerializedAdditionalRawData?.ContainsKey("finalizing_at") != true && Optional.IsDefined(FinalizingAt)) { writer.WritePropertyName("finalizing_at"u8); writer.WriteNumberValue(FinalizingAt.Value, "U"); } - if (Optional.IsDefined(CompletedAt)) + if (SerializedAdditionalRawData?.ContainsKey("completed_at") != true && Optional.IsDefined(CompletedAt)) { writer.WritePropertyName("completed_at"u8); writer.WriteNumberValue(CompletedAt.Value, "U"); } - if (Optional.IsDefined(FailedAt)) + if (SerializedAdditionalRawData?.ContainsKey("failed_at") != true && Optional.IsDefined(FailedAt)) { writer.WritePropertyName("failed_at"u8); writer.WriteNumberValue(FailedAt.Value, "U"); } - if (Optional.IsDefined(ExpiredAt)) + if (SerializedAdditionalRawData?.ContainsKey("expired_at") != true && Optional.IsDefined(ExpiredAt)) { writer.WritePropertyName("expired_at"u8); writer.WriteNumberValue(ExpiredAt.Value, "U"); } - if (Optional.IsDefined(CancellingAt)) + if (SerializedAdditionalRawData?.ContainsKey("cancelling_at") != true && Optional.IsDefined(CancellingAt)) { writer.WritePropertyName("cancelling_at"u8); writer.WriteNumberValue(CancellingAt.Value, "U"); } - if (Optional.IsDefined(CancelledAt)) + if (SerializedAdditionalRawData?.ContainsKey("cancelled_at") != true && Optional.IsDefined(CancelledAt)) { writer.WritePropertyName("cancelled_at"u8); writer.WriteNumberValue(CancelledAt.Value, "U"); } - if (Optional.IsDefined(RequestCounts)) + if (SerializedAdditionalRawData?.ContainsKey("request_counts") != true && Optional.IsDefined(RequestCounts)) { writer.WritePropertyName("request_counts"u8); writer.WriteObjectValue(RequestCounts, options); } - if (Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true && Optional.IsCollectionDefined(Metadata)) { if (Metadata != null) { @@ -113,10 +134,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriter writer.WriteNull("metadata"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -324,8 +349,9 @@ internal static InternalBatchJob DeserializeInternalBatchJob(JsonElement element metadata = dictionary; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalBatchJob.cs b/src/Generated/Models/InternalBatchJob.cs index 8cd8558b7..bbd35aeac 100644 --- a/src/Generated/Models/InternalBatchJob.cs +++ b/src/Generated/Models/InternalBatchJob.cs @@ -9,8 +9,7 @@ namespace OpenAI.Batch { internal partial class InternalBatchJob { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalBatchJob(string id, string endpoint, string inputFileId, string completionWindow, InternalBatchStatus status, DateTimeOffset createdAt) { Argument.AssertNotNull(id, nameof(id)); @@ -49,7 +48,7 @@ internal InternalBatchJob(string id, InternalBatchObject @object, string endpoin CancelledAt = cancelledAt; RequestCounts = requestCounts; Metadata = metadata; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalBatchJob() diff --git a/src/Generated/Models/InternalBatchRequestCounts.Serialization.cs b/src/Generated/Models/InternalBatchRequestCounts.Serialization.cs index 7f41654a4..ad1b1f9c9 100644 --- a/src/Generated/Models/InternalBatchRequestCounts.Serialization.cs +++ b/src/Generated/Models/InternalBatchRequestCounts.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe } writer.WriteStartObject(); - writer.WritePropertyName("total"u8); - writer.WriteNumberValue(Total); - writer.WritePropertyName("completed"u8); - writer.WriteNumberValue(Completed); - writer.WritePropertyName("failed"u8); - writer.WriteNumberValue(Failed); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("total") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("total"u8); + writer.WriteNumberValue(Total); + } + if (SerializedAdditionalRawData?.ContainsKey("completed") != true) + { + writer.WritePropertyName("completed"u8); + writer.WriteNumberValue(Completed); + } + if (SerializedAdditionalRawData?.ContainsKey("failed") != true) + { + writer.WritePropertyName("failed"u8); + writer.WriteNumberValue(Failed); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static InternalBatchRequestCounts DeserializeInternalBatchRequestCounts failed = property.Value.GetInt32(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalBatchRequestCounts.cs b/src/Generated/Models/InternalBatchRequestCounts.cs index 71e1291d6..1e9731e07 100644 --- a/src/Generated/Models/InternalBatchRequestCounts.cs +++ b/src/Generated/Models/InternalBatchRequestCounts.cs @@ -9,8 +9,7 @@ namespace OpenAI.Batch { internal partial class InternalBatchRequestCounts { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalBatchRequestCounts(int total, int completed, int failed) { Total = total; @@ -23,7 +22,7 @@ internal InternalBatchRequestCounts(int total, int completed, int failed, IDicti Total = total; Completed = completed; Failed = failed; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalBatchRequestCounts() diff --git a/src/Generated/Models/InternalBatchRequestInput.Serialization.cs b/src/Generated/Models/InternalBatchRequestInput.Serialization.cs index 4bd2be752..b367f63b4 100644 --- a/src/Generated/Models/InternalBatchRequestInput.Serialization.cs +++ b/src/Generated/Models/InternalBatchRequestInput.Serialization.cs @@ -21,25 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRea } writer.WriteStartObject(); - if (Optional.IsDefined(CustomId)) + if (SerializedAdditionalRawData?.ContainsKey("custom_id") != true && Optional.IsDefined(CustomId)) { writer.WritePropertyName("custom_id"u8); writer.WriteStringValue(CustomId); } - if (Optional.IsDefined(Method)) + if (SerializedAdditionalRawData?.ContainsKey("method") != true && Optional.IsDefined(Method)) { writer.WritePropertyName("method"u8); writer.WriteStringValue(Method.Value.ToString()); } - if (Optional.IsDefined(Url)) + if (SerializedAdditionalRawData?.ContainsKey("url") != true && Optional.IsDefined(Url)) { writer.WritePropertyName("url"u8); writer.WriteStringValue(Url.AbsoluteUri); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -104,8 +108,9 @@ internal static InternalBatchRequestInput DeserializeInternalBatchRequestInput(J url = new Uri(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalBatchRequestInput.cs b/src/Generated/Models/InternalBatchRequestInput.cs index 326f116b7..7e4b58c93 100644 --- a/src/Generated/Models/InternalBatchRequestInput.cs +++ b/src/Generated/Models/InternalBatchRequestInput.cs @@ -9,8 +9,7 @@ namespace OpenAI.Batch { internal partial class InternalBatchRequestInput { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalBatchRequestInput() { } @@ -20,7 +19,7 @@ internal InternalBatchRequestInput(string customId, InternalBatchRequestInputMet CustomId = customId; Method = method; Url = url; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string CustomId { get; set; } diff --git a/src/Generated/Models/InternalBatchRequestOutput.Serialization.cs b/src/Generated/Models/InternalBatchRequestOutput.Serialization.cs index 94facbd59..7469e791d 100644 --- a/src/Generated/Models/InternalBatchRequestOutput.Serialization.cs +++ b/src/Generated/Models/InternalBatchRequestOutput.Serialization.cs @@ -21,17 +21,17 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe } writer.WriteStartObject(); - if (Optional.IsDefined(Id)) + if (SerializedAdditionalRawData?.ContainsKey("id") != true && Optional.IsDefined(Id)) { writer.WritePropertyName("id"u8); writer.WriteStringValue(Id); } - if (Optional.IsDefined(CustomId)) + if (SerializedAdditionalRawData?.ContainsKey("custom_id") != true && Optional.IsDefined(CustomId)) { writer.WritePropertyName("custom_id"u8); writer.WriteStringValue(CustomId); } - if (Optional.IsDefined(Response)) + if (SerializedAdditionalRawData?.ContainsKey("response") != true && Optional.IsDefined(Response)) { if (Response != null) { @@ -43,7 +43,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe writer.WriteNull("response"); } } - if (Optional.IsDefined(Error)) + if (SerializedAdditionalRawData?.ContainsKey("error") != true && Optional.IsDefined(Error)) { if (Error != null) { @@ -55,10 +55,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe writer.WriteNull("error"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -131,8 +135,9 @@ internal static InternalBatchRequestOutput DeserializeInternalBatchRequestOutput error = InternalBatchRequestOutputError.DeserializeInternalBatchRequestOutputError(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalBatchRequestOutput.cs b/src/Generated/Models/InternalBatchRequestOutput.cs index 41d1a36d2..ae119ecd7 100644 --- a/src/Generated/Models/InternalBatchRequestOutput.cs +++ b/src/Generated/Models/InternalBatchRequestOutput.cs @@ -9,8 +9,7 @@ namespace OpenAI.Batch { internal partial class InternalBatchRequestOutput { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalBatchRequestOutput() { } @@ -21,7 +20,7 @@ internal InternalBatchRequestOutput(string id, string customId, InternalBatchReq CustomId = customId; Response = response; Error = error; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string Id { get; } diff --git a/src/Generated/Models/InternalBatchRequestOutputError.Serialization.cs b/src/Generated/Models/InternalBatchRequestOutputError.Serialization.cs index 483cb262d..64dc33a38 100644 --- a/src/Generated/Models/InternalBatchRequestOutputError.Serialization.cs +++ b/src/Generated/Models/InternalBatchRequestOutputError.Serialization.cs @@ -21,20 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo } writer.WriteStartObject(); - if (Optional.IsDefined(Code)) + if (SerializedAdditionalRawData?.ContainsKey("code") != true && Optional.IsDefined(Code)) { writer.WritePropertyName("code"u8); writer.WriteStringValue(Code); } - if (Optional.IsDefined(Message)) + if (SerializedAdditionalRawData?.ContainsKey("message") != true && Optional.IsDefined(Message)) { writer.WritePropertyName("message"u8); writer.WriteStringValue(Message); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -85,8 +89,9 @@ internal static InternalBatchRequestOutputError DeserializeInternalBatchRequestO message = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalBatchRequestOutputError.cs b/src/Generated/Models/InternalBatchRequestOutputError.cs index c1745449d..b2ddd5bea 100644 --- a/src/Generated/Models/InternalBatchRequestOutputError.cs +++ b/src/Generated/Models/InternalBatchRequestOutputError.cs @@ -9,8 +9,7 @@ namespace OpenAI.Batch { internal partial class InternalBatchRequestOutputError { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalBatchRequestOutputError() { } @@ -19,7 +18,7 @@ internal InternalBatchRequestOutputError(string code, string message, IDictionar { Code = code; Message = message; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string Code { get; } diff --git a/src/Generated/Models/InternalBatchRequestOutputResponse.Serialization.cs b/src/Generated/Models/InternalBatchRequestOutputResponse.Serialization.cs index c0de57ea1..b313874b5 100644 --- a/src/Generated/Models/InternalBatchRequestOutputResponse.Serialization.cs +++ b/src/Generated/Models/InternalBatchRequestOutputResponse.Serialization.cs @@ -21,17 +21,17 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteStartObject(); - if (Optional.IsDefined(StatusCode)) + if (SerializedAdditionalRawData?.ContainsKey("status_code") != true && Optional.IsDefined(StatusCode)) { writer.WritePropertyName("status_code"u8); writer.WriteNumberValue(StatusCode.Value); } - if (Optional.IsDefined(RequestId)) + if (SerializedAdditionalRawData?.ContainsKey("request_id") != true && Optional.IsDefined(RequestId)) { writer.WritePropertyName("request_id"u8); writer.WriteStringValue(RequestId); } - if (Optional.IsCollectionDefined(Body)) + if (SerializedAdditionalRawData?.ContainsKey("body") != true && Optional.IsCollectionDefined(Body)) { writer.WritePropertyName("body"u8); writer.WriteStartObject(); @@ -42,10 +42,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteEndObject(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -115,8 +119,9 @@ internal static InternalBatchRequestOutputResponse DeserializeInternalBatchReque body = dictionary; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalBatchRequestOutputResponse.cs b/src/Generated/Models/InternalBatchRequestOutputResponse.cs index e315808e3..2919fec21 100644 --- a/src/Generated/Models/InternalBatchRequestOutputResponse.cs +++ b/src/Generated/Models/InternalBatchRequestOutputResponse.cs @@ -9,8 +9,7 @@ namespace OpenAI.Batch { internal partial class InternalBatchRequestOutputResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalBatchRequestOutputResponse() { Body = new ChangeTrackingDictionary(); @@ -21,7 +20,7 @@ internal InternalBatchRequestOutputResponse(int? statusCode, string requestId, I StatusCode = statusCode; RequestId = requestId; Body = body; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public int? StatusCode { get; } diff --git a/src/Generated/Models/InternalChatCompletionFunctionCallOption.Serialization.cs b/src/Generated/Models/InternalChatCompletionFunctionCallOption.Serialization.cs index cb0cd1051..848aa320c 100644 --- a/src/Generated/Models/InternalChatCompletionFunctionCallOption.Serialization.cs +++ b/src/Generated/Models/InternalChatCompletionFunctionCallOption.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter w } writer.WriteStartObject(); - writer.WritePropertyName("name"u8); - writer.WriteStringValue(Name); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("name") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("name"u8); + writer.WriteStringValue(Name); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static InternalChatCompletionFunctionCallOption DeserializeInternalChat name = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalChatCompletionFunctionCallOption.cs b/src/Generated/Models/InternalChatCompletionFunctionCallOption.cs index 1de09aca4..2cb95446c 100644 --- a/src/Generated/Models/InternalChatCompletionFunctionCallOption.cs +++ b/src/Generated/Models/InternalChatCompletionFunctionCallOption.cs @@ -9,8 +9,7 @@ namespace OpenAI.Chat { internal partial class InternalChatCompletionFunctionCallOption { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalChatCompletionFunctionCallOption(string name) { Argument.AssertNotNull(name, nameof(name)); @@ -21,7 +20,7 @@ public InternalChatCompletionFunctionCallOption(string name) internal InternalChatCompletionFunctionCallOption(string name, IDictionary serializedAdditionalRawData) { Name = name; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalChatCompletionFunctionCallOption() diff --git a/src/Generated/Models/InternalChatCompletionMessageToolCallChunkFunction.Serialization.cs b/src/Generated/Models/InternalChatCompletionMessageToolCallChunkFunction.Serialization.cs index 014415feb..6b3929ddf 100644 --- a/src/Generated/Models/InternalChatCompletionMessageToolCallChunkFunction.Serialization.cs +++ b/src/Generated/Models/InternalChatCompletionMessageToolCallChunkFunction.Serialization.cs @@ -21,20 +21,24 @@ void IJsonModel.Write(Utf8Js } writer.WriteStartObject(); - if (Optional.IsDefined(Name)) + if (SerializedAdditionalRawData?.ContainsKey("name") != true && Optional.IsDefined(Name)) { writer.WritePropertyName("name"u8); writer.WriteStringValue(Name); } - if (Optional.IsDefined(Arguments)) + if (SerializedAdditionalRawData?.ContainsKey("arguments") != true && Optional.IsDefined(Arguments)) { writer.WritePropertyName("arguments"u8); writer.WriteStringValue(Arguments); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -85,8 +89,9 @@ internal static InternalChatCompletionMessageToolCallChunkFunction DeserializeIn arguments = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalChatCompletionMessageToolCallChunkFunction.cs b/src/Generated/Models/InternalChatCompletionMessageToolCallChunkFunction.cs index 6ec668c55..3119ca2e9 100644 --- a/src/Generated/Models/InternalChatCompletionMessageToolCallChunkFunction.cs +++ b/src/Generated/Models/InternalChatCompletionMessageToolCallChunkFunction.cs @@ -9,8 +9,7 @@ namespace OpenAI.Chat { internal partial class InternalChatCompletionMessageToolCallChunkFunction { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalChatCompletionMessageToolCallChunkFunction() { } @@ -19,7 +18,7 @@ internal InternalChatCompletionMessageToolCallChunkFunction(string name, string { Name = name; Arguments = arguments; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string Name { get; } diff --git a/src/Generated/Models/InternalChatCompletionMessageToolCallFunction.Serialization.cs b/src/Generated/Models/InternalChatCompletionMessageToolCallFunction.Serialization.cs index 2ca9d546c..d6fc850ee 100644 --- a/src/Generated/Models/InternalChatCompletionMessageToolCallFunction.Serialization.cs +++ b/src/Generated/Models/InternalChatCompletionMessageToolCallFunction.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8JsonWri } writer.WriteStartObject(); - writer.WritePropertyName("name"u8); - writer.WriteStringValue(Name); - writer.WritePropertyName("arguments"u8); - writer.WriteStringValue(Arguments); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("name") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("name"u8); + writer.WriteStringValue(Name); + } + if (SerializedAdditionalRawData?.ContainsKey("arguments") != true) + { + writer.WritePropertyName("arguments"u8); + writer.WriteStringValue(Arguments); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static InternalChatCompletionMessageToolCallFunction DeserializeInterna arguments = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalChatCompletionMessageToolCallFunction.cs b/src/Generated/Models/InternalChatCompletionMessageToolCallFunction.cs index 8a65263a6..c725868a0 100644 --- a/src/Generated/Models/InternalChatCompletionMessageToolCallFunction.cs +++ b/src/Generated/Models/InternalChatCompletionMessageToolCallFunction.cs @@ -9,8 +9,7 @@ namespace OpenAI.Chat { internal partial class InternalChatCompletionMessageToolCallFunction { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalChatCompletionMessageToolCallFunction(string name, string arguments) { Argument.AssertNotNull(name, nameof(name)); @@ -24,7 +23,7 @@ internal InternalChatCompletionMessageToolCallFunction(string name, string argum { Name = name; Arguments = arguments; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalChatCompletionMessageToolCallFunction() diff --git a/src/Generated/Models/InternalChatCompletionNamedToolChoice.Serialization.cs b/src/Generated/Models/InternalChatCompletionNamedToolChoice.Serialization.cs index eb51e8eb6..b7be9a655 100644 --- a/src/Generated/Models/InternalChatCompletionNamedToolChoice.Serialization.cs +++ b/src/Generated/Models/InternalChatCompletionNamedToolChoice.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter writ } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type.ToString()); - writer.WritePropertyName("function"u8); - writer.WriteObjectValue(Function, options); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("function") != true) + { + writer.WritePropertyName("function"u8); + writer.WriteObjectValue(Function, options); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static InternalChatCompletionNamedToolChoice DeserializeInternalChatCom function = InternalChatCompletionNamedToolChoiceFunction.DeserializeInternalChatCompletionNamedToolChoiceFunction(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalChatCompletionNamedToolChoice.cs b/src/Generated/Models/InternalChatCompletionNamedToolChoice.cs index c397cfdd7..4538d8136 100644 --- a/src/Generated/Models/InternalChatCompletionNamedToolChoice.cs +++ b/src/Generated/Models/InternalChatCompletionNamedToolChoice.cs @@ -9,8 +9,7 @@ namespace OpenAI.Chat { internal partial class InternalChatCompletionNamedToolChoice { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalChatCompletionNamedToolChoice(InternalChatCompletionNamedToolChoiceFunction function) { Argument.AssertNotNull(function, nameof(function)); @@ -22,7 +21,7 @@ internal InternalChatCompletionNamedToolChoice(InternalChatCompletionNamedToolCh { Type = type; Function = function; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalChatCompletionNamedToolChoice() diff --git a/src/Generated/Models/InternalChatCompletionNamedToolChoiceFunction.Serialization.cs b/src/Generated/Models/InternalChatCompletionNamedToolChoiceFunction.Serialization.cs index f094e0024..4714a67cf 100644 --- a/src/Generated/Models/InternalChatCompletionNamedToolChoiceFunction.Serialization.cs +++ b/src/Generated/Models/InternalChatCompletionNamedToolChoiceFunction.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWri } writer.WriteStartObject(); - writer.WritePropertyName("name"u8); - writer.WriteStringValue(Name); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("name") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("name"u8); + writer.WriteStringValue(Name); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static InternalChatCompletionNamedToolChoiceFunction DeserializeInterna name = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalChatCompletionNamedToolChoiceFunction.cs b/src/Generated/Models/InternalChatCompletionNamedToolChoiceFunction.cs index 9e683d68f..5097bcb79 100644 --- a/src/Generated/Models/InternalChatCompletionNamedToolChoiceFunction.cs +++ b/src/Generated/Models/InternalChatCompletionNamedToolChoiceFunction.cs @@ -9,8 +9,7 @@ namespace OpenAI.Chat { internal partial class InternalChatCompletionNamedToolChoiceFunction { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalChatCompletionNamedToolChoiceFunction(string name) { Argument.AssertNotNull(name, nameof(name)); @@ -21,7 +20,7 @@ public InternalChatCompletionNamedToolChoiceFunction(string name) internal InternalChatCompletionNamedToolChoiceFunction(string name, IDictionary serializedAdditionalRawData) { Name = name; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalChatCompletionNamedToolChoiceFunction() diff --git a/src/Generated/Models/InternalChatCompletionRequestMessageContentPartImage.Serialization.cs b/src/Generated/Models/InternalChatCompletionRequestMessageContentPartImage.Serialization.cs index 925e06c93..560d39cd5 100644 --- a/src/Generated/Models/InternalChatCompletionRequestMessageContentPartImage.Serialization.cs +++ b/src/Generated/Models/InternalChatCompletionRequestMessageContentPartImage.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8 } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type.ToString()); - writer.WritePropertyName("image_url"u8); - writer.WriteObjectValue(ImageUrl, options); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("image_url") != true) + { + writer.WritePropertyName("image_url"u8); + writer.WriteObjectValue(ImageUrl, options); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static InternalChatCompletionRequestMessageContentPartImage Deserialize imageUrl = InternalChatCompletionRequestMessageContentPartImageImageUrl.DeserializeInternalChatCompletionRequestMessageContentPartImageImageUrl(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalChatCompletionRequestMessageContentPartImage.cs b/src/Generated/Models/InternalChatCompletionRequestMessageContentPartImage.cs index 0f3ea4a68..97fb55045 100644 --- a/src/Generated/Models/InternalChatCompletionRequestMessageContentPartImage.cs +++ b/src/Generated/Models/InternalChatCompletionRequestMessageContentPartImage.cs @@ -9,8 +9,7 @@ namespace OpenAI.Chat { internal partial class InternalChatCompletionRequestMessageContentPartImage { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalChatCompletionRequestMessageContentPartImage(InternalChatCompletionRequestMessageContentPartImageImageUrl imageUrl) { Argument.AssertNotNull(imageUrl, nameof(imageUrl)); @@ -22,7 +21,7 @@ internal InternalChatCompletionRequestMessageContentPartImage(InternalChatComple { Type = type; ImageUrl = imageUrl; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalChatCompletionRequestMessageContentPartImage() diff --git a/src/Generated/Models/InternalChatCompletionRequestMessageContentPartImageImageUrl.Serialization.cs b/src/Generated/Models/InternalChatCompletionRequestMessageContentPartImageImageUrl.Serialization.cs index 858430389..e46518a33 100644 --- a/src/Generated/Models/InternalChatCompletionRequestMessageContentPartImageImageUrl.Serialization.cs +++ b/src/Generated/Models/InternalChatCompletionRequestMessageContentPartImageImageUrl.Serialization.cs @@ -21,17 +21,24 @@ void IJsonModel.Wr } writer.WriteStartObject(); - writer.WritePropertyName("url"u8); - writer.WriteStringValue(Url); - if (Optional.IsDefined(Detail)) + if (SerializedAdditionalRawData?.ContainsKey("url") != true) + { + writer.WritePropertyName("url"u8); + writer.WriteStringValue(Url); + } + if (SerializedAdditionalRawData?.ContainsKey("detail") != true && Optional.IsDefined(Detail)) { writer.WritePropertyName("detail"u8); writer.WriteStringValue(Detail.Value.ToString()); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -86,8 +93,9 @@ internal static InternalChatCompletionRequestMessageContentPartImageImageUrl Des detail = new ImageChatMessageContentPartDetail(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalChatCompletionRequestMessageContentPartImageImageUrl.cs b/src/Generated/Models/InternalChatCompletionRequestMessageContentPartImageImageUrl.cs index f095aa780..1ff5dc332 100644 --- a/src/Generated/Models/InternalChatCompletionRequestMessageContentPartImageImageUrl.cs +++ b/src/Generated/Models/InternalChatCompletionRequestMessageContentPartImageImageUrl.cs @@ -9,7 +9,7 @@ namespace OpenAI.Chat { internal partial class InternalChatCompletionRequestMessageContentPartImageImageUrl { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalChatCompletionRequestMessageContentPartImageImageUrl() { diff --git a/src/Generated/Models/InternalChatCompletionRequestMessageContentPartText.Serialization.cs b/src/Generated/Models/InternalChatCompletionRequestMessageContentPartText.Serialization.cs index 946cbc49b..acbb41526 100644 --- a/src/Generated/Models/InternalChatCompletionRequestMessageContentPartText.Serialization.cs +++ b/src/Generated/Models/InternalChatCompletionRequestMessageContentPartText.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8J } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type.ToString()); - writer.WritePropertyName("text"u8); - writer.WriteStringValue(Text); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("text") != true) + { + writer.WritePropertyName("text"u8); + writer.WriteStringValue(Text); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static InternalChatCompletionRequestMessageContentPartText DeserializeI text = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalChatCompletionRequestMessageContentPartText.cs b/src/Generated/Models/InternalChatCompletionRequestMessageContentPartText.cs index d576932a5..09645f628 100644 --- a/src/Generated/Models/InternalChatCompletionRequestMessageContentPartText.cs +++ b/src/Generated/Models/InternalChatCompletionRequestMessageContentPartText.cs @@ -9,8 +9,7 @@ namespace OpenAI.Chat { internal partial class InternalChatCompletionRequestMessageContentPartText { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalChatCompletionRequestMessageContentPartText(string text) { Argument.AssertNotNull(text, nameof(text)); @@ -22,7 +21,7 @@ internal InternalChatCompletionRequestMessageContentPartText(InternalChatComplet { Type = type; Text = text; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalChatCompletionRequestMessageContentPartText() diff --git a/src/Generated/Models/InternalChatCompletionResponseMessage.cs b/src/Generated/Models/InternalChatCompletionResponseMessage.cs index e19166834..114a9ae55 100644 --- a/src/Generated/Models/InternalChatCompletionResponseMessage.cs +++ b/src/Generated/Models/InternalChatCompletionResponseMessage.cs @@ -10,7 +10,7 @@ namespace OpenAI.Chat { internal partial class InternalChatCompletionResponseMessage { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalChatCompletionResponseMessage(IReadOnlyList content, IReadOnlyList toolCalls, ChatMessageRole role, ChatFunctionCall functionCall, IDictionary serializedAdditionalRawData) { @@ -18,7 +18,7 @@ internal InternalChatCompletionResponseMessage(IReadOnlyList.Write(Utf8Jso } writer.WriteStartObject(); - writer.WritePropertyName("arguments"u8); - writer.WriteStringValue(Arguments); - writer.WritePropertyName("name"u8); - writer.WriteStringValue(Name); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("arguments") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("arguments"u8); + writer.WriteStringValue(Arguments); + } + if (SerializedAdditionalRawData?.ContainsKey("name") != true) + { + writer.WritePropertyName("name"u8); + writer.WriteStringValue(Name); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static InternalChatCompletionResponseMessageFunctionCall DeserializeInt name = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalChatCompletionResponseMessageFunctionCall.cs b/src/Generated/Models/InternalChatCompletionResponseMessageFunctionCall.cs index fd02a042d..6a070987f 100644 --- a/src/Generated/Models/InternalChatCompletionResponseMessageFunctionCall.cs +++ b/src/Generated/Models/InternalChatCompletionResponseMessageFunctionCall.cs @@ -9,8 +9,7 @@ namespace OpenAI.Chat { internal partial class InternalChatCompletionResponseMessageFunctionCall { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalChatCompletionResponseMessageFunctionCall(string arguments, string name) { Argument.AssertNotNull(arguments, nameof(arguments)); @@ -24,7 +23,7 @@ internal InternalChatCompletionResponseMessageFunctionCall(string arguments, str { Arguments = arguments; Name = name; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalChatCompletionResponseMessageFunctionCall() diff --git a/src/Generated/Models/InternalChatCompletionStreamOptions.Serialization.cs b/src/Generated/Models/InternalChatCompletionStreamOptions.Serialization.cs index f4f985b83..c5b87c5ba 100644 --- a/src/Generated/Models/InternalChatCompletionStreamOptions.Serialization.cs +++ b/src/Generated/Models/InternalChatCompletionStreamOptions.Serialization.cs @@ -21,15 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer } writer.WriteStartObject(); - if (Optional.IsDefined(IncludeUsage)) + if (SerializedAdditionalRawData?.ContainsKey("include_usage") != true && Optional.IsDefined(IncludeUsage)) { writer.WritePropertyName("include_usage"u8); writer.WriteBooleanValue(IncludeUsage.Value); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -78,8 +82,9 @@ internal static InternalChatCompletionStreamOptions DeserializeInternalChatCompl includeUsage = property.Value.GetBoolean(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalChatCompletionStreamOptions.cs b/src/Generated/Models/InternalChatCompletionStreamOptions.cs index 8ea2d8389..65d1cc3a1 100644 --- a/src/Generated/Models/InternalChatCompletionStreamOptions.cs +++ b/src/Generated/Models/InternalChatCompletionStreamOptions.cs @@ -9,8 +9,7 @@ namespace OpenAI.Chat { internal partial class InternalChatCompletionStreamOptions { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalChatCompletionStreamOptions() { } @@ -18,7 +17,7 @@ public InternalChatCompletionStreamOptions() internal InternalChatCompletionStreamOptions(bool? includeUsage, IDictionary serializedAdditionalRawData) { IncludeUsage = includeUsage; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public bool? IncludeUsage { get; set; } diff --git a/src/Generated/Models/InternalChatCompletionStreamResponseDelta.cs b/src/Generated/Models/InternalChatCompletionStreamResponseDelta.cs index 20d28f3c8..34085b941 100644 --- a/src/Generated/Models/InternalChatCompletionStreamResponseDelta.cs +++ b/src/Generated/Models/InternalChatCompletionStreamResponseDelta.cs @@ -9,7 +9,7 @@ namespace OpenAI.Chat { internal partial class InternalChatCompletionStreamResponseDelta { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalChatCompletionStreamResponseDelta(IReadOnlyList content, StreamingChatFunctionCallUpdate functionCall, IReadOnlyList toolCalls, ChatMessageRole? role, IDictionary serializedAdditionalRawData) { @@ -17,7 +17,7 @@ internal InternalChatCompletionStreamResponseDelta(IReadOnlyList ToolCalls { get; } diff --git a/src/Generated/Models/InternalCreateAssistantRequestResponseFormat.cs b/src/Generated/Models/InternalCreateAssistantRequestResponseFormat.cs deleted file mode 100644 index c9084292d..000000000 --- a/src/Generated/Models/InternalCreateAssistantRequestResponseFormat.cs +++ /dev/null @@ -1,36 +0,0 @@ -// - -#nullable disable - -using System; -using System.ComponentModel; - -namespace OpenAI.Assistants -{ - internal readonly partial struct InternalCreateAssistantRequestResponseFormat : IEquatable - { - private readonly string _value; - - public InternalCreateAssistantRequestResponseFormat(string value) - { - _value = value ?? throw new ArgumentNullException(nameof(value)); - } - - private const string NoneValue = "none"; - private const string AutoValue = "auto"; - - public static InternalCreateAssistantRequestResponseFormat None { get; } = new InternalCreateAssistantRequestResponseFormat(NoneValue); - public static InternalCreateAssistantRequestResponseFormat Auto { get; } = new InternalCreateAssistantRequestResponseFormat(AutoValue); - public static bool operator ==(InternalCreateAssistantRequestResponseFormat left, InternalCreateAssistantRequestResponseFormat right) => left.Equals(right); - public static bool operator !=(InternalCreateAssistantRequestResponseFormat left, InternalCreateAssistantRequestResponseFormat right) => !left.Equals(right); - public static implicit operator InternalCreateAssistantRequestResponseFormat(string value) => new InternalCreateAssistantRequestResponseFormat(value); - - [EditorBrowsable(EditorBrowsableState.Never)] - public override bool Equals(object obj) => obj is InternalCreateAssistantRequestResponseFormat other && Equals(other); - public bool Equals(InternalCreateAssistantRequestResponseFormat other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); - - [EditorBrowsable(EditorBrowsableState.Never)] - public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; - public override string ToString() => _value; - } -} diff --git a/src/Generated/Models/InternalCreateAssistantRequestToolResources.Serialization.cs b/src/Generated/Models/InternalCreateAssistantRequestToolResources.Serialization.cs index 2705ffb74..5b0d4696c 100644 --- a/src/Generated/Models/InternalCreateAssistantRequestToolResources.Serialization.cs +++ b/src/Generated/Models/InternalCreateAssistantRequestToolResources.Serialization.cs @@ -21,12 +21,12 @@ void IJsonModel.Write(Utf8JsonWrite } writer.WriteStartObject(); - if (Optional.IsDefined(CodeInterpreter)) + if (SerializedAdditionalRawData?.ContainsKey("code_interpreter") != true && Optional.IsDefined(CodeInterpreter)) { writer.WritePropertyName("code_interpreter"u8); writer.WriteObjectValue(CodeInterpreter, options); } - if (Optional.IsDefined(FileSearch)) + if (SerializedAdditionalRawData?.ContainsKey("file_search") != true && Optional.IsDefined(FileSearch)) { writer.WritePropertyName("file_search"u8); #if NET6_0_OR_GREATER @@ -38,10 +38,14 @@ void IJsonModel.Write(Utf8JsonWrite } #endif } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -100,8 +104,9 @@ internal static InternalCreateAssistantRequestToolResources DeserializeInternalC fileSearch = BinaryData.FromString(property.Value.GetRawText()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateAssistantRequestToolResources.cs b/src/Generated/Models/InternalCreateAssistantRequestToolResources.cs index 2a96bb548..4ed163de6 100644 --- a/src/Generated/Models/InternalCreateAssistantRequestToolResources.cs +++ b/src/Generated/Models/InternalCreateAssistantRequestToolResources.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalCreateAssistantRequestToolResources { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateAssistantRequestToolResources() { } @@ -19,7 +18,7 @@ internal InternalCreateAssistantRequestToolResources(InternalCreateAssistantRequ { CodeInterpreter = codeInterpreter; FileSearch = fileSearch; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public InternalCreateAssistantRequestToolResourcesCodeInterpreter CodeInterpreter { get; set; } diff --git a/src/Generated/Models/InternalCreateAssistantRequestToolResourcesCodeInterpreter.Serialization.cs b/src/Generated/Models/InternalCreateAssistantRequestToolResourcesCodeInterpreter.Serialization.cs index e501165f1..8ae1d4bb1 100644 --- a/src/Generated/Models/InternalCreateAssistantRequestToolResourcesCodeInterpreter.Serialization.cs +++ b/src/Generated/Models/InternalCreateAssistantRequestToolResourcesCodeInterpreter.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Writ } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(FileIds)) + if (SerializedAdditionalRawData?.ContainsKey("file_ids") != true && Optional.IsCollectionDefined(FileIds)) { writer.WritePropertyName("file_ids"u8); writer.WriteStartArray(); @@ -31,10 +31,14 @@ void IJsonModel.Writ } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -88,8 +92,9 @@ internal static InternalCreateAssistantRequestToolResourcesCodeInterpreter Deser fileIds = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateAssistantRequestToolResourcesCodeInterpreter.cs b/src/Generated/Models/InternalCreateAssistantRequestToolResourcesCodeInterpreter.cs index 73bb12b11..ee042f14f 100644 --- a/src/Generated/Models/InternalCreateAssistantRequestToolResourcesCodeInterpreter.cs +++ b/src/Generated/Models/InternalCreateAssistantRequestToolResourcesCodeInterpreter.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalCreateAssistantRequestToolResourcesCodeInterpreter { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateAssistantRequestToolResourcesCodeInterpreter() { FileIds = new ChangeTrackingList(); @@ -19,7 +18,7 @@ public InternalCreateAssistantRequestToolResourcesCodeInterpreter() internal InternalCreateAssistantRequestToolResourcesCodeInterpreter(IList fileIds, IDictionary serializedAdditionalRawData) { FileIds = fileIds; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IList FileIds { get; } diff --git a/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchBase.Serialization.cs b/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchBase.Serialization.cs index c3fa6061e..c4bcf3750 100644 --- a/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchBase.Serialization.cs +++ b/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchBase.Serialization.cs @@ -21,10 +21,14 @@ void IJsonModel.Write } writer.WriteStartObject(); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -63,8 +67,9 @@ internal static InternalCreateAssistantRequestToolResourcesFileSearchBase Deseri Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) { - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchBase.cs b/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchBase.cs index 6776d76c9..31dff8351 100644 --- a/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchBase.cs +++ b/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchBase.cs @@ -9,15 +9,14 @@ namespace OpenAI.Assistants { internal partial class InternalCreateAssistantRequestToolResourcesFileSearchBase { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateAssistantRequestToolResourcesFileSearchBase() { } internal InternalCreateAssistantRequestToolResourcesFileSearchBase(IDictionary serializedAdditionalRawData) { - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } } } diff --git a/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreCreationHelpers.Serialization.cs b/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreCreationHelpers.Serialization.cs index 6a0828425..a65061481 100644 --- a/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreCreationHelpers.Serialization.cs +++ b/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreCreationHelpers.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreCreationHelpers.cs b/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreCreationHelpers.cs index 88ce6d471..bb2896dc6 100644 --- a/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreCreationHelpers.cs +++ b/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreCreationHelpers.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreCreationHelpers { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreCreationHelpers() { VectorStores = new ChangeTrackingList(); @@ -19,7 +18,7 @@ public InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreCreationH internal InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreCreationHelpers(IList vectorStores, IDictionary serializedAdditionalRawData) { VectorStores = vectorStores; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IList VectorStores { get; } diff --git a/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreIdReferences.Serialization.cs b/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreIdReferences.Serialization.cs index 11f4276da..4c9db0070 100644 --- a/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreIdReferences.Serialization.cs +++ b/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreIdReferences.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreIdReferences.cs b/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreIdReferences.cs index e14a4854e..ba6da6ac4 100644 --- a/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreIdReferences.cs +++ b/src/Generated/Models/InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreIdReferences.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreIdReferences { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreIdReferences() { VectorStoreIds = new ChangeTrackingList(); @@ -19,7 +18,7 @@ public InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreIdReferen internal InternalCreateAssistantRequestToolResourcesFileSearchVectorStoreIdReferences(IList vectorStoreIds, IDictionary serializedAdditionalRawData) { VectorStoreIds = vectorStoreIds; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IList VectorStoreIds { get; } diff --git a/src/Generated/Models/InternalCreateBatchRequest.Serialization.cs b/src/Generated/Models/InternalCreateBatchRequest.Serialization.cs index 22aadf4b3..236bd183b 100644 --- a/src/Generated/Models/InternalCreateBatchRequest.Serialization.cs +++ b/src/Generated/Models/InternalCreateBatchRequest.Serialization.cs @@ -21,13 +21,22 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe } writer.WriteStartObject(); - writer.WritePropertyName("input_file_id"u8); - writer.WriteStringValue(InputFileId); - writer.WritePropertyName("endpoint"u8); - writer.WriteStringValue(Endpoint.ToString()); - writer.WritePropertyName("completion_window"u8); - writer.WriteStringValue(CompletionWindow.ToString()); - if (Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("input_file_id") != true) + { + writer.WritePropertyName("input_file_id"u8); + writer.WriteStringValue(InputFileId); + } + if (SerializedAdditionalRawData?.ContainsKey("endpoint") != true) + { + writer.WritePropertyName("endpoint"u8); + writer.WriteStringValue(Endpoint.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("completion_window") != true) + { + writer.WritePropertyName("completion_window"u8); + writer.WriteStringValue(CompletionWindow.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true && Optional.IsCollectionDefined(Metadata)) { if (Metadata != null) { @@ -45,10 +54,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe writer.WriteNull("metadata"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -120,8 +133,9 @@ internal static InternalCreateBatchRequest DeserializeInternalCreateBatchRequest metadata = dictionary; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateBatchRequest.cs b/src/Generated/Models/InternalCreateBatchRequest.cs index dbe3be6dd..a50129fc8 100644 --- a/src/Generated/Models/InternalCreateBatchRequest.cs +++ b/src/Generated/Models/InternalCreateBatchRequest.cs @@ -9,8 +9,7 @@ namespace OpenAI.Batch { internal partial class InternalCreateBatchRequest { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateBatchRequest(string inputFileId, InternalCreateBatchRequestEndpoint endpoint) { Argument.AssertNotNull(inputFileId, nameof(inputFileId)); @@ -26,7 +25,7 @@ internal InternalCreateBatchRequest(string inputFileId, InternalCreateBatchReque Endpoint = endpoint; CompletionWindow = completionWindow; Metadata = metadata; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalCreateBatchRequest() diff --git a/src/Generated/Models/InternalCreateChatCompletionFunctionResponse.Serialization.cs b/src/Generated/Models/InternalCreateChatCompletionFunctionResponse.Serialization.cs index 48c22da1e..54c21775f 100644 --- a/src/Generated/Models/InternalCreateChatCompletionFunctionResponse.Serialization.cs +++ b/src/Generated/Models/InternalCreateChatCompletionFunctionResponse.Serialization.cs @@ -21,35 +21,54 @@ void IJsonModel.Write(Utf8JsonWrit } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("choices"u8); - writer.WriteStartArray(); - foreach (var item in Choices) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); } - writer.WriteEndArray(); - writer.WritePropertyName("created"u8); - writer.WriteNumberValue(Created, "U"); - writer.WritePropertyName("model"u8); - writer.WriteStringValue(Model); - if (Optional.IsDefined(SystemFingerprint)) + if (SerializedAdditionalRawData?.ContainsKey("choices") != true) + { + writer.WritePropertyName("choices"u8); + writer.WriteStartArray(); + foreach (var item in Choices) + { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + if (SerializedAdditionalRawData?.ContainsKey("created") != true) + { + writer.WritePropertyName("created"u8); + writer.WriteNumberValue(Created, "U"); + } + if (SerializedAdditionalRawData?.ContainsKey("model") != true) + { + writer.WritePropertyName("model"u8); + writer.WriteStringValue(Model); + } + if (SerializedAdditionalRawData?.ContainsKey("system_fingerprint") != true && Optional.IsDefined(SystemFingerprint)) { writer.WritePropertyName("system_fingerprint"u8); writer.WriteStringValue(SystemFingerprint); } - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - if (Optional.IsDefined(Usage)) + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("usage") != true && Optional.IsDefined(Usage)) { writer.WritePropertyName("usage"u8); writer.WriteObjectValue(Usage, options); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -139,8 +158,9 @@ internal static InternalCreateChatCompletionFunctionResponse DeserializeInternal usage = ChatTokenUsage.DeserializeChatTokenUsage(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateChatCompletionFunctionResponse.cs b/src/Generated/Models/InternalCreateChatCompletionFunctionResponse.cs index d8a763b46..19c621203 100644 --- a/src/Generated/Models/InternalCreateChatCompletionFunctionResponse.cs +++ b/src/Generated/Models/InternalCreateChatCompletionFunctionResponse.cs @@ -10,8 +10,7 @@ namespace OpenAI.Chat { internal partial class InternalCreateChatCompletionFunctionResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalCreateChatCompletionFunctionResponse(string id, IEnumerable choices, DateTimeOffset created, string model) { Argument.AssertNotNull(id, nameof(id)); @@ -33,7 +32,7 @@ internal InternalCreateChatCompletionFunctionResponse(string id, IReadOnlyList.Write(Utf8Js } writer.WriteStartObject(); - writer.WritePropertyName("finish_reason"u8); - writer.WriteStringValue(FinishReason.ToString()); - writer.WritePropertyName("index"u8); - writer.WriteNumberValue(Index); - writer.WritePropertyName("message"u8); - writer.WriteObjectValue(Message, options); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("finish_reason") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("finish_reason"u8); + writer.WriteStringValue(FinishReason.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("index") != true) + { + writer.WritePropertyName("index"u8); + writer.WriteNumberValue(Index); + } + if (SerializedAdditionalRawData?.ContainsKey("message") != true) + { + writer.WritePropertyName("message"u8); + writer.WriteObjectValue(Message, options); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static InternalCreateChatCompletionFunctionResponseChoice DeserializeIn message = InternalChatCompletionResponseMessage.DeserializeInternalChatCompletionResponseMessage(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateChatCompletionFunctionResponseChoice.cs b/src/Generated/Models/InternalCreateChatCompletionFunctionResponseChoice.cs index 6e602c543..6e0687ded 100644 --- a/src/Generated/Models/InternalCreateChatCompletionFunctionResponseChoice.cs +++ b/src/Generated/Models/InternalCreateChatCompletionFunctionResponseChoice.cs @@ -9,8 +9,7 @@ namespace OpenAI.Chat { internal partial class InternalCreateChatCompletionFunctionResponseChoice { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalCreateChatCompletionFunctionResponseChoice(InternalCreateChatCompletionFunctionResponseChoiceFinishReason finishReason, int index, InternalChatCompletionResponseMessage message) { Argument.AssertNotNull(message, nameof(message)); @@ -25,7 +24,7 @@ internal InternalCreateChatCompletionFunctionResponseChoice(InternalCreateChatCo FinishReason = finishReason; Index = index; Message = message; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalCreateChatCompletionFunctionResponseChoice() diff --git a/src/Generated/Models/InternalCreateChatCompletionResponseChoice.Serialization.cs b/src/Generated/Models/InternalCreateChatCompletionResponseChoice.Serialization.cs index c3f76c08e..299fbb574 100644 --- a/src/Generated/Models/InternalCreateChatCompletionResponseChoice.Serialization.cs +++ b/src/Generated/Models/InternalCreateChatCompletionResponseChoice.Serialization.cs @@ -21,25 +21,41 @@ void IJsonModel.Write(Utf8JsonWriter } writer.WriteStartObject(); - writer.WritePropertyName("finish_reason"u8); - writer.WriteStringValue(FinishReason.ToSerialString()); - writer.WritePropertyName("index"u8); - writer.WriteNumberValue(Index); - writer.WritePropertyName("message"u8); - writer.WriteObjectValue(Message, options); - if (Logprobs != null) + if (SerializedAdditionalRawData?.ContainsKey("finish_reason") != true) { - writer.WritePropertyName("logprobs"u8); - writer.WriteObjectValue(Logprobs, options); + writer.WritePropertyName("finish_reason"u8); + writer.WriteStringValue(FinishReason.ToSerialString()); } - else + if (SerializedAdditionalRawData?.ContainsKey("index") != true) { - writer.WriteNull("logprobs"); + writer.WritePropertyName("index"u8); + writer.WriteNumberValue(Index); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("message") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("message"u8); + writer.WriteObjectValue(Message, options); + } + if (SerializedAdditionalRawData?.ContainsKey("logprobs") != true) + { + if (Logprobs != null) + { + writer.WritePropertyName("logprobs"u8); + writer.WriteObjectValue(Logprobs, options); + } + else { + writer.WriteNull("logprobs"); + } + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) + { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -107,8 +123,9 @@ internal static InternalCreateChatCompletionResponseChoice DeserializeInternalCr logprobs = InternalCreateChatCompletionResponseChoiceLogprobs.DeserializeInternalCreateChatCompletionResponseChoiceLogprobs(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateChatCompletionResponseChoice.cs b/src/Generated/Models/InternalCreateChatCompletionResponseChoice.cs index acadf5979..88a8051cf 100644 --- a/src/Generated/Models/InternalCreateChatCompletionResponseChoice.cs +++ b/src/Generated/Models/InternalCreateChatCompletionResponseChoice.cs @@ -9,8 +9,7 @@ namespace OpenAI.Chat { internal partial class InternalCreateChatCompletionResponseChoice { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalCreateChatCompletionResponseChoice(ChatFinishReason finishReason, int index, InternalChatCompletionResponseMessage message, InternalCreateChatCompletionResponseChoiceLogprobs logprobs) { Argument.AssertNotNull(message, nameof(message)); @@ -27,7 +26,7 @@ internal InternalCreateChatCompletionResponseChoice(ChatFinishReason finishReaso Index = index; Message = message; Logprobs = logprobs; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalCreateChatCompletionResponseChoice() diff --git a/src/Generated/Models/InternalCreateChatCompletionResponseChoiceLogprobs.Serialization.cs b/src/Generated/Models/InternalCreateChatCompletionResponseChoiceLogprobs.Serialization.cs index 58af6294e..572f387cc 100644 --- a/src/Generated/Models/InternalCreateChatCompletionResponseChoiceLogprobs.Serialization.cs +++ b/src/Generated/Models/InternalCreateChatCompletionResponseChoiceLogprobs.Serialization.cs @@ -21,24 +21,31 @@ void IJsonModel.Write(Utf8Js } writer.WriteStartObject(); - if (Content != null && Optional.IsCollectionDefined(Content)) + if (SerializedAdditionalRawData?.ContainsKey("content") != true) { - writer.WritePropertyName("content"u8); - writer.WriteStartArray(); - foreach (var item in Content) + if (Content != null && Optional.IsCollectionDefined(Content)) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("content"u8); + writer.WriteStartArray(); + foreach (var item in Content) + { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + else + { + writer.WriteNull("content"); } - writer.WriteEndArray(); - } - else - { - writer.WriteNull("content"); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -93,8 +100,9 @@ internal static InternalCreateChatCompletionResponseChoiceLogprobs DeserializeIn content = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateChatCompletionResponseChoiceLogprobs.cs b/src/Generated/Models/InternalCreateChatCompletionResponseChoiceLogprobs.cs index 98ce05b18..d81088a5c 100644 --- a/src/Generated/Models/InternalCreateChatCompletionResponseChoiceLogprobs.cs +++ b/src/Generated/Models/InternalCreateChatCompletionResponseChoiceLogprobs.cs @@ -10,8 +10,7 @@ namespace OpenAI.Chat { internal partial class InternalCreateChatCompletionResponseChoiceLogprobs { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalCreateChatCompletionResponseChoiceLogprobs(IEnumerable content) { Content = content?.ToList(); @@ -20,7 +19,7 @@ internal InternalCreateChatCompletionResponseChoiceLogprobs(IEnumerable content, IDictionary serializedAdditionalRawData) { Content = content; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalCreateChatCompletionResponseChoiceLogprobs() diff --git a/src/Generated/Models/InternalCreateChatCompletionStreamResponseChoice.cs b/src/Generated/Models/InternalCreateChatCompletionStreamResponseChoice.cs index ed61f9a49..6bb376d9f 100644 --- a/src/Generated/Models/InternalCreateChatCompletionStreamResponseChoice.cs +++ b/src/Generated/Models/InternalCreateChatCompletionStreamResponseChoice.cs @@ -9,8 +9,7 @@ namespace OpenAI.Chat { internal partial class InternalCreateChatCompletionStreamResponseChoice { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalCreateChatCompletionStreamResponseChoice(InternalChatCompletionStreamResponseDelta delta, ChatFinishReason? finishReason, int index) { Argument.AssertNotNull(delta, nameof(delta)); @@ -26,7 +25,7 @@ internal InternalCreateChatCompletionStreamResponseChoice(InternalChatCompletion Logprobs = logprobs; FinishReason = finishReason; Index = index; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalCreateChatCompletionStreamResponseChoice() diff --git a/src/Generated/Models/InternalCreateChatCompletionStreamResponseChoiceLogprobs.Serialization.cs b/src/Generated/Models/InternalCreateChatCompletionStreamResponseChoiceLogprobs.Serialization.cs index ac8373be3..7e3b9a4b1 100644 --- a/src/Generated/Models/InternalCreateChatCompletionStreamResponseChoiceLogprobs.Serialization.cs +++ b/src/Generated/Models/InternalCreateChatCompletionStreamResponseChoiceLogprobs.Serialization.cs @@ -21,24 +21,31 @@ void IJsonModel.Write( } writer.WriteStartObject(); - if (Content != null && Optional.IsCollectionDefined(Content)) + if (SerializedAdditionalRawData?.ContainsKey("content") != true) { - writer.WritePropertyName("content"u8); - writer.WriteStartArray(); - foreach (var item in Content) + if (Content != null && Optional.IsCollectionDefined(Content)) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("content"u8); + writer.WriteStartArray(); + foreach (var item in Content) + { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + else + { + writer.WriteNull("content"); } - writer.WriteEndArray(); - } - else - { - writer.WriteNull("content"); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -93,8 +100,9 @@ internal static InternalCreateChatCompletionStreamResponseChoiceLogprobs Deseria content = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateChatCompletionStreamResponseChoiceLogprobs.cs b/src/Generated/Models/InternalCreateChatCompletionStreamResponseChoiceLogprobs.cs index ee73c03db..f0a780dd9 100644 --- a/src/Generated/Models/InternalCreateChatCompletionStreamResponseChoiceLogprobs.cs +++ b/src/Generated/Models/InternalCreateChatCompletionStreamResponseChoiceLogprobs.cs @@ -10,8 +10,7 @@ namespace OpenAI.Chat { internal partial class InternalCreateChatCompletionStreamResponseChoiceLogprobs { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalCreateChatCompletionStreamResponseChoiceLogprobs(IEnumerable content) { Content = content?.ToList(); @@ -20,7 +19,7 @@ internal InternalCreateChatCompletionStreamResponseChoiceLogprobs(IEnumerable content, IDictionary serializedAdditionalRawData) { Content = content; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalCreateChatCompletionStreamResponseChoiceLogprobs() diff --git a/src/Generated/Models/InternalCreateChatCompletionStreamResponseUsage.Serialization.cs b/src/Generated/Models/InternalCreateChatCompletionStreamResponseUsage.Serialization.cs index cd2a51e0b..3fe8d8747 100644 --- a/src/Generated/Models/InternalCreateChatCompletionStreamResponseUsage.Serialization.cs +++ b/src/Generated/Models/InternalCreateChatCompletionStreamResponseUsage.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonW } writer.WriteStartObject(); - writer.WritePropertyName("completion_tokens"u8); - writer.WriteNumberValue(CompletionTokens); - writer.WritePropertyName("prompt_tokens"u8); - writer.WriteNumberValue(PromptTokens); - writer.WritePropertyName("total_tokens"u8); - writer.WriteNumberValue(TotalTokens); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("completion_tokens") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("completion_tokens"u8); + writer.WriteNumberValue(CompletionTokens); + } + if (SerializedAdditionalRawData?.ContainsKey("prompt_tokens") != true) + { + writer.WritePropertyName("prompt_tokens"u8); + writer.WriteNumberValue(PromptTokens); + } + if (SerializedAdditionalRawData?.ContainsKey("total_tokens") != true) + { + writer.WritePropertyName("total_tokens"u8); + writer.WriteNumberValue(TotalTokens); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static InternalCreateChatCompletionStreamResponseUsage DeserializeInter totalTokens = property.Value.GetInt32(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateChatCompletionStreamResponseUsage.cs b/src/Generated/Models/InternalCreateChatCompletionStreamResponseUsage.cs index b43c1be87..922ce4cae 100644 --- a/src/Generated/Models/InternalCreateChatCompletionStreamResponseUsage.cs +++ b/src/Generated/Models/InternalCreateChatCompletionStreamResponseUsage.cs @@ -9,8 +9,7 @@ namespace OpenAI.Chat { internal partial class InternalCreateChatCompletionStreamResponseUsage { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalCreateChatCompletionStreamResponseUsage(int completionTokens, int promptTokens, int totalTokens) { CompletionTokens = completionTokens; @@ -23,7 +22,7 @@ internal InternalCreateChatCompletionStreamResponseUsage(int completionTokens, i CompletionTokens = completionTokens; PromptTokens = promptTokens; TotalTokens = totalTokens; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalCreateChatCompletionStreamResponseUsage() diff --git a/src/Generated/Models/InternalCreateCompletionRequest.Serialization.cs b/src/Generated/Models/InternalCreateCompletionRequest.Serialization.cs index e7f386c9a..ee65e7eb9 100644 --- a/src/Generated/Models/InternalCreateCompletionRequest.Serialization.cs +++ b/src/Generated/Models/InternalCreateCompletionRequest.Serialization.cs @@ -22,25 +22,31 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo } writer.WriteStartObject(); - writer.WritePropertyName("model"u8); - writer.WriteStringValue(Model.ToString()); - if (Prompt != null) + if (SerializedAdditionalRawData?.ContainsKey("model") != true) { - writer.WritePropertyName("prompt"u8); + writer.WritePropertyName("model"u8); + writer.WriteStringValue(Model.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("prompt") != true) + { + if (Prompt != null) + { + writer.WritePropertyName("prompt"u8); #if NET6_0_OR_GREATER writer.WriteRawValue(Prompt); #else - using (JsonDocument document = JsonDocument.Parse(Prompt)) + using (JsonDocument document = JsonDocument.Parse(Prompt)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + else { - JsonSerializer.Serialize(writer, document.RootElement); + writer.WriteNull("prompt"); } -#endif - } - else - { - writer.WriteNull("prompt"); } - if (Optional.IsDefined(BestOf)) + if (SerializedAdditionalRawData?.ContainsKey("best_of") != true && Optional.IsDefined(BestOf)) { if (BestOf != null) { @@ -52,7 +58,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo writer.WriteNull("best_of"); } } - if (Optional.IsDefined(Echo)) + if (SerializedAdditionalRawData?.ContainsKey("echo") != true && Optional.IsDefined(Echo)) { if (Echo != null) { @@ -64,7 +70,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo writer.WriteNull("echo"); } } - if (Optional.IsDefined(FrequencyPenalty)) + if (SerializedAdditionalRawData?.ContainsKey("frequency_penalty") != true && Optional.IsDefined(FrequencyPenalty)) { if (FrequencyPenalty != null) { @@ -76,7 +82,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo writer.WriteNull("frequency_penalty"); } } - if (Optional.IsCollectionDefined(LogitBias)) + if (SerializedAdditionalRawData?.ContainsKey("logit_bias") != true && Optional.IsCollectionDefined(LogitBias)) { if (LogitBias != null) { @@ -94,7 +100,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo writer.WriteNull("logit_bias"); } } - if (Optional.IsDefined(Logprobs)) + if (SerializedAdditionalRawData?.ContainsKey("logprobs") != true && Optional.IsDefined(Logprobs)) { if (Logprobs != null) { @@ -106,7 +112,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo writer.WriteNull("logprobs"); } } - if (Optional.IsDefined(MaxTokens)) + if (SerializedAdditionalRawData?.ContainsKey("max_tokens") != true && Optional.IsDefined(MaxTokens)) { if (MaxTokens != null) { @@ -118,7 +124,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo writer.WriteNull("max_tokens"); } } - if (Optional.IsDefined(N)) + if (SerializedAdditionalRawData?.ContainsKey("n") != true && Optional.IsDefined(N)) { if (N != null) { @@ -130,7 +136,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo writer.WriteNull("n"); } } - if (Optional.IsDefined(PresencePenalty)) + if (SerializedAdditionalRawData?.ContainsKey("presence_penalty") != true && Optional.IsDefined(PresencePenalty)) { if (PresencePenalty != null) { @@ -142,7 +148,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo writer.WriteNull("presence_penalty"); } } - if (Optional.IsDefined(Seed)) + if (SerializedAdditionalRawData?.ContainsKey("seed") != true && Optional.IsDefined(Seed)) { if (Seed != null) { @@ -154,7 +160,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo writer.WriteNull("seed"); } } - if (Optional.IsDefined(Stop)) + if (SerializedAdditionalRawData?.ContainsKey("stop") != true && Optional.IsDefined(Stop)) { if (Stop != null) { @@ -173,7 +179,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo writer.WriteNull("stop"); } } - if (Optional.IsDefined(Stream)) + if (SerializedAdditionalRawData?.ContainsKey("stream") != true && Optional.IsDefined(Stream)) { if (Stream != null) { @@ -185,7 +191,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo writer.WriteNull("stream"); } } - if (Optional.IsDefined(StreamOptions)) + if (SerializedAdditionalRawData?.ContainsKey("stream_options") != true && Optional.IsDefined(StreamOptions)) { if (StreamOptions != null) { @@ -197,7 +203,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo writer.WriteNull("stream_options"); } } - if (Optional.IsDefined(Suffix)) + if (SerializedAdditionalRawData?.ContainsKey("suffix") != true && Optional.IsDefined(Suffix)) { if (Suffix != null) { @@ -209,7 +215,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo writer.WriteNull("suffix"); } } - if (Optional.IsDefined(Temperature)) + if (SerializedAdditionalRawData?.ContainsKey("temperature") != true && Optional.IsDefined(Temperature)) { if (Temperature != null) { @@ -221,7 +227,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo writer.WriteNull("temperature"); } } - if (Optional.IsDefined(TopP)) + if (SerializedAdditionalRawData?.ContainsKey("top_p") != true && Optional.IsDefined(TopP)) { if (TopP != null) { @@ -233,15 +239,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo writer.WriteNull("top_p"); } } - if (Optional.IsDefined(User)) + if (SerializedAdditionalRawData?.ContainsKey("user") != true && Optional.IsDefined(User)) { writer.WritePropertyName("user"u8); writer.WriteStringValue(User); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -472,8 +482,9 @@ internal static InternalCreateCompletionRequest DeserializeInternalCreateComplet user = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateCompletionRequest.cs b/src/Generated/Models/InternalCreateCompletionRequest.cs index c11955841..25e584d3b 100644 --- a/src/Generated/Models/InternalCreateCompletionRequest.cs +++ b/src/Generated/Models/InternalCreateCompletionRequest.cs @@ -10,8 +10,7 @@ namespace OpenAI.LegacyCompletions { internal partial class InternalCreateCompletionRequest { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateCompletionRequest(InternalCreateCompletionRequestModel model, BinaryData prompt) { Model = model; @@ -39,7 +38,7 @@ internal InternalCreateCompletionRequest(InternalCreateCompletionRequestModel mo Temperature = temperature; TopP = topP; User = user; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalCreateCompletionRequest() diff --git a/src/Generated/Models/InternalCreateCompletionResponse.Serialization.cs b/src/Generated/Models/InternalCreateCompletionResponse.Serialization.cs index 9af9a80c8..06e17ee23 100644 --- a/src/Generated/Models/InternalCreateCompletionResponse.Serialization.cs +++ b/src/Generated/Models/InternalCreateCompletionResponse.Serialization.cs @@ -22,35 +22,54 @@ void IJsonModel.Write(Utf8JsonWriter writer, M } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("choices"u8); - writer.WriteStartArray(); - foreach (var item in Choices) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); } - writer.WriteEndArray(); - writer.WritePropertyName("created"u8); - writer.WriteNumberValue(Created, "U"); - writer.WritePropertyName("model"u8); - writer.WriteStringValue(Model); - if (Optional.IsDefined(SystemFingerprint)) + if (SerializedAdditionalRawData?.ContainsKey("choices") != true) + { + writer.WritePropertyName("choices"u8); + writer.WriteStartArray(); + foreach (var item in Choices) + { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + if (SerializedAdditionalRawData?.ContainsKey("created") != true) + { + writer.WritePropertyName("created"u8); + writer.WriteNumberValue(Created, "U"); + } + if (SerializedAdditionalRawData?.ContainsKey("model") != true) + { + writer.WritePropertyName("model"u8); + writer.WriteStringValue(Model); + } + if (SerializedAdditionalRawData?.ContainsKey("system_fingerprint") != true && Optional.IsDefined(SystemFingerprint)) { writer.WritePropertyName("system_fingerprint"u8); writer.WriteStringValue(SystemFingerprint); } - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - if (Optional.IsDefined(Usage)) + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("usage") != true && Optional.IsDefined(Usage)) { writer.WritePropertyName("usage"u8); writer.WriteObjectValue(Usage, options); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -140,8 +159,9 @@ internal static InternalCreateCompletionResponse DeserializeInternalCreateComple usage = ChatTokenUsage.DeserializeChatTokenUsage(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateCompletionResponse.cs b/src/Generated/Models/InternalCreateCompletionResponse.cs index 6a974c85a..b7dd5c2a4 100644 --- a/src/Generated/Models/InternalCreateCompletionResponse.cs +++ b/src/Generated/Models/InternalCreateCompletionResponse.cs @@ -11,8 +11,7 @@ namespace OpenAI.LegacyCompletions { internal partial class InternalCreateCompletionResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalCreateCompletionResponse(string id, IEnumerable choices, DateTimeOffset created, string model) { Argument.AssertNotNull(id, nameof(id)); @@ -34,7 +33,7 @@ internal InternalCreateCompletionResponse(string id, IReadOnlyList.Write(Utf8JsonWriter wri } writer.WriteStartObject(); - writer.WritePropertyName("finish_reason"u8); - writer.WriteStringValue(FinishReason.ToString()); - writer.WritePropertyName("index"u8); - writer.WriteNumberValue(Index); - if (Logprobs != null) + if (SerializedAdditionalRawData?.ContainsKey("finish_reason") != true) { - writer.WritePropertyName("logprobs"u8); - writer.WriteObjectValue(Logprobs, options); + writer.WritePropertyName("finish_reason"u8); + writer.WriteStringValue(FinishReason.ToString()); } - else + if (SerializedAdditionalRawData?.ContainsKey("index") != true) { - writer.WriteNull("logprobs"); + writer.WritePropertyName("index"u8); + writer.WriteNumberValue(Index); } - writer.WritePropertyName("text"u8); - writer.WriteStringValue(Text); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("logprobs") != true) { - foreach (var item in _serializedAdditionalRawData) + if (Logprobs != null) { + writer.WritePropertyName("logprobs"u8); + writer.WriteObjectValue(Logprobs, options); + } + else + { + writer.WriteNull("logprobs"); + } + } + if (SerializedAdditionalRawData?.ContainsKey("text") != true) + { + writer.WritePropertyName("text"u8); + writer.WriteStringValue(Text); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) + { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -107,8 +123,9 @@ internal static InternalCreateCompletionResponseChoice DeserializeInternalCreate text = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateCompletionResponseChoice.cs b/src/Generated/Models/InternalCreateCompletionResponseChoice.cs index 64fea0cfd..5aa7f0cca 100644 --- a/src/Generated/Models/InternalCreateCompletionResponseChoice.cs +++ b/src/Generated/Models/InternalCreateCompletionResponseChoice.cs @@ -9,8 +9,7 @@ namespace OpenAI.LegacyCompletions { internal partial class InternalCreateCompletionResponseChoice { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalCreateCompletionResponseChoice(InternalCreateCompletionResponseChoiceFinishReason finishReason, int index, InternalCreateCompletionResponseChoiceLogprobs logprobs, string text) { Argument.AssertNotNull(text, nameof(text)); @@ -27,7 +26,7 @@ internal InternalCreateCompletionResponseChoice(InternalCreateCompletionResponse Index = index; Logprobs = logprobs; Text = text; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalCreateCompletionResponseChoice() diff --git a/src/Generated/Models/InternalCreateCompletionResponseChoiceLogprobs.Serialization.cs b/src/Generated/Models/InternalCreateCompletionResponseChoiceLogprobs.Serialization.cs index 561a8c807..a4d07c749 100644 --- a/src/Generated/Models/InternalCreateCompletionResponseChoiceLogprobs.Serialization.cs +++ b/src/Generated/Models/InternalCreateCompletionResponseChoiceLogprobs.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write(Utf8JsonWr } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(TextOffset)) + if (SerializedAdditionalRawData?.ContainsKey("text_offset") != true && Optional.IsCollectionDefined(TextOffset)) { writer.WritePropertyName("text_offset"u8); writer.WriteStartArray(); @@ -31,7 +31,7 @@ void IJsonModel.Write(Utf8JsonWr } writer.WriteEndArray(); } - if (Optional.IsCollectionDefined(TokenLogprobs)) + if (SerializedAdditionalRawData?.ContainsKey("token_logprobs") != true && Optional.IsCollectionDefined(TokenLogprobs)) { writer.WritePropertyName("token_logprobs"u8); writer.WriteStartArray(); @@ -41,7 +41,7 @@ void IJsonModel.Write(Utf8JsonWr } writer.WriteEndArray(); } - if (Optional.IsCollectionDefined(Tokens)) + if (SerializedAdditionalRawData?.ContainsKey("tokens") != true && Optional.IsCollectionDefined(Tokens)) { writer.WritePropertyName("tokens"u8); writer.WriteStartArray(); @@ -51,7 +51,7 @@ void IJsonModel.Write(Utf8JsonWr } writer.WriteEndArray(); } - if (Optional.IsCollectionDefined(TopLogprobs)) + if (SerializedAdditionalRawData?.ContainsKey("top_logprobs") != true && Optional.IsCollectionDefined(TopLogprobs)) { writer.WritePropertyName("top_logprobs"u8); writer.WriteStartArray(); @@ -72,10 +72,14 @@ void IJsonModel.Write(Utf8JsonWr } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -186,8 +190,9 @@ internal static InternalCreateCompletionResponseChoiceLogprobs DeserializeIntern topLogprobs = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateCompletionResponseChoiceLogprobs.cs b/src/Generated/Models/InternalCreateCompletionResponseChoiceLogprobs.cs index ccb3d79d0..6f5de82a3 100644 --- a/src/Generated/Models/InternalCreateCompletionResponseChoiceLogprobs.cs +++ b/src/Generated/Models/InternalCreateCompletionResponseChoiceLogprobs.cs @@ -9,8 +9,7 @@ namespace OpenAI.LegacyCompletions { internal partial class InternalCreateCompletionResponseChoiceLogprobs { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalCreateCompletionResponseChoiceLogprobs() { TextOffset = new ChangeTrackingList(); @@ -25,7 +24,7 @@ internal InternalCreateCompletionResponseChoiceLogprobs(IReadOnlyList textO TokenLogprobs = tokenLogprobs; Tokens = tokens; TopLogprobs = topLogprobs; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IReadOnlyList TextOffset { get; } diff --git a/src/Generated/Models/InternalCreateFineTuningJobRequest.Serialization.cs b/src/Generated/Models/InternalCreateFineTuningJobRequest.Serialization.cs index 9553c6d77..45eb127bf 100644 --- a/src/Generated/Models/InternalCreateFineTuningJobRequest.Serialization.cs +++ b/src/Generated/Models/InternalCreateFineTuningJobRequest.Serialization.cs @@ -21,16 +21,22 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteStartObject(); - writer.WritePropertyName("model"u8); - writer.WriteStringValue(Model.ToString()); - writer.WritePropertyName("training_file"u8); - writer.WriteStringValue(TrainingFile); - if (Optional.IsDefined(Hyperparameters)) + if (SerializedAdditionalRawData?.ContainsKey("model") != true) + { + writer.WritePropertyName("model"u8); + writer.WriteStringValue(Model.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("training_file") != true) + { + writer.WritePropertyName("training_file"u8); + writer.WriteStringValue(TrainingFile); + } + if (SerializedAdditionalRawData?.ContainsKey("hyperparameters") != true && Optional.IsDefined(Hyperparameters)) { writer.WritePropertyName("hyperparameters"u8); writer.WriteObjectValue(Hyperparameters, options); } - if (Optional.IsDefined(Suffix)) + if (SerializedAdditionalRawData?.ContainsKey("suffix") != true && Optional.IsDefined(Suffix)) { if (Suffix != null) { @@ -42,7 +48,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("suffix"); } } - if (Optional.IsDefined(ValidationFile)) + if (SerializedAdditionalRawData?.ContainsKey("validation_file") != true && Optional.IsDefined(ValidationFile)) { if (ValidationFile != null) { @@ -54,7 +60,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("validation_file"); } } - if (Optional.IsCollectionDefined(Integrations)) + if (SerializedAdditionalRawData?.ContainsKey("integrations") != true && Optional.IsCollectionDefined(Integrations)) { if (Integrations != null) { @@ -71,7 +77,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("integrations"); } } - if (Optional.IsDefined(Seed)) + if (SerializedAdditionalRawData?.ContainsKey("seed") != true && Optional.IsDefined(Seed)) { if (Seed != null) { @@ -83,10 +89,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("seed"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -195,8 +205,9 @@ internal static InternalCreateFineTuningJobRequest DeserializeInternalCreateFine seed = property.Value.GetInt32(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateFineTuningJobRequest.cs b/src/Generated/Models/InternalCreateFineTuningJobRequest.cs index cb7bb7c5c..6c183c752 100644 --- a/src/Generated/Models/InternalCreateFineTuningJobRequest.cs +++ b/src/Generated/Models/InternalCreateFineTuningJobRequest.cs @@ -9,8 +9,7 @@ namespace OpenAI.FineTuning { internal partial class InternalCreateFineTuningJobRequest { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateFineTuningJobRequest(InternalCreateFineTuningJobRequestModel model, string trainingFile) { Argument.AssertNotNull(trainingFile, nameof(trainingFile)); @@ -29,7 +28,7 @@ internal InternalCreateFineTuningJobRequest(InternalCreateFineTuningJobRequestMo ValidationFile = validationFile; Integrations = integrations; Seed = seed; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalCreateFineTuningJobRequest() diff --git a/src/Generated/Models/InternalCreateFineTuningJobRequestHyperparameters.Serialization.cs b/src/Generated/Models/InternalCreateFineTuningJobRequestHyperparameters.Serialization.cs index 3aa5b580b..e5206d6b8 100644 --- a/src/Generated/Models/InternalCreateFineTuningJobRequestHyperparameters.Serialization.cs +++ b/src/Generated/Models/InternalCreateFineTuningJobRequestHyperparameters.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write(Utf8Jso } writer.WriteStartObject(); - if (Optional.IsDefined(BatchSize)) + if (SerializedAdditionalRawData?.ContainsKey("batch_size") != true && Optional.IsDefined(BatchSize)) { writer.WritePropertyName("batch_size"u8); #if NET6_0_OR_GREATER @@ -33,7 +33,7 @@ void IJsonModel.Write(Utf8Jso } #endif } - if (Optional.IsDefined(LearningRateMultiplier)) + if (SerializedAdditionalRawData?.ContainsKey("learning_rate_multiplier") != true && Optional.IsDefined(LearningRateMultiplier)) { writer.WritePropertyName("learning_rate_multiplier"u8); #if NET6_0_OR_GREATER @@ -45,7 +45,7 @@ void IJsonModel.Write(Utf8Jso } #endif } - if (Optional.IsDefined(NEpochs)) + if (SerializedAdditionalRawData?.ContainsKey("n_epochs") != true && Optional.IsDefined(NEpochs)) { writer.WritePropertyName("n_epochs"u8); #if NET6_0_OR_GREATER @@ -57,10 +57,14 @@ void IJsonModel.Write(Utf8Jso } #endif } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -129,8 +133,9 @@ internal static InternalCreateFineTuningJobRequestHyperparameters DeserializeInt nEpochs = BinaryData.FromString(property.Value.GetRawText()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateFineTuningJobRequestHyperparameters.cs b/src/Generated/Models/InternalCreateFineTuningJobRequestHyperparameters.cs index c2091f0e3..83694fba6 100644 --- a/src/Generated/Models/InternalCreateFineTuningJobRequestHyperparameters.cs +++ b/src/Generated/Models/InternalCreateFineTuningJobRequestHyperparameters.cs @@ -9,8 +9,7 @@ namespace OpenAI.FineTuning { internal partial class InternalCreateFineTuningJobRequestHyperparameters { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateFineTuningJobRequestHyperparameters() { } @@ -20,7 +19,7 @@ internal InternalCreateFineTuningJobRequestHyperparameters(BinaryData batchSize, BatchSize = batchSize; LearningRateMultiplier = learningRateMultiplier; NEpochs = nEpochs; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public BinaryData BatchSize { get; set; } diff --git a/src/Generated/Models/InternalCreateFineTuningJobRequestIntegration.Serialization.cs b/src/Generated/Models/InternalCreateFineTuningJobRequestIntegration.Serialization.cs index d31787c1b..927e7dae9 100644 --- a/src/Generated/Models/InternalCreateFineTuningJobRequestIntegration.Serialization.cs +++ b/src/Generated/Models/InternalCreateFineTuningJobRequestIntegration.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8JsonWri } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type.ToString()); - writer.WritePropertyName("wandb"u8); - writer.WriteObjectValue(Wandb, options); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("wandb") != true) + { + writer.WritePropertyName("wandb"u8); + writer.WriteObjectValue(Wandb, options); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static InternalCreateFineTuningJobRequestIntegration DeserializeInterna wandb = InternalCreateFineTuningJobRequestIntegrationWandb.DeserializeInternalCreateFineTuningJobRequestIntegrationWandb(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateFineTuningJobRequestIntegration.cs b/src/Generated/Models/InternalCreateFineTuningJobRequestIntegration.cs index 9767ae593..1e614b3d4 100644 --- a/src/Generated/Models/InternalCreateFineTuningJobRequestIntegration.cs +++ b/src/Generated/Models/InternalCreateFineTuningJobRequestIntegration.cs @@ -9,8 +9,7 @@ namespace OpenAI.FineTuning { internal partial class InternalCreateFineTuningJobRequestIntegration { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateFineTuningJobRequestIntegration(InternalCreateFineTuningJobRequestIntegrationWandb wandb) { Argument.AssertNotNull(wandb, nameof(wandb)); @@ -22,7 +21,7 @@ internal InternalCreateFineTuningJobRequestIntegration(InternalCreateFineTuningJ { Type = type; Wandb = wandb; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalCreateFineTuningJobRequestIntegration() diff --git a/src/Generated/Models/InternalCreateFineTuningJobRequestIntegrationWandb.Serialization.cs b/src/Generated/Models/InternalCreateFineTuningJobRequestIntegrationWandb.Serialization.cs index f0c8892b8..0ee3e1188 100644 --- a/src/Generated/Models/InternalCreateFineTuningJobRequestIntegrationWandb.Serialization.cs +++ b/src/Generated/Models/InternalCreateFineTuningJobRequestIntegrationWandb.Serialization.cs @@ -21,9 +21,12 @@ void IJsonModel.Write(Utf8Js } writer.WriteStartObject(); - writer.WritePropertyName("project"u8); - writer.WriteStringValue(Project); - if (Optional.IsDefined(Name)) + if (SerializedAdditionalRawData?.ContainsKey("project") != true) + { + writer.WritePropertyName("project"u8); + writer.WriteStringValue(Project); + } + if (SerializedAdditionalRawData?.ContainsKey("name") != true && Optional.IsDefined(Name)) { if (Name != null) { @@ -35,7 +38,7 @@ void IJsonModel.Write(Utf8Js writer.WriteNull("name"); } } - if (Optional.IsDefined(Entity)) + if (SerializedAdditionalRawData?.ContainsKey("entity") != true && Optional.IsDefined(Entity)) { if (Entity != null) { @@ -47,7 +50,7 @@ void IJsonModel.Write(Utf8Js writer.WriteNull("entity"); } } - if (Optional.IsCollectionDefined(Tags)) + if (SerializedAdditionalRawData?.ContainsKey("tags") != true && Optional.IsCollectionDefined(Tags)) { writer.WritePropertyName("tags"u8); writer.WriteStartArray(); @@ -57,10 +60,14 @@ void IJsonModel.Write(Utf8Js } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -142,8 +149,9 @@ internal static InternalCreateFineTuningJobRequestIntegrationWandb DeserializeIn tags = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateFineTuningJobRequestIntegrationWandb.cs b/src/Generated/Models/InternalCreateFineTuningJobRequestIntegrationWandb.cs index ae5042fe8..859e7295c 100644 --- a/src/Generated/Models/InternalCreateFineTuningJobRequestIntegrationWandb.cs +++ b/src/Generated/Models/InternalCreateFineTuningJobRequestIntegrationWandb.cs @@ -9,8 +9,7 @@ namespace OpenAI.FineTuning { internal partial class InternalCreateFineTuningJobRequestIntegrationWandb { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateFineTuningJobRequestIntegrationWandb(string project) { Argument.AssertNotNull(project, nameof(project)); @@ -25,7 +24,7 @@ internal InternalCreateFineTuningJobRequestIntegrationWandb(string project, stri Name = name; Entity = entity; Tags = tags; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalCreateFineTuningJobRequestIntegrationWandb() diff --git a/src/Generated/Models/InternalCreateRunRequestToolChoice.cs b/src/Generated/Models/InternalCreateRunRequestToolChoice.cs deleted file mode 100644 index 343b70471..000000000 --- a/src/Generated/Models/InternalCreateRunRequestToolChoice.cs +++ /dev/null @@ -1,38 +0,0 @@ -// - -#nullable disable - -using System; -using System.ComponentModel; - -namespace OpenAI.Assistants -{ - internal readonly partial struct InternalCreateRunRequestToolChoice : IEquatable - { - private readonly string _value; - - public InternalCreateRunRequestToolChoice(string value) - { - _value = value ?? throw new ArgumentNullException(nameof(value)); - } - - private const string NoneValue = "none"; - private const string AutoValue = "auto"; - private const string RequiredValue = "required"; - - public static InternalCreateRunRequestToolChoice None { get; } = new InternalCreateRunRequestToolChoice(NoneValue); - public static InternalCreateRunRequestToolChoice Auto { get; } = new InternalCreateRunRequestToolChoice(AutoValue); - public static InternalCreateRunRequestToolChoice Required { get; } = new InternalCreateRunRequestToolChoice(RequiredValue); - public static bool operator ==(InternalCreateRunRequestToolChoice left, InternalCreateRunRequestToolChoice right) => left.Equals(right); - public static bool operator !=(InternalCreateRunRequestToolChoice left, InternalCreateRunRequestToolChoice right) => !left.Equals(right); - public static implicit operator InternalCreateRunRequestToolChoice(string value) => new InternalCreateRunRequestToolChoice(value); - - [EditorBrowsable(EditorBrowsableState.Never)] - public override bool Equals(object obj) => obj is InternalCreateRunRequestToolChoice other && Equals(other); - public bool Equals(InternalCreateRunRequestToolChoice other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); - - [EditorBrowsable(EditorBrowsableState.Never)] - public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; - public override string ToString() => _value; - } -} diff --git a/src/Generated/Models/InternalCreateThreadAndRunRequest.Serialization.cs b/src/Generated/Models/InternalCreateThreadAndRunRequest.Serialization.cs index 3c826f8aa..c6de8e92b 100644 --- a/src/Generated/Models/InternalCreateThreadAndRunRequest.Serialization.cs +++ b/src/Generated/Models/InternalCreateThreadAndRunRequest.Serialization.cs @@ -21,14 +21,17 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteStartObject(); - writer.WritePropertyName("assistant_id"u8); - writer.WriteStringValue(AssistantId); - if (Optional.IsDefined(Thread)) + if (SerializedAdditionalRawData?.ContainsKey("assistant_id") != true) + { + writer.WritePropertyName("assistant_id"u8); + writer.WriteStringValue(AssistantId); + } + if (SerializedAdditionalRawData?.ContainsKey("thread") != true && Optional.IsDefined(Thread)) { writer.WritePropertyName("thread"u8); writer.WriteObjectValue(Thread, options); } - if (Optional.IsDefined(Model)) + if (SerializedAdditionalRawData?.ContainsKey("model") != true && Optional.IsDefined(Model)) { if (Model != null) { @@ -40,7 +43,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("model"); } } - if (Optional.IsDefined(Instructions)) + if (SerializedAdditionalRawData?.ContainsKey("instructions") != true && Optional.IsDefined(Instructions)) { if (Instructions != null) { @@ -52,7 +55,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("instructions"); } } - if (Optional.IsCollectionDefined(Tools)) + if (SerializedAdditionalRawData?.ContainsKey("tools") != true && Optional.IsCollectionDefined(Tools)) { if (Tools != null) { @@ -69,7 +72,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("tools"); } } - if (Optional.IsDefined(ToolResources)) + if (SerializedAdditionalRawData?.ContainsKey("tool_resources") != true && Optional.IsDefined(ToolResources)) { if (ToolResources != null) { @@ -81,7 +84,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("tool_resources"); } } - if (Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true && Optional.IsCollectionDefined(Metadata)) { if (Metadata != null) { @@ -99,7 +102,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("metadata"); } } - if (Optional.IsDefined(Temperature)) + if (SerializedAdditionalRawData?.ContainsKey("temperature") != true && Optional.IsDefined(Temperature)) { if (Temperature != null) { @@ -111,7 +114,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("temperature"); } } - if (Optional.IsDefined(TopP)) + if (SerializedAdditionalRawData?.ContainsKey("top_p") != true && Optional.IsDefined(TopP)) { if (TopP != null) { @@ -123,7 +126,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("top_p"); } } - if (Optional.IsDefined(Stream)) + if (SerializedAdditionalRawData?.ContainsKey("stream") != true && Optional.IsDefined(Stream)) { if (Stream != null) { @@ -135,7 +138,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("stream"); } } - if (Optional.IsDefined(MaxPromptTokens)) + if (SerializedAdditionalRawData?.ContainsKey("max_prompt_tokens") != true && Optional.IsDefined(MaxPromptTokens)) { if (MaxPromptTokens != null) { @@ -147,7 +150,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("max_prompt_tokens"); } } - if (Optional.IsDefined(MaxCompletionTokens)) + if (SerializedAdditionalRawData?.ContainsKey("max_completion_tokens") != true && Optional.IsDefined(MaxCompletionTokens)) { if (MaxCompletionTokens != null) { @@ -159,7 +162,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("max_completion_tokens"); } } - if (Optional.IsDefined(TruncationStrategy)) + if (SerializedAdditionalRawData?.ContainsKey("truncation_strategy") != true && Optional.IsDefined(TruncationStrategy)) { if (TruncationStrategy != null) { @@ -171,7 +174,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("truncation_strategy"); } } - if (Optional.IsDefined(ToolChoice)) + if (SerializedAdditionalRawData?.ContainsKey("tool_choice") != true && Optional.IsDefined(ToolChoice)) { if (ToolChoice != null) { @@ -183,12 +186,12 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("tool_choice"); } } - if (Optional.IsDefined(ParallelToolCalls)) + if (SerializedAdditionalRawData?.ContainsKey("parallel_tool_calls") != true && Optional.IsDefined(ParallelToolCalls)) { writer.WritePropertyName("parallel_tool_calls"u8); writer.WriteBooleanValue(ParallelToolCalls.Value); } - if (Optional.IsDefined(ResponseFormat)) + if (SerializedAdditionalRawData?.ContainsKey("response_format") != true && Optional.IsDefined(ResponseFormat)) { if (ResponseFormat != null) { @@ -200,10 +203,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("response_format"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -419,8 +426,9 @@ internal static InternalCreateThreadAndRunRequest DeserializeInternalCreateThrea responseFormat = AssistantResponseFormat.DeserializeAssistantResponseFormat(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateThreadAndRunRequest.cs b/src/Generated/Models/InternalCreateThreadAndRunRequest.cs index 63980b824..5e50cf643 100644 --- a/src/Generated/Models/InternalCreateThreadAndRunRequest.cs +++ b/src/Generated/Models/InternalCreateThreadAndRunRequest.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalCreateThreadAndRunRequest { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateThreadAndRunRequest(string assistantId) { Argument.AssertNotNull(assistantId, nameof(assistantId)); @@ -38,7 +37,7 @@ internal InternalCreateThreadAndRunRequest(string assistantId, ThreadCreationOpt ToolChoice = toolChoice; ParallelToolCalls = parallelToolCalls; ResponseFormat = responseFormat; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalCreateThreadAndRunRequest() diff --git a/src/Generated/Models/InternalCreateThreadAndRunRequestResponseFormat.cs b/src/Generated/Models/InternalCreateThreadAndRunRequestResponseFormat.cs new file mode 100644 index 000000000..e268b7603 --- /dev/null +++ b/src/Generated/Models/InternalCreateThreadAndRunRequestResponseFormat.cs @@ -0,0 +1,36 @@ +// + +#nullable disable + +using System; +using System.ComponentModel; + +namespace OpenAI.Assistants +{ + internal readonly partial struct InternalCreateThreadAndRunRequestResponseFormat : IEquatable + { + private readonly string _value; + + public InternalCreateThreadAndRunRequestResponseFormat(string value) + { + _value = value ?? throw new ArgumentNullException(nameof(value)); + } + + private const string NoneValue = "none"; + private const string AutoValue = "auto"; + + public static InternalCreateThreadAndRunRequestResponseFormat None { get; } = new InternalCreateThreadAndRunRequestResponseFormat(NoneValue); + public static InternalCreateThreadAndRunRequestResponseFormat Auto { get; } = new InternalCreateThreadAndRunRequestResponseFormat(AutoValue); + public static bool operator ==(InternalCreateThreadAndRunRequestResponseFormat left, InternalCreateThreadAndRunRequestResponseFormat right) => left.Equals(right); + public static bool operator !=(InternalCreateThreadAndRunRequestResponseFormat left, InternalCreateThreadAndRunRequestResponseFormat right) => !left.Equals(right); + public static implicit operator InternalCreateThreadAndRunRequestResponseFormat(string value) => new InternalCreateThreadAndRunRequestResponseFormat(value); + + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object obj) => obj is InternalCreateThreadAndRunRequestResponseFormat other && Equals(other); + public bool Equals(InternalCreateThreadAndRunRequestResponseFormat other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); + + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; + public override string ToString() => _value; + } +} diff --git a/src/Generated/Models/InternalCreateThreadAndRunRequestToolChoice.cs b/src/Generated/Models/InternalCreateThreadAndRunRequestToolChoice.cs new file mode 100644 index 000000000..45a467b3c --- /dev/null +++ b/src/Generated/Models/InternalCreateThreadAndRunRequestToolChoice.cs @@ -0,0 +1,38 @@ +// + +#nullable disable + +using System; +using System.ComponentModel; + +namespace OpenAI.Assistants +{ + internal readonly partial struct InternalCreateThreadAndRunRequestToolChoice : IEquatable + { + private readonly string _value; + + public InternalCreateThreadAndRunRequestToolChoice(string value) + { + _value = value ?? throw new ArgumentNullException(nameof(value)); + } + + private const string NoneValue = "none"; + private const string AutoValue = "auto"; + private const string RequiredValue = "required"; + + public static InternalCreateThreadAndRunRequestToolChoice None { get; } = new InternalCreateThreadAndRunRequestToolChoice(NoneValue); + public static InternalCreateThreadAndRunRequestToolChoice Auto { get; } = new InternalCreateThreadAndRunRequestToolChoice(AutoValue); + public static InternalCreateThreadAndRunRequestToolChoice Required { get; } = new InternalCreateThreadAndRunRequestToolChoice(RequiredValue); + public static bool operator ==(InternalCreateThreadAndRunRequestToolChoice left, InternalCreateThreadAndRunRequestToolChoice right) => left.Equals(right); + public static bool operator !=(InternalCreateThreadAndRunRequestToolChoice left, InternalCreateThreadAndRunRequestToolChoice right) => !left.Equals(right); + public static implicit operator InternalCreateThreadAndRunRequestToolChoice(string value) => new InternalCreateThreadAndRunRequestToolChoice(value); + + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object obj) => obj is InternalCreateThreadAndRunRequestToolChoice other && Equals(other); + public bool Equals(InternalCreateThreadAndRunRequestToolChoice other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); + + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; + public override string ToString() => _value; + } +} diff --git a/src/Generated/Models/InternalCreateThreadAndRunRequestToolResources.Serialization.cs b/src/Generated/Models/InternalCreateThreadAndRunRequestToolResources.Serialization.cs index fba646efb..75ffa5acb 100644 --- a/src/Generated/Models/InternalCreateThreadAndRunRequestToolResources.Serialization.cs +++ b/src/Generated/Models/InternalCreateThreadAndRunRequestToolResources.Serialization.cs @@ -21,20 +21,24 @@ void IJsonModel.Write(Utf8JsonWr } writer.WriteStartObject(); - if (Optional.IsDefined(CodeInterpreter)) + if (SerializedAdditionalRawData?.ContainsKey("code_interpreter") != true && Optional.IsDefined(CodeInterpreter)) { writer.WritePropertyName("code_interpreter"u8); writer.WriteObjectValue(CodeInterpreter, options); } - if (Optional.IsDefined(FileSearch)) + if (SerializedAdditionalRawData?.ContainsKey("file_search") != true && Optional.IsDefined(FileSearch)) { writer.WritePropertyName("file_search"u8); writer.WriteObjectValue(FileSearch, options); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -93,8 +97,9 @@ internal static InternalCreateThreadAndRunRequestToolResources DeserializeIntern fileSearch = InternalCreateThreadAndRunRequestToolResourcesFileSearch.DeserializeInternalCreateThreadAndRunRequestToolResourcesFileSearch(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateThreadAndRunRequestToolResources.cs b/src/Generated/Models/InternalCreateThreadAndRunRequestToolResources.cs index d619b353b..452a48065 100644 --- a/src/Generated/Models/InternalCreateThreadAndRunRequestToolResources.cs +++ b/src/Generated/Models/InternalCreateThreadAndRunRequestToolResources.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalCreateThreadAndRunRequestToolResources { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateThreadAndRunRequestToolResources() { } @@ -19,7 +18,7 @@ internal InternalCreateThreadAndRunRequestToolResources(InternalCreateThreadAndR { CodeInterpreter = codeInterpreter; FileSearch = fileSearch; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public InternalCreateThreadAndRunRequestToolResourcesCodeInterpreter CodeInterpreter { get; set; } diff --git a/src/Generated/Models/InternalCreateThreadAndRunRequestToolResourcesCodeInterpreter.Serialization.cs b/src/Generated/Models/InternalCreateThreadAndRunRequestToolResourcesCodeInterpreter.Serialization.cs index 39fb94509..b09f48971 100644 --- a/src/Generated/Models/InternalCreateThreadAndRunRequestToolResourcesCodeInterpreter.Serialization.cs +++ b/src/Generated/Models/InternalCreateThreadAndRunRequestToolResourcesCodeInterpreter.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.W } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(FileIds)) + if (SerializedAdditionalRawData?.ContainsKey("file_ids") != true && Optional.IsCollectionDefined(FileIds)) { writer.WritePropertyName("file_ids"u8); writer.WriteStartArray(); @@ -31,10 +31,14 @@ void IJsonModel.W } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -88,8 +92,9 @@ internal static InternalCreateThreadAndRunRequestToolResourcesCodeInterpreter De fileIds = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateThreadAndRunRequestToolResourcesCodeInterpreter.cs b/src/Generated/Models/InternalCreateThreadAndRunRequestToolResourcesCodeInterpreter.cs index 24c5dfa96..ed362ab6b 100644 --- a/src/Generated/Models/InternalCreateThreadAndRunRequestToolResourcesCodeInterpreter.cs +++ b/src/Generated/Models/InternalCreateThreadAndRunRequestToolResourcesCodeInterpreter.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalCreateThreadAndRunRequestToolResourcesCodeInterpreter { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateThreadAndRunRequestToolResourcesCodeInterpreter() { FileIds = new ChangeTrackingList(); @@ -19,7 +18,7 @@ public InternalCreateThreadAndRunRequestToolResourcesCodeInterpreter() internal InternalCreateThreadAndRunRequestToolResourcesCodeInterpreter(IList fileIds, IDictionary serializedAdditionalRawData) { FileIds = fileIds; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IList FileIds { get; } diff --git a/src/Generated/Models/InternalCreateThreadAndRunRequestToolResourcesFileSearch.Serialization.cs b/src/Generated/Models/InternalCreateThreadAndRunRequestToolResourcesFileSearch.Serialization.cs index 8b1911990..45cc0dc00 100644 --- a/src/Generated/Models/InternalCreateThreadAndRunRequestToolResourcesFileSearch.Serialization.cs +++ b/src/Generated/Models/InternalCreateThreadAndRunRequestToolResourcesFileSearch.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write( } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(VectorStoreIds)) + if (SerializedAdditionalRawData?.ContainsKey("vector_store_ids") != true && Optional.IsCollectionDefined(VectorStoreIds)) { writer.WritePropertyName("vector_store_ids"u8); writer.WriteStartArray(); @@ -31,10 +31,14 @@ void IJsonModel.Write( } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -88,8 +92,9 @@ internal static InternalCreateThreadAndRunRequestToolResourcesFileSearch Deseria vectorStoreIds = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateThreadAndRunRequestToolResourcesFileSearch.cs b/src/Generated/Models/InternalCreateThreadAndRunRequestToolResourcesFileSearch.cs index c06e84ab4..5a5c4b1f1 100644 --- a/src/Generated/Models/InternalCreateThreadAndRunRequestToolResourcesFileSearch.cs +++ b/src/Generated/Models/InternalCreateThreadAndRunRequestToolResourcesFileSearch.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalCreateThreadAndRunRequestToolResourcesFileSearch { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateThreadAndRunRequestToolResourcesFileSearch() { VectorStoreIds = new ChangeTrackingList(); @@ -19,7 +18,7 @@ public InternalCreateThreadAndRunRequestToolResourcesFileSearch() internal InternalCreateThreadAndRunRequestToolResourcesFileSearch(IList vectorStoreIds, IDictionary serializedAdditionalRawData) { VectorStoreIds = vectorStoreIds; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IList VectorStoreIds { get; } diff --git a/src/Generated/Models/InternalCreateThreadRequestToolResources.Serialization.cs b/src/Generated/Models/InternalCreateThreadRequestToolResources.Serialization.cs index 095eb2da4..80421a94b 100644 --- a/src/Generated/Models/InternalCreateThreadRequestToolResources.Serialization.cs +++ b/src/Generated/Models/InternalCreateThreadRequestToolResources.Serialization.cs @@ -21,12 +21,12 @@ void IJsonModel.Write(Utf8JsonWriter w } writer.WriteStartObject(); - if (Optional.IsDefined(CodeInterpreter)) + if (SerializedAdditionalRawData?.ContainsKey("code_interpreter") != true && Optional.IsDefined(CodeInterpreter)) { writer.WritePropertyName("code_interpreter"u8); writer.WriteObjectValue(CodeInterpreter, options); } - if (Optional.IsDefined(FileSearch)) + if (SerializedAdditionalRawData?.ContainsKey("file_search") != true && Optional.IsDefined(FileSearch)) { writer.WritePropertyName("file_search"u8); #if NET6_0_OR_GREATER @@ -38,10 +38,14 @@ void IJsonModel.Write(Utf8JsonWriter w } #endif } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -100,8 +104,9 @@ internal static InternalCreateThreadRequestToolResources DeserializeInternalCrea fileSearch = BinaryData.FromString(property.Value.GetRawText()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateThreadRequestToolResources.cs b/src/Generated/Models/InternalCreateThreadRequestToolResources.cs index f9b93c000..ca16742e9 100644 --- a/src/Generated/Models/InternalCreateThreadRequestToolResources.cs +++ b/src/Generated/Models/InternalCreateThreadRequestToolResources.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalCreateThreadRequestToolResources { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateThreadRequestToolResources() { } @@ -19,7 +18,7 @@ internal InternalCreateThreadRequestToolResources(InternalCreateThreadRequestToo { CodeInterpreter = codeInterpreter; FileSearch = fileSearch; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public InternalCreateThreadRequestToolResourcesCodeInterpreter CodeInterpreter { get; set; } diff --git a/src/Generated/Models/InternalCreateThreadRequestToolResourcesCodeInterpreter.Serialization.cs b/src/Generated/Models/InternalCreateThreadRequestToolResourcesCodeInterpreter.Serialization.cs index e0ef1e613..14ae6666f 100644 --- a/src/Generated/Models/InternalCreateThreadRequestToolResourcesCodeInterpreter.Serialization.cs +++ b/src/Generated/Models/InternalCreateThreadRequestToolResourcesCodeInterpreter.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write(U } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(FileIds)) + if (SerializedAdditionalRawData?.ContainsKey("file_ids") != true && Optional.IsCollectionDefined(FileIds)) { writer.WritePropertyName("file_ids"u8); writer.WriteStartArray(); @@ -31,10 +31,14 @@ void IJsonModel.Write(U } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -88,8 +92,9 @@ internal static InternalCreateThreadRequestToolResourcesCodeInterpreter Deserial fileIds = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateThreadRequestToolResourcesCodeInterpreter.cs b/src/Generated/Models/InternalCreateThreadRequestToolResourcesCodeInterpreter.cs index e5eb3434d..df61d7ce5 100644 --- a/src/Generated/Models/InternalCreateThreadRequestToolResourcesCodeInterpreter.cs +++ b/src/Generated/Models/InternalCreateThreadRequestToolResourcesCodeInterpreter.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalCreateThreadRequestToolResourcesCodeInterpreter { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateThreadRequestToolResourcesCodeInterpreter() { FileIds = new ChangeTrackingList(); @@ -19,7 +18,7 @@ public InternalCreateThreadRequestToolResourcesCodeInterpreter() internal InternalCreateThreadRequestToolResourcesCodeInterpreter(IList fileIds, IDictionary serializedAdditionalRawData) { FileIds = fileIds; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IList FileIds { get; } diff --git a/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchBase.Serialization.cs b/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchBase.Serialization.cs index 25d485447..245728135 100644 --- a/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchBase.Serialization.cs +++ b/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchBase.Serialization.cs @@ -21,10 +21,14 @@ void IJsonModel.Write(Ut } writer.WriteStartObject(); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -63,8 +67,9 @@ internal static InternalCreateThreadRequestToolResourcesFileSearchBase Deseriali Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) { - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchBase.cs b/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchBase.cs index a939d47aa..4a84b73f5 100644 --- a/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchBase.cs +++ b/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchBase.cs @@ -9,15 +9,14 @@ namespace OpenAI.Assistants { internal partial class InternalCreateThreadRequestToolResourcesFileSearchBase { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateThreadRequestToolResourcesFileSearchBase() { } internal InternalCreateThreadRequestToolResourcesFileSearchBase(IDictionary serializedAdditionalRawData) { - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } } } diff --git a/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpers.Serialization.cs b/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpers.Serialization.cs index 47bd2842e..8a6f56a1a 100644 --- a/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpers.Serialization.cs +++ b/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpers.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpers.cs b/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpers.cs index d5e79c1a1..f1854538c 100644 --- a/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpers.cs +++ b/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpers.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpers { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpers() { VectorStores = new ChangeTrackingList(); @@ -19,7 +18,7 @@ public InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelp internal InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpers(IList vectorStores, IDictionary serializedAdditionalRawData) { VectorStores = vectorStores; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IList VectorStores { get; } diff --git a/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpersVectorStore.Serialization.cs b/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpersVectorStore.Serialization.cs index 41fdb6729..383f85c6f 100644 --- a/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpersVectorStore.Serialization.cs +++ b/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpersVectorStore.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpersVectorStore.cs b/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpersVectorStore.cs index 304e2af03..430b2c563 100644 --- a/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpersVectorStore.cs +++ b/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpersVectorStore.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpersVectorStore { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHelpersVectorStore() { FileIds = new ChangeTrackingList(); @@ -21,7 +20,7 @@ internal InternalCreateThreadRequestToolResourcesFileSearchVectorStoreCreationHe { FileIds = fileIds; Metadata = metadata; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IList FileIds { get; } diff --git a/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreIdReferences.Serialization.cs b/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreIdReferences.Serialization.cs index 7714c87fa..0b1774eb4 100644 --- a/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreIdReferences.Serialization.cs +++ b/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreIdReferences.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreIdReferences.cs b/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreIdReferences.cs index ee58c3e5f..140500897 100644 --- a/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreIdReferences.cs +++ b/src/Generated/Models/InternalCreateThreadRequestToolResourcesFileSearchVectorStoreIdReferences.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalCreateThreadRequestToolResourcesFileSearchVectorStoreIdReferences { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateThreadRequestToolResourcesFileSearchVectorStoreIdReferences() { VectorStoreIds = new ChangeTrackingList(); @@ -19,7 +18,7 @@ public InternalCreateThreadRequestToolResourcesFileSearchVectorStoreIdReferences internal InternalCreateThreadRequestToolResourcesFileSearchVectorStoreIdReferences(IList vectorStoreIds, IDictionary serializedAdditionalRawData) { VectorStoreIds = vectorStoreIds; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IList VectorStoreIds { get; } diff --git a/src/Generated/Models/InternalCreateTranscriptionResponseJson.Serialization.cs b/src/Generated/Models/InternalCreateTranscriptionResponseJson.Serialization.cs index 5f5b2c709..12dfb77ff 100644 --- a/src/Generated/Models/InternalCreateTranscriptionResponseJson.Serialization.cs +++ b/src/Generated/Models/InternalCreateTranscriptionResponseJson.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter wr } writer.WriteStartObject(); - writer.WritePropertyName("text"u8); - writer.WriteStringValue(Text); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("text") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("text"u8); + writer.WriteStringValue(Text); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static InternalCreateTranscriptionResponseJson DeserializeInternalCreat text = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateTranscriptionResponseJson.cs b/src/Generated/Models/InternalCreateTranscriptionResponseJson.cs index 6493fbd35..19818f1d1 100644 --- a/src/Generated/Models/InternalCreateTranscriptionResponseJson.cs +++ b/src/Generated/Models/InternalCreateTranscriptionResponseJson.cs @@ -9,8 +9,7 @@ namespace OpenAI.Audio { internal partial class InternalCreateTranscriptionResponseJson { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalCreateTranscriptionResponseJson(string text) { Argument.AssertNotNull(text, nameof(text)); @@ -21,7 +20,7 @@ internal InternalCreateTranscriptionResponseJson(string text) internal InternalCreateTranscriptionResponseJson(string text, IDictionary serializedAdditionalRawData) { Text = text; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalCreateTranscriptionResponseJson() diff --git a/src/Generated/Models/InternalCreateTranslationResponseJson.Serialization.cs b/src/Generated/Models/InternalCreateTranslationResponseJson.Serialization.cs index 5ccec66c3..cff7b1f89 100644 --- a/src/Generated/Models/InternalCreateTranslationResponseJson.Serialization.cs +++ b/src/Generated/Models/InternalCreateTranslationResponseJson.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writ } writer.WriteStartObject(); - writer.WritePropertyName("text"u8); - writer.WriteStringValue(Text); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("text") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("text"u8); + writer.WriteStringValue(Text); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static InternalCreateTranslationResponseJson DeserializeInternalCreateT text = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateTranslationResponseJson.cs b/src/Generated/Models/InternalCreateTranslationResponseJson.cs index aedc4317f..e6e9dae14 100644 --- a/src/Generated/Models/InternalCreateTranslationResponseJson.cs +++ b/src/Generated/Models/InternalCreateTranslationResponseJson.cs @@ -9,8 +9,7 @@ namespace OpenAI.Audio { internal partial class InternalCreateTranslationResponseJson { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalCreateTranslationResponseJson(string text) { Argument.AssertNotNull(text, nameof(text)); @@ -21,7 +20,7 @@ internal InternalCreateTranslationResponseJson(string text) internal InternalCreateTranslationResponseJson(string text, IDictionary serializedAdditionalRawData) { Text = text; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalCreateTranslationResponseJson() diff --git a/src/Generated/Models/InternalCreateVectorStoreFileBatchRequest.Serialization.cs b/src/Generated/Models/InternalCreateVectorStoreFileBatchRequest.Serialization.cs index bd173b9ff..423f063ad 100644 --- a/src/Generated/Models/InternalCreateVectorStoreFileBatchRequest.Serialization.cs +++ b/src/Generated/Models/InternalCreateVectorStoreFileBatchRequest.Serialization.cs @@ -21,14 +21,17 @@ void IJsonModel.Write(Utf8JsonWriter } writer.WriteStartObject(); - writer.WritePropertyName("file_ids"u8); - writer.WriteStartArray(); - foreach (var item in FileIds) + if (SerializedAdditionalRawData?.ContainsKey("file_ids") != true) { - writer.WriteStringValue(item); + writer.WritePropertyName("file_ids"u8); + writer.WriteStartArray(); + foreach (var item in FileIds) + { + writer.WriteStringValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - if (Optional.IsDefined(ChunkingStrategy)) + if (SerializedAdditionalRawData?.ContainsKey("chunking_strategy") != true && Optional.IsDefined(ChunkingStrategy)) { writer.WritePropertyName("chunking_strategy"u8); #if NET6_0_OR_GREATER @@ -40,10 +43,14 @@ void IJsonModel.Write(Utf8JsonWriter } #endif } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -103,8 +110,9 @@ internal static InternalCreateVectorStoreFileBatchRequest DeserializeInternalCre chunkingStrategy = BinaryData.FromString(property.Value.GetRawText()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateVectorStoreFileBatchRequest.cs b/src/Generated/Models/InternalCreateVectorStoreFileBatchRequest.cs index d0bd0d831..3064e3505 100644 --- a/src/Generated/Models/InternalCreateVectorStoreFileBatchRequest.cs +++ b/src/Generated/Models/InternalCreateVectorStoreFileBatchRequest.cs @@ -10,8 +10,7 @@ namespace OpenAI.VectorStores { internal partial class InternalCreateVectorStoreFileBatchRequest { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateVectorStoreFileBatchRequest(IEnumerable fileIds) { Argument.AssertNotNull(fileIds, nameof(fileIds)); @@ -23,7 +22,7 @@ internal InternalCreateVectorStoreFileBatchRequest(IList fileIds, Binary { FileIds = fileIds; ChunkingStrategy = chunkingStrategy; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalCreateVectorStoreFileBatchRequest() diff --git a/src/Generated/Models/InternalCreateVectorStoreFileRequest.Serialization.cs b/src/Generated/Models/InternalCreateVectorStoreFileRequest.Serialization.cs index 72f7af320..57c6c8a14 100644 --- a/src/Generated/Models/InternalCreateVectorStoreFileRequest.Serialization.cs +++ b/src/Generated/Models/InternalCreateVectorStoreFileRequest.Serialization.cs @@ -21,17 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter write } writer.WriteStartObject(); - writer.WritePropertyName("file_id"u8); - writer.WriteStringValue(FileId); - if (Optional.IsDefined(ChunkingStrategy)) + if (SerializedAdditionalRawData?.ContainsKey("file_id") != true) + { + writer.WritePropertyName("file_id"u8); + writer.WriteStringValue(FileId); + } + if (SerializedAdditionalRawData?.ContainsKey("chunking_strategy") != true && Optional.IsDefined(ChunkingStrategy)) { writer.WritePropertyName("chunking_strategy"u8); writer.WriteObjectValue(ChunkingStrategy, options); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -86,8 +93,9 @@ internal static InternalCreateVectorStoreFileRequest DeserializeInternalCreateVe chunkingStrategy = FileChunkingStrategy.DeserializeFileChunkingStrategy(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalCreateVectorStoreFileRequest.cs b/src/Generated/Models/InternalCreateVectorStoreFileRequest.cs index 0aaf19fc7..4224f5fca 100644 --- a/src/Generated/Models/InternalCreateVectorStoreFileRequest.cs +++ b/src/Generated/Models/InternalCreateVectorStoreFileRequest.cs @@ -9,8 +9,7 @@ namespace OpenAI.VectorStores { internal partial class InternalCreateVectorStoreFileRequest { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalCreateVectorStoreFileRequest(string fileId) { Argument.AssertNotNull(fileId, nameof(fileId)); @@ -22,7 +21,7 @@ internal InternalCreateVectorStoreFileRequest(string fileId, FileChunkingStrateg { FileId = fileId; ChunkingStrategy = chunkingStrategy; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalCreateVectorStoreFileRequest() diff --git a/src/Generated/Models/InternalDeleteAssistantResponse.Serialization.cs b/src/Generated/Models/InternalDeleteAssistantResponse.Serialization.cs index 57798a40f..823c704a3 100644 --- a/src/Generated/Models/InternalDeleteAssistantResponse.Serialization.cs +++ b/src/Generated/Models/InternalDeleteAssistantResponse.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("deleted"u8); - writer.WriteBooleanValue(Deleted); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("deleted") != true) + { + writer.WritePropertyName("deleted"u8); + writer.WriteBooleanValue(Deleted); + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static InternalDeleteAssistantResponse DeserializeInternalDeleteAssista @object = new InternalDeleteAssistantResponseObject(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalDeleteAssistantResponse.cs b/src/Generated/Models/InternalDeleteAssistantResponse.cs index 12928f339..804997b70 100644 --- a/src/Generated/Models/InternalDeleteAssistantResponse.cs +++ b/src/Generated/Models/InternalDeleteAssistantResponse.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalDeleteAssistantResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalDeleteAssistantResponse(string id, bool deleted) { Argument.AssertNotNull(id, nameof(id)); @@ -24,7 +23,7 @@ internal InternalDeleteAssistantResponse(string id, bool deleted, InternalDelete Id = id; Deleted = deleted; Object = @object; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalDeleteAssistantResponse() diff --git a/src/Generated/Models/InternalDeleteFileResponse.Serialization.cs b/src/Generated/Models/InternalDeleteFileResponse.Serialization.cs index 2b3fdf312..9a4ebc340 100644 --- a/src/Generated/Models/InternalDeleteFileResponse.Serialization.cs +++ b/src/Generated/Models/InternalDeleteFileResponse.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("deleted"u8); - writer.WriteBooleanValue(Deleted); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("deleted") != true) + { + writer.WritePropertyName("deleted"u8); + writer.WriteBooleanValue(Deleted); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static InternalDeleteFileResponse DeserializeInternalDeleteFileResponse deleted = property.Value.GetBoolean(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalDeleteFileResponse.cs b/src/Generated/Models/InternalDeleteFileResponse.cs index 8adbb95fc..20d559dcd 100644 --- a/src/Generated/Models/InternalDeleteFileResponse.cs +++ b/src/Generated/Models/InternalDeleteFileResponse.cs @@ -9,8 +9,7 @@ namespace OpenAI.Files { internal partial class InternalDeleteFileResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalDeleteFileResponse(string id, bool deleted) { Argument.AssertNotNull(id, nameof(id)); @@ -24,7 +23,7 @@ internal InternalDeleteFileResponse(string id, InternalDeleteFileResponseObject Id = id; Object = @object; Deleted = deleted; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalDeleteFileResponse() diff --git a/src/Generated/Models/InternalDeleteMessageResponse.Serialization.cs b/src/Generated/Models/InternalDeleteMessageResponse.Serialization.cs index 11b46f7e8..b79356a29 100644 --- a/src/Generated/Models/InternalDeleteMessageResponse.Serialization.cs +++ b/src/Generated/Models/InternalDeleteMessageResponse.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mode } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("deleted"u8); - writer.WriteBooleanValue(Deleted); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("deleted") != true) + { + writer.WritePropertyName("deleted"u8); + writer.WriteBooleanValue(Deleted); + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static InternalDeleteMessageResponse DeserializeInternalDeleteMessageRe @object = new InternalDeleteMessageResponseObject(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalDeleteMessageResponse.cs b/src/Generated/Models/InternalDeleteMessageResponse.cs index f3880e986..98cad7c8d 100644 --- a/src/Generated/Models/InternalDeleteMessageResponse.cs +++ b/src/Generated/Models/InternalDeleteMessageResponse.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalDeleteMessageResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalDeleteMessageResponse(string id, bool deleted) { Argument.AssertNotNull(id, nameof(id)); @@ -24,7 +23,7 @@ internal InternalDeleteMessageResponse(string id, bool deleted, InternalDeleteMe Id = id; Deleted = deleted; Object = @object; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalDeleteMessageResponse() diff --git a/src/Generated/Models/InternalDeleteModelResponse.Serialization.cs b/src/Generated/Models/InternalDeleteModelResponse.Serialization.cs index 2a6d1baf7..e8c92cc81 100644 --- a/src/Generated/Models/InternalDeleteModelResponse.Serialization.cs +++ b/src/Generated/Models/InternalDeleteModelResponse.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelR } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("deleted"u8); - writer.WriteBooleanValue(Deleted); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("deleted") != true) + { + writer.WritePropertyName("deleted"u8); + writer.WriteBooleanValue(Deleted); + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static InternalDeleteModelResponse DeserializeInternalDeleteModelRespon @object = new InternalDeleteModelResponseObject(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalDeleteModelResponse.cs b/src/Generated/Models/InternalDeleteModelResponse.cs index d4ed689d4..2b9c6561d 100644 --- a/src/Generated/Models/InternalDeleteModelResponse.cs +++ b/src/Generated/Models/InternalDeleteModelResponse.cs @@ -9,8 +9,7 @@ namespace OpenAI.Models { internal partial class InternalDeleteModelResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalDeleteModelResponse(string id, bool deleted) { Argument.AssertNotNull(id, nameof(id)); @@ -24,7 +23,7 @@ internal InternalDeleteModelResponse(string id, bool deleted, InternalDeleteMode Id = id; Deleted = deleted; Object = @object; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalDeleteModelResponse() diff --git a/src/Generated/Models/InternalDeleteThreadResponse.Serialization.cs b/src/Generated/Models/InternalDeleteThreadResponse.Serialization.cs index f421a46f4..5e38bede5 100644 --- a/src/Generated/Models/InternalDeleteThreadResponse.Serialization.cs +++ b/src/Generated/Models/InternalDeleteThreadResponse.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, Model } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("deleted"u8); - writer.WriteBooleanValue(Deleted); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("deleted") != true) + { + writer.WritePropertyName("deleted"u8); + writer.WriteBooleanValue(Deleted); + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static InternalDeleteThreadResponse DeserializeInternalDeleteThreadResp @object = new InternalDeleteThreadResponseObject(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalDeleteThreadResponse.cs b/src/Generated/Models/InternalDeleteThreadResponse.cs index 6d2663a40..983dc8adb 100644 --- a/src/Generated/Models/InternalDeleteThreadResponse.cs +++ b/src/Generated/Models/InternalDeleteThreadResponse.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalDeleteThreadResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalDeleteThreadResponse(string id, bool deleted) { Argument.AssertNotNull(id, nameof(id)); @@ -24,7 +23,7 @@ internal InternalDeleteThreadResponse(string id, bool deleted, InternalDeleteThr Id = id; Deleted = deleted; Object = @object; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalDeleteThreadResponse() diff --git a/src/Generated/Models/InternalDeleteVectorStoreFileResponse.Serialization.cs b/src/Generated/Models/InternalDeleteVectorStoreFileResponse.Serialization.cs index 2af70be18..d09608f91 100644 --- a/src/Generated/Models/InternalDeleteVectorStoreFileResponse.Serialization.cs +++ b/src/Generated/Models/InternalDeleteVectorStoreFileResponse.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writ } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("deleted"u8); - writer.WriteBooleanValue(Deleted); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("deleted") != true) + { + writer.WritePropertyName("deleted"u8); + writer.WriteBooleanValue(Deleted); + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static InternalDeleteVectorStoreFileResponse DeserializeInternalDeleteV @object = new InternalDeleteVectorStoreFileResponseObject(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalDeleteVectorStoreFileResponse.cs b/src/Generated/Models/InternalDeleteVectorStoreFileResponse.cs index a1d6800cd..bf3150d47 100644 --- a/src/Generated/Models/InternalDeleteVectorStoreFileResponse.cs +++ b/src/Generated/Models/InternalDeleteVectorStoreFileResponse.cs @@ -9,8 +9,7 @@ namespace OpenAI.VectorStores { internal partial class InternalDeleteVectorStoreFileResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalDeleteVectorStoreFileResponse(string id, bool deleted) { Argument.AssertNotNull(id, nameof(id)); @@ -24,7 +23,7 @@ internal InternalDeleteVectorStoreFileResponse(string id, bool deleted, Internal Id = id; Deleted = deleted; Object = @object; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalDeleteVectorStoreFileResponse() diff --git a/src/Generated/Models/InternalDeleteVectorStoreResponse.Serialization.cs b/src/Generated/Models/InternalDeleteVectorStoreResponse.Serialization.cs index 4c980341d..a0bd186ef 100644 --- a/src/Generated/Models/InternalDeleteVectorStoreResponse.Serialization.cs +++ b/src/Generated/Models/InternalDeleteVectorStoreResponse.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("deleted"u8); - writer.WriteBooleanValue(Deleted); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("deleted") != true) + { + writer.WritePropertyName("deleted"u8); + writer.WriteBooleanValue(Deleted); + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static InternalDeleteVectorStoreResponse DeserializeInternalDeleteVecto @object = new InternalDeleteVectorStoreResponseObject(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalDeleteVectorStoreResponse.cs b/src/Generated/Models/InternalDeleteVectorStoreResponse.cs index 4fd992658..d90d30171 100644 --- a/src/Generated/Models/InternalDeleteVectorStoreResponse.cs +++ b/src/Generated/Models/InternalDeleteVectorStoreResponse.cs @@ -9,8 +9,7 @@ namespace OpenAI.VectorStores { internal partial class InternalDeleteVectorStoreResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalDeleteVectorStoreResponse(string id, bool deleted) { Argument.AssertNotNull(id, nameof(id)); @@ -24,7 +23,7 @@ internal InternalDeleteVectorStoreResponse(string id, bool deleted, InternalDele Id = id; Deleted = deleted; Object = @object; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalDeleteVectorStoreResponse() diff --git a/src/Generated/Models/InternalFileChunkingStrategyRequestParam.Serialization.cs b/src/Generated/Models/InternalFileChunkingStrategyRequestParam.Serialization.cs index a203498c5..4a61d2d17 100644 --- a/src/Generated/Models/InternalFileChunkingStrategyRequestParam.Serialization.cs +++ b/src/Generated/Models/InternalFileChunkingStrategyRequestParam.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter w } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); diff --git a/src/Generated/Models/InternalFileChunkingStrategyRequestParam.cs b/src/Generated/Models/InternalFileChunkingStrategyRequestParam.cs index 0ecf2703b..275a076ed 100644 --- a/src/Generated/Models/InternalFileChunkingStrategyRequestParam.cs +++ b/src/Generated/Models/InternalFileChunkingStrategyRequestParam.cs @@ -9,8 +9,7 @@ namespace OpenAI.VectorStores { internal abstract partial class InternalFileChunkingStrategyRequestParam { - private protected IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } protected InternalFileChunkingStrategyRequestParam() { } @@ -18,7 +17,7 @@ protected InternalFileChunkingStrategyRequestParam() internal InternalFileChunkingStrategyRequestParam(string type, IDictionary serializedAdditionalRawData) { Type = type; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal string Type { get; set; } diff --git a/src/Generated/Models/InternalFileUploadOptions.Serialization.cs b/src/Generated/Models/InternalFileUploadOptions.Serialization.cs index 26c7977bb..9faa8aebf 100644 --- a/src/Generated/Models/InternalFileUploadOptions.Serialization.cs +++ b/src/Generated/Models/InternalFileUploadOptions.Serialization.cs @@ -22,21 +22,31 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRea } writer.WriteStartObject(); - writer.WritePropertyName("file"u8); + if (SerializedAdditionalRawData?.ContainsKey("file") != true) + { + writer.WritePropertyName("file"u8); #if NET6_0_OR_GREATER writer.WriteRawValue(global::System.BinaryData.FromStream(File)); #else - using (JsonDocument document = JsonDocument.Parse(BinaryData.FromStream(File))) + using (JsonDocument document = JsonDocument.Parse(BinaryData.FromStream(File))) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + if (SerializedAdditionalRawData?.ContainsKey("purpose") != true) { - JsonSerializer.Serialize(writer, document.RootElement); + writer.WritePropertyName("purpose"u8); + writer.WriteStringValue(Purpose.ToString()); } -#endif - writer.WritePropertyName("purpose"u8); - writer.WriteStringValue(Purpose.ToString()); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +97,9 @@ internal static InternalFileUploadOptions DeserializeInternalFileUploadOptions(J purpose = new FileUploadPurpose(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalFileUploadOptions.cs b/src/Generated/Models/InternalFileUploadOptions.cs index 2cb211b2b..7873ae62e 100644 --- a/src/Generated/Models/InternalFileUploadOptions.cs +++ b/src/Generated/Models/InternalFileUploadOptions.cs @@ -10,13 +10,13 @@ namespace OpenAI.Files { internal partial class InternalFileUploadOptions { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalFileUploadOptions(Stream file, FileUploadPurpose purpose, IDictionary serializedAdditionalRawData) { File = file; Purpose = purpose; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } } } diff --git a/src/Generated/Models/InternalFineTuneChatCompletionRequestAssistantMessage.Serialization.cs b/src/Generated/Models/InternalFineTuneChatCompletionRequestAssistantMessage.Serialization.cs index b694ee2d1..95b63ec49 100644 --- a/src/Generated/Models/InternalFineTuneChatCompletionRequestAssistantMessage.Serialization.cs +++ b/src/Generated/Models/InternalFineTuneChatCompletionRequestAssistantMessage.Serialization.cs @@ -22,12 +22,12 @@ void IJsonModel.Write(Utf } writer.WriteStartObject(); - if (Optional.IsDefined(ParticipantName)) + if (SerializedAdditionalRawData?.ContainsKey("name") != true && Optional.IsDefined(ParticipantName)) { writer.WritePropertyName("name"u8); writer.WriteStringValue(ParticipantName); } - if (Optional.IsCollectionDefined(ToolCalls)) + if (SerializedAdditionalRawData?.ContainsKey("tool_calls") != true && Optional.IsCollectionDefined(ToolCalls)) { writer.WritePropertyName("tool_calls"u8); writer.WriteStartArray(); @@ -37,7 +37,7 @@ void IJsonModel.Write(Utf } writer.WriteEndArray(); } - if (Optional.IsDefined(FunctionCall)) + if (SerializedAdditionalRawData?.ContainsKey("function_call") != true && Optional.IsDefined(FunctionCall)) { if (FunctionCall != null) { @@ -49,17 +49,24 @@ void IJsonModel.Write(Utf writer.WriteNull("function_call"); } } - writer.WritePropertyName("role"u8); - writer.WriteStringValue(Role); - if (Optional.IsCollectionDefined(Content)) + if (SerializedAdditionalRawData?.ContainsKey("role") != true) + { + writer.WritePropertyName("role"u8); + writer.WriteStringValue(Role); + } + if (SerializedAdditionalRawData?.ContainsKey("content") != true && Optional.IsCollectionDefined(Content)) { writer.WritePropertyName("content"u8); SerializeContentValue(writer, options); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -142,8 +149,9 @@ internal static InternalFineTuneChatCompletionRequestAssistantMessage Deserializ DeserializeContentValue(property, ref content); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalFineTuningIntegration.Serialization.cs b/src/Generated/Models/InternalFineTuningIntegration.Serialization.cs index add5d54c8..89653288f 100644 --- a/src/Generated/Models/InternalFineTuningIntegration.Serialization.cs +++ b/src/Generated/Models/InternalFineTuningIntegration.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mode } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type.ToString()); - writer.WritePropertyName("wandb"u8); - writer.WriteObjectValue(Wandb, options); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("wandb") != true) + { + writer.WritePropertyName("wandb"u8); + writer.WriteObjectValue(Wandb, options); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static InternalFineTuningIntegration DeserializeInternalFineTuningInteg wandb = InternalFineTuningIntegrationWandb.DeserializeInternalFineTuningIntegrationWandb(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalFineTuningIntegration.cs b/src/Generated/Models/InternalFineTuningIntegration.cs index f9113e3da..36288d789 100644 --- a/src/Generated/Models/InternalFineTuningIntegration.cs +++ b/src/Generated/Models/InternalFineTuningIntegration.cs @@ -9,8 +9,7 @@ namespace OpenAI.FineTuning { internal partial class InternalFineTuningIntegration { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalFineTuningIntegration(InternalFineTuningIntegrationWandb wandb) { Argument.AssertNotNull(wandb, nameof(wandb)); @@ -22,7 +21,7 @@ internal InternalFineTuningIntegration(InternalFineTuningIntegrationType type, I { Type = type; Wandb = wandb; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalFineTuningIntegration() diff --git a/src/Generated/Models/InternalFineTuningIntegrationWandb.Serialization.cs b/src/Generated/Models/InternalFineTuningIntegrationWandb.Serialization.cs index ae6d1ce78..814b95ddc 100644 --- a/src/Generated/Models/InternalFineTuningIntegrationWandb.Serialization.cs +++ b/src/Generated/Models/InternalFineTuningIntegrationWandb.Serialization.cs @@ -21,9 +21,12 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteStartObject(); - writer.WritePropertyName("project"u8); - writer.WriteStringValue(Project); - if (Optional.IsDefined(Name)) + if (SerializedAdditionalRawData?.ContainsKey("project") != true) + { + writer.WritePropertyName("project"u8); + writer.WriteStringValue(Project); + } + if (SerializedAdditionalRawData?.ContainsKey("name") != true && Optional.IsDefined(Name)) { if (Name != null) { @@ -35,7 +38,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("name"); } } - if (Optional.IsDefined(Entity)) + if (SerializedAdditionalRawData?.ContainsKey("entity") != true && Optional.IsDefined(Entity)) { if (Entity != null) { @@ -47,7 +50,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, writer.WriteNull("entity"); } } - if (Optional.IsCollectionDefined(Tags)) + if (SerializedAdditionalRawData?.ContainsKey("tags") != true && Optional.IsCollectionDefined(Tags)) { writer.WritePropertyName("tags"u8); writer.WriteStartArray(); @@ -57,10 +60,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -142,8 +149,9 @@ internal static InternalFineTuningIntegrationWandb DeserializeInternalFineTuning tags = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalFineTuningIntegrationWandb.cs b/src/Generated/Models/InternalFineTuningIntegrationWandb.cs index 63740e49b..c7dba57b6 100644 --- a/src/Generated/Models/InternalFineTuningIntegrationWandb.cs +++ b/src/Generated/Models/InternalFineTuningIntegrationWandb.cs @@ -9,8 +9,7 @@ namespace OpenAI.FineTuning { internal partial class InternalFineTuningIntegrationWandb { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalFineTuningIntegrationWandb(string project) { Argument.AssertNotNull(project, nameof(project)); @@ -25,7 +24,7 @@ internal InternalFineTuningIntegrationWandb(string project, string name, string Name = name; Entity = entity; Tags = tags; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalFineTuningIntegrationWandb() diff --git a/src/Generated/Models/InternalFineTuningJob.Serialization.cs b/src/Generated/Models/InternalFineTuningJob.Serialization.cs index 71e4bb5d9..a97bc5537 100644 --- a/src/Generated/Models/InternalFineTuningJob.Serialization.cs +++ b/src/Generated/Models/InternalFineTuningJob.Serialization.cs @@ -21,75 +21,117 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("created_at"u8); - writer.WriteNumberValue(CreatedAt, "U"); - if (Error != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - writer.WritePropertyName("error"u8); - writer.WriteObjectValue(Error, options); + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); } - else + if (SerializedAdditionalRawData?.ContainsKey("created_at") != true) { - writer.WriteNull("error"); + writer.WritePropertyName("created_at"u8); + writer.WriteNumberValue(CreatedAt, "U"); } - if (FineTunedModel != null) + if (SerializedAdditionalRawData?.ContainsKey("error") != true) { - writer.WritePropertyName("fine_tuned_model"u8); - writer.WriteStringValue(FineTunedModel); + if (Error != null) + { + writer.WritePropertyName("error"u8); + writer.WriteObjectValue(Error, options); + } + else + { + writer.WriteNull("error"); + } + } + if (SerializedAdditionalRawData?.ContainsKey("fine_tuned_model") != true) + { + if (FineTunedModel != null) + { + writer.WritePropertyName("fine_tuned_model"u8); + writer.WriteStringValue(FineTunedModel); + } + else + { + writer.WriteNull("fine_tuned_model"); + } + } + if (SerializedAdditionalRawData?.ContainsKey("finished_at") != true) + { + if (FinishedAt != null) + { + writer.WritePropertyName("finished_at"u8); + writer.WriteNumberValue(FinishedAt.Value, "U"); + } + else + { + writer.WriteNull("finished_at"); + } } - else + if (SerializedAdditionalRawData?.ContainsKey("hyperparameters") != true) { - writer.WriteNull("fine_tuned_model"); + writer.WritePropertyName("hyperparameters"u8); + writer.WriteObjectValue(Hyperparameters, options); } - if (FinishedAt != null) + if (SerializedAdditionalRawData?.ContainsKey("model") != true) { - writer.WritePropertyName("finished_at"u8); - writer.WriteNumberValue(FinishedAt.Value, "U"); + writer.WritePropertyName("model"u8); + writer.WriteStringValue(Model); } - else + if (SerializedAdditionalRawData?.ContainsKey("object") != true) { - writer.WriteNull("finished_at"); + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); } - writer.WritePropertyName("hyperparameters"u8); - writer.WriteObjectValue(Hyperparameters, options); - writer.WritePropertyName("model"u8); - writer.WriteStringValue(Model); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("organization_id"u8); - writer.WriteStringValue(OrganizationId); - writer.WritePropertyName("result_files"u8); - writer.WriteStartArray(); - foreach (var item in ResultFiles) + if (SerializedAdditionalRawData?.ContainsKey("organization_id") != true) { - writer.WriteStringValue(item); + writer.WritePropertyName("organization_id"u8); + writer.WriteStringValue(OrganizationId); } - writer.WriteEndArray(); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - if (TrainedTokens != null) + if (SerializedAdditionalRawData?.ContainsKey("result_files") != true) { - writer.WritePropertyName("trained_tokens"u8); - writer.WriteNumberValue(TrainedTokens.Value); + writer.WritePropertyName("result_files"u8); + writer.WriteStartArray(); + foreach (var item in ResultFiles) + { + writer.WriteStringValue(item); + } + writer.WriteEndArray(); } - else + if (SerializedAdditionalRawData?.ContainsKey("status") != true) { - writer.WriteNull("trained_tokens"); + writer.WritePropertyName("status"u8); + writer.WriteStringValue(Status.ToString()); } - writer.WritePropertyName("training_file"u8); - writer.WriteStringValue(TrainingFile); - if (ValidationFile != null) + if (SerializedAdditionalRawData?.ContainsKey("trained_tokens") != true) { - writer.WritePropertyName("validation_file"u8); - writer.WriteStringValue(ValidationFile); + if (TrainedTokens != null) + { + writer.WritePropertyName("trained_tokens"u8); + writer.WriteNumberValue(TrainedTokens.Value); + } + else + { + writer.WriteNull("trained_tokens"); + } } - else + if (SerializedAdditionalRawData?.ContainsKey("training_file") != true) { - writer.WriteNull("validation_file"); + writer.WritePropertyName("training_file"u8); + writer.WriteStringValue(TrainingFile); } - if (Optional.IsCollectionDefined(Integrations)) + if (SerializedAdditionalRawData?.ContainsKey("validation_file") != true) + { + if (ValidationFile != null) + { + writer.WritePropertyName("validation_file"u8); + writer.WriteStringValue(ValidationFile); + } + else + { + writer.WriteNull("validation_file"); + } + } + if (SerializedAdditionalRawData?.ContainsKey("integrations") != true && Optional.IsCollectionDefined(Integrations)) { if (Integrations != null) { @@ -106,9 +148,12 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("integrations"); } } - writer.WritePropertyName("seed"u8); - writer.WriteNumberValue(Seed); - if (Optional.IsDefined(EstimatedFinish)) + if (SerializedAdditionalRawData?.ContainsKey("seed") != true) + { + writer.WritePropertyName("seed"u8); + writer.WriteNumberValue(Seed); + } + if (SerializedAdditionalRawData?.ContainsKey("estimated_finish") != true && Optional.IsDefined(EstimatedFinish)) { if (EstimatedFinish != null) { @@ -120,10 +165,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("estimated_finish"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -308,8 +357,9 @@ internal static InternalFineTuningJob DeserializeInternalFineTuningJob(JsonEleme estimatedFinish = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalFineTuningJob.cs b/src/Generated/Models/InternalFineTuningJob.cs index f8cd8cb7b..ce30e5cdd 100644 --- a/src/Generated/Models/InternalFineTuningJob.cs +++ b/src/Generated/Models/InternalFineTuningJob.cs @@ -10,8 +10,7 @@ namespace OpenAI.FineTuning { internal partial class InternalFineTuningJob { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalFineTuningJob(string id, DateTimeOffset createdAt, InternalFineTuningJobError error, string fineTunedModel, DateTimeOffset? finishedAt, InternalFineTuningJobHyperparameters hyperparameters, string model, string organizationId, IEnumerable resultFiles, InternalFineTuningJobStatus status, int? trainedTokens, string trainingFile, string validationFile, int seed) { Argument.AssertNotNull(id, nameof(id)); @@ -57,7 +56,7 @@ internal InternalFineTuningJob(string id, DateTimeOffset createdAt, InternalFine Integrations = integrations; Seed = seed; EstimatedFinish = estimatedFinish; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalFineTuningJob() diff --git a/src/Generated/Models/InternalFineTuningJobCheckpoint.Serialization.cs b/src/Generated/Models/InternalFineTuningJobCheckpoint.Serialization.cs index 957e37ab8..b2c50cd52 100644 --- a/src/Generated/Models/InternalFineTuningJobCheckpoint.Serialization.cs +++ b/src/Generated/Models/InternalFineTuningJobCheckpoint.Serialization.cs @@ -21,24 +21,49 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("created_at"u8); - writer.WriteNumberValue(CreatedAt, "U"); - writer.WritePropertyName("fine_tuned_model_checkpoint"u8); - writer.WriteStringValue(FineTunedModelCheckpoint); - writer.WritePropertyName("step_number"u8); - writer.WriteNumberValue(StepNumber); - writer.WritePropertyName("metrics"u8); - writer.WriteObjectValue(Metrics, options); - writer.WritePropertyName("fine_tuning_job_id"u8); - writer.WriteStringValue(FineTuningJobId); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("created_at") != true) + { + writer.WritePropertyName("created_at"u8); + writer.WriteNumberValue(CreatedAt, "U"); + } + if (SerializedAdditionalRawData?.ContainsKey("fine_tuned_model_checkpoint") != true) + { + writer.WritePropertyName("fine_tuned_model_checkpoint"u8); + writer.WriteStringValue(FineTunedModelCheckpoint); + } + if (SerializedAdditionalRawData?.ContainsKey("step_number") != true) + { + writer.WritePropertyName("step_number"u8); + writer.WriteNumberValue(StepNumber); + } + if (SerializedAdditionalRawData?.ContainsKey("metrics") != true) + { + writer.WritePropertyName("metrics"u8); + writer.WriteObjectValue(Metrics, options); + } + if (SerializedAdditionalRawData?.ContainsKey("fine_tuning_job_id") != true) + { + writer.WritePropertyName("fine_tuning_job_id"u8); + writer.WriteStringValue(FineTuningJobId); + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -119,8 +144,9 @@ internal static InternalFineTuningJobCheckpoint DeserializeInternalFineTuningJob @object = new InternalFineTuningJobCheckpointObject(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalFineTuningJobCheckpoint.cs b/src/Generated/Models/InternalFineTuningJobCheckpoint.cs index c4c1ab855..463cfd4fb 100644 --- a/src/Generated/Models/InternalFineTuningJobCheckpoint.cs +++ b/src/Generated/Models/InternalFineTuningJobCheckpoint.cs @@ -9,8 +9,7 @@ namespace OpenAI.FineTuning { internal partial class InternalFineTuningJobCheckpoint { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalFineTuningJobCheckpoint(string id, DateTimeOffset createdAt, string fineTunedModelCheckpoint, int stepNumber, InternalFineTuningJobCheckpointMetrics metrics, string fineTuningJobId) { Argument.AssertNotNull(id, nameof(id)); @@ -35,7 +34,7 @@ internal InternalFineTuningJobCheckpoint(string id, DateTimeOffset createdAt, st Metrics = metrics; FineTuningJobId = fineTuningJobId; Object = @object; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalFineTuningJobCheckpoint() diff --git a/src/Generated/Models/InternalFineTuningJobCheckpointMetrics.Serialization.cs b/src/Generated/Models/InternalFineTuningJobCheckpointMetrics.Serialization.cs index 5720042aa..c32d2e2c2 100644 --- a/src/Generated/Models/InternalFineTuningJobCheckpointMetrics.Serialization.cs +++ b/src/Generated/Models/InternalFineTuningJobCheckpointMetrics.Serialization.cs @@ -21,45 +21,49 @@ void IJsonModel.Write(Utf8JsonWriter wri } writer.WriteStartObject(); - if (Optional.IsDefined(Step)) + if (SerializedAdditionalRawData?.ContainsKey("step") != true && Optional.IsDefined(Step)) { writer.WritePropertyName("step"u8); writer.WriteNumberValue(Step.Value); } - if (Optional.IsDefined(TrainLoss)) + if (SerializedAdditionalRawData?.ContainsKey("train_loss") != true && Optional.IsDefined(TrainLoss)) { writer.WritePropertyName("train_loss"u8); writer.WriteNumberValue(TrainLoss.Value); } - if (Optional.IsDefined(TrainMeanTokenAccuracy)) + if (SerializedAdditionalRawData?.ContainsKey("train_mean_token_accuracy") != true && Optional.IsDefined(TrainMeanTokenAccuracy)) { writer.WritePropertyName("train_mean_token_accuracy"u8); writer.WriteNumberValue(TrainMeanTokenAccuracy.Value); } - if (Optional.IsDefined(ValidLoss)) + if (SerializedAdditionalRawData?.ContainsKey("valid_loss") != true && Optional.IsDefined(ValidLoss)) { writer.WritePropertyName("valid_loss"u8); writer.WriteNumberValue(ValidLoss.Value); } - if (Optional.IsDefined(ValidMeanTokenAccuracy)) + if (SerializedAdditionalRawData?.ContainsKey("valid_mean_token_accuracy") != true && Optional.IsDefined(ValidMeanTokenAccuracy)) { writer.WritePropertyName("valid_mean_token_accuracy"u8); writer.WriteNumberValue(ValidMeanTokenAccuracy.Value); } - if (Optional.IsDefined(FullValidLoss)) + if (SerializedAdditionalRawData?.ContainsKey("full_valid_loss") != true && Optional.IsDefined(FullValidLoss)) { writer.WritePropertyName("full_valid_loss"u8); writer.WriteNumberValue(FullValidLoss.Value); } - if (Optional.IsDefined(FullValidMeanTokenAccuracy)) + if (SerializedAdditionalRawData?.ContainsKey("full_valid_mean_token_accuracy") != true && Optional.IsDefined(FullValidMeanTokenAccuracy)) { writer.WritePropertyName("full_valid_mean_token_accuracy"u8); writer.WriteNumberValue(FullValidMeanTokenAccuracy.Value); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -168,8 +172,9 @@ internal static InternalFineTuningJobCheckpointMetrics DeserializeInternalFineTu fullValidMeanTokenAccuracy = property.Value.GetSingle(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalFineTuningJobCheckpointMetrics.cs b/src/Generated/Models/InternalFineTuningJobCheckpointMetrics.cs index 84af9988b..63c7256ec 100644 --- a/src/Generated/Models/InternalFineTuningJobCheckpointMetrics.cs +++ b/src/Generated/Models/InternalFineTuningJobCheckpointMetrics.cs @@ -9,8 +9,7 @@ namespace OpenAI.FineTuning { internal partial class InternalFineTuningJobCheckpointMetrics { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalFineTuningJobCheckpointMetrics() { } @@ -24,7 +23,7 @@ internal InternalFineTuningJobCheckpointMetrics(float? step, float? trainLoss, f ValidMeanTokenAccuracy = validMeanTokenAccuracy; FullValidLoss = fullValidLoss; FullValidMeanTokenAccuracy = fullValidMeanTokenAccuracy; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public float? Step { get; } diff --git a/src/Generated/Models/InternalFineTuningJobError.Serialization.cs b/src/Generated/Models/InternalFineTuningJobError.Serialization.cs index b7556d43e..d5ffe96e4 100644 --- a/src/Generated/Models/InternalFineTuningJobError.Serialization.cs +++ b/src/Generated/Models/InternalFineTuningJobError.Serialization.cs @@ -21,23 +21,36 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe } writer.WriteStartObject(); - writer.WritePropertyName("code"u8); - writer.WriteStringValue(Code); - writer.WritePropertyName("message"u8); - writer.WriteStringValue(Message); - if (Param != null) + if (SerializedAdditionalRawData?.ContainsKey("code") != true) { - writer.WritePropertyName("param"u8); - writer.WriteStringValue(Param); + writer.WritePropertyName("code"u8); + writer.WriteStringValue(Code); } - else + if (SerializedAdditionalRawData?.ContainsKey("message") != true) { - writer.WriteNull("param"); + writer.WritePropertyName("message"u8); + writer.WriteStringValue(Message); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("param") != true) { - foreach (var item in _serializedAdditionalRawData) + if (Param != null) { + writer.WritePropertyName("param"u8); + writer.WriteStringValue(Param); + } + else + { + writer.WriteNull("param"); + } + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) + { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -99,8 +112,9 @@ internal static InternalFineTuningJobError DeserializeInternalFineTuningJobError param = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalFineTuningJobError.cs b/src/Generated/Models/InternalFineTuningJobError.cs index 7f9caa363..17325bf89 100644 --- a/src/Generated/Models/InternalFineTuningJobError.cs +++ b/src/Generated/Models/InternalFineTuningJobError.cs @@ -9,8 +9,7 @@ namespace OpenAI.FineTuning { internal partial class InternalFineTuningJobError { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalFineTuningJobError(string code, string message, string param) { Argument.AssertNotNull(code, nameof(code)); @@ -26,7 +25,7 @@ internal InternalFineTuningJobError(string code, string message, string param, I Code = code; Message = message; Param = param; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalFineTuningJobError() diff --git a/src/Generated/Models/InternalFineTuningJobEvent.Serialization.cs b/src/Generated/Models/InternalFineTuningJobEvent.Serialization.cs index a11f71901..35eed321a 100644 --- a/src/Generated/Models/InternalFineTuningJobEvent.Serialization.cs +++ b/src/Generated/Models/InternalFineTuningJobEvent.Serialization.cs @@ -21,20 +21,39 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("created_at"u8); - writer.WriteNumberValue(CreatedAt, "U"); - writer.WritePropertyName("level"u8); - writer.WriteStringValue(Level.ToString()); - writer.WritePropertyName("message"u8); - writer.WriteStringValue(Message); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("created_at") != true) + { + writer.WritePropertyName("created_at"u8); + writer.WriteNumberValue(CreatedAt, "U"); + } + if (SerializedAdditionalRawData?.ContainsKey("level") != true) + { + writer.WritePropertyName("level"u8); + writer.WriteStringValue(Level.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("message") != true) + { + writer.WritePropertyName("message"u8); + writer.WriteStringValue(Message); + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -103,8 +122,9 @@ internal static InternalFineTuningJobEvent DeserializeInternalFineTuningJobEvent @object = new InternalFineTuningJobEventObject(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalFineTuningJobEvent.cs b/src/Generated/Models/InternalFineTuningJobEvent.cs index 86c975d5b..500b4ecf1 100644 --- a/src/Generated/Models/InternalFineTuningJobEvent.cs +++ b/src/Generated/Models/InternalFineTuningJobEvent.cs @@ -9,8 +9,7 @@ namespace OpenAI.FineTuning { internal partial class InternalFineTuningJobEvent { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalFineTuningJobEvent(string id, DateTimeOffset createdAt, InternalFineTuningJobEventLevel level, string message) { Argument.AssertNotNull(id, nameof(id)); @@ -29,7 +28,7 @@ internal InternalFineTuningJobEvent(string id, DateTimeOffset createdAt, Interna Level = level; Message = message; Object = @object; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalFineTuningJobEvent() diff --git a/src/Generated/Models/InternalFineTuningJobHyperparameters.Serialization.cs b/src/Generated/Models/InternalFineTuningJobHyperparameters.Serialization.cs index ff120940a..3675a3987 100644 --- a/src/Generated/Models/InternalFineTuningJobHyperparameters.Serialization.cs +++ b/src/Generated/Models/InternalFineTuningJobHyperparameters.Serialization.cs @@ -21,19 +21,26 @@ void IJsonModel.Write(Utf8JsonWriter write } writer.WriteStartObject(); - writer.WritePropertyName("n_epochs"u8); + if (SerializedAdditionalRawData?.ContainsKey("n_epochs") != true) + { + writer.WritePropertyName("n_epochs"u8); #if NET6_0_OR_GREATER writer.WriteRawValue(NEpochs); #else - using (JsonDocument document = JsonDocument.Parse(NEpochs)) - { - JsonSerializer.Serialize(writer, document.RootElement); - } + using (JsonDocument document = JsonDocument.Parse(NEpochs)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } #endif - if (true && _serializedAdditionalRawData != null) + } + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -78,8 +85,9 @@ internal static InternalFineTuningJobHyperparameters DeserializeInternalFineTuni nEpochs = BinaryData.FromString(property.Value.GetRawText()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalFineTuningJobHyperparameters.cs b/src/Generated/Models/InternalFineTuningJobHyperparameters.cs index f8303e9bb..c0855f274 100644 --- a/src/Generated/Models/InternalFineTuningJobHyperparameters.cs +++ b/src/Generated/Models/InternalFineTuningJobHyperparameters.cs @@ -9,8 +9,7 @@ namespace OpenAI.FineTuning { internal partial class InternalFineTuningJobHyperparameters { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalFineTuningJobHyperparameters(BinaryData nEpochs) { Argument.AssertNotNull(nEpochs, nameof(nEpochs)); @@ -21,7 +20,7 @@ internal InternalFineTuningJobHyperparameters(BinaryData nEpochs) internal InternalFineTuningJobHyperparameters(BinaryData nEpochs, IDictionary serializedAdditionalRawData) { NEpochs = nEpochs; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalFineTuningJobHyperparameters() diff --git a/src/Generated/Models/InternalFinetuneChatRequestInput.Serialization.cs b/src/Generated/Models/InternalFinetuneChatRequestInput.Serialization.cs index 8d0d2e2ec..29e279a5f 100644 --- a/src/Generated/Models/InternalFinetuneChatRequestInput.Serialization.cs +++ b/src/Generated/Models/InternalFinetuneChatRequestInput.Serialization.cs @@ -22,7 +22,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, M } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(Messages)) + if (SerializedAdditionalRawData?.ContainsKey("messages") != true && Optional.IsCollectionDefined(Messages)) { writer.WritePropertyName("messages"u8); writer.WriteStartArray(); @@ -44,7 +44,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, M } writer.WriteEndArray(); } - if (Optional.IsCollectionDefined(Tools)) + if (SerializedAdditionalRawData?.ContainsKey("tools") != true && Optional.IsCollectionDefined(Tools)) { writer.WritePropertyName("tools"u8); writer.WriteStartArray(); @@ -54,12 +54,12 @@ void IJsonModel.Write(Utf8JsonWriter writer, M } writer.WriteEndArray(); } - if (Optional.IsDefined(ParallelToolCalls)) + if (SerializedAdditionalRawData?.ContainsKey("parallel_tool_calls") != true && Optional.IsDefined(ParallelToolCalls)) { writer.WritePropertyName("parallel_tool_calls"u8); writer.WriteBooleanValue(ParallelToolCalls.Value); } - if (Optional.IsCollectionDefined(Functions)) + if (SerializedAdditionalRawData?.ContainsKey("functions") != true && Optional.IsCollectionDefined(Functions)) { writer.WritePropertyName("functions"u8); writer.WriteStartArray(); @@ -69,10 +69,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, M } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -173,8 +177,9 @@ internal static InternalFinetuneChatRequestInput DeserializeInternalFinetuneChat functions = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalFinetuneChatRequestInput.cs b/src/Generated/Models/InternalFinetuneChatRequestInput.cs index 83bcf7f59..b325ed536 100644 --- a/src/Generated/Models/InternalFinetuneChatRequestInput.cs +++ b/src/Generated/Models/InternalFinetuneChatRequestInput.cs @@ -10,8 +10,7 @@ namespace OpenAI.FineTuning { internal partial class InternalFinetuneChatRequestInput { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalFinetuneChatRequestInput() { Messages = new ChangeTrackingList(); @@ -25,7 +24,7 @@ internal InternalFinetuneChatRequestInput(IList messages, IList Messages { get; } diff --git a/src/Generated/Models/InternalFinetuneCompletionRequestInput.Serialization.cs b/src/Generated/Models/InternalFinetuneCompletionRequestInput.Serialization.cs index 2de2bf106..a1b911649 100644 --- a/src/Generated/Models/InternalFinetuneCompletionRequestInput.Serialization.cs +++ b/src/Generated/Models/InternalFinetuneCompletionRequestInput.Serialization.cs @@ -21,20 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter wri } writer.WriteStartObject(); - if (Optional.IsDefined(Prompt)) + if (SerializedAdditionalRawData?.ContainsKey("prompt") != true && Optional.IsDefined(Prompt)) { writer.WritePropertyName("prompt"u8); writer.WriteStringValue(Prompt); } - if (Optional.IsDefined(Completion)) + if (SerializedAdditionalRawData?.ContainsKey("completion") != true && Optional.IsDefined(Completion)) { writer.WritePropertyName("completion"u8); writer.WriteStringValue(Completion); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -85,8 +89,9 @@ internal static InternalFinetuneCompletionRequestInput DeserializeInternalFinetu completion = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalFinetuneCompletionRequestInput.cs b/src/Generated/Models/InternalFinetuneCompletionRequestInput.cs index cd5ae8223..3e30640c6 100644 --- a/src/Generated/Models/InternalFinetuneCompletionRequestInput.cs +++ b/src/Generated/Models/InternalFinetuneCompletionRequestInput.cs @@ -9,8 +9,7 @@ namespace OpenAI.FineTuning { internal partial class InternalFinetuneCompletionRequestInput { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalFinetuneCompletionRequestInput() { } @@ -19,7 +18,7 @@ internal InternalFinetuneCompletionRequestInput(string prompt, string completion { Prompt = prompt; Completion = completion; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string Prompt { get; set; } diff --git a/src/Generated/Models/InternalFunctionDefinition.Serialization.cs b/src/Generated/Models/InternalFunctionDefinition.Serialization.cs index e829d5a9d..4e3eecc09 100644 --- a/src/Generated/Models/InternalFunctionDefinition.Serialization.cs +++ b/src/Generated/Models/InternalFunctionDefinition.Serialization.cs @@ -21,14 +21,17 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe } writer.WriteStartObject(); - if (Optional.IsDefined(Description)) + if (SerializedAdditionalRawData?.ContainsKey("description") != true && Optional.IsDefined(Description)) { writer.WritePropertyName("description"u8); writer.WriteStringValue(Description); } - writer.WritePropertyName("name"u8); - writer.WriteStringValue(Name); - if (Optional.IsDefined(Parameters)) + if (SerializedAdditionalRawData?.ContainsKey("name") != true) + { + writer.WritePropertyName("name"u8); + writer.WriteStringValue(Name); + } + if (SerializedAdditionalRawData?.ContainsKey("parameters") != true && Optional.IsDefined(Parameters)) { writer.WritePropertyName("parameters"u8); #if NET6_0_OR_GREATER @@ -40,10 +43,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe } #endif } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -104,8 +111,9 @@ internal static InternalFunctionDefinition DeserializeInternalFunctionDefinition parameters = BinaryData.FromString(property.Value.GetRawText()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalFunctionDefinition.cs b/src/Generated/Models/InternalFunctionDefinition.cs index 5d04ee418..836a40e4b 100644 --- a/src/Generated/Models/InternalFunctionDefinition.cs +++ b/src/Generated/Models/InternalFunctionDefinition.cs @@ -9,8 +9,7 @@ namespace OpenAI { internal partial class InternalFunctionDefinition { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalFunctionDefinition(string name) { Argument.AssertNotNull(name, nameof(name)); @@ -23,7 +22,7 @@ internal InternalFunctionDefinition(string description, string name, BinaryData Description = description; Name = name; Parameters = parameters; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalFunctionDefinition() diff --git a/src/Generated/Models/InternalListAssistantsResponse.Serialization.cs b/src/Generated/Models/InternalListAssistantsResponse.Serialization.cs index 6c5c61b5e..985b078b3 100644 --- a/src/Generated/Models/InternalListAssistantsResponse.Serialization.cs +++ b/src/Generated/Models/InternalListAssistantsResponse.Serialization.cs @@ -21,25 +21,44 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mod } writer.WriteStartObject(); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("data"u8); - writer.WriteStartArray(); - foreach (var item in Data) + if (SerializedAdditionalRawData?.ContainsKey("object") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); } - writer.WriteEndArray(); - writer.WritePropertyName("first_id"u8); - writer.WriteStringValue(FirstId); - writer.WritePropertyName("last_id"u8); - writer.WriteStringValue(LastId); - writer.WritePropertyName("has_more"u8); - writer.WriteBooleanValue(HasMore); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("data") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("data"u8); + writer.WriteStartArray(); + foreach (var item in Data) { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + if (SerializedAdditionalRawData?.ContainsKey("first_id") != true) + { + writer.WritePropertyName("first_id"u8); + writer.WriteStringValue(FirstId); + } + if (SerializedAdditionalRawData?.ContainsKey("last_id") != true) + { + writer.WritePropertyName("last_id"u8); + writer.WriteStringValue(LastId); + } + if (SerializedAdditionalRawData?.ContainsKey("has_more") != true) + { + writer.WritePropertyName("has_more"u8); + writer.WriteBooleanValue(HasMore); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) + { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -113,8 +132,9 @@ internal static InternalListAssistantsResponse DeserializeInternalListAssistants hasMore = property.Value.GetBoolean(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalListAssistantsResponse.cs b/src/Generated/Models/InternalListAssistantsResponse.cs index d00d08c17..6ee4c4ccd 100644 --- a/src/Generated/Models/InternalListAssistantsResponse.cs +++ b/src/Generated/Models/InternalListAssistantsResponse.cs @@ -10,8 +10,7 @@ namespace OpenAI.Assistants { internal partial class InternalListAssistantsResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalListAssistantsResponse(IEnumerable data, string firstId, string lastId, bool hasMore) { Argument.AssertNotNull(data, nameof(data)); @@ -31,7 +30,7 @@ internal InternalListAssistantsResponse(InternalListAssistantsResponseObject @ob FirstId = firstId; LastId = lastId; HasMore = hasMore; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalListAssistantsResponse() diff --git a/src/Generated/Models/InternalListBatchesResponse.Serialization.cs b/src/Generated/Models/InternalListBatchesResponse.Serialization.cs index d121466fe..a9ed8e1ca 100644 --- a/src/Generated/Models/InternalListBatchesResponse.Serialization.cs +++ b/src/Generated/Models/InternalListBatchesResponse.Serialization.cs @@ -21,31 +21,44 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelR } writer.WriteStartObject(); - writer.WritePropertyName("data"u8); - writer.WriteStartArray(); - foreach (var item in Data) + if (SerializedAdditionalRawData?.ContainsKey("data") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("data"u8); + writer.WriteStartArray(); + foreach (var item in Data) + { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - if (Optional.IsDefined(FirstId)) + if (SerializedAdditionalRawData?.ContainsKey("first_id") != true && Optional.IsDefined(FirstId)) { writer.WritePropertyName("first_id"u8); writer.WriteStringValue(FirstId); } - if (Optional.IsDefined(LastId)) + if (SerializedAdditionalRawData?.ContainsKey("last_id") != true && Optional.IsDefined(LastId)) { writer.WritePropertyName("last_id"u8); writer.WriteStringValue(LastId); } - writer.WritePropertyName("has_more"u8); - writer.WriteBooleanValue(HasMore); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("has_more") != true) + { + writer.WritePropertyName("has_more"u8); + writer.WriteBooleanValue(HasMore); + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -119,8 +132,9 @@ internal static InternalListBatchesResponse DeserializeInternalListBatchesRespon @object = new InternalListBatchesResponseObject(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalListBatchesResponse.cs b/src/Generated/Models/InternalListBatchesResponse.cs index c7989e873..c81c672cc 100644 --- a/src/Generated/Models/InternalListBatchesResponse.cs +++ b/src/Generated/Models/InternalListBatchesResponse.cs @@ -10,8 +10,7 @@ namespace OpenAI.Batch { internal partial class InternalListBatchesResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalListBatchesResponse(IEnumerable data, bool hasMore) { Argument.AssertNotNull(data, nameof(data)); @@ -27,7 +26,7 @@ internal InternalListBatchesResponse(IReadOnlyList data, strin LastId = lastId; HasMore = hasMore; Object = @object; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalListBatchesResponse() diff --git a/src/Generated/Models/InternalListFineTuningJobCheckpointsResponse.Serialization.cs b/src/Generated/Models/InternalListFineTuningJobCheckpointsResponse.Serialization.cs index 6b97177d2..fe11464e0 100644 --- a/src/Generated/Models/InternalListFineTuningJobCheckpointsResponse.Serialization.cs +++ b/src/Generated/Models/InternalListFineTuningJobCheckpointsResponse.Serialization.cs @@ -21,16 +21,22 @@ void IJsonModel.Write(Utf8JsonWrit } writer.WriteStartObject(); - writer.WritePropertyName("data"u8); - writer.WriteStartArray(); - foreach (var item in Data) + if (SerializedAdditionalRawData?.ContainsKey("data") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("data"u8); + writer.WriteStartArray(); + foreach (var item in Data) + { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - if (Optional.IsDefined(FirstId)) + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("first_id") != true && Optional.IsDefined(FirstId)) { if (FirstId != null) { @@ -42,7 +48,7 @@ void IJsonModel.Write(Utf8JsonWrit writer.WriteNull("first_id"); } } - if (Optional.IsDefined(LastId)) + if (SerializedAdditionalRawData?.ContainsKey("last_id") != true && Optional.IsDefined(LastId)) { if (LastId != null) { @@ -54,12 +60,19 @@ void IJsonModel.Write(Utf8JsonWrit writer.WriteNull("last_id"); } } - writer.WritePropertyName("has_more"u8); - writer.WriteBooleanValue(HasMore); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("has_more") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("has_more"u8); + writer.WriteBooleanValue(HasMore); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -143,8 +156,9 @@ internal static InternalListFineTuningJobCheckpointsResponse DeserializeInternal hasMore = property.Value.GetBoolean(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalListFineTuningJobCheckpointsResponse.cs b/src/Generated/Models/InternalListFineTuningJobCheckpointsResponse.cs index afdb42170..f96a3d96a 100644 --- a/src/Generated/Models/InternalListFineTuningJobCheckpointsResponse.cs +++ b/src/Generated/Models/InternalListFineTuningJobCheckpointsResponse.cs @@ -10,8 +10,7 @@ namespace OpenAI.FineTuning { internal partial class InternalListFineTuningJobCheckpointsResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalListFineTuningJobCheckpointsResponse(IEnumerable data, bool hasMore) { Argument.AssertNotNull(data, nameof(data)); @@ -27,7 +26,7 @@ internal InternalListFineTuningJobCheckpointsResponse(IReadOnlyList.Write(Utf8JsonWriter wr } writer.WriteStartObject(); - writer.WritePropertyName("data"u8); - writer.WriteStartArray(); - foreach (var item in Data) + if (SerializedAdditionalRawData?.ContainsKey("data") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("data"u8); + writer.WriteStartArray(); + foreach (var item in Data) + { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); } - writer.WriteEndArray(); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -89,8 +99,9 @@ internal static InternalListFineTuningJobEventsResponse DeserializeInternalListF @object = new InternalListFineTuningJobEventsResponseObject(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalListFineTuningJobEventsResponse.cs b/src/Generated/Models/InternalListFineTuningJobEventsResponse.cs index 96e9935be..48fa4db44 100644 --- a/src/Generated/Models/InternalListFineTuningJobEventsResponse.cs +++ b/src/Generated/Models/InternalListFineTuningJobEventsResponse.cs @@ -10,8 +10,7 @@ namespace OpenAI.FineTuning { internal partial class InternalListFineTuningJobEventsResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalListFineTuningJobEventsResponse(IEnumerable data) { Argument.AssertNotNull(data, nameof(data)); @@ -23,7 +22,7 @@ internal InternalListFineTuningJobEventsResponse(IReadOnlyList.Write(Utf8JsonWriter writer, Model } writer.WriteStartObject(); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("data"u8); - writer.WriteStartArray(); - foreach (var item in Data) + if (SerializedAdditionalRawData?.ContainsKey("object") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); } - writer.WriteEndArray(); - writer.WritePropertyName("first_id"u8); - writer.WriteStringValue(FirstId); - writer.WritePropertyName("last_id"u8); - writer.WriteStringValue(LastId); - writer.WritePropertyName("has_more"u8); - writer.WriteBooleanValue(HasMore); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("data") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("data"u8); + writer.WriteStartArray(); + foreach (var item in Data) { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + if (SerializedAdditionalRawData?.ContainsKey("first_id") != true) + { + writer.WritePropertyName("first_id"u8); + writer.WriteStringValue(FirstId); + } + if (SerializedAdditionalRawData?.ContainsKey("last_id") != true) + { + writer.WritePropertyName("last_id"u8); + writer.WriteStringValue(LastId); + } + if (SerializedAdditionalRawData?.ContainsKey("has_more") != true) + { + writer.WritePropertyName("has_more"u8); + writer.WriteBooleanValue(HasMore); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) + { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -113,8 +132,9 @@ internal static InternalListMessagesResponse DeserializeInternalListMessagesResp hasMore = property.Value.GetBoolean(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalListMessagesResponse.cs b/src/Generated/Models/InternalListMessagesResponse.cs index dd02bc2b6..8fd5be212 100644 --- a/src/Generated/Models/InternalListMessagesResponse.cs +++ b/src/Generated/Models/InternalListMessagesResponse.cs @@ -10,8 +10,7 @@ namespace OpenAI.Assistants { internal partial class InternalListMessagesResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalListMessagesResponse(IEnumerable data, string firstId, string lastId, bool hasMore) { Argument.AssertNotNull(data, nameof(data)); @@ -31,7 +30,7 @@ internal InternalListMessagesResponse(InternalListMessagesResponseObject @object FirstId = firstId; LastId = lastId; HasMore = hasMore; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalListMessagesResponse() diff --git a/src/Generated/Models/InternalListPaginatedFineTuningJobsResponse.Serialization.cs b/src/Generated/Models/InternalListPaginatedFineTuningJobsResponse.Serialization.cs index dcafd03c1..dd8bada4f 100644 --- a/src/Generated/Models/InternalListPaginatedFineTuningJobsResponse.Serialization.cs +++ b/src/Generated/Models/InternalListPaginatedFineTuningJobsResponse.Serialization.cs @@ -21,21 +21,34 @@ void IJsonModel.Write(Utf8JsonWrite } writer.WriteStartObject(); - writer.WritePropertyName("data"u8); - writer.WriteStartArray(); - foreach (var item in Data) + if (SerializedAdditionalRawData?.ContainsKey("data") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("data"u8); + writer.WriteStartArray(); + foreach (var item in Data) + { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + if (SerializedAdditionalRawData?.ContainsKey("has_more") != true) + { + writer.WritePropertyName("has_more"u8); + writer.WriteBooleanValue(HasMore); } - writer.WriteEndArray(); - writer.WritePropertyName("has_more"u8); - writer.WriteBooleanValue(HasMore); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("object") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -97,8 +110,9 @@ internal static InternalListPaginatedFineTuningJobsResponse DeserializeInternalL @object = new InternalListPaginatedFineTuningJobsResponseObject(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalListPaginatedFineTuningJobsResponse.cs b/src/Generated/Models/InternalListPaginatedFineTuningJobsResponse.cs index cb54275ea..28ba3af0b 100644 --- a/src/Generated/Models/InternalListPaginatedFineTuningJobsResponse.cs +++ b/src/Generated/Models/InternalListPaginatedFineTuningJobsResponse.cs @@ -10,8 +10,7 @@ namespace OpenAI.FineTuning { internal partial class InternalListPaginatedFineTuningJobsResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalListPaginatedFineTuningJobsResponse(IEnumerable data, bool hasMore) { Argument.AssertNotNull(data, nameof(data)); @@ -25,7 +24,7 @@ internal InternalListPaginatedFineTuningJobsResponse(IReadOnlyList.Write(Utf8JsonWriter writer, Model } writer.WriteStartObject(); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("data"u8); - writer.WriteStartArray(); - foreach (var item in Data) + if (SerializedAdditionalRawData?.ContainsKey("object") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); } - writer.WriteEndArray(); - writer.WritePropertyName("first_id"u8); - writer.WriteStringValue(FirstId); - writer.WritePropertyName("last_id"u8); - writer.WriteStringValue(LastId); - writer.WritePropertyName("has_more"u8); - writer.WriteBooleanValue(HasMore); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("data") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("data"u8); + writer.WriteStartArray(); + foreach (var item in Data) { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + if (SerializedAdditionalRawData?.ContainsKey("first_id") != true) + { + writer.WritePropertyName("first_id"u8); + writer.WriteStringValue(FirstId); + } + if (SerializedAdditionalRawData?.ContainsKey("last_id") != true) + { + writer.WritePropertyName("last_id"u8); + writer.WriteStringValue(LastId); + } + if (SerializedAdditionalRawData?.ContainsKey("has_more") != true) + { + writer.WritePropertyName("has_more"u8); + writer.WriteBooleanValue(HasMore); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) + { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -113,8 +132,9 @@ internal static InternalListRunStepsResponse DeserializeInternalListRunStepsResp hasMore = property.Value.GetBoolean(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalListRunStepsResponse.cs b/src/Generated/Models/InternalListRunStepsResponse.cs index adb139fda..4ef3eb223 100644 --- a/src/Generated/Models/InternalListRunStepsResponse.cs +++ b/src/Generated/Models/InternalListRunStepsResponse.cs @@ -10,8 +10,7 @@ namespace OpenAI.Assistants { internal partial class InternalListRunStepsResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalListRunStepsResponse(IEnumerable data, string firstId, string lastId, bool hasMore) { Argument.AssertNotNull(data, nameof(data)); @@ -31,7 +30,7 @@ internal InternalListRunStepsResponse(InternalListRunStepsResponseObject @object FirstId = firstId; LastId = lastId; HasMore = hasMore; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalListRunStepsResponse() diff --git a/src/Generated/Models/InternalListRunsResponse.Serialization.cs b/src/Generated/Models/InternalListRunsResponse.Serialization.cs index 2ea4ade5b..b0c7cfd7c 100644 --- a/src/Generated/Models/InternalListRunsResponse.Serialization.cs +++ b/src/Generated/Models/InternalListRunsResponse.Serialization.cs @@ -21,25 +21,44 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRead } writer.WriteStartObject(); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("data"u8); - writer.WriteStartArray(); - foreach (var item in Data) + if (SerializedAdditionalRawData?.ContainsKey("object") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); } - writer.WriteEndArray(); - writer.WritePropertyName("first_id"u8); - writer.WriteStringValue(FirstId); - writer.WritePropertyName("last_id"u8); - writer.WriteStringValue(LastId); - writer.WritePropertyName("has_more"u8); - writer.WriteBooleanValue(HasMore); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("data") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("data"u8); + writer.WriteStartArray(); + foreach (var item in Data) { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + if (SerializedAdditionalRawData?.ContainsKey("first_id") != true) + { + writer.WritePropertyName("first_id"u8); + writer.WriteStringValue(FirstId); + } + if (SerializedAdditionalRawData?.ContainsKey("last_id") != true) + { + writer.WritePropertyName("last_id"u8); + writer.WriteStringValue(LastId); + } + if (SerializedAdditionalRawData?.ContainsKey("has_more") != true) + { + writer.WritePropertyName("has_more"u8); + writer.WriteBooleanValue(HasMore); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) + { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -113,8 +132,9 @@ internal static InternalListRunsResponse DeserializeInternalListRunsResponse(Jso hasMore = property.Value.GetBoolean(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalListRunsResponse.cs b/src/Generated/Models/InternalListRunsResponse.cs index b6488a487..4f10784e6 100644 --- a/src/Generated/Models/InternalListRunsResponse.cs +++ b/src/Generated/Models/InternalListRunsResponse.cs @@ -10,8 +10,7 @@ namespace OpenAI.Assistants { internal partial class InternalListRunsResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalListRunsResponse(IEnumerable data, string firstId, string lastId, bool hasMore) { Argument.AssertNotNull(data, nameof(data)); @@ -31,7 +30,7 @@ internal InternalListRunsResponse(InternalListRunsResponseObject @object, IReadO FirstId = firstId; LastId = lastId; HasMore = hasMore; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalListRunsResponse() diff --git a/src/Generated/Models/InternalListThreadsResponse.Serialization.cs b/src/Generated/Models/InternalListThreadsResponse.Serialization.cs index 324cddd77..e8960db37 100644 --- a/src/Generated/Models/InternalListThreadsResponse.Serialization.cs +++ b/src/Generated/Models/InternalListThreadsResponse.Serialization.cs @@ -21,25 +21,44 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelR } writer.WriteStartObject(); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("data"u8); - writer.WriteStartArray(); - foreach (var item in Data) + if (SerializedAdditionalRawData?.ContainsKey("object") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); } - writer.WriteEndArray(); - writer.WritePropertyName("first_id"u8); - writer.WriteStringValue(FirstId); - writer.WritePropertyName("last_id"u8); - writer.WriteStringValue(LastId); - writer.WritePropertyName("has_more"u8); - writer.WriteBooleanValue(HasMore); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("data") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("data"u8); + writer.WriteStartArray(); + foreach (var item in Data) { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + if (SerializedAdditionalRawData?.ContainsKey("first_id") != true) + { + writer.WritePropertyName("first_id"u8); + writer.WriteStringValue(FirstId); + } + if (SerializedAdditionalRawData?.ContainsKey("last_id") != true) + { + writer.WritePropertyName("last_id"u8); + writer.WriteStringValue(LastId); + } + if (SerializedAdditionalRawData?.ContainsKey("has_more") != true) + { + writer.WritePropertyName("has_more"u8); + writer.WriteBooleanValue(HasMore); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) + { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -113,8 +132,9 @@ internal static InternalListThreadsResponse DeserializeInternalListThreadsRespon hasMore = property.Value.GetBoolean(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalListThreadsResponse.cs b/src/Generated/Models/InternalListThreadsResponse.cs index 8714a1c72..0424339fa 100644 --- a/src/Generated/Models/InternalListThreadsResponse.cs +++ b/src/Generated/Models/InternalListThreadsResponse.cs @@ -10,8 +10,7 @@ namespace OpenAI.Assistants { internal partial class InternalListThreadsResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalListThreadsResponse(IEnumerable data, string firstId, string lastId, bool hasMore) { Argument.AssertNotNull(data, nameof(data)); @@ -31,7 +30,7 @@ internal InternalListThreadsResponse(InternalListThreadsResponseObject @object, FirstId = firstId; LastId = lastId; HasMore = hasMore; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalListThreadsResponse() diff --git a/src/Generated/Models/InternalListVectorStoreFilesResponse.Serialization.cs b/src/Generated/Models/InternalListVectorStoreFilesResponse.Serialization.cs index 09005515a..722e441c6 100644 --- a/src/Generated/Models/InternalListVectorStoreFilesResponse.Serialization.cs +++ b/src/Generated/Models/InternalListVectorStoreFilesResponse.Serialization.cs @@ -21,25 +21,44 @@ void IJsonModel.Write(Utf8JsonWriter write } writer.WriteStartObject(); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("data"u8); - writer.WriteStartArray(); - foreach (var item in Data) + if (SerializedAdditionalRawData?.ContainsKey("object") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); } - writer.WriteEndArray(); - writer.WritePropertyName("first_id"u8); - writer.WriteStringValue(FirstId); - writer.WritePropertyName("last_id"u8); - writer.WriteStringValue(LastId); - writer.WritePropertyName("has_more"u8); - writer.WriteBooleanValue(HasMore); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("data") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("data"u8); + writer.WriteStartArray(); + foreach (var item in Data) { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + if (SerializedAdditionalRawData?.ContainsKey("first_id") != true) + { + writer.WritePropertyName("first_id"u8); + writer.WriteStringValue(FirstId); + } + if (SerializedAdditionalRawData?.ContainsKey("last_id") != true) + { + writer.WritePropertyName("last_id"u8); + writer.WriteStringValue(LastId); + } + if (SerializedAdditionalRawData?.ContainsKey("has_more") != true) + { + writer.WritePropertyName("has_more"u8); + writer.WriteBooleanValue(HasMore); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) + { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -113,8 +132,9 @@ internal static InternalListVectorStoreFilesResponse DeserializeInternalListVect hasMore = property.Value.GetBoolean(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalListVectorStoreFilesResponse.cs b/src/Generated/Models/InternalListVectorStoreFilesResponse.cs index fd06685fb..cef502099 100644 --- a/src/Generated/Models/InternalListVectorStoreFilesResponse.cs +++ b/src/Generated/Models/InternalListVectorStoreFilesResponse.cs @@ -10,8 +10,7 @@ namespace OpenAI.VectorStores { internal partial class InternalListVectorStoreFilesResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalListVectorStoreFilesResponse(IEnumerable data, string firstId, string lastId, bool hasMore) { Argument.AssertNotNull(data, nameof(data)); @@ -31,7 +30,7 @@ internal InternalListVectorStoreFilesResponse(InternalListVectorStoreFilesRespon FirstId = firstId; LastId = lastId; HasMore = hasMore; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalListVectorStoreFilesResponse() diff --git a/src/Generated/Models/InternalListVectorStoresResponse.Serialization.cs b/src/Generated/Models/InternalListVectorStoresResponse.Serialization.cs index 0e93ab30f..b65f1e2e6 100644 --- a/src/Generated/Models/InternalListVectorStoresResponse.Serialization.cs +++ b/src/Generated/Models/InternalListVectorStoresResponse.Serialization.cs @@ -21,25 +21,44 @@ void IJsonModel.Write(Utf8JsonWriter writer, M } writer.WriteStartObject(); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("data"u8); - writer.WriteStartArray(); - foreach (var item in Data) + if (SerializedAdditionalRawData?.ContainsKey("object") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); } - writer.WriteEndArray(); - writer.WritePropertyName("first_id"u8); - writer.WriteStringValue(FirstId); - writer.WritePropertyName("last_id"u8); - writer.WriteStringValue(LastId); - writer.WritePropertyName("has_more"u8); - writer.WriteBooleanValue(HasMore); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("data") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("data"u8); + writer.WriteStartArray(); + foreach (var item in Data) { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + if (SerializedAdditionalRawData?.ContainsKey("first_id") != true) + { + writer.WritePropertyName("first_id"u8); + writer.WriteStringValue(FirstId); + } + if (SerializedAdditionalRawData?.ContainsKey("last_id") != true) + { + writer.WritePropertyName("last_id"u8); + writer.WriteStringValue(LastId); + } + if (SerializedAdditionalRawData?.ContainsKey("has_more") != true) + { + writer.WritePropertyName("has_more"u8); + writer.WriteBooleanValue(HasMore); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) + { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -113,8 +132,9 @@ internal static InternalListVectorStoresResponse DeserializeInternalListVectorSt hasMore = property.Value.GetBoolean(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalListVectorStoresResponse.cs b/src/Generated/Models/InternalListVectorStoresResponse.cs index c4fd91f58..98135e24b 100644 --- a/src/Generated/Models/InternalListVectorStoresResponse.cs +++ b/src/Generated/Models/InternalListVectorStoresResponse.cs @@ -10,8 +10,7 @@ namespace OpenAI.VectorStores { internal partial class InternalListVectorStoresResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalListVectorStoresResponse(IEnumerable data, string firstId, string lastId, bool hasMore) { Argument.AssertNotNull(data, nameof(data)); @@ -31,7 +30,7 @@ internal InternalListVectorStoresResponse(InternalListVectorStoresResponseObject FirstId = firstId; LastId = lastId; HasMore = hasMore; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalListVectorStoresResponse() diff --git a/src/Generated/Models/InternalMessageContentImageUrlObjectImageUrl.Serialization.cs b/src/Generated/Models/InternalMessageContentImageUrlObjectImageUrl.Serialization.cs index 79a2f0233..f23daaf9c 100644 --- a/src/Generated/Models/InternalMessageContentImageUrlObjectImageUrl.Serialization.cs +++ b/src/Generated/Models/InternalMessageContentImageUrlObjectImageUrl.Serialization.cs @@ -21,17 +21,24 @@ void IJsonModel.Write(Utf8JsonWrit } writer.WriteStartObject(); - writer.WritePropertyName("url"u8); - writer.WriteStringValue(Url.AbsoluteUri); - if (Optional.IsDefined(Detail)) + if (SerializedAdditionalRawData?.ContainsKey("url") != true) + { + writer.WritePropertyName("url"u8); + writer.WriteStringValue(Url.AbsoluteUri); + } + if (SerializedAdditionalRawData?.ContainsKey("detail") != true && Optional.IsDefined(Detail)) { writer.WritePropertyName("detail"u8); writer.WriteStringValue(Detail); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -82,8 +89,9 @@ internal static InternalMessageContentImageUrlObjectImageUrl DeserializeInternal detail = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalMessageContentImageUrlObjectImageUrl.cs b/src/Generated/Models/InternalMessageContentImageUrlObjectImageUrl.cs index addb510fa..ec3f49b7f 100644 --- a/src/Generated/Models/InternalMessageContentImageUrlObjectImageUrl.cs +++ b/src/Generated/Models/InternalMessageContentImageUrlObjectImageUrl.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalMessageContentImageUrlObjectImageUrl { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalMessageContentImageUrlObjectImageUrl(Uri url) { Argument.AssertNotNull(url, nameof(url)); @@ -22,7 +21,7 @@ internal InternalMessageContentImageUrlObjectImageUrl(Uri url, string detail, ID { Url = url; Detail = detail; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalMessageContentImageUrlObjectImageUrl() diff --git a/src/Generated/Models/InternalMessageContentItemFileObjectImageFile.Serialization.cs b/src/Generated/Models/InternalMessageContentItemFileObjectImageFile.Serialization.cs index 194dacbc7..98f67e77b 100644 --- a/src/Generated/Models/InternalMessageContentItemFileObjectImageFile.Serialization.cs +++ b/src/Generated/Models/InternalMessageContentItemFileObjectImageFile.Serialization.cs @@ -21,17 +21,24 @@ void IJsonModel.Write(Utf8JsonWri } writer.WriteStartObject(); - writer.WritePropertyName("file_id"u8); - writer.WriteStringValue(FileId); - if (Optional.IsDefined(Detail)) + if (SerializedAdditionalRawData?.ContainsKey("file_id") != true) + { + writer.WritePropertyName("file_id"u8); + writer.WriteStringValue(FileId); + } + if (SerializedAdditionalRawData?.ContainsKey("detail") != true && Optional.IsDefined(Detail)) { writer.WritePropertyName("detail"u8); writer.WriteStringValue(Detail); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -82,8 +89,9 @@ internal static InternalMessageContentItemFileObjectImageFile DeserializeInterna detail = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalMessageContentItemFileObjectImageFile.cs b/src/Generated/Models/InternalMessageContentItemFileObjectImageFile.cs index c4f9f3afe..b002cac9f 100644 --- a/src/Generated/Models/InternalMessageContentItemFileObjectImageFile.cs +++ b/src/Generated/Models/InternalMessageContentItemFileObjectImageFile.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalMessageContentItemFileObjectImageFile { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalMessageContentItemFileObjectImageFile(string fileId) { Argument.AssertNotNull(fileId, nameof(fileId)); @@ -22,7 +21,7 @@ internal InternalMessageContentItemFileObjectImageFile(string fileId, string det { FileId = fileId; Detail = detail; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalMessageContentItemFileObjectImageFile() diff --git a/src/Generated/Models/InternalMessageContentTextAnnotationsFileCitationObjectFileCitation.Serialization.cs b/src/Generated/Models/InternalMessageContentTextAnnotationsFileCitationObjectFileCitation.Serialization.cs index 9fc3672fc..370380b90 100644 --- a/src/Generated/Models/InternalMessageContentTextAnnotationsFileCitationObjectFileCitation.Serialization.cs +++ b/src/Generated/Models/InternalMessageContentTextAnnotationsFileCitationObjectFileCitation.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalMessageContentTextAnnotationsFileCitationObjectFileCitation.cs b/src/Generated/Models/InternalMessageContentTextAnnotationsFileCitationObjectFileCitation.cs index 857b89071..1c255cb2c 100644 --- a/src/Generated/Models/InternalMessageContentTextAnnotationsFileCitationObjectFileCitation.cs +++ b/src/Generated/Models/InternalMessageContentTextAnnotationsFileCitationObjectFileCitation.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalMessageContentTextAnnotationsFileCitationObjectFileCitation { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalMessageContentTextAnnotationsFileCitationObjectFileCitation(string fileId) { Argument.AssertNotNull(fileId, nameof(fileId)); @@ -21,7 +20,7 @@ public InternalMessageContentTextAnnotationsFileCitationObjectFileCitation(strin internal InternalMessageContentTextAnnotationsFileCitationObjectFileCitation(string fileId, IDictionary serializedAdditionalRawData) { FileId = fileId; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalMessageContentTextAnnotationsFileCitationObjectFileCitation() diff --git a/src/Generated/Models/InternalMessageContentTextAnnotationsFilePathObjectFilePath.Serialization.cs b/src/Generated/Models/InternalMessageContentTextAnnotationsFilePathObjectFilePath.Serialization.cs index f741cd13a..9f03121a2 100644 --- a/src/Generated/Models/InternalMessageContentTextAnnotationsFilePathObjectFilePath.Serialization.cs +++ b/src/Generated/Models/InternalMessageContentTextAnnotationsFilePathObjectFilePath.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Wri } writer.WriteStartObject(); - writer.WritePropertyName("file_id"u8); - writer.WriteStringValue(FileId); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("file_id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("file_id"u8); + writer.WriteStringValue(FileId); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static InternalMessageContentTextAnnotationsFilePathObjectFilePath Dese fileId = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalMessageContentTextAnnotationsFilePathObjectFilePath.cs b/src/Generated/Models/InternalMessageContentTextAnnotationsFilePathObjectFilePath.cs index bb9ca8006..de47c05b1 100644 --- a/src/Generated/Models/InternalMessageContentTextAnnotationsFilePathObjectFilePath.cs +++ b/src/Generated/Models/InternalMessageContentTextAnnotationsFilePathObjectFilePath.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalMessageContentTextAnnotationsFilePathObjectFilePath { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalMessageContentTextAnnotationsFilePathObjectFilePath(string fileId) { Argument.AssertNotNull(fileId, nameof(fileId)); @@ -21,7 +20,7 @@ public InternalMessageContentTextAnnotationsFilePathObjectFilePath(string fileId internal InternalMessageContentTextAnnotationsFilePathObjectFilePath(string fileId, IDictionary serializedAdditionalRawData) { FileId = fileId; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalMessageContentTextAnnotationsFilePathObjectFilePath() diff --git a/src/Generated/Models/InternalMessageDeltaObject.Serialization.cs b/src/Generated/Models/InternalMessageDeltaObject.Serialization.cs index 315470eb3..2ea5e979d 100644 --- a/src/Generated/Models/InternalMessageDeltaObject.Serialization.cs +++ b/src/Generated/Models/InternalMessageDeltaObject.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("delta"u8); - writer.WriteObjectValue(Delta, options); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("delta") != true) + { + writer.WritePropertyName("delta"u8); + writer.WriteObjectValue(Delta, options); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static InternalMessageDeltaObject DeserializeInternalMessageDeltaObject delta = MessageDeltaObjectDelta.DeserializeMessageDeltaObjectDelta(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalMessageDeltaObject.cs b/src/Generated/Models/InternalMessageDeltaObject.cs index e821e829f..1f677c64a 100644 --- a/src/Generated/Models/InternalMessageDeltaObject.cs +++ b/src/Generated/Models/InternalMessageDeltaObject.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalMessageDeltaObject { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalMessageDeltaObject(string id, MessageDeltaObjectDelta delta) { Argument.AssertNotNull(id, nameof(id)); @@ -25,7 +24,7 @@ internal InternalMessageDeltaObject(string id, InternalMessageDeltaObjectObject Id = id; Object = @object; Delta = delta; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalMessageDeltaObject() diff --git a/src/Generated/Models/InternalMessageImageFileContent.Serialization.cs b/src/Generated/Models/InternalMessageImageFileContent.Serialization.cs index e71efedc9..874fbdd71 100644 --- a/src/Generated/Models/InternalMessageImageFileContent.Serialization.cs +++ b/src/Generated/Models/InternalMessageImageFileContent.Serialization.cs @@ -48,8 +48,9 @@ internal static InternalMessageImageFileContent DeserializeInternalMessageImageF imageFile = InternalMessageContentItemFileObjectImageFile.DeserializeInternalMessageContentItemFileObjectImageFile(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalMessageImageUrlContent.Serialization.cs b/src/Generated/Models/InternalMessageImageUrlContent.Serialization.cs index 9c0dfe325..f1a170c22 100644 --- a/src/Generated/Models/InternalMessageImageUrlContent.Serialization.cs +++ b/src/Generated/Models/InternalMessageImageUrlContent.Serialization.cs @@ -48,8 +48,9 @@ internal static InternalMessageImageUrlContent DeserializeInternalMessageImageUr imageUrl = InternalMessageContentImageUrlObjectImageUrl.DeserializeInternalMessageContentImageUrlObjectImageUrl(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalMessageObjectAttachment.Serialization.cs b/src/Generated/Models/InternalMessageObjectAttachment.Serialization.cs index 6eb58fe78..8cf67e55a 100644 --- a/src/Generated/Models/InternalMessageObjectAttachment.Serialization.cs +++ b/src/Generated/Models/InternalMessageObjectAttachment.Serialization.cs @@ -21,12 +21,12 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo } writer.WriteStartObject(); - if (Optional.IsDefined(FileId)) + if (SerializedAdditionalRawData?.ContainsKey("file_id") != true && Optional.IsDefined(FileId)) { writer.WritePropertyName("file_id"u8); writer.WriteStringValue(FileId); } - if (Optional.IsCollectionDefined(Tools)) + if (SerializedAdditionalRawData?.ContainsKey("tools") != true && Optional.IsCollectionDefined(Tools)) { writer.WritePropertyName("tools"u8); writer.WriteStartArray(); @@ -48,10 +48,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -118,8 +122,9 @@ internal static InternalMessageObjectAttachment DeserializeInternalMessageObject tools = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalMessageObjectAttachment.cs b/src/Generated/Models/InternalMessageObjectAttachment.cs index 621bdd7bc..1e92848e3 100644 --- a/src/Generated/Models/InternalMessageObjectAttachment.cs +++ b/src/Generated/Models/InternalMessageObjectAttachment.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalMessageObjectAttachment { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalMessageObjectAttachment() { Tools = new ChangeTrackingList(); @@ -20,7 +19,7 @@ internal InternalMessageObjectAttachment(string fileId, IReadOnlyList.Write(Utf8JsonWrite } writer.WriteStartObject(); - if (Optional.IsDefined(CodeInterpreter)) + if (SerializedAdditionalRawData?.ContainsKey("code_interpreter") != true && Optional.IsDefined(CodeInterpreter)) { writer.WritePropertyName("code_interpreter"u8); writer.WriteObjectValue(CodeInterpreter, options); } - if (Optional.IsDefined(FileSearch)) + if (SerializedAdditionalRawData?.ContainsKey("file_search") != true && Optional.IsDefined(FileSearch)) { writer.WritePropertyName("file_search"u8); writer.WriteObjectValue(FileSearch, options); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -93,8 +97,9 @@ internal static InternalModifyAssistantRequestToolResources DeserializeInternalM fileSearch = InternalModifyAssistantRequestToolResourcesFileSearch.DeserializeInternalModifyAssistantRequestToolResourcesFileSearch(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalModifyAssistantRequestToolResources.cs b/src/Generated/Models/InternalModifyAssistantRequestToolResources.cs index 65383db0b..5aa4a77d8 100644 --- a/src/Generated/Models/InternalModifyAssistantRequestToolResources.cs +++ b/src/Generated/Models/InternalModifyAssistantRequestToolResources.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalModifyAssistantRequestToolResources { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalModifyAssistantRequestToolResources() { } @@ -19,7 +18,7 @@ internal InternalModifyAssistantRequestToolResources(InternalModifyAssistantRequ { CodeInterpreter = codeInterpreter; FileSearch = fileSearch; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public InternalModifyAssistantRequestToolResourcesCodeInterpreter CodeInterpreter { get; set; } diff --git a/src/Generated/Models/InternalModifyAssistantRequestToolResourcesCodeInterpreter.Serialization.cs b/src/Generated/Models/InternalModifyAssistantRequestToolResourcesCodeInterpreter.Serialization.cs index 87d0b050f..c479b1a2f 100644 --- a/src/Generated/Models/InternalModifyAssistantRequestToolResourcesCodeInterpreter.Serialization.cs +++ b/src/Generated/Models/InternalModifyAssistantRequestToolResourcesCodeInterpreter.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Writ } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(FileIds)) + if (SerializedAdditionalRawData?.ContainsKey("file_ids") != true && Optional.IsCollectionDefined(FileIds)) { writer.WritePropertyName("file_ids"u8); writer.WriteStartArray(); @@ -31,10 +31,14 @@ void IJsonModel.Writ } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -88,8 +92,9 @@ internal static InternalModifyAssistantRequestToolResourcesCodeInterpreter Deser fileIds = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalModifyAssistantRequestToolResourcesCodeInterpreter.cs b/src/Generated/Models/InternalModifyAssistantRequestToolResourcesCodeInterpreter.cs index 0dcf41e62..1b2538796 100644 --- a/src/Generated/Models/InternalModifyAssistantRequestToolResourcesCodeInterpreter.cs +++ b/src/Generated/Models/InternalModifyAssistantRequestToolResourcesCodeInterpreter.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalModifyAssistantRequestToolResourcesCodeInterpreter { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalModifyAssistantRequestToolResourcesCodeInterpreter() { FileIds = new ChangeTrackingList(); @@ -19,7 +18,7 @@ public InternalModifyAssistantRequestToolResourcesCodeInterpreter() internal InternalModifyAssistantRequestToolResourcesCodeInterpreter(IList fileIds, IDictionary serializedAdditionalRawData) { FileIds = fileIds; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IList FileIds { get; } diff --git a/src/Generated/Models/InternalModifyAssistantRequestToolResourcesFileSearch.Serialization.cs b/src/Generated/Models/InternalModifyAssistantRequestToolResourcesFileSearch.Serialization.cs index a8884b903..44392baf4 100644 --- a/src/Generated/Models/InternalModifyAssistantRequestToolResourcesFileSearch.Serialization.cs +++ b/src/Generated/Models/InternalModifyAssistantRequestToolResourcesFileSearch.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write(Utf } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(VectorStoreIds)) + if (SerializedAdditionalRawData?.ContainsKey("vector_store_ids") != true && Optional.IsCollectionDefined(VectorStoreIds)) { writer.WritePropertyName("vector_store_ids"u8); writer.WriteStartArray(); @@ -31,10 +31,14 @@ void IJsonModel.Write(Utf } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -88,8 +92,9 @@ internal static InternalModifyAssistantRequestToolResourcesFileSearch Deserializ vectorStoreIds = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalModifyAssistantRequestToolResourcesFileSearch.cs b/src/Generated/Models/InternalModifyAssistantRequestToolResourcesFileSearch.cs index 8633f16ba..e9b82d57a 100644 --- a/src/Generated/Models/InternalModifyAssistantRequestToolResourcesFileSearch.cs +++ b/src/Generated/Models/InternalModifyAssistantRequestToolResourcesFileSearch.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalModifyAssistantRequestToolResourcesFileSearch { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalModifyAssistantRequestToolResourcesFileSearch() { VectorStoreIds = new ChangeTrackingList(); @@ -19,7 +18,7 @@ public InternalModifyAssistantRequestToolResourcesFileSearch() internal InternalModifyAssistantRequestToolResourcesFileSearch(IList vectorStoreIds, IDictionary serializedAdditionalRawData) { VectorStoreIds = vectorStoreIds; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IList VectorStoreIds { get; } diff --git a/src/Generated/Models/InternalModifyThreadRequestToolResources.Serialization.cs b/src/Generated/Models/InternalModifyThreadRequestToolResources.Serialization.cs index 93e19b426..361e88afa 100644 --- a/src/Generated/Models/InternalModifyThreadRequestToolResources.Serialization.cs +++ b/src/Generated/Models/InternalModifyThreadRequestToolResources.Serialization.cs @@ -21,20 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter w } writer.WriteStartObject(); - if (Optional.IsDefined(CodeInterpreter)) + if (SerializedAdditionalRawData?.ContainsKey("code_interpreter") != true && Optional.IsDefined(CodeInterpreter)) { writer.WritePropertyName("code_interpreter"u8); writer.WriteObjectValue(CodeInterpreter, options); } - if (Optional.IsDefined(FileSearch)) + if (SerializedAdditionalRawData?.ContainsKey("file_search") != true && Optional.IsDefined(FileSearch)) { writer.WritePropertyName("file_search"u8); writer.WriteObjectValue(FileSearch, options); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -93,8 +97,9 @@ internal static InternalModifyThreadRequestToolResources DeserializeInternalModi fileSearch = InternalModifyThreadRequestToolResourcesFileSearch.DeserializeInternalModifyThreadRequestToolResourcesFileSearch(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalModifyThreadRequestToolResources.cs b/src/Generated/Models/InternalModifyThreadRequestToolResources.cs index b3747496b..0d8078ba4 100644 --- a/src/Generated/Models/InternalModifyThreadRequestToolResources.cs +++ b/src/Generated/Models/InternalModifyThreadRequestToolResources.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalModifyThreadRequestToolResources { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalModifyThreadRequestToolResources() { } @@ -19,7 +18,7 @@ internal InternalModifyThreadRequestToolResources(InternalModifyThreadRequestToo { CodeInterpreter = codeInterpreter; FileSearch = fileSearch; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public InternalModifyThreadRequestToolResourcesCodeInterpreter CodeInterpreter { get; set; } diff --git a/src/Generated/Models/InternalModifyThreadRequestToolResourcesCodeInterpreter.Serialization.cs b/src/Generated/Models/InternalModifyThreadRequestToolResourcesCodeInterpreter.Serialization.cs index 2390d6adb..72455c6a4 100644 --- a/src/Generated/Models/InternalModifyThreadRequestToolResourcesCodeInterpreter.Serialization.cs +++ b/src/Generated/Models/InternalModifyThreadRequestToolResourcesCodeInterpreter.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write(U } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(FileIds)) + if (SerializedAdditionalRawData?.ContainsKey("file_ids") != true && Optional.IsCollectionDefined(FileIds)) { writer.WritePropertyName("file_ids"u8); writer.WriteStartArray(); @@ -31,10 +31,14 @@ void IJsonModel.Write(U } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -88,8 +92,9 @@ internal static InternalModifyThreadRequestToolResourcesCodeInterpreter Deserial fileIds = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalModifyThreadRequestToolResourcesCodeInterpreter.cs b/src/Generated/Models/InternalModifyThreadRequestToolResourcesCodeInterpreter.cs index d861cec30..df0ce6bf8 100644 --- a/src/Generated/Models/InternalModifyThreadRequestToolResourcesCodeInterpreter.cs +++ b/src/Generated/Models/InternalModifyThreadRequestToolResourcesCodeInterpreter.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalModifyThreadRequestToolResourcesCodeInterpreter { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalModifyThreadRequestToolResourcesCodeInterpreter() { FileIds = new ChangeTrackingList(); @@ -19,7 +18,7 @@ public InternalModifyThreadRequestToolResourcesCodeInterpreter() internal InternalModifyThreadRequestToolResourcesCodeInterpreter(IList fileIds, IDictionary serializedAdditionalRawData) { FileIds = fileIds; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IList FileIds { get; } diff --git a/src/Generated/Models/InternalModifyThreadRequestToolResourcesFileSearch.Serialization.cs b/src/Generated/Models/InternalModifyThreadRequestToolResourcesFileSearch.Serialization.cs index a66c5049e..d535a557a 100644 --- a/src/Generated/Models/InternalModifyThreadRequestToolResourcesFileSearch.Serialization.cs +++ b/src/Generated/Models/InternalModifyThreadRequestToolResourcesFileSearch.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write(Utf8Js } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(VectorStoreIds)) + if (SerializedAdditionalRawData?.ContainsKey("vector_store_ids") != true && Optional.IsCollectionDefined(VectorStoreIds)) { writer.WritePropertyName("vector_store_ids"u8); writer.WriteStartArray(); @@ -31,10 +31,14 @@ void IJsonModel.Write(Utf8Js } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -88,8 +92,9 @@ internal static InternalModifyThreadRequestToolResourcesFileSearch DeserializeIn vectorStoreIds = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalModifyThreadRequestToolResourcesFileSearch.cs b/src/Generated/Models/InternalModifyThreadRequestToolResourcesFileSearch.cs index cec40e69d..f87c6ace1 100644 --- a/src/Generated/Models/InternalModifyThreadRequestToolResourcesFileSearch.cs +++ b/src/Generated/Models/InternalModifyThreadRequestToolResourcesFileSearch.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalModifyThreadRequestToolResourcesFileSearch { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalModifyThreadRequestToolResourcesFileSearch() { VectorStoreIds = new ChangeTrackingList(); @@ -19,7 +18,7 @@ public InternalModifyThreadRequestToolResourcesFileSearch() internal InternalModifyThreadRequestToolResourcesFileSearch(IList vectorStoreIds, IDictionary serializedAdditionalRawData) { VectorStoreIds = vectorStoreIds; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IList VectorStoreIds { get; } diff --git a/src/Generated/Models/InternalRequestMessageTextContent.Serialization.cs b/src/Generated/Models/InternalRequestMessageTextContent.Serialization.cs index 21809e845..7ee3c6e25 100644 --- a/src/Generated/Models/InternalRequestMessageTextContent.Serialization.cs +++ b/src/Generated/Models/InternalRequestMessageTextContent.Serialization.cs @@ -48,8 +48,9 @@ internal static InternalRequestMessageTextContent DeserializeInternalRequestMess text = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRequiredFunctionToolCall.Serialization.cs b/src/Generated/Models/InternalRequiredFunctionToolCall.Serialization.cs index c550c4ff0..a1f6474d3 100644 --- a/src/Generated/Models/InternalRequiredFunctionToolCall.Serialization.cs +++ b/src/Generated/Models/InternalRequiredFunctionToolCall.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, M } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("type"u8); - writer.WriteObjectValue(_type, options); - writer.WritePropertyName("function"u8); - writer.WriteObjectValue(_internalFunction, options); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteObjectValue(_type, options); + } + if (SerializedAdditionalRawData?.ContainsKey("function") != true) + { + writer.WritePropertyName("function"u8); + writer.WriteObjectValue(_internalFunction, options); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static InternalRequiredFunctionToolCall DeserializeInternalRequiredFunc function = InternalRunToolCallObjectFunction.DeserializeInternalRunToolCallObjectFunction(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRequiredFunctionToolCall.cs b/src/Generated/Models/InternalRequiredFunctionToolCall.cs index 4c3672a27..3d44b809d 100644 --- a/src/Generated/Models/InternalRequiredFunctionToolCall.cs +++ b/src/Generated/Models/InternalRequiredFunctionToolCall.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalRequiredFunctionToolCall { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalRequiredFunctionToolCall(string id, InternalRunToolCallObjectFunction internalFunction) { Argument.AssertNotNull(id, nameof(id)); @@ -25,7 +24,7 @@ internal InternalRequiredFunctionToolCall(string id, object type, InternalRunToo Id = id; _type = type; _internalFunction = internalFunction; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalRequiredFunctionToolCall() diff --git a/src/Generated/Models/InternalResponseMessageTextContent.Serialization.cs b/src/Generated/Models/InternalResponseMessageTextContent.Serialization.cs index 14afc8525..3996ddd9e 100644 --- a/src/Generated/Models/InternalResponseMessageTextContent.Serialization.cs +++ b/src/Generated/Models/InternalResponseMessageTextContent.Serialization.cs @@ -48,8 +48,9 @@ internal static InternalResponseMessageTextContent DeserializeInternalResponseMe text = MessageContentTextObjectText.DeserializeMessageContentTextObjectText(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunObjectRequiredActionSubmitToolOutputs.Serialization.cs b/src/Generated/Models/InternalRunObjectRequiredActionSubmitToolOutputs.Serialization.cs index db2e87b6c..be434a596 100644 --- a/src/Generated/Models/InternalRunObjectRequiredActionSubmitToolOutputs.Serialization.cs +++ b/src/Generated/Models/InternalRunObjectRequiredActionSubmitToolOutputs.Serialization.cs @@ -21,17 +21,24 @@ void IJsonModel.Write(Utf8Json } writer.WriteStartObject(); - writer.WritePropertyName("tool_calls"u8); - writer.WriteStartArray(); - foreach (var item in ToolCalls) + if (SerializedAdditionalRawData?.ContainsKey("tool_calls") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("tool_calls"u8); + writer.WriteStartArray(); + foreach (var item in ToolCalls) + { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -81,8 +88,9 @@ internal static InternalRunObjectRequiredActionSubmitToolOutputs DeserializeInte toolCalls = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunObjectRequiredActionSubmitToolOutputs.cs b/src/Generated/Models/InternalRunObjectRequiredActionSubmitToolOutputs.cs index 51b94f72d..323fc341c 100644 --- a/src/Generated/Models/InternalRunObjectRequiredActionSubmitToolOutputs.cs +++ b/src/Generated/Models/InternalRunObjectRequiredActionSubmitToolOutputs.cs @@ -10,8 +10,7 @@ namespace OpenAI.Assistants { internal partial class InternalRunObjectRequiredActionSubmitToolOutputs { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalRunObjectRequiredActionSubmitToolOutputs(IEnumerable toolCalls) { Argument.AssertNotNull(toolCalls, nameof(toolCalls)); @@ -22,7 +21,7 @@ internal InternalRunObjectRequiredActionSubmitToolOutputs(IEnumerable toolCalls, IDictionary serializedAdditionalRawData) { ToolCalls = toolCalls; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalRunObjectRequiredActionSubmitToolOutputs() diff --git a/src/Generated/Models/InternalRunRequiredAction.Serialization.cs b/src/Generated/Models/InternalRunRequiredAction.Serialization.cs index e2607100d..7cd1bed9f 100644 --- a/src/Generated/Models/InternalRunRequiredAction.Serialization.cs +++ b/src/Generated/Models/InternalRunRequiredAction.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRea } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteObjectValue(Type, options); - writer.WritePropertyName("submit_tool_outputs"u8); - writer.WriteObjectValue(SubmitToolOutputs, options); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteObjectValue(Type, options); + } + if (SerializedAdditionalRawData?.ContainsKey("submit_tool_outputs") != true) + { + writer.WritePropertyName("submit_tool_outputs"u8); + writer.WriteObjectValue(SubmitToolOutputs, options); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static InternalRunRequiredAction DeserializeInternalRunRequiredAction(J submitToolOutputs = InternalRunObjectRequiredActionSubmitToolOutputs.DeserializeInternalRunObjectRequiredActionSubmitToolOutputs(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunRequiredAction.cs b/src/Generated/Models/InternalRunRequiredAction.cs index b284b7e11..627dd8b84 100644 --- a/src/Generated/Models/InternalRunRequiredAction.cs +++ b/src/Generated/Models/InternalRunRequiredAction.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalRunRequiredAction { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalRunRequiredAction(InternalRunObjectRequiredActionSubmitToolOutputs submitToolOutputs) { Argument.AssertNotNull(submitToolOutputs, nameof(submitToolOutputs)); @@ -22,7 +21,7 @@ internal InternalRunRequiredAction(object type, InternalRunObjectRequiredActionS { Type = type; SubmitToolOutputs = submitToolOutputs; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalRunRequiredAction() diff --git a/src/Generated/Models/InternalRunStepCodeInterpreterLogOutput.Serialization.cs b/src/Generated/Models/InternalRunStepCodeInterpreterLogOutput.Serialization.cs index eced3a380..3517b3b82 100644 --- a/src/Generated/Models/InternalRunStepCodeInterpreterLogOutput.Serialization.cs +++ b/src/Generated/Models/InternalRunStepCodeInterpreterLogOutput.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter wr } writer.WriteStartObject(); - writer.WritePropertyName("logs"u8); - writer.WriteStringValue(InternalLogs); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("logs") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("logs"u8); + writer.WriteStringValue(InternalLogs); + } + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static InternalRunStepCodeInterpreterLogOutput DeserializeInternalRunSt type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepCodeInterpreterToolCallDetails.Serialization.cs b/src/Generated/Models/InternalRunStepCodeInterpreterToolCallDetails.Serialization.cs index 68f8c7477..432f26036 100644 --- a/src/Generated/Models/InternalRunStepCodeInterpreterToolCallDetails.Serialization.cs +++ b/src/Generated/Models/InternalRunStepCodeInterpreterToolCallDetails.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonWri } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("code_interpreter"u8); - writer.WriteObjectValue(_codeInterpreter, options); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("code_interpreter") != true) + { + writer.WritePropertyName("code_interpreter"u8); + writer.WriteObjectValue(_codeInterpreter, options); + } + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static InternalRunStepCodeInterpreterToolCallDetails DeserializeInterna type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDelta.Serialization.cs b/src/Generated/Models/InternalRunStepDelta.Serialization.cs index 85f18f9e0..d485c4fb7 100644 --- a/src/Generated/Models/InternalRunStepDelta.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDelta.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWr } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("object"u8); - writer.WriteObjectValue(Object, options); - writer.WritePropertyName("delta"u8); - writer.WriteObjectValue(Delta, options); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteObjectValue(Object, options); + } + if (SerializedAdditionalRawData?.ContainsKey("delta") != true) + { + writer.WritePropertyName("delta"u8); + writer.WriteObjectValue(Delta, options); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static InternalRunStepDelta DeserializeInternalRunStepDelta(JsonElement delta = InternalRunStepDeltaObjectDelta.DeserializeInternalRunStepDeltaObjectDelta(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDelta.cs b/src/Generated/Models/InternalRunStepDelta.cs index 5923e5705..55d73464a 100644 --- a/src/Generated/Models/InternalRunStepDelta.cs +++ b/src/Generated/Models/InternalRunStepDelta.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalRunStepDelta { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalRunStepDelta(string id, InternalRunStepDeltaObjectDelta delta) { Argument.AssertNotNull(id, nameof(id)); @@ -25,7 +24,7 @@ internal InternalRunStepDelta(string id, object @object, InternalRunStepDeltaObj Id = id; Object = @object; Delta = delta; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalRunStepDelta() diff --git a/src/Generated/Models/InternalRunStepDeltaObjectDelta.Serialization.cs b/src/Generated/Models/InternalRunStepDeltaObjectDelta.Serialization.cs index a14b0cf94..5c5404753 100644 --- a/src/Generated/Models/InternalRunStepDeltaObjectDelta.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDeltaObjectDelta.Serialization.cs @@ -21,15 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo } writer.WriteStartObject(); - if (Optional.IsDefined(StepDetails)) + if (SerializedAdditionalRawData?.ContainsKey("step_details") != true && Optional.IsDefined(StepDetails)) { writer.WritePropertyName("step_details"u8); writer.WriteObjectValue(StepDetails, options); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -78,8 +82,9 @@ internal static InternalRunStepDeltaObjectDelta DeserializeInternalRunStepDeltaO stepDetails = InternalRunStepDeltaStepDetails.DeserializeInternalRunStepDeltaStepDetails(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDeltaObjectDelta.cs b/src/Generated/Models/InternalRunStepDeltaObjectDelta.cs index 97b20ca55..1faf845db 100644 --- a/src/Generated/Models/InternalRunStepDeltaObjectDelta.cs +++ b/src/Generated/Models/InternalRunStepDeltaObjectDelta.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalRunStepDeltaObjectDelta { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalRunStepDeltaObjectDelta() { } @@ -18,7 +17,7 @@ internal InternalRunStepDeltaObjectDelta() internal InternalRunStepDeltaObjectDelta(InternalRunStepDeltaStepDetails stepDetails, IDictionary serializedAdditionalRawData) { StepDetails = stepDetails; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public InternalRunStepDeltaStepDetails StepDetails { get; } diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetails.Serialization.cs b/src/Generated/Models/InternalRunStepDeltaStepDetails.Serialization.cs index ab142e262..6ba369d00 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetails.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetails.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetails.cs b/src/Generated/Models/InternalRunStepDeltaStepDetails.cs index d929ace6b..987886798 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetails.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetails.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal abstract partial class InternalRunStepDeltaStepDetails { - private protected IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } protected InternalRunStepDeltaStepDetails() { } @@ -18,7 +17,7 @@ protected InternalRunStepDeltaStepDetails() internal InternalRunStepDeltaStepDetails(string type, IDictionary serializedAdditionalRawData) { Type = type; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal string Type { get; set; } diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetailsMessageCreationObject.Serialization.cs b/src/Generated/Models/InternalRunStepDeltaStepDetailsMessageCreationObject.Serialization.cs index 58ab09576..6b1cd7fb1 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetailsMessageCreationObject.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetailsMessageCreationObject.Serialization.cs @@ -21,17 +21,24 @@ void IJsonModel.Write(Utf8 } writer.WriteStartObject(); - if (Optional.IsDefined(MessageCreation)) + if (SerializedAdditionalRawData?.ContainsKey("message_creation") != true && Optional.IsDefined(MessageCreation)) { writer.WritePropertyName("message_creation"u8); writer.WriteObjectValue(MessageCreation, options); } - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -86,8 +93,9 @@ internal static InternalRunStepDeltaStepDetailsMessageCreationObject Deserialize type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetailsMessageCreationObjectMessageCreation.Serialization.cs b/src/Generated/Models/InternalRunStepDeltaStepDetailsMessageCreationObjectMessageCreation.Serialization.cs index cb9f753f6..9b61f2d96 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetailsMessageCreationObjectMessageCreation.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetailsMessageCreationObjectMessageCreation.Serialization.cs @@ -21,15 +21,19 @@ void IJsonModel(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetailsMessageCreationObjectMessageCreation.cs b/src/Generated/Models/InternalRunStepDeltaStepDetailsMessageCreationObjectMessageCreation.cs index 360465097..812f249c3 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetailsMessageCreationObjectMessageCreation.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetailsMessageCreationObjectMessageCreation.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalRunStepDeltaStepDetailsMessageCreationObjectMessageCreation { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalRunStepDeltaStepDetailsMessageCreationObjectMessageCreation() { } @@ -18,7 +17,7 @@ internal InternalRunStepDeltaStepDetailsMessageCreationObjectMessageCreation() internal InternalRunStepDeltaStepDetailsMessageCreationObjectMessageCreation(string messageId, IDictionary serializedAdditionalRawData) { MessageId = messageId; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string MessageId { get; } diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeObject.Serialization.cs b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeObject.Serialization.cs index 213213609..7c76a0307 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeObject.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeObject.Serialization.cs @@ -21,24 +21,34 @@ void IJsonModel.Write(Utf8Js } writer.WriteStartObject(); - writer.WritePropertyName("index"u8); - writer.WriteNumberValue(Index); - if (Optional.IsDefined(Id)) + if (SerializedAdditionalRawData?.ContainsKey("index") != true) + { + writer.WritePropertyName("index"u8); + writer.WriteNumberValue(Index); + } + if (SerializedAdditionalRawData?.ContainsKey("id") != true && Optional.IsDefined(Id)) { writer.WritePropertyName("id"u8); writer.WriteStringValue(Id); } - if (Optional.IsDefined(CodeInterpreter)) + if (SerializedAdditionalRawData?.ContainsKey("code_interpreter") != true && Optional.IsDefined(CodeInterpreter)) { writer.WritePropertyName("code_interpreter"u8); writer.WriteObjectValue(CodeInterpreter, options); } - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -105,8 +115,9 @@ internal static InternalRunStepDeltaStepDetailsToolCallsCodeObject DeserializeIn type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreter.Serialization.cs b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreter.Serialization.cs index aaca2b893..4b159c20a 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreter.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreter.Serialization.cs @@ -21,12 +21,12 @@ void IJsonModel(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreter.cs b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreter.cs index 765fe60e6..2330d340a 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreter.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreter.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreter { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreter() { Outputs = new ChangeTrackingList(); @@ -20,7 +19,7 @@ internal InternalRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreter(strin { Input = input; Outputs = outputs; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string Input { get; } diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeOutputImageObject.Serialization.cs b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeOutputImageObject.Serialization.cs index f516b6843..04c7653cd 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeOutputImageObject.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeOutputImageObject.Serialization.cs @@ -21,19 +21,29 @@ void IJsonModel.W } writer.WriteStartObject(); - writer.WritePropertyName("index"u8); - writer.WriteNumberValue(Index); - if (Optional.IsDefined(Image)) + if (SerializedAdditionalRawData?.ContainsKey("index") != true) + { + writer.WritePropertyName("index"u8); + writer.WriteNumberValue(Index); + } + if (SerializedAdditionalRawData?.ContainsKey("image") != true && Optional.IsDefined(Image)) { writer.WritePropertyName("image"u8); writer.WriteObjectValue(Image, options); } - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -94,8 +104,9 @@ internal static InternalRunStepDeltaStepDetailsToolCallsCodeOutputImageObject De type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeOutputImageObjectImage.Serialization.cs b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeOutputImageObjectImage.Serialization.cs index a91e923f3..edb0a3f42 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeOutputImageObjectImage.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeOutputImageObjectImage.Serialization.cs @@ -21,15 +21,19 @@ void IJsonModel(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeOutputImageObjectImage.cs b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeOutputImageObjectImage.cs index 22589c661..cd41fb9fa 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeOutputImageObjectImage.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeOutputImageObjectImage.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalRunStepDeltaStepDetailsToolCallsCodeOutputImageObjectImage { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalRunStepDeltaStepDetailsToolCallsCodeOutputImageObjectImage() { } @@ -18,7 +17,7 @@ internal InternalRunStepDeltaStepDetailsToolCallsCodeOutputImageObjectImage() internal InternalRunStepDeltaStepDetailsToolCallsCodeOutputImageObjectImage(string fileId, IDictionary serializedAdditionalRawData) { FileId = fileId; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string FileId { get; } diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeOutputLogsObject.Serialization.cs b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeOutputLogsObject.Serialization.cs index fc4ae2ba9..0dfe2e5c9 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeOutputLogsObject.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsCodeOutputLogsObject.Serialization.cs @@ -21,19 +21,29 @@ void IJsonModel.Wr } writer.WriteStartObject(); - writer.WritePropertyName("index"u8); - writer.WriteNumberValue(Index); - if (Optional.IsDefined(InternalLogs)) + if (SerializedAdditionalRawData?.ContainsKey("index") != true) + { + writer.WritePropertyName("index"u8); + writer.WriteNumberValue(Index); + } + if (SerializedAdditionalRawData?.ContainsKey("logs") != true && Optional.IsDefined(InternalLogs)) { writer.WritePropertyName("logs"u8); writer.WriteStringValue(InternalLogs); } - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -90,8 +100,9 @@ internal static InternalRunStepDeltaStepDetailsToolCallsCodeOutputLogsObject Des type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsFileSearchObject.Serialization.cs b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsFileSearchObject.Serialization.cs index 8140f5be9..5df7a1630 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsFileSearchObject.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsFileSearchObject.Serialization.cs @@ -21,27 +21,40 @@ void IJsonModel.Write( } writer.WriteStartObject(); - writer.WritePropertyName("index"u8); - writer.WriteNumberValue(Index); - if (Optional.IsDefined(Id)) + if (SerializedAdditionalRawData?.ContainsKey("index") != true) + { + writer.WritePropertyName("index"u8); + writer.WriteNumberValue(Index); + } + if (SerializedAdditionalRawData?.ContainsKey("id") != true && Optional.IsDefined(Id)) { writer.WritePropertyName("id"u8); writer.WriteStringValue(Id); } - writer.WritePropertyName("file_search"u8); - writer.WriteStartObject(); - foreach (var item in FileSearch) + if (SerializedAdditionalRawData?.ContainsKey("file_search") != true) { - writer.WritePropertyName(item.Key); - writer.WriteStringValue(item.Value); + writer.WritePropertyName("file_search"u8); + writer.WriteStartObject(); + foreach (var item in FileSearch) + { + writer.WritePropertyName(item.Key); + writer.WriteStringValue(item.Value); + } + writer.WriteEndObject(); } - writer.WriteEndObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -109,8 +122,9 @@ internal static InternalRunStepDeltaStepDetailsToolCallsFileSearchObject Deseria type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsFunctionObject.Serialization.cs b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsFunctionObject.Serialization.cs index b0df84cbe..4d033dc02 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsFunctionObject.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsFunctionObject.Serialization.cs @@ -21,24 +21,34 @@ void IJsonModel.Write(Ut } writer.WriteStartObject(); - writer.WritePropertyName("index"u8); - writer.WriteNumberValue(Index); - if (Optional.IsDefined(Id)) + if (SerializedAdditionalRawData?.ContainsKey("index") != true) + { + writer.WritePropertyName("index"u8); + writer.WriteNumberValue(Index); + } + if (SerializedAdditionalRawData?.ContainsKey("id") != true && Optional.IsDefined(Id)) { writer.WritePropertyName("id"u8); writer.WriteStringValue(Id); } - if (Optional.IsDefined(Function)) + if (SerializedAdditionalRawData?.ContainsKey("function") != true && Optional.IsDefined(Function)) { writer.WritePropertyName("function"u8); writer.WriteObjectValue(Function, options); } - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -105,8 +115,9 @@ internal static InternalRunStepDeltaStepDetailsToolCallsFunctionObject Deseriali type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsFunctionObjectFunction.Serialization.cs b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsFunctionObjectFunction.Serialization.cs index 9521077a6..776eb2df8 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsFunctionObjectFunction.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsFunctionObjectFunction.Serialization.cs @@ -21,17 +21,17 @@ void IJsonModel. } writer.WriteStartObject(); - if (Optional.IsDefined(Name)) + if (SerializedAdditionalRawData?.ContainsKey("name") != true && Optional.IsDefined(Name)) { writer.WritePropertyName("name"u8); writer.WriteStringValue(Name); } - if (Optional.IsDefined(Arguments)) + if (SerializedAdditionalRawData?.ContainsKey("arguments") != true && Optional.IsDefined(Arguments)) { writer.WritePropertyName("arguments"u8); writer.WriteStringValue(Arguments); } - if (Optional.IsDefined(Output)) + if (SerializedAdditionalRawData?.ContainsKey("output") != true && Optional.IsDefined(Output)) { if (Output != null) { @@ -43,10 +43,14 @@ void IJsonModel. writer.WriteNull("output"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -108,8 +112,9 @@ internal static InternalRunStepDeltaStepDetailsToolCallsFunctionObjectFunction D output = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsFunctionObjectFunction.cs b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsFunctionObjectFunction.cs index e7d1e61d2..e546c4f89 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsFunctionObjectFunction.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsFunctionObjectFunction.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalRunStepDeltaStepDetailsToolCallsFunctionObjectFunction { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalRunStepDeltaStepDetailsToolCallsFunctionObjectFunction() { } @@ -20,7 +19,7 @@ internal InternalRunStepDeltaStepDetailsToolCallsFunctionObjectFunction(string n Name = name; Arguments = arguments; Output = output; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string Name { get; } diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsObject.Serialization.cs b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsObject.Serialization.cs index ee0218bcd..5e53319bc 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsObject.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsObject.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write(Utf8JsonWr } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(ToolCalls)) + if (SerializedAdditionalRawData?.ContainsKey("tool_calls") != true && Optional.IsCollectionDefined(ToolCalls)) { writer.WritePropertyName("tool_calls"u8); writer.WriteStartArray(); @@ -31,12 +31,19 @@ void IJsonModel.Write(Utf8JsonWr } writer.WriteEndArray(); } - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -96,8 +103,9 @@ internal static InternalRunStepDeltaStepDetailsToolCallsObject DeserializeIntern type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsObjectToolCallsObject.Serialization.cs b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsObjectToolCallsObject.Serialization.cs index 5b84a56d9..f9aa10e1a 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsObjectToolCallsObject.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsObjectToolCallsObject.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.W } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); diff --git a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsObjectToolCallsObject.cs b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsObjectToolCallsObject.cs index b4eaa646d..55b7f0b45 100644 --- a/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsObjectToolCallsObject.cs +++ b/src/Generated/Models/InternalRunStepDeltaStepDetailsToolCallsObjectToolCallsObject.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal abstract partial class InternalRunStepDeltaStepDetailsToolCallsObjectToolCallsObject { - private protected IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } protected InternalRunStepDeltaStepDetailsToolCallsObjectToolCallsObject() { } @@ -18,7 +17,7 @@ protected InternalRunStepDeltaStepDetailsToolCallsObjectToolCallsObject() internal InternalRunStepDeltaStepDetailsToolCallsObjectToolCallsObject(string type, IDictionary serializedAdditionalRawData) { Type = type; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal string Type { get; set; } diff --git a/src/Generated/Models/InternalRunStepDetailsMessageCreationObject.Serialization.cs b/src/Generated/Models/InternalRunStepDetailsMessageCreationObject.Serialization.cs index b8b351ece..d8c762a40 100644 --- a/src/Generated/Models/InternalRunStepDetailsMessageCreationObject.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDetailsMessageCreationObject.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8JsonWrite } writer.WriteStartObject(); - writer.WritePropertyName("message_creation"u8); - writer.WriteObjectValue(_messageCreation, options); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("message_creation") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("message_creation"u8); + writer.WriteObjectValue(_messageCreation, options); + } + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static InternalRunStepDetailsMessageCreationObject DeserializeInternalR type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDetailsMessageCreationObjectMessageCreation.Serialization.cs b/src/Generated/Models/InternalRunStepDetailsMessageCreationObjectMessageCreation.Serialization.cs index 0c0dc4c94..7b1320b96 100644 --- a/src/Generated/Models/InternalRunStepDetailsMessageCreationObjectMessageCreation.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDetailsMessageCreationObjectMessageCreation.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Writ } writer.WriteStartObject(); - writer.WritePropertyName("message_id"u8); - writer.WriteStringValue(MessageId); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("message_id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("message_id"u8); + writer.WriteStringValue(MessageId); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static InternalRunStepDetailsMessageCreationObjectMessageCreation Deser messageId = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDetailsMessageCreationObjectMessageCreation.cs b/src/Generated/Models/InternalRunStepDetailsMessageCreationObjectMessageCreation.cs index 4ec8b4b68..b876ff8c4 100644 --- a/src/Generated/Models/InternalRunStepDetailsMessageCreationObjectMessageCreation.cs +++ b/src/Generated/Models/InternalRunStepDetailsMessageCreationObjectMessageCreation.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalRunStepDetailsMessageCreationObjectMessageCreation { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalRunStepDetailsMessageCreationObjectMessageCreation(string messageId) { Argument.AssertNotNull(messageId, nameof(messageId)); @@ -21,7 +20,7 @@ internal InternalRunStepDetailsMessageCreationObjectMessageCreation(string messa internal InternalRunStepDetailsMessageCreationObjectMessageCreation(string messageId, IDictionary serializedAdditionalRawData) { MessageId = messageId; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalRunStepDetailsMessageCreationObjectMessageCreation() diff --git a/src/Generated/Models/InternalRunStepDetailsToolCallsCodeObjectCodeInterpreter.Serialization.cs b/src/Generated/Models/InternalRunStepDetailsToolCallsCodeObjectCodeInterpreter.Serialization.cs index 1e321f895..44349b774 100644 --- a/src/Generated/Models/InternalRunStepDetailsToolCallsCodeObjectCodeInterpreter.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDetailsToolCallsCodeObjectCodeInterpreter.Serialization.cs @@ -21,19 +21,29 @@ void IJsonModel.Write( } writer.WriteStartObject(); - writer.WritePropertyName("input"u8); - writer.WriteStringValue(Input); - writer.WritePropertyName("outputs"u8); - writer.WriteStartArray(); - foreach (var item in Outputs) + if (SerializedAdditionalRawData?.ContainsKey("input") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("input"u8); + writer.WriteStringValue(Input); } - writer.WriteEndArray(); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("outputs") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("outputs"u8); + writer.WriteStartArray(); + foreach (var item in Outputs) { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) + { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -89,8 +99,9 @@ internal static InternalRunStepDetailsToolCallsCodeObjectCodeInterpreter Deseria outputs = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDetailsToolCallsCodeObjectCodeInterpreter.cs b/src/Generated/Models/InternalRunStepDetailsToolCallsCodeObjectCodeInterpreter.cs index 528aada10..2c309b663 100644 --- a/src/Generated/Models/InternalRunStepDetailsToolCallsCodeObjectCodeInterpreter.cs +++ b/src/Generated/Models/InternalRunStepDetailsToolCallsCodeObjectCodeInterpreter.cs @@ -10,8 +10,7 @@ namespace OpenAI.Assistants { internal partial class InternalRunStepDetailsToolCallsCodeObjectCodeInterpreter { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalRunStepDetailsToolCallsCodeObjectCodeInterpreter(string input, IEnumerable outputs) { Argument.AssertNotNull(input, nameof(input)); @@ -25,7 +24,7 @@ internal InternalRunStepDetailsToolCallsCodeObjectCodeInterpreter(string input, { Input = input; Outputs = outputs; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalRunStepDetailsToolCallsCodeObjectCodeInterpreter() diff --git a/src/Generated/Models/InternalRunStepDetailsToolCallsCodeOutputImageObject.Serialization.cs b/src/Generated/Models/InternalRunStepDetailsToolCallsCodeOutputImageObject.Serialization.cs index 4dd28734d..4e4248784 100644 --- a/src/Generated/Models/InternalRunStepDetailsToolCallsCodeOutputImageObject.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDetailsToolCallsCodeOutputImageObject.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8 } writer.WriteStartObject(); - writer.WritePropertyName("image"u8); - writer.WriteObjectValue(_image, options); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("image") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("image"u8); + writer.WriteObjectValue(_image, options); + } + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static InternalRunStepDetailsToolCallsCodeOutputImageObject Deserialize type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDetailsToolCallsCodeOutputImageObjectImage.Serialization.cs b/src/Generated/Models/InternalRunStepDetailsToolCallsCodeOutputImageObjectImage.Serialization.cs index 920b287e4..85271932d 100644 --- a/src/Generated/Models/InternalRunStepDetailsToolCallsCodeOutputImageObjectImage.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDetailsToolCallsCodeOutputImageObjectImage.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write } writer.WriteStartObject(); - writer.WritePropertyName("file_id"u8); - writer.WriteStringValue(FileId); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("file_id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("file_id"u8); + writer.WriteStringValue(FileId); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static InternalRunStepDetailsToolCallsCodeOutputImageObjectImage Deseri fileId = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDetailsToolCallsCodeOutputImageObjectImage.cs b/src/Generated/Models/InternalRunStepDetailsToolCallsCodeOutputImageObjectImage.cs index 7540b3dc4..17afb0073 100644 --- a/src/Generated/Models/InternalRunStepDetailsToolCallsCodeOutputImageObjectImage.cs +++ b/src/Generated/Models/InternalRunStepDetailsToolCallsCodeOutputImageObjectImage.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalRunStepDetailsToolCallsCodeOutputImageObjectImage { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalRunStepDetailsToolCallsCodeOutputImageObjectImage(string fileId) { Argument.AssertNotNull(fileId, nameof(fileId)); @@ -21,7 +20,7 @@ internal InternalRunStepDetailsToolCallsCodeOutputImageObjectImage(string fileId internal InternalRunStepDetailsToolCallsCodeOutputImageObjectImage(string fileId, IDictionary serializedAdditionalRawData) { FileId = fileId; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalRunStepDetailsToolCallsCodeOutputImageObjectImage() diff --git a/src/Generated/Models/InternalRunStepDetailsToolCallsFunctionObjectFunction.Serialization.cs b/src/Generated/Models/InternalRunStepDetailsToolCallsFunctionObjectFunction.Serialization.cs index 26c686523..90b909e75 100644 --- a/src/Generated/Models/InternalRunStepDetailsToolCallsFunctionObjectFunction.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDetailsToolCallsFunctionObjectFunction.Serialization.cs @@ -21,23 +21,36 @@ void IJsonModel.Write(Utf } writer.WriteStartObject(); - writer.WritePropertyName("name"u8); - writer.WriteStringValue(Name); - writer.WritePropertyName("arguments"u8); - writer.WriteStringValue(Arguments); - if (Output != null) + if (SerializedAdditionalRawData?.ContainsKey("name") != true) { - writer.WritePropertyName("output"u8); - writer.WriteStringValue(Output); + writer.WritePropertyName("name"u8); + writer.WriteStringValue(Name); } - else + if (SerializedAdditionalRawData?.ContainsKey("arguments") != true) { - writer.WriteNull("output"); + writer.WritePropertyName("arguments"u8); + writer.WriteStringValue(Arguments); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("output") != true) { - foreach (var item in _serializedAdditionalRawData) + if (Output != null) { + writer.WritePropertyName("output"u8); + writer.WriteStringValue(Output); + } + else + { + writer.WriteNull("output"); + } + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) + { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -99,8 +112,9 @@ internal static InternalRunStepDetailsToolCallsFunctionObjectFunction Deserializ output = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepDetailsToolCallsFunctionObjectFunction.cs b/src/Generated/Models/InternalRunStepDetailsToolCallsFunctionObjectFunction.cs index 81341cbbf..588377cde 100644 --- a/src/Generated/Models/InternalRunStepDetailsToolCallsFunctionObjectFunction.cs +++ b/src/Generated/Models/InternalRunStepDetailsToolCallsFunctionObjectFunction.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalRunStepDetailsToolCallsFunctionObjectFunction { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalRunStepDetailsToolCallsFunctionObjectFunction(string name, string arguments, string output) { Argument.AssertNotNull(name, nameof(name)); @@ -26,7 +25,7 @@ internal InternalRunStepDetailsToolCallsFunctionObjectFunction(string name, stri Name = name; Arguments = arguments; Output = output; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalRunStepDetailsToolCallsFunctionObjectFunction() diff --git a/src/Generated/Models/InternalRunStepDetailsToolCallsObject.Serialization.cs b/src/Generated/Models/InternalRunStepDetailsToolCallsObject.Serialization.cs index 66c3c8130..57154d168 100644 --- a/src/Generated/Models/InternalRunStepDetailsToolCallsObject.Serialization.cs +++ b/src/Generated/Models/InternalRunStepDetailsToolCallsObject.Serialization.cs @@ -21,19 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writ } writer.WriteStartObject(); - writer.WritePropertyName("tool_calls"u8); - writer.WriteStartArray(); - foreach (var item in InternalToolCalls) + if (SerializedAdditionalRawData?.ContainsKey("tool_calls") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("tool_calls"u8); + writer.WriteStartArray(); + foreach (var item in InternalToolCalls) + { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); } - writer.WriteEndArray(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -89,8 +99,9 @@ internal static InternalRunStepDetailsToolCallsObject DeserializeInternalRunStep type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepFileSearchToolCallDetails.Serialization.cs b/src/Generated/Models/InternalRunStepFileSearchToolCallDetails.Serialization.cs index d0fe86067..359feae65 100644 --- a/src/Generated/Models/InternalRunStepFileSearchToolCallDetails.Serialization.cs +++ b/src/Generated/Models/InternalRunStepFileSearchToolCallDetails.Serialization.cs @@ -21,23 +21,36 @@ void IJsonModel.Write(Utf8JsonWriter w } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("file_search"u8); - writer.WriteStartObject(); - foreach (var item in FileSearch) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - writer.WritePropertyName(item.Key); - writer.WriteStringValue(item.Value); + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); } - writer.WriteEndObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("file_search") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("file_search"u8); + writer.WriteStartObject(); + foreach (var item in FileSearch) { writer.WritePropertyName(item.Key); + writer.WriteStringValue(item.Value); + } + writer.WriteEndObject(); + } + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) + { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } + writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); #else @@ -98,8 +111,9 @@ internal static InternalRunStepFileSearchToolCallDetails DeserializeInternalRunS type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunStepFunctionToolCallDetails.Serialization.cs b/src/Generated/Models/InternalRunStepFunctionToolCallDetails.Serialization.cs index 67cc48f70..59d25eb21 100644 --- a/src/Generated/Models/InternalRunStepFunctionToolCallDetails.Serialization.cs +++ b/src/Generated/Models/InternalRunStepFunctionToolCallDetails.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter wri } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("function"u8); - writer.WriteObjectValue(_internalFunction, options); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("function") != true) + { + writer.WritePropertyName("function"u8); + writer.WriteObjectValue(_internalFunction, options); + } + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static InternalRunStepFunctionToolCallDetails DeserializeInternalRunSte type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunToolCallObjectFunction.Serialization.cs b/src/Generated/Models/InternalRunToolCallObjectFunction.Serialization.cs index 8c55e6945..ed203a144 100644 --- a/src/Generated/Models/InternalRunToolCallObjectFunction.Serialization.cs +++ b/src/Generated/Models/InternalRunToolCallObjectFunction.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteStartObject(); - writer.WritePropertyName("name"u8); - writer.WriteStringValue(Name); - writer.WritePropertyName("arguments"u8); - writer.WriteStringValue(Arguments); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("name") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("name"u8); + writer.WriteStringValue(Name); + } + if (SerializedAdditionalRawData?.ContainsKey("arguments") != true) + { + writer.WritePropertyName("arguments"u8); + writer.WriteStringValue(Arguments); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static InternalRunToolCallObjectFunction DeserializeInternalRunToolCall arguments = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalRunToolCallObjectFunction.cs b/src/Generated/Models/InternalRunToolCallObjectFunction.cs index 3d5d9f4aa..a9f72778e 100644 --- a/src/Generated/Models/InternalRunToolCallObjectFunction.cs +++ b/src/Generated/Models/InternalRunToolCallObjectFunction.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalRunToolCallObjectFunction { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalRunToolCallObjectFunction(string name, string arguments) { Argument.AssertNotNull(name, nameof(name)); @@ -24,7 +23,7 @@ internal InternalRunToolCallObjectFunction(string name, string arguments, IDicti { Name = name; Arguments = arguments; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalRunToolCallObjectFunction() diff --git a/src/Generated/Models/InternalStaticChunkingStrategyDetails.Serialization.cs b/src/Generated/Models/InternalStaticChunkingStrategyDetails.Serialization.cs index deb8e7f3d..954ce7d55 100644 --- a/src/Generated/Models/InternalStaticChunkingStrategyDetails.Serialization.cs +++ b/src/Generated/Models/InternalStaticChunkingStrategyDetails.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter writ } writer.WriteStartObject(); - writer.WritePropertyName("max_chunk_size_tokens"u8); - writer.WriteNumberValue(MaxChunkSizeTokens); - writer.WritePropertyName("chunk_overlap_tokens"u8); - writer.WriteNumberValue(ChunkOverlapTokens); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("max_chunk_size_tokens") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("max_chunk_size_tokens"u8); + writer.WriteNumberValue(MaxChunkSizeTokens); + } + if (SerializedAdditionalRawData?.ContainsKey("chunk_overlap_tokens") != true) + { + writer.WritePropertyName("chunk_overlap_tokens"u8); + writer.WriteNumberValue(ChunkOverlapTokens); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static InternalStaticChunkingStrategyDetails DeserializeInternalStaticC chunkOverlapTokens = property.Value.GetInt32(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalStaticChunkingStrategyDetails.cs b/src/Generated/Models/InternalStaticChunkingStrategyDetails.cs index 051e45552..26a6aa2e1 100644 --- a/src/Generated/Models/InternalStaticChunkingStrategyDetails.cs +++ b/src/Generated/Models/InternalStaticChunkingStrategyDetails.cs @@ -9,8 +9,7 @@ namespace OpenAI.VectorStores { internal partial class InternalStaticChunkingStrategyDetails { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalStaticChunkingStrategyDetails(int maxChunkSizeTokens, int chunkOverlapTokens) { MaxChunkSizeTokens = maxChunkSizeTokens; @@ -21,7 +20,7 @@ internal InternalStaticChunkingStrategyDetails(int maxChunkSizeTokens, int chunk { MaxChunkSizeTokens = maxChunkSizeTokens; ChunkOverlapTokens = chunkOverlapTokens; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalStaticChunkingStrategyDetails() diff --git a/src/Generated/Models/InternalStaticChunkingStrategyRequestParam.Serialization.cs b/src/Generated/Models/InternalStaticChunkingStrategyRequestParam.Serialization.cs index 881cfebff..a8c791dfe 100644 --- a/src/Generated/Models/InternalStaticChunkingStrategyRequestParam.Serialization.cs +++ b/src/Generated/Models/InternalStaticChunkingStrategyRequestParam.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter } writer.WriteStartObject(); - writer.WritePropertyName("static"u8); - writer.WriteObjectValue(Static, options); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("static") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("static"u8); + writer.WriteObjectValue(Static, options); + } + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static InternalStaticChunkingStrategyRequestParam DeserializeInternalSt type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalSubmitToolOutputsRunRequest.Serialization.cs b/src/Generated/Models/InternalSubmitToolOutputsRunRequest.Serialization.cs index 1b2dea6a4..2db0da4f3 100644 --- a/src/Generated/Models/InternalSubmitToolOutputsRunRequest.Serialization.cs +++ b/src/Generated/Models/InternalSubmitToolOutputsRunRequest.Serialization.cs @@ -21,14 +21,17 @@ void IJsonModel.Write(Utf8JsonWriter writer } writer.WriteStartObject(); - writer.WritePropertyName("tool_outputs"u8); - writer.WriteStartArray(); - foreach (var item in ToolOutputs) + if (SerializedAdditionalRawData?.ContainsKey("tool_outputs") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("tool_outputs"u8); + writer.WriteStartArray(); + foreach (var item in ToolOutputs) + { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - if (Optional.IsDefined(Stream)) + if (SerializedAdditionalRawData?.ContainsKey("stream") != true && Optional.IsDefined(Stream)) { if (Stream != null) { @@ -40,10 +43,14 @@ void IJsonModel.Write(Utf8JsonWriter writer writer.WriteNull("stream"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -104,8 +111,9 @@ internal static InternalSubmitToolOutputsRunRequest DeserializeInternalSubmitToo stream = property.Value.GetBoolean(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalSubmitToolOutputsRunRequest.cs b/src/Generated/Models/InternalSubmitToolOutputsRunRequest.cs index e602133ba..13a442914 100644 --- a/src/Generated/Models/InternalSubmitToolOutputsRunRequest.cs +++ b/src/Generated/Models/InternalSubmitToolOutputsRunRequest.cs @@ -10,8 +10,7 @@ namespace OpenAI.Assistants { internal partial class InternalSubmitToolOutputsRunRequest { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } public InternalSubmitToolOutputsRunRequest(IEnumerable toolOutputs) { Argument.AssertNotNull(toolOutputs, nameof(toolOutputs)); @@ -23,7 +22,7 @@ internal InternalSubmitToolOutputsRunRequest(IList toolOutputs, bool { ToolOutputs = toolOutputs; Stream = stream; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalSubmitToolOutputsRunRequest() diff --git a/src/Generated/Models/InternalThreadObjectToolResources.Serialization.cs b/src/Generated/Models/InternalThreadObjectToolResources.Serialization.cs index 72b3657cf..c5a8f2055 100644 --- a/src/Generated/Models/InternalThreadObjectToolResources.Serialization.cs +++ b/src/Generated/Models/InternalThreadObjectToolResources.Serialization.cs @@ -21,20 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteStartObject(); - if (Optional.IsDefined(CodeInterpreter)) + if (SerializedAdditionalRawData?.ContainsKey("code_interpreter") != true && Optional.IsDefined(CodeInterpreter)) { writer.WritePropertyName("code_interpreter"u8); writer.WriteObjectValue(CodeInterpreter, options); } - if (Optional.IsDefined(FileSearch)) + if (SerializedAdditionalRawData?.ContainsKey("file_search") != true && Optional.IsDefined(FileSearch)) { writer.WritePropertyName("file_search"u8); writer.WriteObjectValue(FileSearch, options); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -93,8 +97,9 @@ internal static InternalThreadObjectToolResources DeserializeInternalThreadObjec fileSearch = InternalThreadObjectToolResourcesFileSearch.DeserializeInternalThreadObjectToolResourcesFileSearch(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalThreadObjectToolResources.cs b/src/Generated/Models/InternalThreadObjectToolResources.cs index de8ac491f..5d766bb62 100644 --- a/src/Generated/Models/InternalThreadObjectToolResources.cs +++ b/src/Generated/Models/InternalThreadObjectToolResources.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalThreadObjectToolResources { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalThreadObjectToolResources() { } @@ -19,7 +18,7 @@ internal InternalThreadObjectToolResources(InternalThreadObjectToolResourcesCode { CodeInterpreter = codeInterpreter; FileSearch = fileSearch; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public InternalThreadObjectToolResourcesCodeInterpreter CodeInterpreter { get; } diff --git a/src/Generated/Models/InternalThreadObjectToolResourcesCodeInterpreter.Serialization.cs b/src/Generated/Models/InternalThreadObjectToolResourcesCodeInterpreter.Serialization.cs index c04745ed8..d60b3eeef 100644 --- a/src/Generated/Models/InternalThreadObjectToolResourcesCodeInterpreter.Serialization.cs +++ b/src/Generated/Models/InternalThreadObjectToolResourcesCodeInterpreter.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write(Utf8Json } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(FileIds)) + if (SerializedAdditionalRawData?.ContainsKey("file_ids") != true && Optional.IsCollectionDefined(FileIds)) { writer.WritePropertyName("file_ids"u8); writer.WriteStartArray(); @@ -31,10 +31,14 @@ void IJsonModel.Write(Utf8Json } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -88,8 +92,9 @@ internal static InternalThreadObjectToolResourcesCodeInterpreter DeserializeInte fileIds = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalThreadObjectToolResourcesCodeInterpreter.cs b/src/Generated/Models/InternalThreadObjectToolResourcesCodeInterpreter.cs index 68671b7b0..ddcfa61ee 100644 --- a/src/Generated/Models/InternalThreadObjectToolResourcesCodeInterpreter.cs +++ b/src/Generated/Models/InternalThreadObjectToolResourcesCodeInterpreter.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalThreadObjectToolResourcesCodeInterpreter { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalThreadObjectToolResourcesCodeInterpreter() { FileIds = new ChangeTrackingList(); @@ -19,7 +18,7 @@ internal InternalThreadObjectToolResourcesCodeInterpreter() internal InternalThreadObjectToolResourcesCodeInterpreter(IReadOnlyList fileIds, IDictionary serializedAdditionalRawData) { FileIds = fileIds; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IReadOnlyList FileIds { get; } diff --git a/src/Generated/Models/InternalThreadObjectToolResourcesFileSearch.Serialization.cs b/src/Generated/Models/InternalThreadObjectToolResourcesFileSearch.Serialization.cs index 621a90336..63b7217cf 100644 --- a/src/Generated/Models/InternalThreadObjectToolResourcesFileSearch.Serialization.cs +++ b/src/Generated/Models/InternalThreadObjectToolResourcesFileSearch.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write(Utf8JsonWrite } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(VectorStoreIds)) + if (SerializedAdditionalRawData?.ContainsKey("vector_store_ids") != true && Optional.IsCollectionDefined(VectorStoreIds)) { writer.WritePropertyName("vector_store_ids"u8); writer.WriteStartArray(); @@ -31,10 +31,14 @@ void IJsonModel.Write(Utf8JsonWrite } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -88,8 +92,9 @@ internal static InternalThreadObjectToolResourcesFileSearch DeserializeInternalT vectorStoreIds = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalThreadObjectToolResourcesFileSearch.cs b/src/Generated/Models/InternalThreadObjectToolResourcesFileSearch.cs index f93de28a0..4214562af 100644 --- a/src/Generated/Models/InternalThreadObjectToolResourcesFileSearch.cs +++ b/src/Generated/Models/InternalThreadObjectToolResourcesFileSearch.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class InternalThreadObjectToolResourcesFileSearch { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalThreadObjectToolResourcesFileSearch() { VectorStoreIds = new ChangeTrackingList(); @@ -19,7 +18,7 @@ internal InternalThreadObjectToolResourcesFileSearch() internal InternalThreadObjectToolResourcesFileSearch(IReadOnlyList vectorStoreIds, IDictionary serializedAdditionalRawData) { VectorStoreIds = vectorStoreIds; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IReadOnlyList VectorStoreIds { get; } diff --git a/src/Generated/Models/InternalUnknownChunkingStrategy.Serialization.cs b/src/Generated/Models/InternalUnknownChunkingStrategy.Serialization.cs index 9f9a663d9..8d9ba385b 100644 --- a/src/Generated/Models/InternalUnknownChunkingStrategy.Serialization.cs +++ b/src/Generated/Models/InternalUnknownChunkingStrategy.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static InternalUnknownChunkingStrategy DeserializeInternalUnknownChunki type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalUnknownFileChunkingStrategyRequestParamProxy.Serialization.cs b/src/Generated/Models/InternalUnknownFileChunkingStrategyRequestParamProxy.Serialization.cs index 2f6c829a3..e7d498383 100644 --- a/src/Generated/Models/InternalUnknownFileChunkingStrategyRequestParamProxy.Serialization.cs +++ b/src/Generated/Models/InternalUnknownFileChunkingStrategyRequestParamProxy.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter w } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static InternalUnknownFileChunkingStrategyRequestParamProxy Deserialize type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalUnknownFileChunkingStrategyResponseParamProxy.Serialization.cs b/src/Generated/Models/InternalUnknownFileChunkingStrategyResponseParamProxy.Serialization.cs index f4b8d85bf..81222645e 100644 --- a/src/Generated/Models/InternalUnknownFileChunkingStrategyResponseParamProxy.Serialization.cs +++ b/src/Generated/Models/InternalUnknownFileChunkingStrategyResponseParamProxy.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWr } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static InternalUnknownFileChunkingStrategyResponseParamProxy Deserializ type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalVectorStoreFileBatchObjectFileCounts.Serialization.cs b/src/Generated/Models/InternalVectorStoreFileBatchObjectFileCounts.Serialization.cs index 79f93929a..8e7dfc44d 100644 --- a/src/Generated/Models/InternalVectorStoreFileBatchObjectFileCounts.Serialization.cs +++ b/src/Generated/Models/InternalVectorStoreFileBatchObjectFileCounts.Serialization.cs @@ -21,20 +21,39 @@ void IJsonModel.Write(Utf8JsonWrit } writer.WriteStartObject(); - writer.WritePropertyName("in_progress"u8); - writer.WriteNumberValue(InProgress); - writer.WritePropertyName("completed"u8); - writer.WriteNumberValue(Completed); - writer.WritePropertyName("failed"u8); - writer.WriteNumberValue(Failed); - writer.WritePropertyName("cancelled"u8); - writer.WriteNumberValue(Cancelled); - writer.WritePropertyName("total"u8); - writer.WriteNumberValue(Total); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("in_progress") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("in_progress"u8); + writer.WriteNumberValue(InProgress); + } + if (SerializedAdditionalRawData?.ContainsKey("completed") != true) + { + writer.WritePropertyName("completed"u8); + writer.WriteNumberValue(Completed); + } + if (SerializedAdditionalRawData?.ContainsKey("failed") != true) + { + writer.WritePropertyName("failed"u8); + writer.WriteNumberValue(Failed); + } + if (SerializedAdditionalRawData?.ContainsKey("cancelled") != true) + { + writer.WritePropertyName("cancelled"u8); + writer.WriteNumberValue(Cancelled); + } + if (SerializedAdditionalRawData?.ContainsKey("total") != true) + { + writer.WritePropertyName("total"u8); + writer.WriteNumberValue(Total); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -103,8 +122,9 @@ internal static InternalVectorStoreFileBatchObjectFileCounts DeserializeInternal total = property.Value.GetInt32(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/InternalVectorStoreFileBatchObjectFileCounts.cs b/src/Generated/Models/InternalVectorStoreFileBatchObjectFileCounts.cs index ec07b6761..03849395d 100644 --- a/src/Generated/Models/InternalVectorStoreFileBatchObjectFileCounts.cs +++ b/src/Generated/Models/InternalVectorStoreFileBatchObjectFileCounts.cs @@ -9,8 +9,7 @@ namespace OpenAI.VectorStores { internal partial class InternalVectorStoreFileBatchObjectFileCounts { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; set; } internal InternalVectorStoreFileBatchObjectFileCounts(int inProgress, int completed, int failed, int cancelled, int total) { InProgress = inProgress; @@ -27,7 +26,7 @@ internal InternalVectorStoreFileBatchObjectFileCounts(int inProgress, int comple Failed = failed; Cancelled = cancelled; Total = total; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal InternalVectorStoreFileBatchObjectFileCounts() diff --git a/src/Generated/Models/MessageContent.cs b/src/Generated/Models/MessageContent.cs index 118f79f6f..acd2eed78 100644 --- a/src/Generated/Models/MessageContent.cs +++ b/src/Generated/Models/MessageContent.cs @@ -9,11 +9,11 @@ namespace OpenAI.Assistants { public abstract partial class MessageContent { - private protected IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal MessageContent(IDictionary serializedAdditionalRawData) { - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } } } diff --git a/src/Generated/Models/MessageContentTextAnnotationsFileCitationObject.Serialization.cs b/src/Generated/Models/MessageContentTextAnnotationsFileCitationObject.Serialization.cs index f76ab3eb2..72de78084 100644 --- a/src/Generated/Models/MessageContentTextAnnotationsFileCitationObject.Serialization.cs +++ b/src/Generated/Models/MessageContentTextAnnotationsFileCitationObject.Serialization.cs @@ -21,20 +21,39 @@ void IJsonModel.Write(Utf8JsonW } writer.WriteStartObject(); - writer.WritePropertyName("text"u8); - writer.WriteStringValue(Text); - writer.WritePropertyName("file_citation"u8); - writer.WriteObjectValue(FileCitation, options); - writer.WritePropertyName("start_index"u8); - writer.WriteNumberValue(StartIndex); - writer.WritePropertyName("end_index"u8); - writer.WriteNumberValue(EndIndex); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("text") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("text"u8); + writer.WriteStringValue(Text); + } + if (SerializedAdditionalRawData?.ContainsKey("file_citation") != true) + { + writer.WritePropertyName("file_citation"u8); + writer.WriteObjectValue(FileCitation, options); + } + if (SerializedAdditionalRawData?.ContainsKey("start_index") != true) + { + writer.WritePropertyName("start_index"u8); + writer.WriteNumberValue(StartIndex); + } + if (SerializedAdditionalRawData?.ContainsKey("end_index") != true) + { + writer.WritePropertyName("end_index"u8); + writer.WriteNumberValue(EndIndex); + } + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -103,8 +122,9 @@ internal static MessageContentTextAnnotationsFileCitationObject DeserializeMessa type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/MessageContentTextAnnotationsFilePathObject.Serialization.cs b/src/Generated/Models/MessageContentTextAnnotationsFilePathObject.Serialization.cs index 394556481..e87842425 100644 --- a/src/Generated/Models/MessageContentTextAnnotationsFilePathObject.Serialization.cs +++ b/src/Generated/Models/MessageContentTextAnnotationsFilePathObject.Serialization.cs @@ -21,20 +21,39 @@ void IJsonModel.Write(Utf8JsonWrite } writer.WriteStartObject(); - writer.WritePropertyName("text"u8); - writer.WriteStringValue(Text); - writer.WritePropertyName("file_path"u8); - writer.WriteObjectValue(FilePath, options); - writer.WritePropertyName("start_index"u8); - writer.WriteNumberValue(StartIndex); - writer.WritePropertyName("end_index"u8); - writer.WriteNumberValue(EndIndex); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("text") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("text"u8); + writer.WriteStringValue(Text); + } + if (SerializedAdditionalRawData?.ContainsKey("file_path") != true) + { + writer.WritePropertyName("file_path"u8); + writer.WriteObjectValue(FilePath, options); + } + if (SerializedAdditionalRawData?.ContainsKey("start_index") != true) + { + writer.WritePropertyName("start_index"u8); + writer.WriteNumberValue(StartIndex); + } + if (SerializedAdditionalRawData?.ContainsKey("end_index") != true) + { + writer.WritePropertyName("end_index"u8); + writer.WriteNumberValue(EndIndex); + } + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -103,8 +122,9 @@ internal static MessageContentTextAnnotationsFilePathObject DeserializeMessageCo type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/MessageContentTextObjectAnnotation.Serialization.cs b/src/Generated/Models/MessageContentTextObjectAnnotation.Serialization.cs index cb9573236..3b2495f19 100644 --- a/src/Generated/Models/MessageContentTextObjectAnnotation.Serialization.cs +++ b/src/Generated/Models/MessageContentTextObjectAnnotation.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); diff --git a/src/Generated/Models/MessageContentTextObjectAnnotation.cs b/src/Generated/Models/MessageContentTextObjectAnnotation.cs index a2ee673ee..11509a0e0 100644 --- a/src/Generated/Models/MessageContentTextObjectAnnotation.cs +++ b/src/Generated/Models/MessageContentTextObjectAnnotation.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal abstract partial class MessageContentTextObjectAnnotation { - private protected IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } protected MessageContentTextObjectAnnotation() { } @@ -18,7 +17,7 @@ protected MessageContentTextObjectAnnotation() internal MessageContentTextObjectAnnotation(string type, IDictionary serializedAdditionalRawData) { Type = type; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal string Type { get; init; } diff --git a/src/Generated/Models/MessageContentTextObjectText.Serialization.cs b/src/Generated/Models/MessageContentTextObjectText.Serialization.cs index 4dea6d768..ef26c9537 100644 --- a/src/Generated/Models/MessageContentTextObjectText.Serialization.cs +++ b/src/Generated/Models/MessageContentTextObjectText.Serialization.cs @@ -21,19 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, Model } writer.WriteStartObject(); - writer.WritePropertyName("value"u8); - writer.WriteStringValue(Value); - writer.WritePropertyName("annotations"u8); - writer.WriteStartArray(); - foreach (var item in Annotations) + if (SerializedAdditionalRawData?.ContainsKey("value") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("value"u8); + writer.WriteStringValue(Value); } - writer.WriteEndArray(); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("annotations") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("annotations"u8); + writer.WriteStartArray(); + foreach (var item in Annotations) { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) + { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -89,8 +99,9 @@ internal static MessageContentTextObjectText DeserializeMessageContentTextObject annotations = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/MessageContentTextObjectText.cs b/src/Generated/Models/MessageContentTextObjectText.cs index 847d3d84b..8dd8542dc 100644 --- a/src/Generated/Models/MessageContentTextObjectText.cs +++ b/src/Generated/Models/MessageContentTextObjectText.cs @@ -10,8 +10,7 @@ namespace OpenAI.Assistants { internal partial class MessageContentTextObjectText { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } public MessageContentTextObjectText(string value, IEnumerable annotations) { Argument.AssertNotNull(value, nameof(value)); @@ -25,7 +24,7 @@ internal MessageContentTextObjectText(string value, IList.Write(Utf8JsonWriter writer, ModelRea } writer.WriteStartObject(); - writer.WritePropertyName("file_id"u8); - writer.WriteStringValue(FileId); - writer.WritePropertyName("tools"u8); - SerializeTools(writer, options); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("file_id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("file_id"u8); + writer.WriteStringValue(FileId); + } + if (SerializedAdditionalRawData?.ContainsKey("tools") != true) + { + writer.WritePropertyName("tools"u8); + SerializeTools(writer, options); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static MessageCreationAttachment DeserializeMessageCreationAttachment(J DeserializeTools(property, ref tools); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/MessageCreationAttachment.cs b/src/Generated/Models/MessageCreationAttachment.cs index 8844ef79e..0fe4a75ca 100644 --- a/src/Generated/Models/MessageCreationAttachment.cs +++ b/src/Generated/Models/MessageCreationAttachment.cs @@ -10,8 +10,7 @@ namespace OpenAI.Assistants { public partial class MessageCreationAttachment { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } public MessageCreationAttachment(string fileId, IEnumerable tools) { Argument.AssertNotNull(fileId, nameof(fileId)); @@ -25,7 +24,7 @@ internal MessageCreationAttachment(string fileId, IReadOnlyList { FileId = fileId; Tools = tools; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal MessageCreationAttachment() diff --git a/src/Generated/Models/MessageCreationOptions.Serialization.cs b/src/Generated/Models/MessageCreationOptions.Serialization.cs index f4baa938e..5a3e69de0 100644 --- a/src/Generated/Models/MessageCreationOptions.Serialization.cs +++ b/src/Generated/Models/MessageCreationOptions.Serialization.cs @@ -21,11 +21,17 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReader } writer.WriteStartObject(); - writer.WritePropertyName("role"u8); - writer.WriteStringValue(Role.ToSerialString()); - writer.WritePropertyName("content"u8); - SerializeContent(writer, options); - if (Optional.IsCollectionDefined(Attachments)) + if (SerializedAdditionalRawData?.ContainsKey("role") != true) + { + writer.WritePropertyName("role"u8); + writer.WriteStringValue(Role.ToSerialString()); + } + if (SerializedAdditionalRawData?.ContainsKey("content") != true) + { + writer.WritePropertyName("content"u8); + SerializeContent(writer, options); + } + if (SerializedAdditionalRawData?.ContainsKey("attachments") != true && Optional.IsCollectionDefined(Attachments)) { if (Attachments != null) { @@ -42,7 +48,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReader writer.WriteNull("attachments"); } } - if (Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true && Optional.IsCollectionDefined(Metadata)) { if (Metadata != null) { @@ -60,10 +66,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReader writer.WriteNull("metadata"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -149,8 +159,9 @@ internal static MessageCreationOptions DeserializeMessageCreationOptions(JsonEle metadata = dictionary; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/MessageCreationOptions.cs b/src/Generated/Models/MessageCreationOptions.cs index 85f6ee95f..384246e6c 100644 --- a/src/Generated/Models/MessageCreationOptions.cs +++ b/src/Generated/Models/MessageCreationOptions.cs @@ -10,7 +10,7 @@ namespace OpenAI.Assistants { public partial class MessageCreationOptions { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal MessageCreationOptions(MessageRole role, IList content, IList attachments, IDictionary metadata, IDictionary serializedAdditionalRawData) { @@ -18,7 +18,7 @@ internal MessageCreationOptions(MessageRole role, IList content, Content = content; Attachments = attachments; Metadata = metadata; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IList Attachments { get; } public IDictionary Metadata { get; } diff --git a/src/Generated/Models/MessageDeltaContent.Serialization.cs b/src/Generated/Models/MessageDeltaContent.Serialization.cs index f6deddaf6..9de25d996 100644 --- a/src/Generated/Models/MessageDeltaContent.Serialization.cs +++ b/src/Generated/Models/MessageDeltaContent.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWri } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); diff --git a/src/Generated/Models/MessageDeltaContent.cs b/src/Generated/Models/MessageDeltaContent.cs index ab303bd97..a12ac9005 100644 --- a/src/Generated/Models/MessageDeltaContent.cs +++ b/src/Generated/Models/MessageDeltaContent.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal abstract partial class MessageDeltaContent { - private protected IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } protected MessageDeltaContent() { } @@ -18,7 +17,7 @@ protected MessageDeltaContent() internal MessageDeltaContent(string type, IDictionary serializedAdditionalRawData) { Type = type; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal string Type { get; init; } diff --git a/src/Generated/Models/MessageDeltaContentImageFileObject.Serialization.cs b/src/Generated/Models/MessageDeltaContentImageFileObject.Serialization.cs index da1dd2d0e..7e3b037b4 100644 --- a/src/Generated/Models/MessageDeltaContentImageFileObject.Serialization.cs +++ b/src/Generated/Models/MessageDeltaContentImageFileObject.Serialization.cs @@ -21,19 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteStartObject(); - writer.WritePropertyName("index"u8); - writer.WriteNumberValue(Index); - if (Optional.IsDefined(ImageFile)) + if (SerializedAdditionalRawData?.ContainsKey("index") != true) + { + writer.WritePropertyName("index"u8); + writer.WriteNumberValue(Index); + } + if (SerializedAdditionalRawData?.ContainsKey("image_file") != true && Optional.IsDefined(ImageFile)) { writer.WritePropertyName("image_file"u8); writer.WriteObjectValue(ImageFile, options); } - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -94,8 +104,9 @@ internal static MessageDeltaContentImageFileObject DeserializeMessageDeltaConten type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/MessageDeltaContentImageFileObjectImageFile.Serialization.cs b/src/Generated/Models/MessageDeltaContentImageFileObjectImageFile.Serialization.cs index 33a538d74..dfde5e919 100644 --- a/src/Generated/Models/MessageDeltaContentImageFileObjectImageFile.Serialization.cs +++ b/src/Generated/Models/MessageDeltaContentImageFileObjectImageFile.Serialization.cs @@ -21,20 +21,24 @@ void IJsonModel.Write(Utf8JsonWrite } writer.WriteStartObject(); - if (Optional.IsDefined(FileId)) + if (SerializedAdditionalRawData?.ContainsKey("file_id") != true && Optional.IsDefined(FileId)) { writer.WritePropertyName("file_id"u8); writer.WriteStringValue(FileId); } - if (Optional.IsDefined(Detail)) + if (SerializedAdditionalRawData?.ContainsKey("detail") != true && Optional.IsDefined(Detail)) { writer.WritePropertyName("detail"u8); writer.WriteStringValue(Detail); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -85,8 +89,9 @@ internal static MessageDeltaContentImageFileObjectImageFile DeserializeMessageDe detail = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/MessageDeltaContentImageFileObjectImageFile.cs b/src/Generated/Models/MessageDeltaContentImageFileObjectImageFile.cs index 283c74923..ad2925486 100644 --- a/src/Generated/Models/MessageDeltaContentImageFileObjectImageFile.cs +++ b/src/Generated/Models/MessageDeltaContentImageFileObjectImageFile.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class MessageDeltaContentImageFileObjectImageFile { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal MessageDeltaContentImageFileObjectImageFile() { } @@ -19,7 +18,7 @@ internal MessageDeltaContentImageFileObjectImageFile(string fileId, string detai { FileId = fileId; Detail = detail; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string FileId { get; } diff --git a/src/Generated/Models/MessageDeltaContentImageUrlObject.Serialization.cs b/src/Generated/Models/MessageDeltaContentImageUrlObject.Serialization.cs index dd9889d3a..5bcbcf94f 100644 --- a/src/Generated/Models/MessageDeltaContentImageUrlObject.Serialization.cs +++ b/src/Generated/Models/MessageDeltaContentImageUrlObject.Serialization.cs @@ -21,19 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteStartObject(); - writer.WritePropertyName("index"u8); - writer.WriteNumberValue(Index); - if (Optional.IsDefined(ImageUrl)) + if (SerializedAdditionalRawData?.ContainsKey("index") != true) + { + writer.WritePropertyName("index"u8); + writer.WriteNumberValue(Index); + } + if (SerializedAdditionalRawData?.ContainsKey("image_url") != true && Optional.IsDefined(ImageUrl)) { writer.WritePropertyName("image_url"u8); writer.WriteObjectValue(ImageUrl, options); } - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -94,8 +104,9 @@ internal static MessageDeltaContentImageUrlObject DeserializeMessageDeltaContent type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/MessageDeltaContentImageUrlObjectImageUrl.Serialization.cs b/src/Generated/Models/MessageDeltaContentImageUrlObjectImageUrl.Serialization.cs index 07b8bf20b..f5a3e4c13 100644 --- a/src/Generated/Models/MessageDeltaContentImageUrlObjectImageUrl.Serialization.cs +++ b/src/Generated/Models/MessageDeltaContentImageUrlObjectImageUrl.Serialization.cs @@ -21,20 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter } writer.WriteStartObject(); - if (Optional.IsDefined(Url)) + if (SerializedAdditionalRawData?.ContainsKey("url") != true && Optional.IsDefined(Url)) { writer.WritePropertyName("url"u8); writer.WriteStringValue(Url.AbsoluteUri); } - if (Optional.IsDefined(Detail)) + if (SerializedAdditionalRawData?.ContainsKey("detail") != true && Optional.IsDefined(Detail)) { writer.WritePropertyName("detail"u8); writer.WriteStringValue(Detail); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -89,8 +93,9 @@ internal static MessageDeltaContentImageUrlObjectImageUrl DeserializeMessageDelt detail = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/MessageDeltaContentImageUrlObjectImageUrl.cs b/src/Generated/Models/MessageDeltaContentImageUrlObjectImageUrl.cs index 8389da101..686a3335e 100644 --- a/src/Generated/Models/MessageDeltaContentImageUrlObjectImageUrl.cs +++ b/src/Generated/Models/MessageDeltaContentImageUrlObjectImageUrl.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class MessageDeltaContentImageUrlObjectImageUrl { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal MessageDeltaContentImageUrlObjectImageUrl() { } @@ -19,7 +18,7 @@ internal MessageDeltaContentImageUrlObjectImageUrl(Uri url, string detail, IDict { Url = url; Detail = detail; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public Uri Url { get; } diff --git a/src/Generated/Models/MessageDeltaContentTextAnnotationsFileCitationObject.Serialization.cs b/src/Generated/Models/MessageDeltaContentTextAnnotationsFileCitationObject.Serialization.cs index 8214cf4ce..0cb5bb9a3 100644 --- a/src/Generated/Models/MessageDeltaContentTextAnnotationsFileCitationObject.Serialization.cs +++ b/src/Generated/Models/MessageDeltaContentTextAnnotationsFileCitationObject.Serialization.cs @@ -21,34 +21,44 @@ void IJsonModel.Write(Utf8 } writer.WriteStartObject(); - writer.WritePropertyName("index"u8); - writer.WriteNumberValue(Index); - if (Optional.IsDefined(Text)) + if (SerializedAdditionalRawData?.ContainsKey("index") != true) + { + writer.WritePropertyName("index"u8); + writer.WriteNumberValue(Index); + } + if (SerializedAdditionalRawData?.ContainsKey("text") != true && Optional.IsDefined(Text)) { writer.WritePropertyName("text"u8); writer.WriteStringValue(Text); } - if (Optional.IsDefined(FileCitation)) + if (SerializedAdditionalRawData?.ContainsKey("file_citation") != true && Optional.IsDefined(FileCitation)) { writer.WritePropertyName("file_citation"u8); writer.WriteObjectValue(FileCitation, options); } - if (Optional.IsDefined(StartIndex)) + if (SerializedAdditionalRawData?.ContainsKey("start_index") != true && Optional.IsDefined(StartIndex)) { writer.WritePropertyName("start_index"u8); writer.WriteNumberValue(StartIndex.Value); } - if (Optional.IsDefined(EndIndex)) + if (SerializedAdditionalRawData?.ContainsKey("end_index") != true && Optional.IsDefined(EndIndex)) { writer.WritePropertyName("end_index"u8); writer.WriteNumberValue(EndIndex.Value); } - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -135,8 +145,9 @@ internal static MessageDeltaContentTextAnnotationsFileCitationObject Deserialize type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/MessageDeltaContentTextAnnotationsFileCitationObjectFileCitation.Serialization.cs b/src/Generated/Models/MessageDeltaContentTextAnnotationsFileCitationObjectFileCitation.Serialization.cs index 94e1a842f..0ec64a166 100644 --- a/src/Generated/Models/MessageDeltaContentTextAnnotationsFileCitationObjectFileCitation.Serialization.cs +++ b/src/Generated/Models/MessageDeltaContentTextAnnotationsFileCitationObjectFileCitation.Serialization.cs @@ -21,20 +21,24 @@ void IJsonModel(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/MessageDeltaContentTextAnnotationsFileCitationObjectFileCitation.cs b/src/Generated/Models/MessageDeltaContentTextAnnotationsFileCitationObjectFileCitation.cs index b6c3f0fab..026d439e8 100644 --- a/src/Generated/Models/MessageDeltaContentTextAnnotationsFileCitationObjectFileCitation.cs +++ b/src/Generated/Models/MessageDeltaContentTextAnnotationsFileCitationObjectFileCitation.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class MessageDeltaContentTextAnnotationsFileCitationObjectFileCitation { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal MessageDeltaContentTextAnnotationsFileCitationObjectFileCitation() { } @@ -19,7 +18,7 @@ internal MessageDeltaContentTextAnnotationsFileCitationObjectFileCitation(string { FileId = fileId; Quote = quote; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string FileId { get; } diff --git a/src/Generated/Models/MessageDeltaContentTextAnnotationsFilePathObject.Serialization.cs b/src/Generated/Models/MessageDeltaContentTextAnnotationsFilePathObject.Serialization.cs index 3efc3bf92..880797294 100644 --- a/src/Generated/Models/MessageDeltaContentTextAnnotationsFilePathObject.Serialization.cs +++ b/src/Generated/Models/MessageDeltaContentTextAnnotationsFilePathObject.Serialization.cs @@ -21,34 +21,44 @@ void IJsonModel.Write(Utf8Json } writer.WriteStartObject(); - writer.WritePropertyName("index"u8); - writer.WriteNumberValue(Index); - if (Optional.IsDefined(Text)) + if (SerializedAdditionalRawData?.ContainsKey("index") != true) + { + writer.WritePropertyName("index"u8); + writer.WriteNumberValue(Index); + } + if (SerializedAdditionalRawData?.ContainsKey("text") != true && Optional.IsDefined(Text)) { writer.WritePropertyName("text"u8); writer.WriteStringValue(Text); } - if (Optional.IsDefined(FilePath)) + if (SerializedAdditionalRawData?.ContainsKey("file_path") != true && Optional.IsDefined(FilePath)) { writer.WritePropertyName("file_path"u8); writer.WriteObjectValue(FilePath, options); } - if (Optional.IsDefined(StartIndex)) + if (SerializedAdditionalRawData?.ContainsKey("start_index") != true && Optional.IsDefined(StartIndex)) { writer.WritePropertyName("start_index"u8); writer.WriteNumberValue(StartIndex.Value); } - if (Optional.IsDefined(EndIndex)) + if (SerializedAdditionalRawData?.ContainsKey("end_index") != true && Optional.IsDefined(EndIndex)) { writer.WritePropertyName("end_index"u8); writer.WriteNumberValue(EndIndex.Value); } - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -135,8 +145,9 @@ internal static MessageDeltaContentTextAnnotationsFilePathObject DeserializeMess type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/MessageDeltaContentTextAnnotationsFilePathObjectFilePath.Serialization.cs b/src/Generated/Models/MessageDeltaContentTextAnnotationsFilePathObjectFilePath.Serialization.cs index 1c2f0931e..290ec5cb6 100644 --- a/src/Generated/Models/MessageDeltaContentTextAnnotationsFilePathObjectFilePath.Serialization.cs +++ b/src/Generated/Models/MessageDeltaContentTextAnnotationsFilePathObjectFilePath.Serialization.cs @@ -21,15 +21,19 @@ void IJsonModel.Write( } writer.WriteStartObject(); - if (Optional.IsDefined(FileId)) + if (SerializedAdditionalRawData?.ContainsKey("file_id") != true && Optional.IsDefined(FileId)) { writer.WritePropertyName("file_id"u8); writer.WriteStringValue(FileId); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -74,8 +78,9 @@ internal static MessageDeltaContentTextAnnotationsFilePathObjectFilePath Deseria fileId = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/MessageDeltaContentTextAnnotationsFilePathObjectFilePath.cs b/src/Generated/Models/MessageDeltaContentTextAnnotationsFilePathObjectFilePath.cs index 54e2fa689..6d3473b48 100644 --- a/src/Generated/Models/MessageDeltaContentTextAnnotationsFilePathObjectFilePath.cs +++ b/src/Generated/Models/MessageDeltaContentTextAnnotationsFilePathObjectFilePath.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class MessageDeltaContentTextAnnotationsFilePathObjectFilePath { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal MessageDeltaContentTextAnnotationsFilePathObjectFilePath() { } @@ -18,7 +17,7 @@ internal MessageDeltaContentTextAnnotationsFilePathObjectFilePath() internal MessageDeltaContentTextAnnotationsFilePathObjectFilePath(string fileId, IDictionary serializedAdditionalRawData) { FileId = fileId; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string FileId { get; } diff --git a/src/Generated/Models/MessageDeltaContentTextObject.Serialization.cs b/src/Generated/Models/MessageDeltaContentTextObject.Serialization.cs index e56a2c548..d80da1ecf 100644 --- a/src/Generated/Models/MessageDeltaContentTextObject.Serialization.cs +++ b/src/Generated/Models/MessageDeltaContentTextObject.Serialization.cs @@ -21,19 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mode } writer.WriteStartObject(); - writer.WritePropertyName("index"u8); - writer.WriteNumberValue(Index); - if (Optional.IsDefined(Text)) + if (SerializedAdditionalRawData?.ContainsKey("index") != true) + { + writer.WritePropertyName("index"u8); + writer.WriteNumberValue(Index); + } + if (SerializedAdditionalRawData?.ContainsKey("text") != true && Optional.IsDefined(Text)) { writer.WritePropertyName("text"u8); writer.WriteObjectValue(Text, options); } - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -94,8 +104,9 @@ internal static MessageDeltaContentTextObject DeserializeMessageDeltaContentText type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/MessageDeltaContentTextObjectText.Serialization.cs b/src/Generated/Models/MessageDeltaContentTextObjectText.Serialization.cs index daeeefa9a..2faf63f3a 100644 --- a/src/Generated/Models/MessageDeltaContentTextObjectText.Serialization.cs +++ b/src/Generated/Models/MessageDeltaContentTextObjectText.Serialization.cs @@ -21,12 +21,12 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteStartObject(); - if (Optional.IsDefined(Value)) + if (SerializedAdditionalRawData?.ContainsKey("value") != true && Optional.IsDefined(Value)) { writer.WritePropertyName("value"u8); writer.WriteStringValue(Value); } - if (Optional.IsCollectionDefined(Annotations)) + if (SerializedAdditionalRawData?.ContainsKey("annotations") != true && Optional.IsCollectionDefined(Annotations)) { writer.WritePropertyName("annotations"u8); writer.WriteStartArray(); @@ -36,10 +36,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -99,8 +103,9 @@ internal static MessageDeltaContentTextObjectText DeserializeMessageDeltaContent annotations = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/MessageDeltaContentTextObjectText.cs b/src/Generated/Models/MessageDeltaContentTextObjectText.cs index 98c1aafd2..2c26acbb4 100644 --- a/src/Generated/Models/MessageDeltaContentTextObjectText.cs +++ b/src/Generated/Models/MessageDeltaContentTextObjectText.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class MessageDeltaContentTextObjectText { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal MessageDeltaContentTextObjectText() { Annotations = new ChangeTrackingList(); @@ -20,7 +19,7 @@ internal MessageDeltaContentTextObjectText(string value, IReadOnlyList.Write(Utf8JsonWriter writer, ModelReade } writer.WriteStartObject(); - writer.WritePropertyName("role"u8); - writer.WriteStringValue(Role.ToSerialString()); - if (Optional.IsCollectionDefined(Content)) + if (SerializedAdditionalRawData?.ContainsKey("role") != true) + { + writer.WritePropertyName("role"u8); + writer.WriteStringValue(Role.ToSerialString()); + } + if (SerializedAdditionalRawData?.ContainsKey("content") != true && Optional.IsCollectionDefined(Content)) { writer.WritePropertyName("content"u8); writer.WriteStartArray(); @@ -33,10 +36,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReade } writer.WriteEndArray(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -100,8 +107,9 @@ internal static MessageDeltaObjectDelta DeserializeMessageDeltaObjectDelta(JsonE content = array; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/MessageDeltaObjectDelta.cs b/src/Generated/Models/MessageDeltaObjectDelta.cs index 5b405f6a6..49ae72336 100644 --- a/src/Generated/Models/MessageDeltaObjectDelta.cs +++ b/src/Generated/Models/MessageDeltaObjectDelta.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal partial class MessageDeltaObjectDelta { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal MessageDeltaObjectDelta() { Content = new ChangeTrackingList(); @@ -20,7 +19,7 @@ internal MessageDeltaObjectDelta(MessageRole role, IReadOnlyList Content { get; } } diff --git a/src/Generated/Models/MessageDeltaTextContentAnnotation.Serialization.cs b/src/Generated/Models/MessageDeltaTextContentAnnotation.Serialization.cs index 0a2e5d002..fc8043bdb 100644 --- a/src/Generated/Models/MessageDeltaTextContentAnnotation.Serialization.cs +++ b/src/Generated/Models/MessageDeltaTextContentAnnotation.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); diff --git a/src/Generated/Models/MessageDeltaTextContentAnnotation.cs b/src/Generated/Models/MessageDeltaTextContentAnnotation.cs index 1fdc201e7..8e00cc80e 100644 --- a/src/Generated/Models/MessageDeltaTextContentAnnotation.cs +++ b/src/Generated/Models/MessageDeltaTextContentAnnotation.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { internal abstract partial class MessageDeltaTextContentAnnotation { - private protected IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } protected MessageDeltaTextContentAnnotation() { } @@ -18,7 +17,7 @@ protected MessageDeltaTextContentAnnotation() internal MessageDeltaTextContentAnnotation(string type, IDictionary serializedAdditionalRawData) { Type = type; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal string Type { get; init; } diff --git a/src/Generated/Models/MessageFailureDetails.Serialization.cs b/src/Generated/Models/MessageFailureDetails.Serialization.cs index a0bf026d8..d2de41ece 100644 --- a/src/Generated/Models/MessageFailureDetails.Serialization.cs +++ b/src/Generated/Models/MessageFailureDetails.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW } writer.WriteStartObject(); - writer.WritePropertyName("reason"u8); - writer.WriteStringValue(Reason.ToString()); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("reason") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("reason"u8); + writer.WriteStringValue(Reason.ToString()); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static MessageFailureDetails DeserializeMessageFailureDetails(JsonEleme reason = new MessageFailureReason(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/MessageFailureDetails.cs b/src/Generated/Models/MessageFailureDetails.cs index 2e43ade63..c919164c9 100644 --- a/src/Generated/Models/MessageFailureDetails.cs +++ b/src/Generated/Models/MessageFailureDetails.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public partial class MessageFailureDetails { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal MessageFailureDetails(MessageFailureReason reason) { Reason = reason; @@ -19,7 +18,7 @@ internal MessageFailureDetails(MessageFailureReason reason) internal MessageFailureDetails(MessageFailureReason reason, IDictionary serializedAdditionalRawData) { Reason = reason; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal MessageFailureDetails() diff --git a/src/Generated/Models/MessageModificationOptions.Serialization.cs b/src/Generated/Models/MessageModificationOptions.Serialization.cs index 58dbd6eff..c81a7a933 100644 --- a/src/Generated/Models/MessageModificationOptions.Serialization.cs +++ b/src/Generated/Models/MessageModificationOptions.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true && Optional.IsCollectionDefined(Metadata)) { if (Metadata != null) { @@ -39,10 +39,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe writer.WriteNull("metadata"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -96,8 +100,9 @@ internal static MessageModificationOptions DeserializeMessageModificationOptions metadata = dictionary; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/MessageModificationOptions.cs b/src/Generated/Models/MessageModificationOptions.cs index 108c0f1ad..96cbd0c3c 100644 --- a/src/Generated/Models/MessageModificationOptions.cs +++ b/src/Generated/Models/MessageModificationOptions.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public partial class MessageModificationOptions { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } public MessageModificationOptions() { Metadata = new ChangeTrackingDictionary(); @@ -19,7 +18,7 @@ public MessageModificationOptions() internal MessageModificationOptions(IDictionary metadata, IDictionary serializedAdditionalRawData) { Metadata = metadata; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IDictionary Metadata { get; } diff --git a/src/Generated/Models/ModerationCategories.Serialization.cs b/src/Generated/Models/ModerationCategories.Serialization.cs index 4f0ec9181..40fa975a9 100644 --- a/src/Generated/Models/ModerationCategories.Serialization.cs +++ b/src/Generated/Models/ModerationCategories.Serialization.cs @@ -21,32 +21,69 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWr } writer.WriteStartObject(); - writer.WritePropertyName("hate"u8); - writer.WriteBooleanValue(Hate); - writer.WritePropertyName("hate/threatening"u8); - writer.WriteBooleanValue(HateThreatening); - writer.WritePropertyName("harassment"u8); - writer.WriteBooleanValue(Harassment); - writer.WritePropertyName("harassment/threatening"u8); - writer.WriteBooleanValue(HarassmentThreatening); - writer.WritePropertyName("self-harm"u8); - writer.WriteBooleanValue(SelfHarm); - writer.WritePropertyName("self-harm/intent"u8); - writer.WriteBooleanValue(SelfHarmIntent); - writer.WritePropertyName("self-harm/instructions"u8); - writer.WriteBooleanValue(SelfHarmInstructions); - writer.WritePropertyName("sexual"u8); - writer.WriteBooleanValue(Sexual); - writer.WritePropertyName("sexual/minors"u8); - writer.WriteBooleanValue(SexualMinors); - writer.WritePropertyName("violence"u8); - writer.WriteBooleanValue(Violence); - writer.WritePropertyName("violence/graphic"u8); - writer.WriteBooleanValue(ViolenceGraphic); - if (true && _serializedAdditionalRawData != null) - { - foreach (var item in _serializedAdditionalRawData) + if (SerializedAdditionalRawData?.ContainsKey("hate") != true) + { + writer.WritePropertyName("hate"u8); + writer.WriteBooleanValue(Hate); + } + if (SerializedAdditionalRawData?.ContainsKey("hate/threatening") != true) + { + writer.WritePropertyName("hate/threatening"u8); + writer.WriteBooleanValue(HateThreatening); + } + if (SerializedAdditionalRawData?.ContainsKey("harassment") != true) + { + writer.WritePropertyName("harassment"u8); + writer.WriteBooleanValue(Harassment); + } + if (SerializedAdditionalRawData?.ContainsKey("harassment/threatening") != true) + { + writer.WritePropertyName("harassment/threatening"u8); + writer.WriteBooleanValue(HarassmentThreatening); + } + if (SerializedAdditionalRawData?.ContainsKey("self-harm") != true) + { + writer.WritePropertyName("self-harm"u8); + writer.WriteBooleanValue(SelfHarm); + } + if (SerializedAdditionalRawData?.ContainsKey("self-harm/intent") != true) + { + writer.WritePropertyName("self-harm/intent"u8); + writer.WriteBooleanValue(SelfHarmIntent); + } + if (SerializedAdditionalRawData?.ContainsKey("self-harm/instructions") != true) + { + writer.WritePropertyName("self-harm/instructions"u8); + writer.WriteBooleanValue(SelfHarmInstructions); + } + if (SerializedAdditionalRawData?.ContainsKey("sexual") != true) + { + writer.WritePropertyName("sexual"u8); + writer.WriteBooleanValue(Sexual); + } + if (SerializedAdditionalRawData?.ContainsKey("sexual/minors") != true) + { + writer.WritePropertyName("sexual/minors"u8); + writer.WriteBooleanValue(SexualMinors); + } + if (SerializedAdditionalRawData?.ContainsKey("violence") != true) + { + writer.WritePropertyName("violence"u8); + writer.WriteBooleanValue(Violence); + } + if (SerializedAdditionalRawData?.ContainsKey("violence/graphic") != true) + { + writer.WritePropertyName("violence/graphic"u8); + writer.WriteBooleanValue(ViolenceGraphic); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -151,8 +188,9 @@ internal static ModerationCategories DeserializeModerationCategories(JsonElement violenceGraphic = property.Value.GetBoolean(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ModerationCategories.cs b/src/Generated/Models/ModerationCategories.cs index 7ae083e9a..f0dcfcf71 100644 --- a/src/Generated/Models/ModerationCategories.cs +++ b/src/Generated/Models/ModerationCategories.cs @@ -9,8 +9,7 @@ namespace OpenAI.Moderations { public partial class ModerationCategories { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal ModerationCategories(bool hate, bool hateThreatening, bool harassment, bool harassmentThreatening, bool selfHarm, bool selfHarmIntent, bool selfHarmInstructions, bool sexual, bool sexualMinors, bool violence, bool violenceGraphic) { Hate = hate; @@ -39,7 +38,7 @@ internal ModerationCategories(bool hate, bool hateThreatening, bool harassment, SexualMinors = sexualMinors; Violence = violence; ViolenceGraphic = violenceGraphic; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal ModerationCategories() diff --git a/src/Generated/Models/ModerationCategoryScores.Serialization.cs b/src/Generated/Models/ModerationCategoryScores.Serialization.cs index cd47e74ad..64cc010a6 100644 --- a/src/Generated/Models/ModerationCategoryScores.Serialization.cs +++ b/src/Generated/Models/ModerationCategoryScores.Serialization.cs @@ -21,32 +21,69 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRead } writer.WriteStartObject(); - writer.WritePropertyName("hate"u8); - writer.WriteNumberValue(Hate); - writer.WritePropertyName("hate/threatening"u8); - writer.WriteNumberValue(HateThreatening); - writer.WritePropertyName("harassment"u8); - writer.WriteNumberValue(Harassment); - writer.WritePropertyName("harassment/threatening"u8); - writer.WriteNumberValue(HarassmentThreatening); - writer.WritePropertyName("self-harm"u8); - writer.WriteNumberValue(SelfHarm); - writer.WritePropertyName("self-harm/intent"u8); - writer.WriteNumberValue(SelfHarmIntent); - writer.WritePropertyName("self-harm/instructions"u8); - writer.WriteNumberValue(SelfHarmInstructions); - writer.WritePropertyName("sexual"u8); - writer.WriteNumberValue(Sexual); - writer.WritePropertyName("sexual/minors"u8); - writer.WriteNumberValue(SexualMinors); - writer.WritePropertyName("violence"u8); - writer.WriteNumberValue(Violence); - writer.WritePropertyName("violence/graphic"u8); - writer.WriteNumberValue(ViolenceGraphic); - if (true && _serializedAdditionalRawData != null) - { - foreach (var item in _serializedAdditionalRawData) + if (SerializedAdditionalRawData?.ContainsKey("hate") != true) + { + writer.WritePropertyName("hate"u8); + writer.WriteNumberValue(Hate); + } + if (SerializedAdditionalRawData?.ContainsKey("hate/threatening") != true) + { + writer.WritePropertyName("hate/threatening"u8); + writer.WriteNumberValue(HateThreatening); + } + if (SerializedAdditionalRawData?.ContainsKey("harassment") != true) + { + writer.WritePropertyName("harassment"u8); + writer.WriteNumberValue(Harassment); + } + if (SerializedAdditionalRawData?.ContainsKey("harassment/threatening") != true) + { + writer.WritePropertyName("harassment/threatening"u8); + writer.WriteNumberValue(HarassmentThreatening); + } + if (SerializedAdditionalRawData?.ContainsKey("self-harm") != true) + { + writer.WritePropertyName("self-harm"u8); + writer.WriteNumberValue(SelfHarm); + } + if (SerializedAdditionalRawData?.ContainsKey("self-harm/intent") != true) + { + writer.WritePropertyName("self-harm/intent"u8); + writer.WriteNumberValue(SelfHarmIntent); + } + if (SerializedAdditionalRawData?.ContainsKey("self-harm/instructions") != true) + { + writer.WritePropertyName("self-harm/instructions"u8); + writer.WriteNumberValue(SelfHarmInstructions); + } + if (SerializedAdditionalRawData?.ContainsKey("sexual") != true) + { + writer.WritePropertyName("sexual"u8); + writer.WriteNumberValue(Sexual); + } + if (SerializedAdditionalRawData?.ContainsKey("sexual/minors") != true) + { + writer.WritePropertyName("sexual/minors"u8); + writer.WriteNumberValue(SexualMinors); + } + if (SerializedAdditionalRawData?.ContainsKey("violence") != true) + { + writer.WritePropertyName("violence"u8); + writer.WriteNumberValue(Violence); + } + if (SerializedAdditionalRawData?.ContainsKey("violence/graphic") != true) + { + writer.WritePropertyName("violence/graphic"u8); + writer.WriteNumberValue(ViolenceGraphic); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -151,8 +188,9 @@ internal static ModerationCategoryScores DeserializeModerationCategoryScores(Jso violenceGraphic = property.Value.GetSingle(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ModerationCategoryScores.cs b/src/Generated/Models/ModerationCategoryScores.cs index 77724e7af..f213ce5bc 100644 --- a/src/Generated/Models/ModerationCategoryScores.cs +++ b/src/Generated/Models/ModerationCategoryScores.cs @@ -9,8 +9,7 @@ namespace OpenAI.Moderations { public partial class ModerationCategoryScores { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal ModerationCategoryScores(float hate, float hateThreatening, float harassment, float harassmentThreatening, float selfHarm, float selfHarmIntent, float selfHarmInstructions, float sexual, float sexualMinors, float violence, float violenceGraphic) { Hate = hate; @@ -39,7 +38,7 @@ internal ModerationCategoryScores(float hate, float hateThreatening, float haras SexualMinors = sexualMinors; Violence = violence; ViolenceGraphic = violenceGraphic; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal ModerationCategoryScores() diff --git a/src/Generated/Models/ModerationOptions.Serialization.cs b/src/Generated/Models/ModerationOptions.Serialization.cs index d1bf1301b..bf8dd6aa3 100644 --- a/src/Generated/Models/ModerationOptions.Serialization.cs +++ b/src/Generated/Models/ModerationOptions.Serialization.cs @@ -21,24 +21,31 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrite } writer.WriteStartObject(); - writer.WritePropertyName("input"u8); + if (SerializedAdditionalRawData?.ContainsKey("input") != true) + { + writer.WritePropertyName("input"u8); #if NET6_0_OR_GREATER writer.WriteRawValue(Input); #else - using (JsonDocument document = JsonDocument.Parse(Input)) - { - JsonSerializer.Serialize(writer, document.RootElement); - } + using (JsonDocument document = JsonDocument.Parse(Input)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } #endif - if (Optional.IsDefined(Model)) + } + if (SerializedAdditionalRawData?.ContainsKey("model") != true && Optional.IsDefined(Model)) { writer.WritePropertyName("model"u8); writer.WriteStringValue(Model.Value.ToString()); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -93,8 +100,9 @@ internal static ModerationOptions DeserializeModerationOptions(JsonElement eleme model = new InternalCreateModerationRequestModel(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ModerationOptions.cs b/src/Generated/Models/ModerationOptions.cs index fc2b620ce..3b1bdb0ed 100644 --- a/src/Generated/Models/ModerationOptions.cs +++ b/src/Generated/Models/ModerationOptions.cs @@ -9,13 +9,13 @@ namespace OpenAI.Moderations { internal partial class ModerationOptions { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal ModerationOptions(BinaryData input, InternalCreateModerationRequestModel? model, IDictionary serializedAdditionalRawData) { Input = input; Model = model; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } } } diff --git a/src/Generated/Models/ModerationResult.Serialization.cs b/src/Generated/Models/ModerationResult.Serialization.cs index 2e908e806..e3bdfb8ec 100644 --- a/src/Generated/Models/ModerationResult.Serialization.cs +++ b/src/Generated/Models/ModerationResult.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriter } writer.WriteStartObject(); - writer.WritePropertyName("flagged"u8); - writer.WriteBooleanValue(Flagged); - writer.WritePropertyName("categories"u8); - writer.WriteObjectValue(Categories, options); - writer.WritePropertyName("category_scores"u8); - writer.WriteObjectValue(CategoryScores, options); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("flagged") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("flagged"u8); + writer.WriteBooleanValue(Flagged); + } + if (SerializedAdditionalRawData?.ContainsKey("categories") != true) + { + writer.WritePropertyName("categories"u8); + writer.WriteObjectValue(Categories, options); + } + if (SerializedAdditionalRawData?.ContainsKey("category_scores") != true) + { + writer.WritePropertyName("category_scores"u8); + writer.WriteObjectValue(CategoryScores, options); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static ModerationResult DeserializeModerationResult(JsonElement element categoryScores = ModerationCategoryScores.DeserializeModerationCategoryScores(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ModerationResult.cs b/src/Generated/Models/ModerationResult.cs index 9783589c9..67d4bde28 100644 --- a/src/Generated/Models/ModerationResult.cs +++ b/src/Generated/Models/ModerationResult.cs @@ -9,8 +9,7 @@ namespace OpenAI.Moderations { public partial class ModerationResult { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal ModerationResult(bool flagged, ModerationCategories categories, ModerationCategoryScores categoryScores) { Argument.AssertNotNull(categories, nameof(categories)); @@ -26,7 +25,7 @@ internal ModerationResult(bool flagged, ModerationCategories categories, Moderat Flagged = flagged; Categories = categories; CategoryScores = categoryScores; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal ModerationResult() diff --git a/src/Generated/Models/OpenAIError.Serialization.cs b/src/Generated/Models/OpenAIError.Serialization.cs index 883819949..48b1c7159 100644 --- a/src/Generated/Models/OpenAIError.Serialization.cs +++ b/src/Generated/Models/OpenAIError.Serialization.cs @@ -21,32 +21,48 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptio } writer.WriteStartObject(); - if (Code != null) + if (SerializedAdditionalRawData?.ContainsKey("code") != true) { - writer.WritePropertyName("code"u8); - writer.WriteStringValue(Code); + if (Code != null) + { + writer.WritePropertyName("code"u8); + writer.WriteStringValue(Code); + } + else + { + writer.WriteNull("code"); + } } - else + if (SerializedAdditionalRawData?.ContainsKey("message") != true) { - writer.WriteNull("code"); + writer.WritePropertyName("message"u8); + writer.WriteStringValue(Message); } - writer.WritePropertyName("message"u8); - writer.WriteStringValue(Message); - if (Param != null) + if (SerializedAdditionalRawData?.ContainsKey("param") != true) { - writer.WritePropertyName("param"u8); - writer.WriteStringValue(Param); + if (Param != null) + { + writer.WritePropertyName("param"u8); + writer.WriteStringValue(Param); + } + else + { + writer.WriteNull("param"); + } } - else + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - writer.WriteNull("param"); + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); } - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -119,8 +135,9 @@ internal static OpenAIError DeserializeOpenAIError(JsonElement element, ModelRea type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/OpenAIError.cs b/src/Generated/Models/OpenAIError.cs index dc5c977b0..b335c87a5 100644 --- a/src/Generated/Models/OpenAIError.cs +++ b/src/Generated/Models/OpenAIError.cs @@ -9,8 +9,7 @@ namespace OpenAI.Internal { internal partial class OpenAIError { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal OpenAIError(string code, string message, string param, string type) { Argument.AssertNotNull(message, nameof(message)); @@ -28,7 +27,7 @@ internal OpenAIError(string code, string message, string param, string type, IDi Message = message; Param = param; Type = type; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal OpenAIError() diff --git a/src/Generated/Models/OpenAIErrorResponse.Serialization.cs b/src/Generated/Models/OpenAIErrorResponse.Serialization.cs index f38ff4447..30adf205a 100644 --- a/src/Generated/Models/OpenAIErrorResponse.Serialization.cs +++ b/src/Generated/Models/OpenAIErrorResponse.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWri } writer.WriteStartObject(); - writer.WritePropertyName("error"u8); - writer.WriteObjectValue(Error, options); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("error") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("error"u8); + writer.WriteObjectValue(Error, options); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static OpenAIErrorResponse DeserializeOpenAIErrorResponse(JsonElement e error = OpenAIError.DeserializeOpenAIError(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/OpenAIErrorResponse.cs b/src/Generated/Models/OpenAIErrorResponse.cs index d8a1d926a..1edcef9e5 100644 --- a/src/Generated/Models/OpenAIErrorResponse.cs +++ b/src/Generated/Models/OpenAIErrorResponse.cs @@ -9,8 +9,7 @@ namespace OpenAI.Internal { internal partial class OpenAIErrorResponse { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal OpenAIErrorResponse(OpenAIError error) { Argument.AssertNotNull(error, nameof(error)); @@ -21,7 +20,7 @@ internal OpenAIErrorResponse(OpenAIError error) internal OpenAIErrorResponse(OpenAIError error, IDictionary serializedAdditionalRawData) { Error = error; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal OpenAIErrorResponse() diff --git a/src/Generated/Models/OpenAIFileInfo.Serialization.cs b/src/Generated/Models/OpenAIFileInfo.Serialization.cs index 94834efae..758abba06 100644 --- a/src/Generated/Models/OpenAIFileInfo.Serialization.cs +++ b/src/Generated/Models/OpenAIFileInfo.Serialization.cs @@ -21,36 +21,61 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOp } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - if (SizeInBytes != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - writer.WritePropertyName("bytes"u8); - writer.WriteNumberValue(SizeInBytes.Value); + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); } - else + if (SerializedAdditionalRawData?.ContainsKey("bytes") != true) { - writer.WriteNull("bytes"); + if (SizeInBytes != null) + { + writer.WritePropertyName("bytes"u8); + writer.WriteNumberValue(SizeInBytes.Value); + } + else + { + writer.WriteNull("bytes"); + } } - writer.WritePropertyName("created_at"u8); - writer.WriteNumberValue(CreatedAt, "U"); - writer.WritePropertyName("filename"u8); - writer.WriteStringValue(Filename); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("purpose"u8); - writer.WriteStringValue(Purpose.ToString()); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - if (Optional.IsDefined(StatusDetails)) + if (SerializedAdditionalRawData?.ContainsKey("created_at") != true) + { + writer.WritePropertyName("created_at"u8); + writer.WriteNumberValue(CreatedAt, "U"); + } + if (SerializedAdditionalRawData?.ContainsKey("filename") != true) + { + writer.WritePropertyName("filename"u8); + writer.WriteStringValue(Filename); + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("purpose") != true) + { + writer.WritePropertyName("purpose"u8); + writer.WriteStringValue(Purpose.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("status") != true) + { + writer.WritePropertyName("status"u8); + writer.WriteStringValue(Status.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("status_details") != true && Optional.IsDefined(StatusDetails)) { writer.WritePropertyName("status_details"u8); writer.WriteStringValue(StatusDetails); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -142,8 +167,9 @@ internal static OpenAIFileInfo DeserializeOpenAIFileInfo(JsonElement element, Mo statusDetails = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/OpenAIFileInfo.cs b/src/Generated/Models/OpenAIFileInfo.cs index 6be3cfb8a..060c87cfa 100644 --- a/src/Generated/Models/OpenAIFileInfo.cs +++ b/src/Generated/Models/OpenAIFileInfo.cs @@ -9,8 +9,7 @@ namespace OpenAI.Files { public partial class OpenAIFileInfo { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal OpenAIFileInfo(string id, long? sizeInBytes, DateTimeOffset createdAt, string filename, OpenAIFilePurpose purpose, OpenAIFileStatus status) { Argument.AssertNotNull(id, nameof(id)); @@ -34,7 +33,7 @@ internal OpenAIFileInfo(string id, long? sizeInBytes, DateTimeOffset createdAt, Purpose = purpose; Status = status; StatusDetails = statusDetails; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal OpenAIFileInfo() diff --git a/src/Generated/Models/OpenAIModelInfo.Serialization.cs b/src/Generated/Models/OpenAIModelInfo.Serialization.cs index 08d3b7277..cd2770c5a 100644 --- a/src/Generated/Models/OpenAIModelInfo.Serialization.cs +++ b/src/Generated/Models/OpenAIModelInfo.Serialization.cs @@ -21,18 +21,34 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterO } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("created"u8); - writer.WriteNumberValue(CreatedAt, "U"); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("owned_by"u8); - writer.WriteStringValue(OwnedBy); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("created") != true) + { + writer.WritePropertyName("created"u8); + writer.WriteNumberValue(CreatedAt, "U"); + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("owned_by") != true) + { + writer.WritePropertyName("owned_by"u8); + writer.WriteStringValue(OwnedBy); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -95,8 +111,9 @@ internal static OpenAIModelInfo DeserializeOpenAIModelInfo(JsonElement element, ownedBy = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/OpenAIModelInfo.cs b/src/Generated/Models/OpenAIModelInfo.cs index ad56a1f33..08d2b7e34 100644 --- a/src/Generated/Models/OpenAIModelInfo.cs +++ b/src/Generated/Models/OpenAIModelInfo.cs @@ -9,8 +9,7 @@ namespace OpenAI.Models { public partial class OpenAIModelInfo { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal OpenAIModelInfo(string id, DateTimeOffset createdAt, string ownedBy) { Argument.AssertNotNull(id, nameof(id)); @@ -27,7 +26,7 @@ internal OpenAIModelInfo(string id, DateTimeOffset createdAt, InternalModelObjec CreatedAt = createdAt; Object = @object; OwnedBy = ownedBy; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal OpenAIModelInfo() diff --git a/src/Generated/Models/RunCreationOptions.Serialization.cs b/src/Generated/Models/RunCreationOptions.Serialization.cs index 0443f8024..24edf0d5c 100644 --- a/src/Generated/Models/RunCreationOptions.Serialization.cs +++ b/src/Generated/Models/RunCreationOptions.Serialization.cs @@ -21,9 +21,12 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit } writer.WriteStartObject(); - writer.WritePropertyName("assistant_id"u8); - writer.WriteStringValue(AssistantId); - if (Optional.IsDefined(ModelOverride)) + if (SerializedAdditionalRawData?.ContainsKey("assistant_id") != true) + { + writer.WritePropertyName("assistant_id"u8); + writer.WriteStringValue(AssistantId); + } + if (SerializedAdditionalRawData?.ContainsKey("model") != true && Optional.IsDefined(ModelOverride)) { if (ModelOverride != null) { @@ -35,7 +38,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit writer.WriteNull("model"); } } - if (Optional.IsDefined(InstructionsOverride)) + if (SerializedAdditionalRawData?.ContainsKey("instructions") != true && Optional.IsDefined(InstructionsOverride)) { if (InstructionsOverride != null) { @@ -47,7 +50,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit writer.WriteNull("instructions"); } } - if (Optional.IsDefined(AdditionalInstructions)) + if (SerializedAdditionalRawData?.ContainsKey("additional_instructions") != true && Optional.IsDefined(AdditionalInstructions)) { if (AdditionalInstructions != null) { @@ -59,7 +62,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit writer.WriteNull("additional_instructions"); } } - if (Optional.IsCollectionDefined(InternalMessages)) + if (SerializedAdditionalRawData?.ContainsKey("additional_messages") != true && Optional.IsCollectionDefined(InternalMessages)) { if (InternalMessages != null) { @@ -76,7 +79,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit writer.WriteNull("additional_messages"); } } - if (Optional.IsCollectionDefined(ToolsOverride)) + if (SerializedAdditionalRawData?.ContainsKey("tools") != true && Optional.IsCollectionDefined(ToolsOverride)) { if (ToolsOverride != null) { @@ -93,7 +96,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit writer.WriteNull("tools"); } } - if (Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true && Optional.IsCollectionDefined(Metadata)) { if (Metadata != null) { @@ -111,7 +114,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit writer.WriteNull("metadata"); } } - if (Optional.IsDefined(Temperature)) + if (SerializedAdditionalRawData?.ContainsKey("temperature") != true && Optional.IsDefined(Temperature)) { if (Temperature != null) { @@ -123,7 +126,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit writer.WriteNull("temperature"); } } - if (Optional.IsDefined(NucleusSamplingFactor)) + if (SerializedAdditionalRawData?.ContainsKey("top_p") != true && Optional.IsDefined(NucleusSamplingFactor)) { if (NucleusSamplingFactor != null) { @@ -135,7 +138,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit writer.WriteNull("top_p"); } } - if (Optional.IsDefined(Stream)) + if (SerializedAdditionalRawData?.ContainsKey("stream") != true && Optional.IsDefined(Stream)) { if (Stream != null) { @@ -147,7 +150,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit writer.WriteNull("stream"); } } - if (Optional.IsDefined(MaxPromptTokens)) + if (SerializedAdditionalRawData?.ContainsKey("max_prompt_tokens") != true && Optional.IsDefined(MaxPromptTokens)) { if (MaxPromptTokens != null) { @@ -159,7 +162,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit writer.WriteNull("max_prompt_tokens"); } } - if (Optional.IsDefined(MaxCompletionTokens)) + if (SerializedAdditionalRawData?.ContainsKey("max_completion_tokens") != true && Optional.IsDefined(MaxCompletionTokens)) { if (MaxCompletionTokens != null) { @@ -171,7 +174,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit writer.WriteNull("max_completion_tokens"); } } - if (Optional.IsDefined(TruncationStrategy)) + if (SerializedAdditionalRawData?.ContainsKey("truncation_strategy") != true && Optional.IsDefined(TruncationStrategy)) { if (TruncationStrategy != null) { @@ -183,7 +186,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit writer.WriteNull("truncation_strategy"); } } - if (Optional.IsDefined(ToolConstraint)) + if (SerializedAdditionalRawData?.ContainsKey("tool_choice") != true && Optional.IsDefined(ToolConstraint)) { if (ToolConstraint != null) { @@ -195,12 +198,12 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit writer.WriteNull("tool_choice"); } } - if (Optional.IsDefined(ParallelToolCallsEnabled)) + if (SerializedAdditionalRawData?.ContainsKey("parallel_tool_calls") != true && Optional.IsDefined(ParallelToolCallsEnabled)) { writer.WritePropertyName("parallel_tool_calls"u8); writer.WriteBooleanValue(ParallelToolCallsEnabled.Value); } - if (Optional.IsDefined(ResponseFormat)) + if (SerializedAdditionalRawData?.ContainsKey("response_format") != true && Optional.IsDefined(ResponseFormat)) { if (ResponseFormat != null) { @@ -212,10 +215,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit writer.WriteNull("response_format"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -436,8 +443,9 @@ internal static RunCreationOptions DeserializeRunCreationOptions(JsonElement ele responseFormat = AssistantResponseFormat.DeserializeAssistantResponseFormat(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/RunCreationOptions.cs b/src/Generated/Models/RunCreationOptions.cs index 86a41fa80..60a0d49c3 100644 --- a/src/Generated/Models/RunCreationOptions.cs +++ b/src/Generated/Models/RunCreationOptions.cs @@ -9,7 +9,7 @@ namespace OpenAI.Assistants { public partial class RunCreationOptions { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal RunCreationOptions(string assistantId, string modelOverride, string instructionsOverride, string additionalInstructions, IList internalMessages, IList toolsOverride, IDictionary metadata, float? temperature, float? nucleusSamplingFactor, bool? stream, int? maxPromptTokens, int? maxCompletionTokens, RunTruncationStrategy truncationStrategy, ToolConstraint toolConstraint, bool? parallelToolCallsEnabled, AssistantResponseFormat responseFormat, IDictionary serializedAdditionalRawData) { @@ -29,7 +29,7 @@ internal RunCreationOptions(string assistantId, string modelOverride, string ins ToolConstraint = toolConstraint; ParallelToolCallsEnabled = parallelToolCallsEnabled; ResponseFormat = responseFormat; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } } } diff --git a/src/Generated/Models/RunError.Serialization.cs b/src/Generated/Models/RunError.Serialization.cs index db330f7bb..d18a32fca 100644 --- a/src/Generated/Models/RunError.Serialization.cs +++ b/src/Generated/Models/RunError.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions } writer.WriteStartObject(); - writer.WritePropertyName("code"u8); - writer.WriteStringValue(Code.ToString()); - writer.WritePropertyName("message"u8); - writer.WriteStringValue(Message); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("code") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("code"u8); + writer.WriteStringValue(Code.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("message") != true) + { + writer.WritePropertyName("message"u8); + writer.WriteStringValue(Message); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static RunError DeserializeRunError(JsonElement element, ModelReaderWri message = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/RunError.cs b/src/Generated/Models/RunError.cs index 5922e20a7..8d0928481 100644 --- a/src/Generated/Models/RunError.cs +++ b/src/Generated/Models/RunError.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public partial class RunError { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal RunError(RunErrorCode code, string message) { Argument.AssertNotNull(message, nameof(message)); @@ -23,7 +22,7 @@ internal RunError(RunErrorCode code, string message, IDictionary.Write(Utf8JsonWriter writer, ModelReaderWr } writer.WriteStartObject(); - if (Optional.IsDefined(Reason)) + if (SerializedAdditionalRawData?.ContainsKey("reason") != true && Optional.IsDefined(Reason)) { writer.WritePropertyName("reason"u8); writer.WriteStringValue(Reason.Value.ToString()); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -78,8 +82,9 @@ internal static RunIncompleteDetails DeserializeRunIncompleteDetails(JsonElement reason = new RunIncompleteReason(property.Value.GetString()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/RunIncompleteDetails.cs b/src/Generated/Models/RunIncompleteDetails.cs index 5484924fd..625784bbf 100644 --- a/src/Generated/Models/RunIncompleteDetails.cs +++ b/src/Generated/Models/RunIncompleteDetails.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public partial class RunIncompleteDetails { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal RunIncompleteDetails() { } @@ -18,7 +17,7 @@ internal RunIncompleteDetails() internal RunIncompleteDetails(RunIncompleteReason? reason, IDictionary serializedAdditionalRawData) { Reason = reason; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public RunIncompleteReason? Reason { get; } diff --git a/src/Generated/Models/RunModificationOptions.Serialization.cs b/src/Generated/Models/RunModificationOptions.Serialization.cs index a4a4937bd..f5c48a3a2 100644 --- a/src/Generated/Models/RunModificationOptions.Serialization.cs +++ b/src/Generated/Models/RunModificationOptions.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReader } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true && Optional.IsCollectionDefined(Metadata)) { if (Metadata != null) { @@ -39,10 +39,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReader writer.WriteNull("metadata"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -96,8 +100,9 @@ internal static RunModificationOptions DeserializeRunModificationOptions(JsonEle metadata = dictionary; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/RunModificationOptions.cs b/src/Generated/Models/RunModificationOptions.cs index 0b75a8ccb..5e4f8bfcc 100644 --- a/src/Generated/Models/RunModificationOptions.cs +++ b/src/Generated/Models/RunModificationOptions.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public partial class RunModificationOptions { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } public RunModificationOptions() { Metadata = new ChangeTrackingDictionary(); @@ -19,7 +18,7 @@ public RunModificationOptions() internal RunModificationOptions(IDictionary metadata, IDictionary serializedAdditionalRawData) { Metadata = metadata; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IDictionary Metadata { get; } diff --git a/src/Generated/Models/RunStep.Serialization.cs b/src/Generated/Models/RunStep.Serialization.cs index 9aff37f59..ca563793b 100644 --- a/src/Generated/Models/RunStep.Serialization.cs +++ b/src/Generated/Models/RunStep.Serialization.cs @@ -21,97 +21,149 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions o } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("created_at"u8); - writer.WriteNumberValue(CreatedAt, "U"); - writer.WritePropertyName("assistant_id"u8); - writer.WriteStringValue(AssistantId); - writer.WritePropertyName("thread_id"u8); - writer.WriteStringValue(ThreadId); - writer.WritePropertyName("run_id"u8); - writer.WriteStringValue(RunId); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type.ToString()); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - writer.WritePropertyName("step_details"u8); - writer.WriteObjectValue(Details, options); - if (LastError != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - writer.WritePropertyName("last_error"u8); - writer.WriteObjectValue(LastError, options); + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); } - else + if (SerializedAdditionalRawData?.ContainsKey("object") != true) { - writer.WriteNull("last_error"); + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); } - if (ExpiredAt != null) + if (SerializedAdditionalRawData?.ContainsKey("created_at") != true) { - writer.WritePropertyName("expired_at"u8); - writer.WriteNumberValue(ExpiredAt.Value, "U"); + writer.WritePropertyName("created_at"u8); + writer.WriteNumberValue(CreatedAt, "U"); } - else + if (SerializedAdditionalRawData?.ContainsKey("assistant_id") != true) { - writer.WriteNull("expired_at"); + writer.WritePropertyName("assistant_id"u8); + writer.WriteStringValue(AssistantId); } - if (CancelledAt != null) + if (SerializedAdditionalRawData?.ContainsKey("thread_id") != true) { - writer.WritePropertyName("cancelled_at"u8); - writer.WriteNumberValue(CancelledAt.Value, "U"); + writer.WritePropertyName("thread_id"u8); + writer.WriteStringValue(ThreadId); } - else + if (SerializedAdditionalRawData?.ContainsKey("run_id") != true) { - writer.WriteNull("cancelled_at"); + writer.WritePropertyName("run_id"u8); + writer.WriteStringValue(RunId); } - if (FailedAt != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - writer.WritePropertyName("failed_at"u8); - writer.WriteNumberValue(FailedAt.Value, "U"); + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type.ToString()); } - else + if (SerializedAdditionalRawData?.ContainsKey("status") != true) { - writer.WriteNull("failed_at"); + writer.WritePropertyName("status"u8); + writer.WriteStringValue(Status.ToString()); } - if (CompletedAt != null) + if (SerializedAdditionalRawData?.ContainsKey("step_details") != true) { - writer.WritePropertyName("completed_at"u8); - writer.WriteNumberValue(CompletedAt.Value, "U"); + writer.WritePropertyName("step_details"u8); + writer.WriteObjectValue(Details, options); } - else + if (SerializedAdditionalRawData?.ContainsKey("last_error") != true) { - writer.WriteNull("completed_at"); + if (LastError != null) + { + writer.WritePropertyName("last_error"u8); + writer.WriteObjectValue(LastError, options); + } + else + { + writer.WriteNull("last_error"); + } } - if (Metadata != null && Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("expired_at") != true) { - writer.WritePropertyName("metadata"u8); - writer.WriteStartObject(); - foreach (var item in Metadata) + if (ExpiredAt != null) { - writer.WritePropertyName(item.Key); - writer.WriteStringValue(item.Value); + writer.WritePropertyName("expired_at"u8); + writer.WriteNumberValue(ExpiredAt.Value, "U"); + } + else + { + writer.WriteNull("expired_at"); + } + } + if (SerializedAdditionalRawData?.ContainsKey("cancelled_at") != true) + { + if (CancelledAt != null) + { + writer.WritePropertyName("cancelled_at"u8); + writer.WriteNumberValue(CancelledAt.Value, "U"); + } + else + { + writer.WriteNull("cancelled_at"); + } + } + if (SerializedAdditionalRawData?.ContainsKey("failed_at") != true) + { + if (FailedAt != null) + { + writer.WritePropertyName("failed_at"u8); + writer.WriteNumberValue(FailedAt.Value, "U"); + } + else + { + writer.WriteNull("failed_at"); } - writer.WriteEndObject(); } - else + if (SerializedAdditionalRawData?.ContainsKey("completed_at") != true) { - writer.WriteNull("metadata"); + if (CompletedAt != null) + { + writer.WritePropertyName("completed_at"u8); + writer.WriteNumberValue(CompletedAt.Value, "U"); + } + else + { + writer.WriteNull("completed_at"); + } } - if (Usage != null) + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true) { - writer.WritePropertyName("usage"u8); - writer.WriteObjectValue(Usage, options); + if (Metadata != null && Optional.IsCollectionDefined(Metadata)) + { + writer.WritePropertyName("metadata"u8); + writer.WriteStartObject(); + foreach (var item in Metadata) + { + writer.WritePropertyName(item.Key); + writer.WriteStringValue(item.Value); + } + writer.WriteEndObject(); + } + else + { + writer.WriteNull("metadata"); + } } - else + if (SerializedAdditionalRawData?.ContainsKey("usage") != true) { - writer.WriteNull("usage"); + if (Usage != null) + { + writer.WritePropertyName("usage"u8); + writer.WriteObjectValue(Usage, options); + } + else + { + writer.WriteNull("usage"); + } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -286,8 +338,9 @@ internal static RunStep DeserializeRunStep(JsonElement element, ModelReaderWrite usage = RunStepTokenUsage.DeserializeRunStepTokenUsage(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/RunStep.cs b/src/Generated/Models/RunStep.cs index 60f553719..27f85bb6e 100644 --- a/src/Generated/Models/RunStep.cs +++ b/src/Generated/Models/RunStep.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public partial class RunStep { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal RunStep(string id, DateTimeOffset createdAt, string assistantId, string threadId, string runId, RunStepType type, RunStepStatus status, RunStepDetails details, RunStepError lastError, DateTimeOffset? expiredAt, DateTimeOffset? cancelledAt, DateTimeOffset? failedAt, DateTimeOffset? completedAt, IReadOnlyDictionary metadata, RunStepTokenUsage usage) { Argument.AssertNotNull(id, nameof(id)); @@ -54,7 +53,7 @@ internal RunStep(string id, InternalRunStepObjectObject @object, DateTimeOffset CompletedAt = completedAt; Metadata = metadata; Usage = usage; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal RunStep() diff --git a/src/Generated/Models/RunStepCodeInterpreterOutput.Serialization.cs b/src/Generated/Models/RunStepCodeInterpreterOutput.Serialization.cs index b5ed2a2f4..f7ef07662 100644 --- a/src/Generated/Models/RunStepCodeInterpreterOutput.Serialization.cs +++ b/src/Generated/Models/RunStepCodeInterpreterOutput.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, Model } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); diff --git a/src/Generated/Models/RunStepCodeInterpreterOutput.cs b/src/Generated/Models/RunStepCodeInterpreterOutput.cs index 531807091..06a2c10de 100644 --- a/src/Generated/Models/RunStepCodeInterpreterOutput.cs +++ b/src/Generated/Models/RunStepCodeInterpreterOutput.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public abstract partial class RunStepCodeInterpreterOutput { - private protected IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } protected RunStepCodeInterpreterOutput() { } @@ -18,7 +17,7 @@ protected RunStepCodeInterpreterOutput() internal RunStepCodeInterpreterOutput(string type, IDictionary serializedAdditionalRawData) { Type = type; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal string Type { get; init; } diff --git a/src/Generated/Models/RunStepDetails.Serialization.cs b/src/Generated/Models/RunStepDetails.Serialization.cs index 282ec21ff..35e15ea14 100644 --- a/src/Generated/Models/RunStepDetails.Serialization.cs +++ b/src/Generated/Models/RunStepDetails.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOp } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); diff --git a/src/Generated/Models/RunStepDetails.cs b/src/Generated/Models/RunStepDetails.cs index 204463dde..3f4e91dee 100644 --- a/src/Generated/Models/RunStepDetails.cs +++ b/src/Generated/Models/RunStepDetails.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public abstract partial class RunStepDetails { - private protected IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } protected RunStepDetails() { } @@ -18,7 +17,7 @@ protected RunStepDetails() internal RunStepDetails(string type, IDictionary serializedAdditionalRawData) { Type = type; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal string Type { get; init; } diff --git a/src/Generated/Models/RunStepError.Serialization.cs b/src/Generated/Models/RunStepError.Serialization.cs index 0716569ff..e81e1ee96 100644 --- a/src/Generated/Models/RunStepError.Serialization.cs +++ b/src/Generated/Models/RunStepError.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOpti } writer.WriteStartObject(); - writer.WritePropertyName("code"u8); - writer.WriteStringValue(Code.ToString()); - writer.WritePropertyName("message"u8); - writer.WriteStringValue(Message); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("code") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("code"u8); + writer.WriteStringValue(Code.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("message") != true) + { + writer.WritePropertyName("message"u8); + writer.WriteStringValue(Message); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static RunStepError DeserializeRunStepError(JsonElement element, ModelR message = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/RunStepError.cs b/src/Generated/Models/RunStepError.cs index 977d87a38..2646b3be7 100644 --- a/src/Generated/Models/RunStepError.cs +++ b/src/Generated/Models/RunStepError.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public partial class RunStepError { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal RunStepError(RunStepErrorCode code, string message) { Argument.AssertNotNull(message, nameof(message)); @@ -23,7 +22,7 @@ internal RunStepError(RunStepErrorCode code, string message, IDictionary.Write(Utf8JsonWriter writer, ModelReaderWrite } writer.WriteStartObject(); - writer.WritePropertyName("completion_tokens"u8); - writer.WriteNumberValue(CompletionTokens); - writer.WritePropertyName("prompt_tokens"u8); - writer.WriteNumberValue(PromptTokens); - writer.WritePropertyName("total_tokens"u8); - writer.WriteNumberValue(TotalTokens); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("completion_tokens") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("completion_tokens"u8); + writer.WriteNumberValue(CompletionTokens); + } + if (SerializedAdditionalRawData?.ContainsKey("prompt_tokens") != true) + { + writer.WritePropertyName("prompt_tokens"u8); + writer.WriteNumberValue(PromptTokens); + } + if (SerializedAdditionalRawData?.ContainsKey("total_tokens") != true) + { + writer.WritePropertyName("total_tokens"u8); + writer.WriteNumberValue(TotalTokens); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static RunStepTokenUsage DeserializeRunStepTokenUsage(JsonElement eleme totalTokens = property.Value.GetInt32(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/RunStepTokenUsage.cs b/src/Generated/Models/RunStepTokenUsage.cs index 475085b3e..f377278c0 100644 --- a/src/Generated/Models/RunStepTokenUsage.cs +++ b/src/Generated/Models/RunStepTokenUsage.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public partial class RunStepTokenUsage { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal RunStepTokenUsage(int completionTokens, int promptTokens, int totalTokens) { CompletionTokens = completionTokens; @@ -23,7 +22,7 @@ internal RunStepTokenUsage(int completionTokens, int promptTokens, int totalToke CompletionTokens = completionTokens; PromptTokens = promptTokens; TotalTokens = totalTokens; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal RunStepTokenUsage() diff --git a/src/Generated/Models/RunStepToolCall.Serialization.cs b/src/Generated/Models/RunStepToolCall.Serialization.cs index 7862386d5..322ca021d 100644 --- a/src/Generated/Models/RunStepToolCall.Serialization.cs +++ b/src/Generated/Models/RunStepToolCall.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterO } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); diff --git a/src/Generated/Models/RunStepToolCall.cs b/src/Generated/Models/RunStepToolCall.cs index ff60e3735..2ab1bb318 100644 --- a/src/Generated/Models/RunStepToolCall.cs +++ b/src/Generated/Models/RunStepToolCall.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public abstract partial class RunStepToolCall { - private protected IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } protected RunStepToolCall() { } @@ -18,7 +17,7 @@ protected RunStepToolCall() internal RunStepToolCall(string type, IDictionary serializedAdditionalRawData) { Type = type; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal string Type { get; init; } diff --git a/src/Generated/Models/RunStepUpdateCodeInterpreterOutput.Serialization.cs b/src/Generated/Models/RunStepUpdateCodeInterpreterOutput.Serialization.cs index c3201dbe4..15407f30d 100644 --- a/src/Generated/Models/RunStepUpdateCodeInterpreterOutput.Serialization.cs +++ b/src/Generated/Models/RunStepUpdateCodeInterpreterOutput.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); diff --git a/src/Generated/Models/RunStepUpdateCodeInterpreterOutput.cs b/src/Generated/Models/RunStepUpdateCodeInterpreterOutput.cs index 17e9ec48c..ddb2b38c9 100644 --- a/src/Generated/Models/RunStepUpdateCodeInterpreterOutput.cs +++ b/src/Generated/Models/RunStepUpdateCodeInterpreterOutput.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public abstract partial class RunStepUpdateCodeInterpreterOutput { - private protected IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } protected RunStepUpdateCodeInterpreterOutput() { } @@ -18,7 +17,7 @@ protected RunStepUpdateCodeInterpreterOutput() internal RunStepUpdateCodeInterpreterOutput(string type, IDictionary serializedAdditionalRawData) { Type = type; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal string Type { get; init; } diff --git a/src/Generated/Models/RunTokenUsage.Serialization.cs b/src/Generated/Models/RunTokenUsage.Serialization.cs index 06d7f3c7e..306791245 100644 --- a/src/Generated/Models/RunTokenUsage.Serialization.cs +++ b/src/Generated/Models/RunTokenUsage.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOpt } writer.WriteStartObject(); - writer.WritePropertyName("completion_tokens"u8); - writer.WriteNumberValue(CompletionTokens); - writer.WritePropertyName("prompt_tokens"u8); - writer.WriteNumberValue(PromptTokens); - writer.WritePropertyName("total_tokens"u8); - writer.WriteNumberValue(TotalTokens); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("completion_tokens") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("completion_tokens"u8); + writer.WriteNumberValue(CompletionTokens); + } + if (SerializedAdditionalRawData?.ContainsKey("prompt_tokens") != true) + { + writer.WritePropertyName("prompt_tokens"u8); + writer.WriteNumberValue(PromptTokens); + } + if (SerializedAdditionalRawData?.ContainsKey("total_tokens") != true) + { + writer.WritePropertyName("total_tokens"u8); + writer.WriteNumberValue(TotalTokens); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static RunTokenUsage DeserializeRunTokenUsage(JsonElement element, Mode totalTokens = property.Value.GetInt32(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/RunTokenUsage.cs b/src/Generated/Models/RunTokenUsage.cs index 2cf1be74e..912ce45ab 100644 --- a/src/Generated/Models/RunTokenUsage.cs +++ b/src/Generated/Models/RunTokenUsage.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public partial class RunTokenUsage { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal RunTokenUsage(int completionTokens, int promptTokens, int totalTokens) { CompletionTokens = completionTokens; @@ -23,7 +22,7 @@ internal RunTokenUsage(int completionTokens, int promptTokens, int totalTokens, CompletionTokens = completionTokens; PromptTokens = promptTokens; TotalTokens = totalTokens; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal RunTokenUsage() diff --git a/src/Generated/Models/RunTruncationStrategy.Serialization.cs b/src/Generated/Models/RunTruncationStrategy.Serialization.cs index e19170a39..aa08e0cbf 100644 --- a/src/Generated/Models/RunTruncationStrategy.Serialization.cs +++ b/src/Generated/Models/RunTruncationStrategy.Serialization.cs @@ -21,9 +21,12 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(_type.ToString()); - if (Optional.IsDefined(LastMessages)) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(_type.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("last_messages") != true && Optional.IsDefined(LastMessages)) { if (LastMessages != null) { @@ -35,10 +38,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("last_messages"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -94,8 +101,9 @@ internal static RunTruncationStrategy DeserializeRunTruncationStrategy(JsonEleme lastMessages = property.Value.GetInt32(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/RunTruncationStrategy.cs b/src/Generated/Models/RunTruncationStrategy.cs index f1c011b39..3fb0b2da8 100644 --- a/src/Generated/Models/RunTruncationStrategy.cs +++ b/src/Generated/Models/RunTruncationStrategy.cs @@ -13,7 +13,7 @@ internal RunTruncationStrategy(InternalTruncationObjectType type, int? lastMessa { _type = type; LastMessages = lastMessages; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal RunTruncationStrategy() diff --git a/src/Generated/Models/SpeechGenerationOptions.Serialization.cs b/src/Generated/Models/SpeechGenerationOptions.Serialization.cs index 4e136b063..87576b92f 100644 --- a/src/Generated/Models/SpeechGenerationOptions.Serialization.cs +++ b/src/Generated/Models/SpeechGenerationOptions.Serialization.cs @@ -21,26 +21,39 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReade } writer.WriteStartObject(); - writer.WritePropertyName("model"u8); - writer.WriteStringValue(Model.ToString()); - writer.WritePropertyName("input"u8); - writer.WriteStringValue(Input); - writer.WritePropertyName("voice"u8); - writer.WriteStringValue(Voice.ToSerialString()); - if (Optional.IsDefined(ResponseFormat)) + if (SerializedAdditionalRawData?.ContainsKey("model") != true) + { + writer.WritePropertyName("model"u8); + writer.WriteStringValue(Model.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("input") != true) + { + writer.WritePropertyName("input"u8); + writer.WriteStringValue(Input); + } + if (SerializedAdditionalRawData?.ContainsKey("voice") != true) + { + writer.WritePropertyName("voice"u8); + writer.WriteStringValue(Voice.ToSerialString()); + } + if (SerializedAdditionalRawData?.ContainsKey("response_format") != true && Optional.IsDefined(ResponseFormat)) { writer.WritePropertyName("response_format"u8); writer.WriteStringValue(ResponseFormat.Value.ToSerialString()); } - if (Optional.IsDefined(Speed)) + if (SerializedAdditionalRawData?.ContainsKey("speed") != true && Optional.IsDefined(Speed)) { writer.WritePropertyName("speed"u8); writer.WriteNumberValue(Speed.Value); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -117,8 +130,9 @@ internal static SpeechGenerationOptions DeserializeSpeechGenerationOptions(JsonE speed = property.Value.GetSingle(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/SpeechGenerationOptions.cs b/src/Generated/Models/SpeechGenerationOptions.cs index e4848d0f4..8a2fcb335 100644 --- a/src/Generated/Models/SpeechGenerationOptions.cs +++ b/src/Generated/Models/SpeechGenerationOptions.cs @@ -9,7 +9,7 @@ namespace OpenAI.Audio { public partial class SpeechGenerationOptions { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal SpeechGenerationOptions(InternalCreateSpeechRequestModel model, string input, GeneratedSpeechVoice voice, GeneratedSpeechFormat? responseFormat, float? speed, IDictionary serializedAdditionalRawData) { @@ -18,7 +18,7 @@ internal SpeechGenerationOptions(InternalCreateSpeechRequestModel model, string Voice = voice; ResponseFormat = responseFormat; Speed = speed; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public GeneratedSpeechFormat? ResponseFormat { get; init; } public float? Speed { get; init; } diff --git a/src/Generated/Models/StaticFileChunkingStrategy.Serialization.cs b/src/Generated/Models/StaticFileChunkingStrategy.Serialization.cs index 0d1fcf6f7..55be32ef2 100644 --- a/src/Generated/Models/StaticFileChunkingStrategy.Serialization.cs +++ b/src/Generated/Models/StaticFileChunkingStrategy.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe } writer.WriteStartObject(); - writer.WritePropertyName("static"u8); - writer.WriteObjectValue(_internalDetails, options); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("static") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("static"u8); + writer.WriteObjectValue(_internalDetails, options); + } + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static StaticFileChunkingStrategy DeserializeStaticFileChunkingStrategy type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/StreamingChatCompletionUpdate.Serialization.cs b/src/Generated/Models/StreamingChatCompletionUpdate.Serialization.cs index d246e9833..d46b77fb0 100644 --- a/src/Generated/Models/StreamingChatCompletionUpdate.Serialization.cs +++ b/src/Generated/Models/StreamingChatCompletionUpdate.Serialization.cs @@ -21,35 +21,54 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mode } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("choices"u8); - writer.WriteStartArray(); - foreach (var item in Choices) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); } - writer.WriteEndArray(); - writer.WritePropertyName("created"u8); - writer.WriteNumberValue(CreatedAt, "U"); - writer.WritePropertyName("model"u8); - writer.WriteStringValue(Model); - if (Optional.IsDefined(SystemFingerprint)) + if (SerializedAdditionalRawData?.ContainsKey("choices") != true) + { + writer.WritePropertyName("choices"u8); + writer.WriteStartArray(); + foreach (var item in Choices) + { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + if (SerializedAdditionalRawData?.ContainsKey("created") != true) + { + writer.WritePropertyName("created"u8); + writer.WriteNumberValue(CreatedAt, "U"); + } + if (SerializedAdditionalRawData?.ContainsKey("model") != true) + { + writer.WritePropertyName("model"u8); + writer.WriteStringValue(Model); + } + if (SerializedAdditionalRawData?.ContainsKey("system_fingerprint") != true && Optional.IsDefined(SystemFingerprint)) { writer.WritePropertyName("system_fingerprint"u8); writer.WriteStringValue(SystemFingerprint); } - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - if (Optional.IsDefined(Usage)) + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("usage") != true && Optional.IsDefined(Usage)) { writer.WritePropertyName("usage"u8); writer.WriteObjectValue(Usage, options); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -139,8 +158,9 @@ internal static StreamingChatCompletionUpdate DeserializeStreamingChatCompletion usage = ChatTokenUsage.DeserializeChatTokenUsage(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/StreamingChatCompletionUpdate.cs b/src/Generated/Models/StreamingChatCompletionUpdate.cs index 5a308e7d6..696d8e2d9 100644 --- a/src/Generated/Models/StreamingChatCompletionUpdate.cs +++ b/src/Generated/Models/StreamingChatCompletionUpdate.cs @@ -10,8 +10,7 @@ namespace OpenAI.Chat { public partial class StreamingChatCompletionUpdate { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal StreamingChatCompletionUpdate(string id, IEnumerable choices, DateTimeOffset createdAt, string model) { Argument.AssertNotNull(id, nameof(id)); @@ -33,7 +32,7 @@ internal StreamingChatCompletionUpdate(string id, IReadOnlyList.Write(Utf8JsonWriter writer, Mo } writer.WriteStartObject(); - if (Optional.IsDefined(FunctionArgumentsUpdate)) + if (SerializedAdditionalRawData?.ContainsKey("arguments") != true && Optional.IsDefined(FunctionArgumentsUpdate)) { writer.WritePropertyName("arguments"u8); writer.WriteStringValue(FunctionArgumentsUpdate); } - if (Optional.IsDefined(FunctionName)) + if (SerializedAdditionalRawData?.ContainsKey("name") != true && Optional.IsDefined(FunctionName)) { writer.WritePropertyName("name"u8); writer.WriteStringValue(FunctionName); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -85,8 +89,9 @@ internal static StreamingChatFunctionCallUpdate DeserializeStreamingChatFunction name = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/StreamingChatFunctionCallUpdate.cs b/src/Generated/Models/StreamingChatFunctionCallUpdate.cs index 5d57dd724..f00dd7f26 100644 --- a/src/Generated/Models/StreamingChatFunctionCallUpdate.cs +++ b/src/Generated/Models/StreamingChatFunctionCallUpdate.cs @@ -9,8 +9,7 @@ namespace OpenAI.Chat { public partial class StreamingChatFunctionCallUpdate { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal StreamingChatFunctionCallUpdate() { } @@ -19,7 +18,7 @@ internal StreamingChatFunctionCallUpdate(string functionArgumentsUpdate, string { FunctionArgumentsUpdate = functionArgumentsUpdate; FunctionName = functionName; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } } } diff --git a/src/Generated/Models/StreamingChatToolCallUpdate.Serialization.cs b/src/Generated/Models/StreamingChatToolCallUpdate.Serialization.cs index fd57e4e6f..d1d2e25aa 100644 --- a/src/Generated/Models/StreamingChatToolCallUpdate.Serialization.cs +++ b/src/Generated/Models/StreamingChatToolCallUpdate.Serialization.cs @@ -21,24 +21,34 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelR } writer.WriteStartObject(); - writer.WritePropertyName("index"u8); - writer.WriteNumberValue(Index); - if (Optional.IsDefined(Id)) + if (SerializedAdditionalRawData?.ContainsKey("index") != true) + { + writer.WritePropertyName("index"u8); + writer.WriteNumberValue(Index); + } + if (SerializedAdditionalRawData?.ContainsKey("id") != true && Optional.IsDefined(Id)) { writer.WritePropertyName("id"u8); writer.WriteStringValue(Id); } - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Kind.ToString()); - if (Optional.IsDefined(Function)) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) + { + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Kind.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("function") != true && Optional.IsDefined(Function)) { writer.WritePropertyName("function"u8); writer.WriteObjectValue(Function, options); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -109,8 +119,9 @@ internal static StreamingChatToolCallUpdate DeserializeStreamingChatToolCallUpda function = InternalChatCompletionMessageToolCallChunkFunction.DeserializeInternalChatCompletionMessageToolCallChunkFunction(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/StreamingChatToolCallUpdate.cs b/src/Generated/Models/StreamingChatToolCallUpdate.cs index 81a570619..22d2dd99f 100644 --- a/src/Generated/Models/StreamingChatToolCallUpdate.cs +++ b/src/Generated/Models/StreamingChatToolCallUpdate.cs @@ -9,7 +9,7 @@ namespace OpenAI.Chat { public partial class StreamingChatToolCallUpdate { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal StreamingChatToolCallUpdate(int index, string id, ChatToolCallKind kind, InternalChatCompletionMessageToolCallChunkFunction function, IDictionary serializedAdditionalRawData) { @@ -17,7 +17,7 @@ internal StreamingChatToolCallUpdate(int index, string id, ChatToolCallKind kind Id = id; Kind = kind; Function = function; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal StreamingChatToolCallUpdate() diff --git a/src/Generated/Models/SystemChatMessage.Serialization.cs b/src/Generated/Models/SystemChatMessage.Serialization.cs index 5f2623f01..b3342e4c6 100644 --- a/src/Generated/Models/SystemChatMessage.Serialization.cs +++ b/src/Generated/Models/SystemChatMessage.Serialization.cs @@ -54,8 +54,9 @@ internal static SystemChatMessage DeserializeSystemChatMessage(JsonElement eleme DeserializeContentValue(property, ref content); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ThreadCreationOptions.Serialization.cs b/src/Generated/Models/ThreadCreationOptions.Serialization.cs index e2a9ab277..840bf6dc9 100644 --- a/src/Generated/Models/ThreadCreationOptions.Serialization.cs +++ b/src/Generated/Models/ThreadCreationOptions.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(InternalMessages)) + if (SerializedAdditionalRawData?.ContainsKey("messages") != true && Optional.IsCollectionDefined(InternalMessages)) { writer.WritePropertyName("messages"u8); writer.WriteStartArray(); @@ -31,7 +31,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW } writer.WriteEndArray(); } - if (Optional.IsDefined(ToolResources)) + if (SerializedAdditionalRawData?.ContainsKey("tool_resources") != true && Optional.IsDefined(ToolResources)) { if (ToolResources != null) { @@ -43,7 +43,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("tool_resources"); } } - if (Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true && Optional.IsCollectionDefined(Metadata)) { if (Metadata != null) { @@ -61,10 +61,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW writer.WriteNull("metadata"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -144,8 +148,9 @@ internal static ThreadCreationOptions DeserializeThreadCreationOptions(JsonEleme metadata = dictionary; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ThreadCreationOptions.cs b/src/Generated/Models/ThreadCreationOptions.cs index 542bd8c80..911254aa3 100644 --- a/src/Generated/Models/ThreadCreationOptions.cs +++ b/src/Generated/Models/ThreadCreationOptions.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public partial class ThreadCreationOptions { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } public ThreadCreationOptions() { InternalMessages = new ChangeTrackingList(); @@ -22,7 +21,7 @@ internal ThreadCreationOptions(IList internalMessages, T InternalMessages = internalMessages; ToolResources = toolResources; Metadata = metadata; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public IDictionary Metadata { get; } } diff --git a/src/Generated/Models/ThreadMessage.Serialization.cs b/src/Generated/Models/ThreadMessage.Serialization.cs index 25d6ccdc5..9787e5532 100644 --- a/src/Generated/Models/ThreadMessage.Serialization.cs +++ b/src/Generated/Models/ThreadMessage.Serialization.cs @@ -21,103 +21,149 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOpt } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("created_at"u8); - writer.WriteNumberValue(CreatedAt, "U"); - writer.WritePropertyName("thread_id"u8); - writer.WriteStringValue(ThreadId); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - if (IncompleteDetails != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - writer.WritePropertyName("incomplete_details"u8); - writer.WriteObjectValue(IncompleteDetails, options); + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); } - else + if (SerializedAdditionalRawData?.ContainsKey("object") != true) { - writer.WriteNull("incomplete_details"); + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); } - if (CompletedAt != null) + if (SerializedAdditionalRawData?.ContainsKey("created_at") != true) { - writer.WritePropertyName("completed_at"u8); - writer.WriteNumberValue(CompletedAt.Value, "U"); + writer.WritePropertyName("created_at"u8); + writer.WriteNumberValue(CreatedAt, "U"); } - else + if (SerializedAdditionalRawData?.ContainsKey("thread_id") != true) { - writer.WriteNull("completed_at"); + writer.WritePropertyName("thread_id"u8); + writer.WriteStringValue(ThreadId); } - if (IncompleteAt != null) + if (SerializedAdditionalRawData?.ContainsKey("status") != true) { - writer.WritePropertyName("incomplete_at"u8); - writer.WriteNumberValue(IncompleteAt.Value, "U"); + writer.WritePropertyName("status"u8); + writer.WriteStringValue(Status.ToString()); } - else + if (SerializedAdditionalRawData?.ContainsKey("incomplete_details") != true) { - writer.WriteNull("incomplete_at"); - } - writer.WritePropertyName("role"u8); - writer.WriteStringValue(Role.ToSerialString()); - writer.WritePropertyName("content"u8); - writer.WriteStartArray(); - foreach (var item in Content) - { - writer.WriteObjectValue(item, options); - } - writer.WriteEndArray(); - if (AssistantId != null) - { - writer.WritePropertyName("assistant_id"u8); - writer.WriteStringValue(AssistantId); + if (IncompleteDetails != null) + { + writer.WritePropertyName("incomplete_details"u8); + writer.WriteObjectValue(IncompleteDetails, options); + } + else + { + writer.WriteNull("incomplete_details"); + } } - else + if (SerializedAdditionalRawData?.ContainsKey("completed_at") != true) { - writer.WriteNull("assistant_id"); + if (CompletedAt != null) + { + writer.WritePropertyName("completed_at"u8); + writer.WriteNumberValue(CompletedAt.Value, "U"); + } + else + { + writer.WriteNull("completed_at"); + } } - if (RunId != null) + if (SerializedAdditionalRawData?.ContainsKey("incomplete_at") != true) { - writer.WritePropertyName("run_id"u8); - writer.WriteStringValue(RunId); + if (IncompleteAt != null) + { + writer.WritePropertyName("incomplete_at"u8); + writer.WriteNumberValue(IncompleteAt.Value, "U"); + } + else + { + writer.WriteNull("incomplete_at"); + } } - else + if (SerializedAdditionalRawData?.ContainsKey("role") != true) { - writer.WriteNull("run_id"); + writer.WritePropertyName("role"u8); + writer.WriteStringValue(Role.ToSerialString()); } - if (Attachments != null && Optional.IsCollectionDefined(Attachments)) + if (SerializedAdditionalRawData?.ContainsKey("content") != true) { - writer.WritePropertyName("attachments"u8); + writer.WritePropertyName("content"u8); writer.WriteStartArray(); - foreach (var item in Attachments) + foreach (var item in Content) { - writer.WriteObjectValue(item, options); + writer.WriteObjectValue(item, options); } writer.WriteEndArray(); } - else + if (SerializedAdditionalRawData?.ContainsKey("assistant_id") != true) + { + if (AssistantId != null) + { + writer.WritePropertyName("assistant_id"u8); + writer.WriteStringValue(AssistantId); + } + else + { + writer.WriteNull("assistant_id"); + } + } + if (SerializedAdditionalRawData?.ContainsKey("run_id") != true) { - writer.WriteNull("attachments"); + if (RunId != null) + { + writer.WritePropertyName("run_id"u8); + writer.WriteStringValue(RunId); + } + else + { + writer.WriteNull("run_id"); + } } - if (Metadata != null && Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("attachments") != true) { - writer.WritePropertyName("metadata"u8); - writer.WriteStartObject(); - foreach (var item in Metadata) + if (Attachments != null && Optional.IsCollectionDefined(Attachments)) { - writer.WritePropertyName(item.Key); - writer.WriteStringValue(item.Value); + writer.WritePropertyName("attachments"u8); + writer.WriteStartArray(); + foreach (var item in Attachments) + { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + } + else + { + writer.WriteNull("attachments"); } - writer.WriteEndObject(); } - else + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true) { - writer.WriteNull("metadata"); + if (Metadata != null && Optional.IsCollectionDefined(Metadata)) + { + writer.WritePropertyName("metadata"u8); + writer.WriteStartObject(); + foreach (var item in Metadata) + { + writer.WritePropertyName(item.Key); + writer.WriteStringValue(item.Value); + } + writer.WriteEndObject(); + } + else + { + writer.WriteNull("metadata"); + } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -290,8 +336,9 @@ internal static ThreadMessage DeserializeThreadMessage(JsonElement element, Mode metadata = dictionary; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ThreadMessage.cs b/src/Generated/Models/ThreadMessage.cs index 6e34bd82c..d2d6d1fad 100644 --- a/src/Generated/Models/ThreadMessage.cs +++ b/src/Generated/Models/ThreadMessage.cs @@ -10,8 +10,7 @@ namespace OpenAI.Assistants { public partial class ThreadMessage { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal ThreadMessage(string id, DateTimeOffset createdAt, string threadId, MessageStatus status, MessageFailureDetails incompleteDetails, DateTimeOffset? completedAt, DateTimeOffset? incompleteAt, MessageRole role, IEnumerable content, string assistantId, string runId, IEnumerable attachments, IReadOnlyDictionary metadata) { Argument.AssertNotNull(id, nameof(id)); @@ -49,7 +48,7 @@ internal ThreadMessage(string id, InternalMessageObjectObject @object, DateTimeO RunId = runId; Attachments = attachments; Metadata = metadata; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal ThreadMessage() diff --git a/src/Generated/Models/ThreadModificationOptions.Serialization.cs b/src/Generated/Models/ThreadModificationOptions.Serialization.cs index a869b4780..dd5f8ba74 100644 --- a/src/Generated/Models/ThreadModificationOptions.Serialization.cs +++ b/src/Generated/Models/ThreadModificationOptions.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRea } writer.WriteStartObject(); - if (Optional.IsDefined(ToolResources)) + if (SerializedAdditionalRawData?.ContainsKey("tool_resources") != true && Optional.IsDefined(ToolResources)) { if (ToolResources != null) { @@ -33,7 +33,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRea writer.WriteNull("tool_resources"); } } - if (Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true && Optional.IsCollectionDefined(Metadata)) { if (Metadata != null) { @@ -51,10 +51,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRea writer.WriteNull("metadata"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -119,8 +123,9 @@ internal static ThreadModificationOptions DeserializeThreadModificationOptions(J metadata = dictionary; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ThreadModificationOptions.cs b/src/Generated/Models/ThreadModificationOptions.cs index fb6e27006..ee21326ca 100644 --- a/src/Generated/Models/ThreadModificationOptions.cs +++ b/src/Generated/Models/ThreadModificationOptions.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public partial class ThreadModificationOptions { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } public ThreadModificationOptions() { Metadata = new ChangeTrackingDictionary(); @@ -20,7 +19,7 @@ internal ThreadModificationOptions(ToolResources toolResources, IDictionary Metadata { get; } } diff --git a/src/Generated/Models/ThreadRun.Serialization.cs b/src/Generated/Models/ThreadRun.Serialization.cs index 62ba1a8e8..7ea22c7c2 100644 --- a/src/Generated/Models/ThreadRun.Serialization.cs +++ b/src/Generated/Models/ThreadRun.Serialization.cs @@ -21,126 +21,183 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("created_at"u8); - writer.WriteNumberValue(CreatedAt, "U"); - writer.WritePropertyName("thread_id"u8); - writer.WriteStringValue(ThreadId); - writer.WritePropertyName("assistant_id"u8); - writer.WriteStringValue(AssistantId); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - if (_internalRequiredAction != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - writer.WritePropertyName("required_action"u8); - writer.WriteObjectValue(_internalRequiredAction, options); + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); } - else + if (SerializedAdditionalRawData?.ContainsKey("object") != true) { - writer.WriteNull("required_action"); + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); } - if (LastError != null) + if (SerializedAdditionalRawData?.ContainsKey("created_at") != true) { - writer.WritePropertyName("last_error"u8); - writer.WriteObjectValue(LastError, options); + writer.WritePropertyName("created_at"u8); + writer.WriteNumberValue(CreatedAt, "U"); } - else + if (SerializedAdditionalRawData?.ContainsKey("thread_id") != true) { - writer.WriteNull("last_error"); + writer.WritePropertyName("thread_id"u8); + writer.WriteStringValue(ThreadId); } - if (ExpiresAt != null) + if (SerializedAdditionalRawData?.ContainsKey("assistant_id") != true) { - writer.WritePropertyName("expires_at"u8); - writer.WriteNumberValue(ExpiresAt.Value, "U"); + writer.WritePropertyName("assistant_id"u8); + writer.WriteStringValue(AssistantId); } - else + if (SerializedAdditionalRawData?.ContainsKey("status") != true) { - writer.WriteNull("expires_at"); + writer.WritePropertyName("status"u8); + writer.WriteStringValue(Status.ToString()); } - if (StartedAt != null) + if (SerializedAdditionalRawData?.ContainsKey("required_action") != true) { - writer.WritePropertyName("started_at"u8); - writer.WriteNumberValue(StartedAt.Value, "U"); - } - else - { - writer.WriteNull("started_at"); + if (_internalRequiredAction != null) + { + writer.WritePropertyName("required_action"u8); + writer.WriteObjectValue(_internalRequiredAction, options); + } + else + { + writer.WriteNull("required_action"); + } } - if (CancelledAt != null) + if (SerializedAdditionalRawData?.ContainsKey("last_error") != true) { - writer.WritePropertyName("cancelled_at"u8); - writer.WriteNumberValue(CancelledAt.Value, "U"); + if (LastError != null) + { + writer.WritePropertyName("last_error"u8); + writer.WriteObjectValue(LastError, options); + } + else + { + writer.WriteNull("last_error"); + } } - else + if (SerializedAdditionalRawData?.ContainsKey("expires_at") != true) { - writer.WriteNull("cancelled_at"); + if (ExpiresAt != null) + { + writer.WritePropertyName("expires_at"u8); + writer.WriteNumberValue(ExpiresAt.Value, "U"); + } + else + { + writer.WriteNull("expires_at"); + } } - if (FailedAt != null) + if (SerializedAdditionalRawData?.ContainsKey("started_at") != true) { - writer.WritePropertyName("failed_at"u8); - writer.WriteNumberValue(FailedAt.Value, "U"); + if (StartedAt != null) + { + writer.WritePropertyName("started_at"u8); + writer.WriteNumberValue(StartedAt.Value, "U"); + } + else + { + writer.WriteNull("started_at"); + } } - else + if (SerializedAdditionalRawData?.ContainsKey("cancelled_at") != true) { - writer.WriteNull("failed_at"); + if (CancelledAt != null) + { + writer.WritePropertyName("cancelled_at"u8); + writer.WriteNumberValue(CancelledAt.Value, "U"); + } + else + { + writer.WriteNull("cancelled_at"); + } } - if (CompletedAt != null) + if (SerializedAdditionalRawData?.ContainsKey("failed_at") != true) { - writer.WritePropertyName("completed_at"u8); - writer.WriteNumberValue(CompletedAt.Value, "U"); + if (FailedAt != null) + { + writer.WritePropertyName("failed_at"u8); + writer.WriteNumberValue(FailedAt.Value, "U"); + } + else + { + writer.WriteNull("failed_at"); + } } - else + if (SerializedAdditionalRawData?.ContainsKey("completed_at") != true) { - writer.WriteNull("completed_at"); + if (CompletedAt != null) + { + writer.WritePropertyName("completed_at"u8); + writer.WriteNumberValue(CompletedAt.Value, "U"); + } + else + { + writer.WriteNull("completed_at"); + } } - if (IncompleteDetails != null) + if (SerializedAdditionalRawData?.ContainsKey("incomplete_details") != true) { - writer.WritePropertyName("incomplete_details"u8); - writer.WriteObjectValue(IncompleteDetails, options); + if (IncompleteDetails != null) + { + writer.WritePropertyName("incomplete_details"u8); + writer.WriteObjectValue(IncompleteDetails, options); + } + else + { + writer.WriteNull("incomplete_details"); + } } - else + if (SerializedAdditionalRawData?.ContainsKey("model") != true) { - writer.WriteNull("incomplete_details"); + writer.WritePropertyName("model"u8); + writer.WriteStringValue(Model); } - writer.WritePropertyName("model"u8); - writer.WriteStringValue(Model); - writer.WritePropertyName("instructions"u8); - writer.WriteStringValue(Instructions); - writer.WritePropertyName("tools"u8); - writer.WriteStartArray(); - foreach (var item in Tools) + if (SerializedAdditionalRawData?.ContainsKey("instructions") != true) { - writer.WriteObjectValue(item, options); + writer.WritePropertyName("instructions"u8); + writer.WriteStringValue(Instructions); } - writer.WriteEndArray(); - if (Metadata != null && Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("tools") != true) { - writer.WritePropertyName("metadata"u8); - writer.WriteStartObject(); - foreach (var item in Metadata) + writer.WritePropertyName("tools"u8); + writer.WriteStartArray(); + foreach (var item in Tools) { - writer.WritePropertyName(item.Key); - writer.WriteStringValue(item.Value); + writer.WriteObjectValue(item, options); } - writer.WriteEndObject(); - } - else - { - writer.WriteNull("metadata"); + writer.WriteEndArray(); } - if (Usage != null) + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true) { - writer.WritePropertyName("usage"u8); - writer.WriteObjectValue(Usage, options); + if (Metadata != null && Optional.IsCollectionDefined(Metadata)) + { + writer.WritePropertyName("metadata"u8); + writer.WriteStartObject(); + foreach (var item in Metadata) + { + writer.WritePropertyName(item.Key); + writer.WriteStringValue(item.Value); + } + writer.WriteEndObject(); + } + else + { + writer.WriteNull("metadata"); + } } - else + if (SerializedAdditionalRawData?.ContainsKey("usage") != true) { - writer.WriteNull("usage"); + if (Usage != null) + { + writer.WritePropertyName("usage"u8); + writer.WriteObjectValue(Usage, options); + } + else + { + writer.WriteNull("usage"); + } } - if (Optional.IsDefined(Temperature)) + if (SerializedAdditionalRawData?.ContainsKey("temperature") != true && Optional.IsDefined(Temperature)) { if (Temperature != null) { @@ -152,7 +209,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions writer.WriteNull("temperature"); } } - if (Optional.IsDefined(NucleusSamplingFactor)) + if (SerializedAdditionalRawData?.ContainsKey("top_p") != true && Optional.IsDefined(NucleusSamplingFactor)) { if (NucleusSamplingFactor != null) { @@ -164,57 +221,79 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions writer.WriteNull("top_p"); } } - if (MaxPromptTokens != null) - { - writer.WritePropertyName("max_prompt_tokens"u8); - writer.WriteNumberValue(MaxPromptTokens.Value); - } - else + if (SerializedAdditionalRawData?.ContainsKey("max_prompt_tokens") != true) { - writer.WriteNull("max_prompt_tokens"); - } - if (MaxCompletionTokens != null) - { - writer.WritePropertyName("max_completion_tokens"u8); - writer.WriteNumberValue(MaxCompletionTokens.Value); - } - else - { - writer.WriteNull("max_completion_tokens"); - } - if (TruncationStrategy != null) - { - writer.WritePropertyName("truncation_strategy"u8); - writer.WriteObjectValue(TruncationStrategy, options); + if (MaxPromptTokens != null) + { + writer.WritePropertyName("max_prompt_tokens"u8); + writer.WriteNumberValue(MaxPromptTokens.Value); + } + else + { + writer.WriteNull("max_prompt_tokens"); + } } - else + if (SerializedAdditionalRawData?.ContainsKey("max_completion_tokens") != true) { - writer.WriteNull("truncation_strategy"); + if (MaxCompletionTokens != null) + { + writer.WritePropertyName("max_completion_tokens"u8); + writer.WriteNumberValue(MaxCompletionTokens.Value); + } + else + { + writer.WriteNull("max_completion_tokens"); + } } - if (ToolConstraint != null) + if (SerializedAdditionalRawData?.ContainsKey("truncation_strategy") != true) { - writer.WritePropertyName("tool_choice"u8); - writer.WriteObjectValue(ToolConstraint, options); + if (TruncationStrategy != null) + { + writer.WritePropertyName("truncation_strategy"u8); + writer.WriteObjectValue(TruncationStrategy, options); + } + else + { + writer.WriteNull("truncation_strategy"); + } } - else + if (SerializedAdditionalRawData?.ContainsKey("tool_choice") != true) { - writer.WriteNull("tool_choice"); + if (ToolConstraint != null) + { + writer.WritePropertyName("tool_choice"u8); + writer.WriteObjectValue(ToolConstraint, options); + } + else + { + writer.WriteNull("tool_choice"); + } } - writer.WritePropertyName("parallel_tool_calls"u8); - writer.WriteBooleanValue(ParallelToolCallsEnabled.Value); - if (ResponseFormat != null) + if (SerializedAdditionalRawData?.ContainsKey("parallel_tool_calls") != true) { - writer.WritePropertyName("response_format"u8); - writer.WriteObjectValue(ResponseFormat, options); + writer.WritePropertyName("parallel_tool_calls"u8); + writer.WriteBooleanValue(ParallelToolCallsEnabled.Value); } - else + if (SerializedAdditionalRawData?.ContainsKey("response_format") != true) { - writer.WriteNull("response_format"); + if (ResponseFormat != null) + { + writer.WritePropertyName("response_format"u8); + writer.WriteObjectValue(ResponseFormat, options); + } + else + { + writer.WriteNull("response_format"); + } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -510,8 +589,9 @@ internal static ThreadRun DeserializeThreadRun(JsonElement element, ModelReaderW responseFormat = AssistantResponseFormat.DeserializeAssistantResponseFormat(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ThreadRun.cs b/src/Generated/Models/ThreadRun.cs index 3544555f1..59c455c1d 100644 --- a/src/Generated/Models/ThreadRun.cs +++ b/src/Generated/Models/ThreadRun.cs @@ -10,7 +10,7 @@ namespace OpenAI.Assistants { public partial class ThreadRun { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal ThreadRun(string id, InternalRunObjectObject @object, DateTimeOffset createdAt, string threadId, string assistantId, RunStatus status, InternalRunRequiredAction internalRequiredAction, RunError lastError, DateTimeOffset? expiresAt, DateTimeOffset? startedAt, DateTimeOffset? cancelledAt, DateTimeOffset? failedAt, DateTimeOffset? completedAt, RunIncompleteDetails incompleteDetails, string model, string instructions, IReadOnlyList tools, IReadOnlyDictionary metadata, RunTokenUsage usage, float? temperature, float? nucleusSamplingFactor, int? maxPromptTokens, int? maxCompletionTokens, RunTruncationStrategy truncationStrategy, ToolConstraint toolConstraint, bool? parallelToolCallsEnabled, AssistantResponseFormat responseFormat, IDictionary serializedAdditionalRawData) { @@ -41,7 +41,7 @@ internal ThreadRun(string id, InternalRunObjectObject @object, DateTimeOffset cr ToolConstraint = toolConstraint; ParallelToolCallsEnabled = parallelToolCallsEnabled; ResponseFormat = responseFormat; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal ThreadRun() diff --git a/src/Generated/Models/ToolChatMessage.Serialization.cs b/src/Generated/Models/ToolChatMessage.Serialization.cs index 422e245e3..9844c178e 100644 --- a/src/Generated/Models/ToolChatMessage.Serialization.cs +++ b/src/Generated/Models/ToolChatMessage.Serialization.cs @@ -54,8 +54,9 @@ internal static ToolChatMessage DeserializeToolChatMessage(JsonElement element, DeserializeContentValue(property, ref content); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ToolConstraint.cs b/src/Generated/Models/ToolConstraint.cs index 9be9bf373..519953a5f 100644 --- a/src/Generated/Models/ToolConstraint.cs +++ b/src/Generated/Models/ToolConstraint.cs @@ -13,7 +13,7 @@ internal ToolConstraint(string objectType, InternalAssistantsNamedToolChoiceFunc { _objectType = objectType; Function = function; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal ToolConstraint() diff --git a/src/Generated/Models/ToolDefinition.cs b/src/Generated/Models/ToolDefinition.cs index 4331567db..d9b57fed6 100644 --- a/src/Generated/Models/ToolDefinition.cs +++ b/src/Generated/Models/ToolDefinition.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public abstract partial class ToolDefinition { - private protected IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } protected ToolDefinition() { } @@ -18,7 +17,7 @@ protected ToolDefinition() internal ToolDefinition(string type, IDictionary serializedAdditionalRawData) { Type = type; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal string Type { get; init; } diff --git a/src/Generated/Models/ToolOutput.Serialization.cs b/src/Generated/Models/ToolOutput.Serialization.cs index c52de5f86..e8267b3a1 100644 --- a/src/Generated/Models/ToolOutput.Serialization.cs +++ b/src/Generated/Models/ToolOutput.Serialization.cs @@ -21,20 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOption } writer.WriteStartObject(); - if (Optional.IsDefined(ToolCallId)) + if (SerializedAdditionalRawData?.ContainsKey("tool_call_id") != true && Optional.IsDefined(ToolCallId)) { writer.WritePropertyName("tool_call_id"u8); writer.WriteStringValue(ToolCallId); } - if (Optional.IsDefined(Output)) + if (SerializedAdditionalRawData?.ContainsKey("output") != true && Optional.IsDefined(Output)) { writer.WritePropertyName("output"u8); writer.WriteStringValue(Output); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -85,8 +89,9 @@ internal static ToolOutput DeserializeToolOutput(JsonElement element, ModelReade output = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ToolOutput.cs b/src/Generated/Models/ToolOutput.cs index 9b9d7a6d8..cd5450fa0 100644 --- a/src/Generated/Models/ToolOutput.cs +++ b/src/Generated/Models/ToolOutput.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public partial class ToolOutput { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } public ToolOutput() { } @@ -19,7 +18,7 @@ internal ToolOutput(string toolCallId, string output, IDictionary.Write(Utf8JsonWriter writer, ModelReaderWriterOpt } writer.WriteStartObject(); - if (Optional.IsDefined(CodeInterpreter)) + if (SerializedAdditionalRawData?.ContainsKey("code_interpreter") != true && Optional.IsDefined(CodeInterpreter)) { writer.WritePropertyName("code_interpreter"u8); writer.WriteObjectValue(CodeInterpreter, options); } - if (Optional.IsDefined(FileSearch)) + if (SerializedAdditionalRawData?.ContainsKey("file_search") != true && Optional.IsDefined(FileSearch)) { writer.WritePropertyName("file_search"u8); SerializeFileSearch(writer, options); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -93,8 +97,9 @@ internal static ToolResources DeserializeToolResources(JsonElement element, Mode fileSearch = FileSearchToolResources.DeserializeFileSearchToolResources(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/ToolResources.cs b/src/Generated/Models/ToolResources.cs index 02f4ec95c..5f3293523 100644 --- a/src/Generated/Models/ToolResources.cs +++ b/src/Generated/Models/ToolResources.cs @@ -9,13 +9,13 @@ namespace OpenAI.Assistants { public partial class ToolResources { - internal IDictionary _serializedAdditionalRawData; + internal IDictionary SerializedAdditionalRawData { get; } internal ToolResources(CodeInterpreterToolResources codeInterpreter, FileSearchToolResources fileSearch, IDictionary serializedAdditionalRawData) { CodeInterpreter = codeInterpreter; FileSearch = fileSearch; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } } } diff --git a/src/Generated/Models/TranscribedSegment.Serialization.cs b/src/Generated/Models/TranscribedSegment.Serialization.cs index 6b010f71a..6abf6ad78 100644 --- a/src/Generated/Models/TranscribedSegment.Serialization.cs +++ b/src/Generated/Models/TranscribedSegment.Serialization.cs @@ -21,35 +21,69 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWrit } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteNumberValue(Id); - writer.WritePropertyName("seek"u8); - writer.WriteNumberValue(SeekOffset); - writer.WritePropertyName("start"u8); - writer.WriteNumberValue(Convert.ToDouble(Start.ToString("s\\.FFF"))); - writer.WritePropertyName("end"u8); - writer.WriteNumberValue(Convert.ToDouble(End.ToString("s\\.FFF"))); - writer.WritePropertyName("text"u8); - writer.WriteStringValue(Text); - writer.WritePropertyName("tokens"u8); - writer.WriteStartArray(); - foreach (var item in TokenIds) - { - writer.WriteNumberValue(item); - } - writer.WriteEndArray(); - writer.WritePropertyName("temperature"u8); - writer.WriteNumberValue(Temperature); - writer.WritePropertyName("avg_logprob"u8); - writer.WriteNumberValue(AverageLogProbability); - writer.WritePropertyName("compression_ratio"u8); - writer.WriteNumberValue(CompressionRatio); - writer.WritePropertyName("no_speech_prob"u8); - writer.WriteNumberValue(NoSpeechProbability); - if (true && _serializedAdditionalRawData != null) - { - foreach (var item in _serializedAdditionalRawData) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) + { + writer.WritePropertyName("id"u8); + writer.WriteNumberValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("seek") != true) + { + writer.WritePropertyName("seek"u8); + writer.WriteNumberValue(SeekOffset); + } + if (SerializedAdditionalRawData?.ContainsKey("start") != true) + { + writer.WritePropertyName("start"u8); + writer.WriteNumberValue(Convert.ToDouble(Start.ToString("s\\.FFF"))); + } + if (SerializedAdditionalRawData?.ContainsKey("end") != true) + { + writer.WritePropertyName("end"u8); + writer.WriteNumberValue(Convert.ToDouble(End.ToString("s\\.FFF"))); + } + if (SerializedAdditionalRawData?.ContainsKey("text") != true) + { + writer.WritePropertyName("text"u8); + writer.WriteStringValue(Text); + } + if (SerializedAdditionalRawData?.ContainsKey("tokens") != true) + { + writer.WritePropertyName("tokens"u8); + writer.WriteStartArray(); + foreach (var item in TokenIds) { + writer.WriteNumberValue(item); + } + writer.WriteEndArray(); + } + if (SerializedAdditionalRawData?.ContainsKey("temperature") != true) + { + writer.WritePropertyName("temperature"u8); + writer.WriteNumberValue(Temperature); + } + if (SerializedAdditionalRawData?.ContainsKey("avg_logprob") != true) + { + writer.WritePropertyName("avg_logprob"u8); + writer.WriteNumberValue(AverageLogProbability); + } + if (SerializedAdditionalRawData?.ContainsKey("compression_ratio") != true) + { + writer.WritePropertyName("compression_ratio"u8); + writer.WriteNumberValue(CompressionRatio); + } + if (SerializedAdditionalRawData?.ContainsKey("no_speech_prob") != true) + { + writer.WritePropertyName("no_speech_prob"u8); + writer.WriteNumberValue(NoSpeechProbability); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) + { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -153,8 +187,9 @@ internal static TranscribedSegment DeserializeTranscribedSegment(JsonElement ele noSpeechProb = property.Value.GetDouble(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/TranscribedSegment.cs b/src/Generated/Models/TranscribedSegment.cs index b87078296..29262a166 100644 --- a/src/Generated/Models/TranscribedSegment.cs +++ b/src/Generated/Models/TranscribedSegment.cs @@ -10,8 +10,7 @@ namespace OpenAI.Audio { public readonly partial struct TranscribedSegment { - private readonly IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal TranscribedSegment(int id, long seekOffset, TimeSpan start, TimeSpan end, string text, IEnumerable tokenIds, float temperature, double averageLogProbability, float compressionRatio, double noSpeechProbability) { Argument.AssertNotNull(text, nameof(text)); @@ -41,7 +40,7 @@ internal TranscribedSegment(int id, long seekOffset, TimeSpan start, TimeSpan en AverageLogProbability = averageLogProbability; CompressionRatio = compressionRatio; NoSpeechProbability = noSpeechProbability; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public TranscribedSegment() diff --git a/src/Generated/Models/TranscribedWord.Serialization.cs b/src/Generated/Models/TranscribedWord.Serialization.cs index 7f7855e56..5b690d693 100644 --- a/src/Generated/Models/TranscribedWord.Serialization.cs +++ b/src/Generated/Models/TranscribedWord.Serialization.cs @@ -21,16 +21,29 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterO } writer.WriteStartObject(); - writer.WritePropertyName("word"u8); - writer.WriteStringValue(Word); - writer.WritePropertyName("start"u8); - writer.WriteNumberValue(Convert.ToDouble(Start.ToString("s\\.FFF"))); - writer.WritePropertyName("end"u8); - writer.WriteNumberValue(Convert.ToDouble(End.ToString("s\\.FFF"))); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("word") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("word"u8); + writer.WriteStringValue(Word); + } + if (SerializedAdditionalRawData?.ContainsKey("start") != true) + { + writer.WritePropertyName("start"u8); + writer.WriteNumberValue(Convert.ToDouble(Start.ToString("s\\.FFF"))); + } + if (SerializedAdditionalRawData?.ContainsKey("end") != true) + { + writer.WritePropertyName("end"u8); + writer.WriteNumberValue(Convert.ToDouble(End.ToString("s\\.FFF"))); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -87,8 +100,9 @@ internal static TranscribedWord DeserializeTranscribedWord(JsonElement element, end = TimeSpan.FromSeconds(property.Value.GetDouble()); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/TranscribedWord.cs b/src/Generated/Models/TranscribedWord.cs index 613c73c64..7c9882ae2 100644 --- a/src/Generated/Models/TranscribedWord.cs +++ b/src/Generated/Models/TranscribedWord.cs @@ -9,8 +9,7 @@ namespace OpenAI.Audio { public readonly partial struct TranscribedWord { - private readonly IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal TranscribedWord(string word, TimeSpan start, TimeSpan end) { Argument.AssertNotNull(word, nameof(word)); @@ -25,7 +24,7 @@ internal TranscribedWord(string word, TimeSpan start, TimeSpan end, IDictionary< Word = word; Start = start; End = end; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public TranscribedWord() diff --git a/src/Generated/Models/UnknownAssistantToolDefinition.Serialization.cs b/src/Generated/Models/UnknownAssistantToolDefinition.Serialization.cs index 222bf3d9d..ee0b95a63 100644 --- a/src/Generated/Models/UnknownAssistantToolDefinition.Serialization.cs +++ b/src/Generated/Models/UnknownAssistantToolDefinition.Serialization.cs @@ -42,8 +42,9 @@ internal static UnknownAssistantToolDefinition DeserializeUnknownAssistantToolDe type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/UnknownMessageContentTextObjectAnnotation.Serialization.cs b/src/Generated/Models/UnknownMessageContentTextObjectAnnotation.Serialization.cs index 18394509c..2115ac1cf 100644 --- a/src/Generated/Models/UnknownMessageContentTextObjectAnnotation.Serialization.cs +++ b/src/Generated/Models/UnknownMessageContentTextObjectAnnotation.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static UnknownMessageContentTextObjectAnnotation DeserializeUnknownMess type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/UnknownMessageDeltaContent.Serialization.cs b/src/Generated/Models/UnknownMessageDeltaContent.Serialization.cs index 777d8a72f..2b21c2f1e 100644 --- a/src/Generated/Models/UnknownMessageDeltaContent.Serialization.cs +++ b/src/Generated/Models/UnknownMessageDeltaContent.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWri } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static UnknownMessageDeltaContent DeserializeUnknownMessageDeltaContent type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/UnknownMessageDeltaTextContentAnnotation.Serialization.cs b/src/Generated/Models/UnknownMessageDeltaTextContentAnnotation.Serialization.cs index a7a3f2a68..bcac7574e 100644 --- a/src/Generated/Models/UnknownMessageDeltaTextContentAnnotation.Serialization.cs +++ b/src/Generated/Models/UnknownMessageDeltaTextContentAnnotation.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static UnknownMessageDeltaTextContentAnnotation DeserializeUnknownMessa type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/UnknownRunStepDeltaStepDetails.Serialization.cs b/src/Generated/Models/UnknownRunStepDeltaStepDetails.Serialization.cs index fdb2cc817..cb38f3394 100644 --- a/src/Generated/Models/UnknownRunStepDeltaStepDetails.Serialization.cs +++ b/src/Generated/Models/UnknownRunStepDeltaStepDetails.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static UnknownRunStepDeltaStepDetails DeserializeUnknownRunStepDeltaSte type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/UnknownRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject.Serialization.cs b/src/Generated/Models/UnknownRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject.Serialization.cs index 0c3daf57d..0313b67d5 100644 --- a/src/Generated/Models/UnknownRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject.Serialization.cs +++ b/src/Generated/Models/UnknownRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static UnknownRunStepDeltaStepDetailsToolCallsCodeObjectCodeInterpreter type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/UnknownRunStepDeltaStepDetailsToolCallsObjectToolCallsObject.Serialization.cs b/src/Generated/Models/UnknownRunStepDeltaStepDetailsToolCallsObjectToolCallsObject.Serialization.cs index 64e4e0048..4248a166c 100644 --- a/src/Generated/Models/UnknownRunStepDeltaStepDetailsToolCallsObjectToolCallsObject.Serialization.cs +++ b/src/Generated/Models/UnknownRunStepDeltaStepDetailsToolCallsObjectToolCallsObject.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.W } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static UnknownRunStepDeltaStepDetailsToolCallsObjectToolCallsObject Des type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/UnknownRunStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject.Serialization.cs b/src/Generated/Models/UnknownRunStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject.Serialization.cs index 9b203e355..797541cb3 100644 --- a/src/Generated/Models/UnknownRunStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject.Serialization.cs +++ b/src/Generated/Models/UnknownRunStepDetailsToolCallsCodeObjectCodeInterpreterOutputsObject.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, Model } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static UnknownRunStepDetailsToolCallsCodeObjectCodeInterpreterOutputsOb type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/UnknownRunStepDetailsToolCallsObjectToolCallsObject.Serialization.cs b/src/Generated/Models/UnknownRunStepDetailsToolCallsObjectToolCallsObject.Serialization.cs index 7ed834778..74a75b71b 100644 --- a/src/Generated/Models/UnknownRunStepDetailsToolCallsObjectToolCallsObject.Serialization.cs +++ b/src/Generated/Models/UnknownRunStepDetailsToolCallsObjectToolCallsObject.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterO } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static UnknownRunStepDetailsToolCallsObjectToolCallsObject DeserializeU type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/UnknownRunStepObjectStepDetails.Serialization.cs b/src/Generated/Models/UnknownRunStepObjectStepDetails.Serialization.cs index 85341b504..680d5656c 100644 --- a/src/Generated/Models/UnknownRunStepObjectStepDetails.Serialization.cs +++ b/src/Generated/Models/UnknownRunStepObjectStepDetails.Serialization.cs @@ -21,12 +21,19 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOp } writer.WriteStartObject(); - writer.WritePropertyName("type"u8); - writer.WriteStringValue(Type); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("type") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("type"u8); + writer.WriteStringValue(Type); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -71,8 +78,9 @@ internal static UnknownRunStepObjectStepDetails DeserializeUnknownRunStepObjectS type = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/UserChatMessage.Serialization.cs b/src/Generated/Models/UserChatMessage.Serialization.cs index 8a484185d..00e8a2e41 100644 --- a/src/Generated/Models/UserChatMessage.Serialization.cs +++ b/src/Generated/Models/UserChatMessage.Serialization.cs @@ -54,8 +54,9 @@ internal static UserChatMessage DeserializeUserChatMessage(JsonElement element, DeserializeContentValue(property, ref content); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/VectorStore.Serialization.cs b/src/Generated/Models/VectorStore.Serialization.cs index fac8d8356..da9a00fda 100644 --- a/src/Generated/Models/VectorStore.Serialization.cs +++ b/src/Generated/Models/VectorStore.Serialization.cs @@ -21,26 +21,47 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptio } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(Id); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("created_at"u8); - writer.WriteNumberValue(CreatedAt, "U"); - writer.WritePropertyName("name"u8); - writer.WriteStringValue(Name); - writer.WritePropertyName("usage_bytes"u8); - writer.WriteNumberValue(UsageBytes); - writer.WritePropertyName("file_counts"u8); - writer.WriteObjectValue(FileCounts, options); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToSerialString()); - if (Optional.IsDefined(ExpirationPolicy)) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) + { + writer.WritePropertyName("id"u8); + writer.WriteStringValue(Id); + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("created_at") != true) + { + writer.WritePropertyName("created_at"u8); + writer.WriteNumberValue(CreatedAt, "U"); + } + if (SerializedAdditionalRawData?.ContainsKey("name") != true) + { + writer.WritePropertyName("name"u8); + writer.WriteStringValue(Name); + } + if (SerializedAdditionalRawData?.ContainsKey("usage_bytes") != true) + { + writer.WritePropertyName("usage_bytes"u8); + writer.WriteNumberValue(UsageBytes); + } + if (SerializedAdditionalRawData?.ContainsKey("file_counts") != true) + { + writer.WritePropertyName("file_counts"u8); + writer.WriteObjectValue(FileCounts, options); + } + if (SerializedAdditionalRawData?.ContainsKey("status") != true) + { + writer.WritePropertyName("status"u8); + writer.WriteStringValue(Status.ToSerialString()); + } + if (SerializedAdditionalRawData?.ContainsKey("expires_after") != true && Optional.IsDefined(ExpirationPolicy)) { writer.WritePropertyName("expires_after"u8); writer.WriteObjectValue(ExpirationPolicy, options); } - if (Optional.IsDefined(ExpiresAt)) + if (SerializedAdditionalRawData?.ContainsKey("expires_at") != true && Optional.IsDefined(ExpiresAt)) { if (ExpiresAt != null) { @@ -52,34 +73,44 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptio writer.WriteNull("expires_at"); } } - if (LastActiveAt != null) - { - writer.WritePropertyName("last_active_at"u8); - writer.WriteNumberValue(LastActiveAt.Value, "U"); - } - else + if (SerializedAdditionalRawData?.ContainsKey("last_active_at") != true) { - writer.WriteNull("last_active_at"); - } - if (Metadata != null && Optional.IsCollectionDefined(Metadata)) - { - writer.WritePropertyName("metadata"u8); - writer.WriteStartObject(); - foreach (var item in Metadata) + if (LastActiveAt != null) { - writer.WritePropertyName(item.Key); - writer.WriteStringValue(item.Value); + writer.WritePropertyName("last_active_at"u8); + writer.WriteNumberValue(LastActiveAt.Value, "U"); + } + else + { + writer.WriteNull("last_active_at"); } - writer.WriteEndObject(); } - else + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true) { - writer.WriteNull("metadata"); + if (Metadata != null && Optional.IsCollectionDefined(Metadata)) + { + writer.WritePropertyName("metadata"u8); + writer.WriteStartObject(); + foreach (var item in Metadata) + { + writer.WritePropertyName(item.Key); + writer.WriteStringValue(item.Value); + } + writer.WriteEndObject(); + } + else + { + writer.WriteNull("metadata"); + } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -208,8 +239,9 @@ internal static VectorStore DeserializeVectorStore(JsonElement element, ModelRea metadata = dictionary; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/VectorStore.cs b/src/Generated/Models/VectorStore.cs index 98271727f..6aa49d15e 100644 --- a/src/Generated/Models/VectorStore.cs +++ b/src/Generated/Models/VectorStore.cs @@ -9,8 +9,7 @@ namespace OpenAI.VectorStores { public partial class VectorStore { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal VectorStore(string id, DateTimeOffset createdAt, string name, int usageBytes, VectorStoreFileCounts fileCounts, VectorStoreStatus status, DateTimeOffset? lastActiveAt, IReadOnlyDictionary metadata) { Argument.AssertNotNull(id, nameof(id)); @@ -39,7 +38,7 @@ internal VectorStore(string id, InternalVectorStoreObjectObject @object, DateTim ExpiresAt = expiresAt; LastActiveAt = lastActiveAt; Metadata = metadata; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal VectorStore() diff --git a/src/Generated/Models/VectorStoreBatchFileJob.Serialization.cs b/src/Generated/Models/VectorStoreBatchFileJob.Serialization.cs index 713eeb769..14f557aa4 100644 --- a/src/Generated/Models/VectorStoreBatchFileJob.Serialization.cs +++ b/src/Generated/Models/VectorStoreBatchFileJob.Serialization.cs @@ -21,22 +21,44 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReade } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(BatchId); - writer.WritePropertyName("object"u8); - writer.WriteObjectValue(Object, options); - writer.WritePropertyName("created_at"u8); - writer.WriteNumberValue(CreatedAt, "U"); - writer.WritePropertyName("vector_store_id"u8); - writer.WriteStringValue(VectorStoreId); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToString()); - writer.WritePropertyName("file_counts"u8); - writer.WriteObjectValue(FileCounts, options); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("id"u8); + writer.WriteStringValue(BatchId); + } + if (SerializedAdditionalRawData?.ContainsKey("object") != true) + { + writer.WritePropertyName("object"u8); + writer.WriteObjectValue(Object, options); + } + if (SerializedAdditionalRawData?.ContainsKey("created_at") != true) + { + writer.WritePropertyName("created_at"u8); + writer.WriteNumberValue(CreatedAt, "U"); + } + if (SerializedAdditionalRawData?.ContainsKey("vector_store_id") != true) + { + writer.WritePropertyName("vector_store_id"u8); + writer.WriteStringValue(VectorStoreId); + } + if (SerializedAdditionalRawData?.ContainsKey("status") != true) + { + writer.WritePropertyName("status"u8); + writer.WriteStringValue(Status.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("file_counts") != true) + { + writer.WritePropertyName("file_counts"u8); + writer.WriteObjectValue(FileCounts, options); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -111,8 +133,9 @@ internal static VectorStoreBatchFileJob DeserializeVectorStoreBatchFileJob(JsonE fileCounts = VectorStoreFileCounts.DeserializeVectorStoreFileCounts(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/VectorStoreBatchFileJob.cs b/src/Generated/Models/VectorStoreBatchFileJob.cs index 3b159d0f0..acdd29b4d 100644 --- a/src/Generated/Models/VectorStoreBatchFileJob.cs +++ b/src/Generated/Models/VectorStoreBatchFileJob.cs @@ -9,8 +9,7 @@ namespace OpenAI.VectorStores { public partial class VectorStoreBatchFileJob { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal VectorStoreBatchFileJob(string batchId, DateTimeOffset createdAt, string vectorStoreId, VectorStoreBatchFileJobStatus status, VectorStoreFileCounts fileCounts) { Argument.AssertNotNull(batchId, nameof(batchId)); @@ -31,7 +30,7 @@ internal VectorStoreBatchFileJob(string batchId, object @object, DateTimeOffset VectorStoreId = vectorStoreId; Status = status; FileCounts = fileCounts; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal VectorStoreBatchFileJob() diff --git a/src/Generated/Models/VectorStoreCreationHelper.Serialization.cs b/src/Generated/Models/VectorStoreCreationHelper.Serialization.cs index c7b746115..7d1b2942b 100644 --- a/src/Generated/Models/VectorStoreCreationHelper.Serialization.cs +++ b/src/Generated/Models/VectorStoreCreationHelper.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRea } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(FileIds)) + if (SerializedAdditionalRawData?.ContainsKey("file_ids") != true && Optional.IsCollectionDefined(FileIds)) { writer.WritePropertyName("file_ids"u8); writer.WriteStartArray(); @@ -31,7 +31,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRea } writer.WriteEndArray(); } - if (Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true && Optional.IsCollectionDefined(Metadata)) { writer.WritePropertyName("metadata"u8); writer.WriteStartObject(); @@ -42,10 +42,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRea } writer.WriteEndObject(); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -114,8 +118,9 @@ internal static VectorStoreCreationHelper DeserializeVectorStoreCreationHelper(J metadata = dictionary; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/VectorStoreCreationHelper.cs b/src/Generated/Models/VectorStoreCreationHelper.cs index 0a0500df9..38767788f 100644 --- a/src/Generated/Models/VectorStoreCreationHelper.cs +++ b/src/Generated/Models/VectorStoreCreationHelper.cs @@ -9,8 +9,7 @@ namespace OpenAI.Assistants { public partial class VectorStoreCreationHelper { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } public VectorStoreCreationHelper() { FileIds = new ChangeTrackingList(); @@ -21,7 +20,7 @@ internal VectorStoreCreationHelper(IList fileIds, IDictionary FileIds { get; } diff --git a/src/Generated/Models/VectorStoreCreationOptions.Serialization.cs b/src/Generated/Models/VectorStoreCreationOptions.Serialization.cs index 8fd567ba8..d8303a3a1 100644 --- a/src/Generated/Models/VectorStoreCreationOptions.Serialization.cs +++ b/src/Generated/Models/VectorStoreCreationOptions.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe } writer.WriteStartObject(); - if (Optional.IsCollectionDefined(FileIds)) + if (SerializedAdditionalRawData?.ContainsKey("file_ids") != true && Optional.IsCollectionDefined(FileIds)) { writer.WritePropertyName("file_ids"u8); writer.WriteStartArray(); @@ -31,22 +31,22 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe } writer.WriteEndArray(); } - if (Optional.IsDefined(Name)) + if (SerializedAdditionalRawData?.ContainsKey("name") != true && Optional.IsDefined(Name)) { writer.WritePropertyName("name"u8); writer.WriteStringValue(Name); } - if (Optional.IsDefined(ExpirationPolicy)) + if (SerializedAdditionalRawData?.ContainsKey("expires_after") != true && Optional.IsDefined(ExpirationPolicy)) { writer.WritePropertyName("expires_after"u8); writer.WriteObjectValue(ExpirationPolicy, options); } - if (Optional.IsDefined(ChunkingStrategy)) + if (SerializedAdditionalRawData?.ContainsKey("chunking_strategy") != true && Optional.IsDefined(ChunkingStrategy)) { writer.WritePropertyName("chunking_strategy"u8); writer.WriteObjectValue(ChunkingStrategy, options); } - if (Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true && Optional.IsCollectionDefined(Metadata)) { if (Metadata != null) { @@ -64,10 +64,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe writer.WriteNull("metadata"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -162,8 +166,9 @@ internal static VectorStoreCreationOptions DeserializeVectorStoreCreationOptions metadata = dictionary; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/VectorStoreCreationOptions.cs b/src/Generated/Models/VectorStoreCreationOptions.cs index 8ab8faf55..f3e50307f 100644 --- a/src/Generated/Models/VectorStoreCreationOptions.cs +++ b/src/Generated/Models/VectorStoreCreationOptions.cs @@ -9,8 +9,7 @@ namespace OpenAI.VectorStores { public partial class VectorStoreCreationOptions { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } public VectorStoreCreationOptions() { FileIds = new ChangeTrackingList(); @@ -24,7 +23,7 @@ internal VectorStoreCreationOptions(IList fileIds, string name, VectorSt ExpirationPolicy = expirationPolicy; ChunkingStrategy = chunkingStrategy; Metadata = metadata; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string Name { get; init; } public IDictionary Metadata { get; } diff --git a/src/Generated/Models/VectorStoreExpirationPolicy.Serialization.cs b/src/Generated/Models/VectorStoreExpirationPolicy.Serialization.cs index e27f8d301..389d5de38 100644 --- a/src/Generated/Models/VectorStoreExpirationPolicy.Serialization.cs +++ b/src/Generated/Models/VectorStoreExpirationPolicy.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelR } writer.WriteStartObject(); - writer.WritePropertyName("anchor"u8); - writer.WriteStringValue(_anchor.ToSerialString()); - writer.WritePropertyName("days"u8); - writer.WriteNumberValue(_days); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("anchor") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("anchor"u8); + writer.WriteStringValue(_anchor.ToSerialString()); + } + if (SerializedAdditionalRawData?.ContainsKey("days") != true) + { + writer.WritePropertyName("days"u8); + writer.WriteNumberValue(_days); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static VectorStoreExpirationPolicy DeserializeVectorStoreExpirationPoli days = property.Value.GetInt32(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/VectorStoreFileAssociation.Serialization.cs b/src/Generated/Models/VectorStoreFileAssociation.Serialization.cs index 0b3490d1b..f3fa8bb82 100644 --- a/src/Generated/Models/VectorStoreFileAssociation.Serialization.cs +++ b/src/Generated/Models/VectorStoreFileAssociation.Serialization.cs @@ -21,36 +21,61 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelRe } writer.WriteStartObject(); - writer.WritePropertyName("id"u8); - writer.WriteStringValue(FileId); - writer.WritePropertyName("object"u8); - writer.WriteStringValue(Object.ToString()); - writer.WritePropertyName("usage_bytes"u8); - writer.WriteNumberValue(Size); - writer.WritePropertyName("created_at"u8); - writer.WriteNumberValue(CreatedAt, "U"); - writer.WritePropertyName("vector_store_id"u8); - writer.WriteStringValue(VectorStoreId); - writer.WritePropertyName("status"u8); - writer.WriteStringValue(Status.ToSerialString()); - if (LastError != null) + if (SerializedAdditionalRawData?.ContainsKey("id") != true) { - writer.WritePropertyName("last_error"u8); - writer.WriteObjectValue(LastError, options); + writer.WritePropertyName("id"u8); + writer.WriteStringValue(FileId); } - else + if (SerializedAdditionalRawData?.ContainsKey("object") != true) { - writer.WriteNull("last_error"); + writer.WritePropertyName("object"u8); + writer.WriteStringValue(Object.ToString()); } - if (Optional.IsDefined(ChunkingStrategy)) + if (SerializedAdditionalRawData?.ContainsKey("usage_bytes") != true) + { + writer.WritePropertyName("usage_bytes"u8); + writer.WriteNumberValue(Size); + } + if (SerializedAdditionalRawData?.ContainsKey("created_at") != true) + { + writer.WritePropertyName("created_at"u8); + writer.WriteNumberValue(CreatedAt, "U"); + } + if (SerializedAdditionalRawData?.ContainsKey("vector_store_id") != true) + { + writer.WritePropertyName("vector_store_id"u8); + writer.WriteStringValue(VectorStoreId); + } + if (SerializedAdditionalRawData?.ContainsKey("status") != true) + { + writer.WritePropertyName("status"u8); + writer.WriteStringValue(Status.ToSerialString()); + } + if (SerializedAdditionalRawData?.ContainsKey("last_error") != true) + { + if (LastError != null) + { + writer.WritePropertyName("last_error"u8); + writer.WriteObjectValue(LastError, options); + } + else + { + writer.WriteNull("last_error"); + } + } + if (SerializedAdditionalRawData?.ContainsKey("chunking_strategy") != true && Optional.IsDefined(ChunkingStrategy)) { writer.WritePropertyName("chunking_strategy"u8); writer.WriteObjectValue(ChunkingStrategy, options); } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -146,8 +171,9 @@ internal static VectorStoreFileAssociation DeserializeVectorStoreFileAssociation chunkingStrategy = FileChunkingStrategy.DeserializeFileChunkingStrategy(property.Value, options); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/VectorStoreFileAssociation.cs b/src/Generated/Models/VectorStoreFileAssociation.cs index 68f115853..e977200d6 100644 --- a/src/Generated/Models/VectorStoreFileAssociation.cs +++ b/src/Generated/Models/VectorStoreFileAssociation.cs @@ -9,8 +9,7 @@ namespace OpenAI.VectorStores { public partial class VectorStoreFileAssociation { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal VectorStoreFileAssociation(string fileId, int size, DateTimeOffset createdAt, string vectorStoreId, VectorStoreFileAssociationStatus status, VectorStoreFileAssociationError? lastError) { Argument.AssertNotNull(fileId, nameof(fileId)); @@ -34,7 +33,7 @@ internal VectorStoreFileAssociation(string fileId, InternalVectorStoreFileObject Status = status; LastError = lastError; ChunkingStrategy = chunkingStrategy; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } internal VectorStoreFileAssociation() diff --git a/src/Generated/Models/VectorStoreFileAssociationError.Serialization.cs b/src/Generated/Models/VectorStoreFileAssociationError.Serialization.cs index ae368bca9..73218695b 100644 --- a/src/Generated/Models/VectorStoreFileAssociationError.Serialization.cs +++ b/src/Generated/Models/VectorStoreFileAssociationError.Serialization.cs @@ -21,14 +21,24 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mo } writer.WriteStartObject(); - writer.WritePropertyName("code"u8); - writer.WriteStringValue(Code.ToString()); - writer.WritePropertyName("message"u8); - writer.WriteStringValue(Message); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("code") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("code"u8); + writer.WriteStringValue(Code.ToString()); + } + if (SerializedAdditionalRawData?.ContainsKey("message") != true) + { + writer.WritePropertyName("message"u8); + writer.WriteStringValue(Message); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -79,8 +89,9 @@ internal static VectorStoreFileAssociationError DeserializeVectorStoreFileAssoci message = property.Value.GetString(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/VectorStoreFileAssociationError.cs b/src/Generated/Models/VectorStoreFileAssociationError.cs index 7205de2ee..c3f3c0c58 100644 --- a/src/Generated/Models/VectorStoreFileAssociationError.cs +++ b/src/Generated/Models/VectorStoreFileAssociationError.cs @@ -9,8 +9,7 @@ namespace OpenAI.VectorStores { public readonly partial struct VectorStoreFileAssociationError { - private readonly IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal VectorStoreFileAssociationError(VectorStoreFileAssociationErrorCode code, string message) { Argument.AssertNotNull(message, nameof(message)); @@ -23,7 +22,7 @@ internal VectorStoreFileAssociationError(VectorStoreFileAssociationErrorCode cod { Code = code; Message = message; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public VectorStoreFileAssociationError() diff --git a/src/Generated/Models/VectorStoreFileCounts.Serialization.cs b/src/Generated/Models/VectorStoreFileCounts.Serialization.cs index 94870b79c..c923fc663 100644 --- a/src/Generated/Models/VectorStoreFileCounts.Serialization.cs +++ b/src/Generated/Models/VectorStoreFileCounts.Serialization.cs @@ -21,20 +21,39 @@ void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderW } writer.WriteStartObject(); - writer.WritePropertyName("in_progress"u8); - writer.WriteNumberValue(InProgress); - writer.WritePropertyName("completed"u8); - writer.WriteNumberValue(Completed); - writer.WritePropertyName("failed"u8); - writer.WriteNumberValue(Failed); - writer.WritePropertyName("cancelled"u8); - writer.WriteNumberValue(Cancelled); - writer.WritePropertyName("total"u8); - writer.WriteNumberValue(Total); - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData?.ContainsKey("in_progress") != true) { - foreach (var item in _serializedAdditionalRawData) + writer.WritePropertyName("in_progress"u8); + writer.WriteNumberValue(InProgress); + } + if (SerializedAdditionalRawData?.ContainsKey("completed") != true) + { + writer.WritePropertyName("completed"u8); + writer.WriteNumberValue(Completed); + } + if (SerializedAdditionalRawData?.ContainsKey("failed") != true) + { + writer.WritePropertyName("failed"u8); + writer.WriteNumberValue(Failed); + } + if (SerializedAdditionalRawData?.ContainsKey("cancelled") != true) + { + writer.WritePropertyName("cancelled"u8); + writer.WriteNumberValue(Cancelled); + } + if (SerializedAdditionalRawData?.ContainsKey("total") != true) + { + writer.WritePropertyName("total"u8); + writer.WriteNumberValue(Total); + } + if (SerializedAdditionalRawData != null) + { + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -103,8 +122,9 @@ internal static VectorStoreFileCounts DeserializeVectorStoreFileCounts(JsonEleme total = property.Value.GetInt32(); continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/VectorStoreFileCounts.cs b/src/Generated/Models/VectorStoreFileCounts.cs index 16d277c1b..92c8a4885 100644 --- a/src/Generated/Models/VectorStoreFileCounts.cs +++ b/src/Generated/Models/VectorStoreFileCounts.cs @@ -9,8 +9,7 @@ namespace OpenAI.VectorStores { public readonly partial struct VectorStoreFileCounts { - private readonly IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } internal VectorStoreFileCounts(int inProgress, int completed, int failed, int cancelled, int total) { InProgress = inProgress; @@ -27,7 +26,7 @@ internal VectorStoreFileCounts(int inProgress, int completed, int failed, int ca Failed = failed; Cancelled = cancelled; Total = total; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public VectorStoreFileCounts() diff --git a/src/Generated/Models/VectorStoreModificationOptions.Serialization.cs b/src/Generated/Models/VectorStoreModificationOptions.Serialization.cs index 65b2de005..1474b2a4d 100644 --- a/src/Generated/Models/VectorStoreModificationOptions.Serialization.cs +++ b/src/Generated/Models/VectorStoreModificationOptions.Serialization.cs @@ -21,7 +21,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mod } writer.WriteStartObject(); - if (Optional.IsDefined(Name)) + if (SerializedAdditionalRawData?.ContainsKey("name") != true && Optional.IsDefined(Name)) { if (Name != null) { @@ -33,7 +33,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mod writer.WriteNull("name"); } } - if (Optional.IsDefined(ExpirationPolicy)) + if (SerializedAdditionalRawData?.ContainsKey("expires_after") != true && Optional.IsDefined(ExpirationPolicy)) { if (ExpirationPolicy != null) { @@ -45,7 +45,7 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mod writer.WriteNull("expires_after"); } } - if (Optional.IsCollectionDefined(Metadata)) + if (SerializedAdditionalRawData?.ContainsKey("metadata") != true && Optional.IsCollectionDefined(Metadata)) { if (Metadata != null) { @@ -63,10 +63,14 @@ void IJsonModel.Write(Utf8JsonWriter writer, Mod writer.WriteNull("metadata"); } } - if (true && _serializedAdditionalRawData != null) + if (SerializedAdditionalRawData != null) { - foreach (var item in _serializedAdditionalRawData) + foreach (var item in SerializedAdditionalRawData) { + if (ModelSerializationExtensions.IsSentinelValue(item.Value)) + { + continue; + } writer.WritePropertyName(item.Key); #if NET6_0_OR_GREATER writer.WriteRawValue(item.Value); @@ -142,8 +146,9 @@ internal static VectorStoreModificationOptions DeserializeVectorStoreModificatio metadata = dictionary; continue; } - if (true) + if (options.Format != "W") { + rawDataDictionary ??= new Dictionary(); rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } diff --git a/src/Generated/Models/VectorStoreModificationOptions.cs b/src/Generated/Models/VectorStoreModificationOptions.cs index 068a65f74..8b6e967b5 100644 --- a/src/Generated/Models/VectorStoreModificationOptions.cs +++ b/src/Generated/Models/VectorStoreModificationOptions.cs @@ -9,8 +9,7 @@ namespace OpenAI.VectorStores { public partial class VectorStoreModificationOptions { - internal IDictionary _serializedAdditionalRawData; - + internal IDictionary SerializedAdditionalRawData { get; } public VectorStoreModificationOptions() { Metadata = new ChangeTrackingDictionary(); @@ -21,7 +20,7 @@ internal VectorStoreModificationOptions(string name, VectorStoreExpirationPolicy Name = name; ExpirationPolicy = expirationPolicy; Metadata = metadata; - _serializedAdditionalRawData = serializedAdditionalRawData; + SerializedAdditionalRawData = serializedAdditionalRawData; } public string Name { get; init; } diff --git a/tests/Assistants/AssistantSmokeTests.cs b/tests/Assistants/AssistantSmokeTests.cs index efbab1caa..86aa427f8 100644 --- a/tests/Assistants/AssistantSmokeTests.cs +++ b/tests/Assistants/AssistantSmokeTests.cs @@ -1,4 +1,4 @@ -using NUnit.Framework; +using NUnit.Framework; using OpenAI.Assistants; using OpenAI.Files; using OpenAI.VectorStores; @@ -68,100 +68,6 @@ public void RunStepDeserialization() Assert.That(deserializedRunStep.Details.ToolCalls[0].CodeInterpreterOutputs, Has.Count.EqualTo(1)); Assert.That(deserializedRunStep.Details.ToolCalls[0].CodeInterpreterOutputs[0].Logs, Is.Not.Null.And.Not.Empty); } - - [OneTimeTearDown] - protected void Cleanup() - { - // Skip cleanup if there is no API key (e.g., if we are not running live tests). - if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("OPEN_API_KEY"))) - { - return; - } - - AssistantClient client = new(); - FileClient fileClient = new(); - VectorStoreClient vectorStoreClient = new(); - RequestOptions requestOptions = new() - { - ErrorOptions = ClientErrorBehaviors.NoThrow, - }; - foreach (ThreadMessage message in _messagesToDelete) - { - Console.WriteLine($"Cleanup: {message.Id} -> {client.DeleteMessage(message.ThreadId, message.Id, requestOptions)?.GetRawResponse().Status}"); - } - foreach (Assistant assistant in _assistantsToDelete) - { - Console.WriteLine($"Cleanup: {assistant.Id} -> {client.DeleteAssistant(assistant.Id, requestOptions)?.GetRawResponse().Status}"); - } - foreach (AssistantThread thread in _threadsToDelete) - { - Console.WriteLine($"Cleanup: {thread.Id} -> {client.DeleteThread(thread.Id, requestOptions)?.GetRawResponse().Status}"); - } - foreach (OpenAIFileInfo file in _filesToDelete) - { - Console.WriteLine($"Cleanup: {file.Id} -> {fileClient.DeleteFile(file.Id, requestOptions)?.GetRawResponse().Status}"); - } - foreach (string vectorStoreId in _vectorStoreIdsToDelete) - { - Console.WriteLine($"Cleanup: {vectorStoreId} => {vectorStoreClient.DeleteVectorStore(vectorStoreId, requestOptions)?.GetRawResponse().Status}"); - } - _messagesToDelete.Clear(); - _assistantsToDelete.Clear(); - _threadsToDelete.Clear(); - _filesToDelete.Clear(); - _vectorStoreIdsToDelete.Clear(); - } - - /// - /// Performs basic, invariant validation of a target that was just instantiated from its corresponding origination - /// mechanism. If applicable, the instance is recorded into the test run for cleanup of persistent resources. - /// - /// Instance type being validated. - /// The instance to validate. - /// The provided instance type isn't supported. - private void Validate(T target) - { - if (target is Assistant assistant) - { - Assert.That(assistant?.Id, Is.Not.Null); - _assistantsToDelete.Add(assistant); - } - else if (target is AssistantThread thread) - { - Assert.That(thread?.Id, Is.Not.Null); - _threadsToDelete.Add(thread); - } - else if (target is ThreadMessage message) - { - Assert.That(message?.Id, Is.Not.Null); - _messagesToDelete.Add(message); - } - else if (target is ThreadRun run) - { - Assert.That(run?.Id, Is.Not.Null); - } - else if (target is OpenAIFileInfo file) - { - Assert.That(file?.Id, Is.Not.Null); - _filesToDelete.Add(file); - } - else - { - throw new NotImplementedException($"{nameof(Validate)} helper not implemented for: {typeof(T)}"); - } - } - - private readonly List _assistantsToDelete = []; - private readonly List _threadsToDelete = []; - private readonly List _messagesToDelete = []; - private readonly List _filesToDelete = []; - private readonly List _vectorStoreIdsToDelete = []; - - private static AssistantClient GetTestClient() => GetTestClient(TestScenario.Assistants); - - private static readonly DateTimeOffset s_2024 = new(2024, 1, 1, 0, 0, 0, TimeSpan.Zero); - private static readonly string s_testAssistantName = $".NET SDK Test Assistant - Please Delete Me"; - private static readonly string s_cleanupMetadataKey = $"test_metadata_cleanup_eligible"; } #pragma warning restore OPENAI001 diff --git a/tests/Chat/ChatSmokeTests.cs b/tests/Chat/ChatSmokeTests.cs index 100aaeef6..a3849d3a6 100644 --- a/tests/Chat/ChatSmokeTests.cs +++ b/tests/Chat/ChatSmokeTests.cs @@ -1,4 +1,4 @@ -using Microsoft.VisualStudio.TestPlatform.ObjectModel; +using Microsoft.VisualStudio.TestPlatform.ObjectModel; using NUnit.Framework; using OpenAI.Chat; using OpenAI.Tests.Utility; diff --git a/tests/Images/ImageGenerationTests.cs b/tests/Images/ImageGenerationTests.cs index 9acae471f..1739f758a 100644 --- a/tests/Images/ImageGenerationTests.cs +++ b/tests/Images/ImageGenerationTests.cs @@ -24,7 +24,7 @@ public ImageGenerationTests(bool isAsync) : base(isAsync) [Test] public async Task BasicGenerationWorks() { - ImageClient client = GetTestClient(); + ImageClient client = GetTestClient(TestScenario.Images); string prompt = "An isolated stop sign."; @@ -41,7 +41,7 @@ public async Task BasicGenerationWorks() [Test] public async Task GenerationWithOptionsWorks() { - ImageClient client = GetTestClient(); + ImageClient client = GetTestClient(TestScenario.Images); string prompt = "An isolated stop sign."; @@ -60,7 +60,7 @@ public async Task GenerationWithOptionsWorks() [Test] public async Task GenerationWithBytesResponseWorks() { - ImageClient client = GetTestClient(); + ImageClient client = GetTestClient(TestScenario.Images); string prompt = "An isolated stop sign."; @@ -136,7 +136,7 @@ public async Task GenerateImageEditWithBytesResponseWorks() Assert.That(image.ImageUri, Is.Null); Assert.That(image.ImageBytes, Is.Not.Null); - ValidateGeneratedImage(image.ImageBytes, "cat"); + ValidateGeneratedImage(image.ImageBytes, "cat", "Note that it likely depicts some sort of animal."); } [Test] @@ -153,7 +153,7 @@ public async Task GenerateImageVariationWorks() Console.WriteLine(image.ImageUri.AbsoluteUri); - ValidateGeneratedImage(image.ImageUri, "dog"); + ValidateGeneratedImage(image.ImageUri, "dog", "Note that it likely depicts some sort of animal."); } [Test] @@ -173,15 +173,15 @@ public async Task GenerateImageVariationWithBytesResponseWorks() Assert.That(image.ImageUri, Is.Null); Assert.That(image.ImageBytes, Is.Not.Null); - ValidateGeneratedImage(image.ImageBytes, "cat"); + ValidateGeneratedImage(image.ImageBytes, "cat", "Note that it likely depicts some sort of animal."); } - private void ValidateGeneratedImage(Uri imageUri, string expectedSubstring) + private void ValidateGeneratedImage(Uri imageUri, string expectedSubstring, string descriptionHint = null) { ChatClient chatClient = GetTestClient(TestScenario.Chat); IEnumerable messages = [ new UserChatMessage( - ChatMessageContentPart.CreateTextMessageContentPart("Describe this image for me."), + ChatMessageContentPart.CreateTextMessageContentPart($"Describe this image for me. {descriptionHint}"), ChatMessageContentPart.CreateImageMessageContentPart(imageUri)), ]; ChatCompletionOptions chatOptions = new() { MaxTokens = 2048 }; @@ -190,12 +190,12 @@ private void ValidateGeneratedImage(Uri imageUri, string expectedSubstring) Assert.That(result.Value.Content[0].Text.ToLowerInvariant(), Contains.Substring(expectedSubstring)); } - private void ValidateGeneratedImage(BinaryData imageBytes, string expectedSubstring) + private void ValidateGeneratedImage(BinaryData imageBytes, string expectedSubstring, string descriptionHint = null) { ChatClient chatClient = GetTestClient(TestScenario.Chat); IEnumerable messages = [ new UserChatMessage( - ChatMessageContentPart.CreateTextMessageContentPart("Describe this image for me."), + ChatMessageContentPart.CreateTextMessageContentPart($"Describe this image for me. {descriptionHint}"), ChatMessageContentPart.CreateImageMessageContentPart(imageBytes, "image/png")), ]; ChatCompletionOptions chatOptions = new() { MaxTokens = 2048 }; @@ -203,6 +203,4 @@ private void ValidateGeneratedImage(BinaryData imageBytes, string expectedSubstr Assert.That(result.Value.Content[0].Text.ToLowerInvariant(), Contains.Substring(expectedSubstring)); } - - private static ImageClient GetTestClient() => GetTestClient(TestScenario.Images); }