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 @@ -29,12 +29,12 @@ public class EvalItemContentJsonConverter : global::System.Text.Json.Serializati
}

readerCopy = reader;
global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>? evalItemContentArray = default;
global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>? anArrayOfInputTextOutputTextInputImageAndInputAudio = default;
try
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>).Name}");
evalItemContentArray = global::System.Text.Json.JsonSerializer.Deserialize(ref readerCopy, typeInfo);
anArrayOfInputTextOutputTextInputImageAndInputAudio = global::System.Text.Json.JsonSerializer.Deserialize(ref readerCopy, typeInfo);
}
catch (global::System.Text.Json.JsonException)
{
Expand All @@ -43,7 +43,7 @@ public class EvalItemContentJsonConverter : global::System.Text.Json.Serializati
var __value = new global::tryAGI.OpenAI.EvalItemContent(
evalContentItem,

evalItemContentArray
anArrayOfInputTextOutputTextInputImageAndInputAudio
);

if (evalContentItem != null)
Expand All @@ -52,7 +52,7 @@ public class EvalItemContentJsonConverter : global::System.Text.Json.Serializati
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.EvalItemContentItem).Name}");
_ = global::System.Text.Json.JsonSerializer.Deserialize(ref reader, typeInfo);
}
else if (evalItemContentArray != null)
else if (anArrayOfInputTextOutputTextInputImageAndInputAudio != null)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>).Name}");
Expand All @@ -77,11 +77,11 @@ public override void Write(
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::tryAGI.OpenAI.EvalItemContentItem).Name}");
global::System.Text.Json.JsonSerializer.Serialize(writer, value.EvalContentItem, typeInfo);
}
else if (value.IsEvalItemContentArray)
else if (value.IsAnArrayOfInputTextOutputTextInputImageAndInputAudio)
{
var typeInfo = typeInfoResolver.GetTypeInfo(typeof(global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>), options) as global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>?> ??
throw new global::System.InvalidOperationException($"Cannot get type info for {typeof(global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>).Name}");
global::System.Text.Json.JsonSerializer.Serialize(writer, value.EvalItemContentArray, typeInfo);
global::System.Text.Json.JsonSerializer.Serialize(writer, value.AnArrayOfInputTextOutputTextInputImageAndInputAudio, typeInfo);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ namespace tryAGI.OpenAI
/// image, or input audio object.
/// </summary>
#if NET6_0_OR_GREATER
public global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>? EvalItemContentArray { get; init; }
public global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>? AnArrayOfInputTextOutputTextInputImageAndInputAudio { get; init; }
#else
public global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>? EvalItemContentArray { get; }
public global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>? AnArrayOfInputTextOutputTextInputImageAndInputAudio { get; }
#endif

/// <summary>
///
/// </summary>
#if NET6_0_OR_GREATER
[global::System.Diagnostics.CodeAnalysis.MemberNotNullWhen(true, nameof(EvalItemContentArray))]
[global::System.Diagnostics.CodeAnalysis.MemberNotNullWhen(true, nameof(AnArrayOfInputTextOutputTextInputImageAndInputAudio))]
#endif
public bool IsEvalItemContentArray => EvalItemContentArray != null;
public bool IsAnArrayOfInputTextOutputTextInputImageAndInputAudio => AnArrayOfInputTextOutputTextInputImageAndInputAudio != null;
/// <summary>
///
/// </summary>
Expand All @@ -66,18 +66,18 @@ public EvalItemContent(global::tryAGI.OpenAI.EvalItemContentItem? value)
/// </summary>
public EvalItemContent(
global::tryAGI.OpenAI.EvalItemContentItem? evalContentItem,
global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>? evalItemContentArray
global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>? anArrayOfInputTextOutputTextInputImageAndInputAudio
)
{
EvalContentItem = evalContentItem;
EvalItemContentArray = evalItemContentArray;
AnArrayOfInputTextOutputTextInputImageAndInputAudio = anArrayOfInputTextOutputTextInputImageAndInputAudio;
}

/// <summary>
///
/// </summary>
public object? Object =>
EvalItemContentArray as object ??
AnArrayOfInputTextOutputTextInputImageAndInputAudio as object ??
EvalContentItem as object
;

Expand All @@ -86,23 +86,23 @@ EvalContentItem as object
/// </summary>
public override string? ToString() =>
EvalContentItem?.ToString() ??
EvalItemContentArray?.ToString()
AnArrayOfInputTextOutputTextInputImageAndInputAudio?.ToString()
;

/// <summary>
///
/// </summary>
public bool Validate()
{
return IsEvalContentItem && !IsEvalItemContentArray || !IsEvalContentItem && IsEvalItemContentArray;
return IsEvalContentItem && !IsAnArrayOfInputTextOutputTextInputImageAndInputAudio || !IsEvalContentItem && IsAnArrayOfInputTextOutputTextInputImageAndInputAudio;
}

/// <summary>
///
/// </summary>
public TResult? Match<TResult>(
global::System.Func<global::tryAGI.OpenAI.EvalItemContentItem?, TResult>? evalContentItem = null,
global::System.Func<global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>?, TResult>? evalItemContentArray = null,
global::System.Func<global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>?, TResult>? anArrayOfInputTextOutputTextInputImageAndInputAudio = null,
bool validate = true)
{
if (validate)
Expand All @@ -114,9 +114,9 @@ public bool Validate()
{
return evalContentItem(EvalContentItem!);
}
else if (IsEvalItemContentArray && evalItemContentArray != null)
else if (IsAnArrayOfInputTextOutputTextInputImageAndInputAudio && anArrayOfInputTextOutputTextInputImageAndInputAudio != null)
{
return evalItemContentArray(EvalItemContentArray!);
return anArrayOfInputTextOutputTextInputImageAndInputAudio(AnArrayOfInputTextOutputTextInputImageAndInputAudio!);
}

return default(TResult);
Expand All @@ -127,7 +127,7 @@ public bool Validate()
/// </summary>
public void Match(
global::System.Action<global::tryAGI.OpenAI.EvalItemContentItem?>? evalContentItem = null,
global::System.Action<global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>?>? evalItemContentArray = null,
global::System.Action<global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>?>? anArrayOfInputTextOutputTextInputImageAndInputAudio = null,
bool validate = true)
{
if (validate)
Expand All @@ -139,9 +139,9 @@ public void Match(
{
evalContentItem?.Invoke(EvalContentItem!);
}
else if (IsEvalItemContentArray)
else if (IsAnArrayOfInputTextOutputTextInputImageAndInputAudio)
{
evalItemContentArray?.Invoke(EvalItemContentArray!);
anArrayOfInputTextOutputTextInputImageAndInputAudio?.Invoke(AnArrayOfInputTextOutputTextInputImageAndInputAudio!);
}
}

Expand All @@ -154,7 +154,7 @@ public override int GetHashCode()
{
EvalContentItem,
typeof(global::tryAGI.OpenAI.EvalItemContentItem),
EvalItemContentArray,
AnArrayOfInputTextOutputTextInputImageAndInputAudio,
typeof(global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>),
};
const int offset = unchecked((int)2166136261);
Expand All @@ -173,7 +173,7 @@ public bool Equals(EvalItemContent other)
{
return
global::System.Collections.Generic.EqualityComparer<global::tryAGI.OpenAI.EvalItemContentItem?>.Default.Equals(EvalContentItem, other.EvalContentItem) &&
global::System.Collections.Generic.EqualityComparer<global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>?>.Default.Equals(EvalItemContentArray, other.EvalItemContentArray)
global::System.Collections.Generic.EqualityComparer<global::System.Collections.Generic.IList<global::tryAGI.OpenAI.EvalItemContentItem>?>.Default.Equals(AnArrayOfInputTextOutputTextInputImageAndInputAudio, other.AnArrayOfInputTextOutputTextInputImageAndInputAudio)
;
}

Expand Down
2 changes: 1 addition & 1 deletion src/libs/tryAGI.OpenAI/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16874,7 +16874,7 @@ components:
- $ref: '#/components/schemas/EvalItemContentArray'
description: "Inputs to the model - can contain template strings. Supports text, output text, input images, and input audio, either as a single item or an array of items.\n"
EvalItemContentArray:
title: Eval item content array
title: 'An array of Input text, Output text, Input image, and Input audio'
type: array
items:
$ref: '#/components/schemas/EvalItemContentItem'
Expand Down
Loading