Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,8 @@ namespace tryAGI.OpenAI
typeof(global::tryAGI.OpenAI.JsonConverters.OutputTextContentTypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.RefusalContentTypeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.RefusalContentTypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.ReasoningTextContentTypeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.ReasoningTextContentTypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.ConversationResourceObjectJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.ConversationResourceObjectNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.TextContentTypeJsonConverter),
Expand Down Expand Up @@ -415,12 +417,10 @@ namespace tryAGI.OpenAI
typeof(global::tryAGI.OpenAI.JsonConverters.ImageGenToolCallStatusNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.ImageGenToolCallTypeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.ImageGenToolCallTypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.ReasoningItemContentItemTypeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.ReasoningItemContentItemTypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.ReasoningItemStatusJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.ReasoningItemStatusNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.ReasoningItemSummaryItemTypeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.ReasoningItemSummaryItemTypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.SummaryTypeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.SummaryTypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.ReasoningItemTypeJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.ReasoningItemTypeNullableJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.LocalShellExecActionTypeJsonConverter),
Expand Down Expand Up @@ -1913,6 +1913,7 @@ namespace tryAGI.OpenAI
typeof(global::tryAGI.OpenAI.JsonConverters.Format2JsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.InputItemJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.ItemJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.OutputMessageContentJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.InputMessagesJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.SourceJsonConverter),
typeof(global::tryAGI.OpenAI.JsonConverters.CreateEvalItemJsonConverter),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,18 @@ public class ContentItemJsonConverter : global::System.Text.Json.Serialization.J
{
}

readerCopy = reader;
global::tryAGI.OpenAI.ReasoningTextContent? reasoningText = default;
try
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.ReasoningTextContent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.ReasoningTextContent> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.ReasoningTextContent).Name}");
reasoningText = global::System.Text.Json.JsonSerializer.Deserialize(ref readerCopy, typeInfo);
}
catch (global::System.Text.Json.JsonException)
{
}

readerCopy = reader;
global::tryAGI.OpenAI.RefusalContent? refusal = default;
try
Expand Down Expand Up @@ -117,6 +129,7 @@ public class ContentItemJsonConverter : global::System.Text.Json.Serialization.J
outputText,
text,
summaryText,
reasoningText,
refusal,
inputImage,
computerScreenshot,
Expand Down Expand Up @@ -147,6 +160,12 @@ public class ContentItemJsonConverter : global::System.Text.Json.Serialization.J
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.SummaryTextContent).Name}");
_ = global::System.Text.Json.JsonSerializer.Deserialize(ref reader, typeInfo);
}
else if (reasoningText != null)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.ReasoningTextContent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.ReasoningTextContent> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.ReasoningTextContent).Name}");
_ = global::System.Text.Json.JsonSerializer.Deserialize(ref reader, typeInfo);
}
else if (refusal != null)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.RefusalContent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.RefusalContent> ??
Expand Down Expand Up @@ -208,6 +227,12 @@ public override void Write(
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.SummaryTextContent).Name}");
global::System.Text.Json.JsonSerializer.Serialize(writer, value.SummaryText, typeInfo);
}
else if (value.IsReasoningText)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.ReasoningTextContent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.ReasoningTextContent?> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.ReasoningTextContent).Name}");
global::System.Text.Json.JsonSerializer.Serialize(writer, value.ReasoningText, typeInfo);
}
else if (value.IsRefusal)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.RefusalContent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.RefusalContent?> ??
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,22 @@ public class OutputContentJsonConverter : global::System.Text.Json.Serialization
{
}

readerCopy = reader;
global::tryAGI.OpenAI.ReasoningTextContent? reasoningText = default;
try
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.ReasoningTextContent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.ReasoningTextContent> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.ReasoningTextContent).Name}");
reasoningText = global::System.Text.Json.JsonSerializer.Deserialize(ref readerCopy, typeInfo);
}
catch (global::System.Text.Json.JsonException)
{
}

var result = new global::tryAGI.OpenAI.OutputContent(
text,
refusal
refusal,
reasoningText
);

if (text != null)
Expand All @@ -57,6 +70,12 @@ public class OutputContentJsonConverter : global::System.Text.Json.Serialization
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.RefusalContent).Name}");
_ = global::System.Text.Json.JsonSerializer.Deserialize(ref reader, typeInfo);
}
else if (reasoningText != null)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.ReasoningTextContent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.ReasoningTextContent> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.ReasoningTextContent).Name}");
_ = global::System.Text.Json.JsonSerializer.Deserialize(ref reader, typeInfo);
}

return result;
}
Expand All @@ -82,6 +101,12 @@ public override void Write(
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.RefusalContent).Name}");
global::System.Text.Json.JsonSerializer.Serialize(writer, value.Refusal, typeInfo);
}
else if (value.IsReasoningText)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.ReasoningTextContent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.ReasoningTextContent?> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.ReasoningTextContent).Name}");
global::System.Text.Json.JsonSerializer.Serialize(writer, value.ReasoningText, typeInfo);
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
#nullable enable
#pragma warning disable CS0618 // Type or member is obsolete

