Merge pull request #60 from betalgo/dev

v6.6.3

Author: kayhantolga

OpenAI.Playground/TestHelpers/CompletionTestHelper.cs

@@ -17,7 +17,8 @@ public static async Task RunSimpleCompletionTest(IOpenAIService sdk)
                 {
                     Prompt = "Once upon a time",
                     //    PromptAsList = new []{"Once upon a time"},
-                    MaxTokens = 5
+                    MaxTokens = 5,
+                    LogProbs = 1,
                 }, Models.Davinci);
 
                 if (completionResult.Successful)

OpenAI.SDK/Managers/OpenAIService.cs

@@ -13,22 +13,7 @@ public partial class OpenAIService : IOpenAIService
 
         [ActivatorUtilitiesConstructor]
         public OpenAIService(HttpClient httpClient, IOptions<OpenAiOptions> settings)
-        {
-            settings.Value.Validate();
-
-            _httpClient = httpClient;
-            _httpClient.BaseAddress = new Uri(settings.Value.BaseDomain);
-            var authKey = settings.Value.ApiKey;
-            _httpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {authKey}");
-            var organization = settings.Value.Organization;
-            if (!string.IsNullOrEmpty(organization))
-            {
-                _httpClient.DefaultRequestHeaders.Add("OpenAI-Organization", $"{organization}");
-            }
-
-            _endpointProvider = new OpenAiEndpointProvider(settings.Value.ApiVersion);
-            _engineId = OpenAiOptions.DefaultEngineId;
-        }
+        : this(settings.Value, httpClient) { }
 
         public OpenAIService(OpenAiOptions settings, HttpClient? httpClient = null)
         {

OpenAI.SDK/ObjectModels/RequestModels/CompletionCreateRequest.cs

@@ -10,7 +10,7 @@ namespace OpenAI.GPT3.ObjectModels.RequestModels
     /// <summary>
     ///     Create Completion Request Model
     /// </summary>
-    public record CompletionCreateRequest : IModelValidate, IOpenAiModels.ITemperature, IOpenAiModels.IModel, IOpenAiModels.ILogProbs, IOpenAiModels.IUser
+    public record CompletionCreateRequest : IModelValidate, IOpenAiModels.ITemperature, IOpenAiModels.IModel, IOpenAiModels.ILogProbsRequest, IOpenAiModels.IUser
     {
         /// <summary>
         ///     The prompt(s) to generate completions for, encoded as a string, a list of strings, or a list of token lists.

OpenAI.SDK/ObjectModels/SharedModels/ChoiceResponse.cs

@@ -2,13 +2,13 @@
 
 namespace OpenAI.GPT3.ObjectModels.SharedModels;
 
-public record ChoiceResponse : IOpenAiModels.ILogProbs
+public record ChoiceResponse : IOpenAiModels.ILogProbsResponse
 {
     [JsonPropertyName("text")] public string Text { get; set; }
 
     [JsonPropertyName("index")] public int? Index { get; set; }
 
     [JsonPropertyName("finish_reason")] public string FinishReason { get; set; }
 
-    [JsonPropertyName("logprobs")] public int? LogProbs { get; set; }
+    [JsonPropertyName("logprobs")] public LogProbsResponse LogProbs { get; set; }
 }

OpenAI.SDK/ObjectModels/SharedModels/IOpenAiModels.cs

@@ -12,11 +12,16 @@ public interface IModel
             string Model { get; set; }
         }
 
-        public interface ILogProbs
+        public interface ILogProbsRequest
         {
             int? LogProbs { get; set; }
         }
 
+        public interface ILogProbsResponse
+        {
+            LogProbsResponse LogProbs { get; set; }
+        }
+
         public interface ITemperature
         {
             float? Temperature { get; set; }

OpenAI.SDK/ObjectModels/SharedModels/LogProbsResponse.cs

@@ -0,0 +1,27 @@
+using System.Linq;
+using System.Text.Json.Serialization;
+
+namespace OpenAI.GPT3.ObjectModels.SharedModels;
+
+public record LogProbsResponse
+{
+    [JsonPropertyName("tokens")] public List<string> Tokens { get; set; }
+
+    [JsonPropertyName("token_logprobs")] public List<double> TokenLogProbs { get; set; }
+
+    [JsonPropertyName("top_logprobs")] public List<Dictionary<string, double>> TopLogProbsRaw { get; set; }
+
+    public List<TopLogProbResponse> TopLogProbs => TopLogProbsRaw.SelectMany(r => r.Select(a=> new TopLogProbResponse()
+    {
+        Key = a.Key,
+        LogProp= a.Value
+    })).ToList();
+
+    [JsonPropertyName("text_offset")] public List<int> TextOffset { get; set; }
+}
+
+public class TopLogProbResponse
+{
+    public string Key { get; set; }
+    public double LogProp { get; set; }
+}

OpenAI.SDK/OpenAI.GPT3.csproj

@@ -9,7 +9,7 @@
 		<PackageProjectUrl>https://openai.com/</PackageProjectUrl>
 		<PackageIcon>OpenAI-Betalgo.png</PackageIcon>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<Version>6.6.2</Version>
+		<Version>6.6.3</Version>
 		<Authors>Tolga Kayhan, Betalgo</Authors>
 		<Company>Betalgo Up Ltd.</Company>
 		<Product>OpenAI GPT-3 and DALL·E dotnet SDK</Product>
@@ -19,6 +19,8 @@
 		<PackageId>Betalgo.$(AssemblyName)</PackageId>
 		<PackageReadmeFile>Readme.md</PackageReadmeFile>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<RepositoryUrl>https://github.com/betalgo/openai.git</RepositoryUrl>
+		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>
 	<ItemGroup>
 		<None Include="..\Readme.md">

Readme.md

@@ -1,12 +1,12 @@
-# Dotnet SDK for OpenAI GTP-3 and DALL·E
+# Dotnet SDK for OpenAI GPT-3 and DALL·E
 
 [![Betalgo.OpenAI.GPT3](https://img.shields.io/nuget/v/Betalgo.OpenAI.GPT3?style=for-the-badge)](https://www.nuget.org/packages/Betalgo.OpenAI.GPT3/)
 
 ```
 Install-Package Betalgo.OpenAI.GPT3
 ```
 
-Dotnet SDK for OpenAI GTP-3 and DALL·E  
+Dotnet SDK for OpenAI GPT-3 and DALL·E  
 *Unofficial*.  
 *GPT-3 doesn't have any official .Net SDK.*
 
@@ -109,8 +109,12 @@ As you can guess I do not accept any damage caused by use of the library. You ar
 
 
 ## Changelog
+### 6.6.3
+* Bug-fix, now we are handling logprops response properly, thanks to @KosmonikOS
+* Code clean-up, thanks to @KosmonikOS
+
 ### 6.6.2
-    * Bug-fix,added jsonignore for `stop` and `stopAsList`, thanks to @Patapum 
+* Bug-fix,added jsonignore for `stop` and `stopAsList`, thanks to @Patapum 
 
 ### 6.6.1
 * **Breaking change**.