-
Notifications
You must be signed in to change notification settings - Fork 286
Fix generation of StreamingResponseTextAnnotationAddedUpdate
#507
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
joseharriaga
wants to merge
1
commit into
main
Choose a base branch
from
joseharriaga/FixStreamingResponseTextAnnotationAddedUpdate
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4326,7 +4326,16 @@ public class StreamingResponseRefusalDoneUpdate : StreamingResponseUpdate, IJson | |
protected override StreamingResponseUpdate PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); | ||
protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); | ||
} | ||
public class StreamingResponseTextAnnotationAddedUpdate { | ||
public class StreamingResponseTextAnnotationAddedUpdate : StreamingResponseUpdate, IJsonModel<StreamingResponseTextAnnotationAddedUpdate>, IPersistableModel<StreamingResponseTextAnnotationAddedUpdate> { | ||
public BinaryData Annotation { get; } | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here, ideally this would be parsed as a |
||
public int AnnotationIndex { get; } | ||
public int ContentIndex { get; } | ||
public string ItemId { get; } | ||
public int OutputIndex { get; } | ||
protected override StreamingResponseUpdate JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options); | ||
protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options); | ||
protected override StreamingResponseUpdate PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options); | ||
protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options); | ||
} | ||
public class StreamingResponseUpdate : IJsonModel<StreamingResponseUpdate>, IPersistableModel<StreamingResponseUpdate> { | ||
public int SequenceNumber { get; } | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
184 changes: 184 additions & 0 deletions
184
src/Generated/Models/StreamingResponseTextAnnotationAddedUpdate.Serialization.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,184 @@ | ||
// <auto-generated/> | ||
|
||
#nullable disable | ||
|
||
using System; | ||
using System.ClientModel.Primitives; | ||
using System.Collections.Generic; | ||
using System.Diagnostics.CodeAnalysis; | ||
using System.Text.Json; | ||
using OpenAI; | ||
|
||
namespace OpenAI.Responses | ||
{ | ||
public partial class StreamingResponseTextAnnotationAddedUpdate : IJsonModel<StreamingResponseTextAnnotationAddedUpdate> | ||
{ | ||
internal StreamingResponseTextAnnotationAddedUpdate() : this(InternalResponseStreamEventType.ResponseOutputTextAnnotationAdded, default, null, null, default, default, default, null) | ||
{ | ||
} | ||
|
||
void IJsonModel<StreamingResponseTextAnnotationAddedUpdate>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) | ||
{ | ||
writer.WriteStartObject(); | ||
JsonModelWriteCore(writer, options); | ||
writer.WriteEndObject(); | ||
} | ||
|
||
[Experimental("OPENAI001")] | ||
protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) | ||
{ | ||
string format = options.Format == "W" ? ((IPersistableModel<StreamingResponseTextAnnotationAddedUpdate>)this).GetFormatFromOptions(options) : options.Format; | ||
if (format != "J") | ||
{ | ||
throw new FormatException($"The model {nameof(StreamingResponseTextAnnotationAddedUpdate)} does not support writing '{format}' format."); | ||
} | ||
base.JsonModelWriteCore(writer, options); | ||
if (_additionalBinaryDataProperties?.ContainsKey("item_id") != true) | ||
{ | ||
writer.WritePropertyName("item_id"u8); | ||
writer.WriteStringValue(ItemId); | ||
} | ||
if (_additionalBinaryDataProperties?.ContainsKey("output_index") != true) | ||
{ | ||
writer.WritePropertyName("output_index"u8); | ||
writer.WriteNumberValue(OutputIndex); | ||
} | ||
if (_additionalBinaryDataProperties?.ContainsKey("content_index") != true) | ||
{ | ||
writer.WritePropertyName("content_index"u8); | ||
writer.WriteNumberValue(ContentIndex); | ||
} | ||
if (_additionalBinaryDataProperties?.ContainsKey("annotation_index") != true) | ||
{ | ||
writer.WritePropertyName("annotation_index"u8); | ||
writer.WriteNumberValue(AnnotationIndex); | ||
} | ||
if (_additionalBinaryDataProperties?.ContainsKey("annotation") != true) | ||
{ | ||
writer.WritePropertyName("annotation"u8); | ||
#if NET6_0_OR_GREATER | ||
writer.WriteRawValue(Annotation); | ||
#else | ||
using (JsonDocument document = JsonDocument.Parse(Annotation)) | ||
{ | ||
JsonSerializer.Serialize(writer, document.RootElement); | ||
} | ||
#endif | ||
} | ||
} | ||
|
||
StreamingResponseTextAnnotationAddedUpdate IJsonModel<StreamingResponseTextAnnotationAddedUpdate>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (StreamingResponseTextAnnotationAddedUpdate)JsonModelCreateCore(ref reader, options); | ||
|
||
[Experimental("OPENAI001")] | ||
protected override StreamingResponseUpdate JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) | ||
{ | ||
string format = options.Format == "W" ? ((IPersistableModel<StreamingResponseTextAnnotationAddedUpdate>)this).GetFormatFromOptions(options) : options.Format; | ||
if (format != "J") | ||
{ | ||
throw new FormatException($"The model {nameof(StreamingResponseTextAnnotationAddedUpdate)} does not support reading '{format}' format."); | ||
} | ||
using JsonDocument document = JsonDocument.ParseValue(ref reader); | ||
return DeserializeStreamingResponseTextAnnotationAddedUpdate(document.RootElement, options); | ||
} | ||
|
||
internal static StreamingResponseTextAnnotationAddedUpdate DeserializeStreamingResponseTextAnnotationAddedUpdate(JsonElement element, ModelReaderWriterOptions options) | ||
{ | ||
if (element.ValueKind == JsonValueKind.Null) | ||
{ | ||
return null; | ||
} | ||
InternalResponseStreamEventType kind = default; | ||
int sequenceNumber = default; | ||
IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>(); | ||
string itemId = default; | ||
int outputIndex = default; | ||
int contentIndex = default; | ||
int annotationIndex = default; | ||
BinaryData annotation = default; | ||
foreach (var prop in element.EnumerateObject()) | ||
{ | ||
if (prop.NameEquals("type"u8)) | ||
{ | ||
kind = new InternalResponseStreamEventType(prop.Value.GetString()); | ||
continue; | ||
} | ||
if (prop.NameEquals("sequence_number"u8)) | ||
{ | ||
sequenceNumber = prop.Value.GetInt32(); | ||
continue; | ||
} | ||
if (prop.NameEquals("item_id"u8)) | ||
{ | ||
itemId = prop.Value.GetString(); | ||
continue; | ||
} | ||
if (prop.NameEquals("output_index"u8)) | ||
{ | ||
outputIndex = prop.Value.GetInt32(); | ||
continue; | ||
} | ||
if (prop.NameEquals("content_index"u8)) | ||
{ | ||
contentIndex = prop.Value.GetInt32(); | ||
continue; | ||
} | ||
if (prop.NameEquals("annotation_index"u8)) | ||
{ | ||
annotationIndex = prop.Value.GetInt32(); | ||
continue; | ||
} | ||
if (prop.NameEquals("annotation"u8)) | ||
{ | ||
annotation = BinaryData.FromString(prop.Value.GetRawText()); | ||
continue; | ||
} | ||
// Plugin customization: remove options.Format != "W" check | ||
additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); | ||
} | ||
return new StreamingResponseTextAnnotationAddedUpdate( | ||
kind, | ||
sequenceNumber, | ||
additionalBinaryDataProperties, | ||
itemId, | ||
outputIndex, | ||
contentIndex, | ||
annotationIndex, | ||
annotation); | ||
} | ||
|
||
BinaryData IPersistableModel<StreamingResponseTextAnnotationAddedUpdate>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); | ||
|
||
[Experimental("OPENAI001")] | ||
protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) | ||
{ | ||
string format = options.Format == "W" ? ((IPersistableModel<StreamingResponseTextAnnotationAddedUpdate>)this).GetFormatFromOptions(options) : options.Format; | ||
switch (format) | ||
{ | ||
case "J": | ||
return ModelReaderWriter.Write(this, options, OpenAIContext.Default); | ||
default: | ||
throw new FormatException($"The model {nameof(StreamingResponseTextAnnotationAddedUpdate)} does not support writing '{options.Format}' format."); | ||
} | ||
} | ||
|
||
StreamingResponseTextAnnotationAddedUpdate IPersistableModel<StreamingResponseTextAnnotationAddedUpdate>.Create(BinaryData data, ModelReaderWriterOptions options) => (StreamingResponseTextAnnotationAddedUpdate)PersistableModelCreateCore(data, options); | ||
|
||
[Experimental("OPENAI001")] | ||
protected override StreamingResponseUpdate PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) | ||
{ | ||
string format = options.Format == "W" ? ((IPersistableModel<StreamingResponseTextAnnotationAddedUpdate>)this).GetFormatFromOptions(options) : options.Format; | ||
switch (format) | ||
{ | ||
case "J": | ||
using (JsonDocument document = JsonDocument.Parse(data)) | ||
{ | ||
return DeserializeStreamingResponseTextAnnotationAddedUpdate(document.RootElement, options); | ||
} | ||
default: | ||
throw new FormatException($"The model {nameof(StreamingResponseTextAnnotationAddedUpdate)} does not support reading '{options.Format}' format."); | ||
} | ||
} | ||
|
||
string IPersistableModel<StreamingResponseTextAnnotationAddedUpdate>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; | ||
} | ||
} |
40 changes: 40 additions & 0 deletions
40
src/Generated/Models/StreamingResponseTextAnnotationAddedUpdate.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
// <auto-generated/> | ||
|
||
#nullable disable | ||
|
||
using System; | ||
using System.Collections.Generic; | ||
|
||
namespace OpenAI.Responses | ||
{ | ||
public partial class StreamingResponseTextAnnotationAddedUpdate : StreamingResponseUpdate | ||
{ | ||
internal StreamingResponseTextAnnotationAddedUpdate(int sequenceNumber, string itemId, int outputIndex, int contentIndex, int annotationIndex, BinaryData annotation) : base(InternalResponseStreamEventType.ResponseOutputTextAnnotationAdded, sequenceNumber) | ||
{ | ||
ItemId = itemId; | ||
OutputIndex = outputIndex; | ||
ContentIndex = contentIndex; | ||
AnnotationIndex = annotationIndex; | ||
Annotation = annotation; | ||
} | ||
|
||
internal StreamingResponseTextAnnotationAddedUpdate(InternalResponseStreamEventType kind, int sequenceNumber, IDictionary<string, BinaryData> additionalBinaryDataProperties, string itemId, int outputIndex, int contentIndex, int annotationIndex, BinaryData annotation) : base(kind, sequenceNumber, additionalBinaryDataProperties) | ||
{ | ||
ItemId = itemId; | ||
OutputIndex = outputIndex; | ||
ContentIndex = contentIndex; | ||
AnnotationIndex = annotationIndex; | ||
Annotation = annotation; | ||
} | ||
|
||
public string ItemId { get; } | ||
|
||
public int OutputIndex { get; } | ||
|
||
public int ContentIndex { get; } | ||
|
||
public int AnnotationIndex { get; } | ||
|
||
public BinaryData Annotation { get; } | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any chance this could be parsed as an
ResponseMessageAnnotation
?