-
Notifications
You must be signed in to change notification settings - Fork 341
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #315 from futzy314/fix-ai-request-settings
Added a converter similar to the Open AI one
- Loading branch information
Showing
7 changed files
with
445 additions
and
4 deletions.
There are no files selected for viewing
This file contains 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
105 changes: 105 additions & 0 deletions
105
LLama.SemanticKernel/ChatCompletion/ChatRequestSettingsConverter.cs
This file contains 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,105 @@ | ||
using System; | ||
using System.Collections.Generic; | ||
using System.Text.Json; | ||
using System.Text.Json.Serialization; | ||
|
||
namespace LLamaSharp.SemanticKernel.ChatCompletion; | ||
|
||
/// <summary> | ||
/// JSON converter for <see cref="OpenAIRequestSettings"/> | ||
/// </summary> | ||
public class ChatRequestSettingsConverter : JsonConverter<ChatRequestSettings> | ||
{ | ||
/// <inheritdoc/> | ||
public override ChatRequestSettings? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) | ||
{ | ||
var requestSettings = new ChatRequestSettings(); | ||
|
||
while (reader.Read() && reader.TokenType != JsonTokenType.EndObject) | ||
{ | ||
if (reader.TokenType == JsonTokenType.PropertyName) | ||
{ | ||
string? propertyName = reader.GetString(); | ||
|
||
if (propertyName is not null) | ||
{ | ||
// normalise property name to uppercase | ||
propertyName = propertyName.ToUpperInvariant(); | ||
} | ||
|
||
reader.Read(); | ||
|
||
switch (propertyName) | ||
{ | ||
case "TEMPERATURE": | ||
requestSettings.Temperature = reader.GetDouble(); | ||
break; | ||
case "TOPP": | ||
case "TOP_P": | ||
requestSettings.TopP = reader.GetDouble(); | ||
break; | ||
case "FREQUENCYPENALTY": | ||
case "FREQUENCY_PENALTY": | ||
requestSettings.FrequencyPenalty = reader.GetDouble(); | ||
break; | ||
case "PRESENCEPENALTY": | ||
case "PRESENCE_PENALTY": | ||
requestSettings.PresencePenalty = reader.GetDouble(); | ||
break; | ||
case "MAXTOKENS": | ||
case "MAX_TOKENS": | ||
requestSettings.MaxTokens = reader.GetInt32(); | ||
break; | ||
case "STOPSEQUENCES": | ||
case "STOP_SEQUENCES": | ||
requestSettings.StopSequences = JsonSerializer.Deserialize<IList<string>>(ref reader, options) ?? Array.Empty<string>(); | ||
break; | ||
case "RESULTSPERPROMPT": | ||
case "RESULTS_PER_PROMPT": | ||
requestSettings.ResultsPerPrompt = reader.GetInt32(); | ||
break; | ||
case "TOKENSELECTIONBIASES": | ||
case "TOKEN_SELECTION_BIASES": | ||
requestSettings.TokenSelectionBiases = JsonSerializer.Deserialize<IDictionary<int, int>>(ref reader, options) ?? new Dictionary<int, int>(); | ||
break; | ||
case "SERVICEID": | ||
case "SERVICE_ID": | ||
requestSettings.ServiceId = reader.GetString(); | ||
break; | ||
default: | ||
reader.Skip(); | ||
break; | ||
} | ||
} | ||
} | ||
|
||
return requestSettings; | ||
} | ||
|
||
/// <inheritdoc/> | ||
public override void Write(Utf8JsonWriter writer, ChatRequestSettings value, JsonSerializerOptions options) | ||
{ | ||
writer.WriteStartObject(); | ||
|
||
writer.WriteNumber("temperature", value.Temperature); | ||
writer.WriteNumber("top_p", value.TopP); | ||
writer.WriteNumber("frequency_penalty", value.FrequencyPenalty); | ||
writer.WriteNumber("presence_penalty", value.PresencePenalty); | ||
if (value.MaxTokens is null) | ||
{ | ||
writer.WriteNull("max_tokens"); | ||
} | ||
else | ||
{ | ||
writer.WriteNumber("max_tokens", (decimal)value.MaxTokens); | ||
} | ||
writer.WritePropertyName("stop_sequences"); | ||
JsonSerializer.Serialize(writer, value.StopSequences, options); | ||
writer.WriteNumber("results_per_prompt", value.ResultsPerPrompt); | ||
writer.WritePropertyName("token_selection_biases"); | ||
JsonSerializer.Serialize(writer, value.TokenSelectionBiases, options); | ||
writer.WriteString("service_id", value.ServiceId); | ||
|
||
writer.WriteEndObject(); | ||
} | ||
} |
This file contains 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 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 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
107 changes: 107 additions & 0 deletions
107
LLama.Unittest/SemanticKernel/ChatRequestSettingsConverterTests.cs
This file contains 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,107 @@ | ||
using LLamaSharp.SemanticKernel.ChatCompletion; | ||
using System.Text.Json; | ||
|
||
namespace LLama.Unittest.SemanticKernel | ||
{ | ||
public class ChatRequestSettingsConverterTests | ||
{ | ||
[Fact] | ||
public void ChatRequestSettingsConverter_DeserializeWithDefaults() | ||
{ | ||
// Arrange | ||
var options = new JsonSerializerOptions(); | ||
options.Converters.Add(new ChatRequestSettingsConverter()); | ||
var json = "{}"; | ||
|
||
// Act | ||
var requestSettings = JsonSerializer.Deserialize<ChatRequestSettings>(json, options); | ||
|
||
// Assert | ||
Assert.NotNull(requestSettings); | ||
Assert.Equal(0, requestSettings.FrequencyPenalty); | ||
Assert.Null(requestSettings.MaxTokens); | ||
Assert.Equal(0, requestSettings.PresencePenalty); | ||
Assert.Equal(1, requestSettings.ResultsPerPrompt); | ||
Assert.NotNull(requestSettings.StopSequences); | ||
Assert.Empty(requestSettings.StopSequences); | ||
Assert.Equal(0, requestSettings.Temperature); | ||
Assert.NotNull(requestSettings.TokenSelectionBiases); | ||
Assert.Empty(requestSettings.TokenSelectionBiases); | ||
Assert.Equal(0, requestSettings.TopP); | ||
} | ||
|
||
[Fact] | ||
public void ChatRequestSettingsConverter_DeserializeWithSnakeCase() | ||
{ | ||
// Arrange | ||
var options = new JsonSerializerOptions(); | ||
options.AllowTrailingCommas = true; | ||
options.Converters.Add(new ChatRequestSettingsConverter()); | ||
var json = @"{ | ||
""frequency_penalty"": 0.5, | ||
""max_tokens"": 250, | ||
""presence_penalty"": 0.5, | ||
""results_per_prompt"": -1, | ||
""stop_sequences"": [ ""foo"", ""bar"" ], | ||
""temperature"": 0.5, | ||
""token_selection_biases"": { ""1"": 2, ""3"": 4 }, | ||
""top_p"": 0.5, | ||
}"; | ||
|
||
// Act | ||
var requestSettings = JsonSerializer.Deserialize<ChatRequestSettings>(json, options); | ||
|
||
// Assert | ||
Assert.NotNull(requestSettings); | ||
Assert.Equal(0.5, requestSettings.FrequencyPenalty); | ||
Assert.Equal(250, requestSettings.MaxTokens); | ||
Assert.Equal(0.5, requestSettings.PresencePenalty); | ||
Assert.Equal(-1, requestSettings.ResultsPerPrompt); | ||
Assert.NotNull(requestSettings.StopSequences); | ||
Assert.Contains("foo", requestSettings.StopSequences); | ||
Assert.Contains("bar", requestSettings.StopSequences); | ||
Assert.Equal(0.5, requestSettings.Temperature); | ||
Assert.NotNull(requestSettings.TokenSelectionBiases); | ||
Assert.Equal(2, requestSettings.TokenSelectionBiases[1]); | ||
Assert.Equal(4, requestSettings.TokenSelectionBiases[3]); | ||
Assert.Equal(0.5, requestSettings.TopP); | ||
} | ||
|
||
[Fact] | ||
public void ChatRequestSettingsConverter_DeserializeWithPascalCase() | ||
{ | ||
// Arrange | ||
var options = new JsonSerializerOptions(); | ||
options.AllowTrailingCommas = true; | ||
options.Converters.Add(new ChatRequestSettingsConverter()); | ||
var json = @"{ | ||
""FrequencyPenalty"": 0.5, | ||
""MaxTokens"": 250, | ||
""PresencePenalty"": 0.5, | ||
""ResultsPerPrompt"": -1, | ||
""StopSequences"": [ ""foo"", ""bar"" ], | ||
""Temperature"": 0.5, | ||
""TokenSelectionBiases"": { ""1"": 2, ""3"": 4 }, | ||
""TopP"": 0.5, | ||
}"; | ||
|
||
// Act | ||
var requestSettings = JsonSerializer.Deserialize<ChatRequestSettings>(json, options); | ||
|
||
// Assert | ||
Assert.NotNull(requestSettings); | ||
Assert.Equal(0.5, requestSettings.FrequencyPenalty); | ||
Assert.Equal(250, requestSettings.MaxTokens); | ||
Assert.Equal(0.5, requestSettings.PresencePenalty); | ||
Assert.Equal(-1, requestSettings.ResultsPerPrompt); | ||
Assert.NotNull(requestSettings.StopSequences); | ||
Assert.Contains("foo", requestSettings.StopSequences); | ||
Assert.Contains("bar", requestSettings.StopSequences); | ||
Assert.Equal(0.5, requestSettings.Temperature); | ||
Assert.NotNull(requestSettings.TokenSelectionBiases); | ||
Assert.Equal(2, requestSettings.TokenSelectionBiases[1]); | ||
Assert.Equal(4, requestSettings.TokenSelectionBiases[3]); | ||
Assert.Equal(0.5, requestSettings.TopP); | ||
} | ||
} | ||
} |
Oops, something went wrong.