Skip to content
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.

Sign up for GitHub

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

OpenAI-DotNet 8.5.3 #411

Merged
merged 2 commits into from
Jan 28, 2025
Merged

OpenAI-DotNet 8.5.3 #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
569ed1f
OpenAI-DotNet 8.5.3
StephenHodgson Jan 28, 2025
a7da39e
remove dup line to add number enum to dict
StephenHodgson Jan 28, 2025
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
5 changes: 5 additions & 0 deletions OpenAI-DotNet/Common/ReasoningEffort.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.

using System.Runtime.Serialization;

namespace OpenAI
{
/// <summary>
Expand All @@ -11,8 +13,11 @@ namespace OpenAI
/// </remarks>
public enum ReasoningEffort
{
[EnumMember(Value = "low")]
Low = 1,
[EnumMember(Value = "medium")]
Medium,
[EnumMember(Value = "high")]
High
}
}
17 changes: 12 additions & 5 deletions OpenAI-DotNet/Common/Role.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.

using System;
using System.Runtime.Serialization;

namespace OpenAI
{
public enum Role
{
[EnumMember(Value = "system")]
System = 1,
Developer = 1,
Assistant = 2,
User = 3,
[EnumMember(Value = "developer")]
Developer,
[EnumMember(Value = "assistant")]
Assistant,
[EnumMember(Value = "user")]
User,
[Obsolete("Use Tool")]
Function = 4,
Tool = 4
[EnumMember(Value = "function")]
Function,
[EnumMember(Value = "tool")]
Tool
}
}
57 changes: 28 additions & 29 deletions OpenAI-DotNet/Extensions/JsonStringEnumConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ namespace OpenAI.Extensions
/// </summary>
internal sealed class JsonStringEnumConverter<TEnum> : JsonConverter<TEnum> where TEnum : struct, Enum
{
private const string ValueField = "value__";
private readonly JsonNamingPolicy namingPolicy;
private readonly Dictionary<int, TEnum> numberToEnum = new();
private readonly Dictionary<TEnum, string> enumToString = new();
Expand All @@ -31,59 +32,57 @@ public JsonStringEnumConverter()
var attribute = enumMember.GetCustomAttributes(typeof(EnumMemberAttribute), false)
.Cast<EnumMemberAttribute>()
.FirstOrDefault();
var index = Convert.ToInt32(type.GetField("value__")?.GetValue(value));
var index = Convert.ToInt32(type.GetField(ValueField)?.GetValue(value));

if (attribute?.Value != null)
{
numberToEnum.Add(index, value);
enumToString.Add(value, attribute.Value);
stringToEnum.Add(attribute.Value, value);
numberToEnum.TryAdd(index, value);
enumToString.TryAdd(value, attribute.Value);
stringToEnum.TryAdd(attribute.Value, value);
}
else
{
var convertedName = namingPolicy != null
? namingPolicy.ConvertName(value.ToString())
: value.ToString();
numberToEnum.Add(index, value);
enumToString.Add(value, convertedName);
stringToEnum.Add(convertedName, value);
numberToEnum.TryAdd(index, value);
enumToString.TryAdd(value, convertedName);
stringToEnum.TryAdd(convertedName, value);
}
}
}

public override TEnum Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
var type = reader.TokenType;

switch (type)
switch (reader.TokenType)
{
case JsonTokenType.String:
{
var stringValue = reader.GetString();

if (stringValue != null)
{
var stringValue = reader.GetString();
var value = namingPolicy != null
? namingPolicy.ConvertName(stringValue)
: stringValue;

if (stringValue != null)
if (stringToEnum.TryGetValue(value, out var enumValue))
{
var value = namingPolicy != null
? namingPolicy.ConvertName(stringValue)
: stringValue;

if (stringToEnum.TryGetValue(value, out var enumValue))
{
return enumValue;
}
return enumValue;
}

break;
}

return default;
}
case JsonTokenType.Number:
{
var numValue = reader.GetInt32();
numberToEnum.TryGetValue(numValue, out var enumValue);
return enumValue;
}
{
var numValue = reader.GetInt32();
numberToEnum.TryGetValue(numValue, out var enumValue);
return enumValue;
}
default:
return default;
}

return default;
}

public override void Write(Utf8JsonWriter writer, TEnum value, JsonSerializerOptions options)
Expand Down
4 changes: 3 additions & 1 deletion OpenAI-DotNet/OpenAI-DotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ More context [on Roger Pincombe's blog](https://rogerpincombe.com/openai-dotnet-
<AssemblyOriginatorKeyFile>OpenAI-DotNet.pfx</AssemblyOriginatorKeyFile>
<IncludeSymbols>true</IncludeSymbols>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Version>8.5.1</Version>
<Version>8.5.3</Version>
<PackageReleaseNotes>
Version 8.5.3
- Fix JsonStringEnumConverter for ChatRequests
Version 8.5.1
- Fix ChatRequest serialization for ReasoningEffort
Version 8.5.0
Expand Down