namespace tryAGI.OpenAI.JsonConverters
{
/// <inheritdoc />
public class OutputMessageContentJsonConverter : global::System.Text.Json.Serialization.JsonConverter<global::tryAGI.OpenAI.OutputMessageContent>
{
/// <inheritdoc />
public override global::tryAGI.OpenAI.OutputMessageContent Read(
ref global::System.Text.Json.Utf8JsonReader reader,
global::System.Type typeToConvert,
global::System.Text.Json.JsonSerializerOptions options)
{
options = options ?? throw new global::System.ArgumentNullException(nameof(options));
var typeInfoResolver = options.TypeInfoResolver ?? throw new global::System.InvalidOperationException("TypeInfoResolver is not set.");

var
readerCopy = reader;
global::tryAGI.OpenAI.OutputTextContent? text = default;
try
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.OutputTextContent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.OutputTextContent> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.OutputTextContent).Name}");
text = global::System.Text.Json.JsonSerializer.Deserialize(ref readerCopy, typeInfo);
}
catch (global::System.Text.Json.JsonException)
{
}

readerCopy = reader;
global::tryAGI.OpenAI.RefusalContent? refusal = default;
try
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.RefusalContent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.RefusalContent> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.RefusalContent).Name}");
refusal = global::System.Text.Json.JsonSerializer.Deserialize(ref readerCopy, typeInfo);
}
catch (global::System.Text.Json.JsonException)
{
}

var result = new global::tryAGI.OpenAI.OutputMessageContent(
text,
refusal
);

if (text != null)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.OutputTextContent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.OutputTextContent> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.OutputTextContent).Name}");
_ = global::System.Text.Json.JsonSerializer.Deserialize(ref reader, typeInfo);
}
else if (refusal != null)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.RefusalContent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.RefusalContent> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.RefusalContent).Name}");
_ = global::System.Text.Json.JsonSerializer.Deserialize(ref reader, typeInfo);
}

return result;
}

/// <inheritdoc />
public override void Write(
global::System.Text.Json.Utf8JsonWriter writer,
global::tryAGI.OpenAI.OutputMessageContent value,
global::System.Text.Json.JsonSerializerOptions options)
{
options = options ?? throw new global::System.ArgumentNullException(nameof(options));
var typeInfoResolver = options.TypeInfoResolver ?? throw new global::System.InvalidOperationException("TypeInfoResolver is not set.");

if (value.IsText)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.OutputTextContent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.OutputTextContent?> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.OutputTextContent).Name}");
global::System.Text.Json.JsonSerializer.Serialize(writer, value.Text, typeInfo);
}
else if (value.IsRefusal)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::tryAGI.OpenAI.RefusalContent), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::tryAGI.OpenAI.RefusalContent?> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.RefusalContent).Name}");
global::System.Text.Json.JsonSerializer.Serialize(writer, value.Refusal, typeInfo);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
namespace tryAGI.OpenAI.JsonConverters
{
/// <inheritdoc />
public sealed class ReasoningItemContentItemTypeJsonConverter : global::System.Text.Json.Serialization.JsonConverter<global::tryAGI.OpenAI.ReasoningItemContentItemType>
public sealed class ReasoningTextContentTypeJsonConverter : global::System.Text.Json.Serialization.JsonConverter<global::tryAGI.OpenAI.ReasoningTextContentType>
{
/// <inheritdoc />
public override global::tryAGI.OpenAI.ReasoningItemContentItemType Read(
public override global::tryAGI.OpenAI.ReasoningTextContentType Read(
ref global::System.Text.Json.Utf8JsonReader reader,
global::System.Type typeToConvert,
global::System.Text.Json.JsonSerializerOptions options)
Expand All @@ -18,19 +18,19 @@ public sealed class ReasoningItemContentItemTypeJsonConverter : global::System.T
var stringValue = reader.GetString();
if (stringValue != null)
{
return global::tryAGI.OpenAI.ReasoningItemContentItemTypeExtensions.ToEnum(stringValue) ?? default;
return global::tryAGI.OpenAI.ReasoningTextContentTypeExtensions.ToEnum(stringValue) ?? default;
}

break;
}
case global::System.Text.Json.JsonTokenType.Number:
{
var numValue = reader.GetInt32();
return (global::tryAGI.OpenAI.ReasoningItemContentItemType)numValue;
return (global::tryAGI.OpenAI.ReasoningTextContentType)numValue;
}
case global::System.Text.Json.JsonTokenType.Null:
{
return default(global::tryAGI.OpenAI.ReasoningItemContentItemType);
return default(global::tryAGI.OpenAI.ReasoningTextContentType);
}
default:
throw new global::System.ArgumentOutOfRangeException(nameof(reader));
Expand All @@ -42,12 +42,12 @@ public sealed class ReasoningItemContentItemTypeJsonConverter : global::System.T
/// <inheritdoc />
public override void Write(
global::System.Text.Json.Utf8JsonWriter writer,
global::tryAGI.OpenAI.ReasoningItemContentItemType value,
global::tryAGI.OpenAI.ReasoningTextContentType value,
global::System.Text.Json.JsonSerializerOptions options)
{
writer = writer ?? throw new global::System.ArgumentNullException(nameof(writer));

writer.WriteStringValue(global::tryAGI.OpenAI.ReasoningItemContentItemTypeExtensions.ToValueString(value));
writer.WriteStringValue(global::tryAGI.OpenAI.ReasoningTextContentTypeExtensions.ToValueString(value));
}
}
}
Loading
Loading