updated project to 2020 LTS

updated packages and dependencies fixed asset config setup added additional completion parameters
RageAgainstThePixel · Apr 14, 2022 · 97c3eba · 97c3eba
1 parent 3fb185c
commit 97c3eba
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 11 deletions.
diff --git a/Runtime/Completions/Choice.cs b/Runtime/Completions/Choice.cs
@@ -36,7 +36,7 @@ public sealed class Choice
         /// <summary>
         /// Gets the main text of this completion
         /// </summary>
-        public override string ToString() => $"{Index}|{FinishReason}|{Text}";
+        public override string ToString() => $"{{\"index\":{Index},\"finish_reason\":\"{FinishReason}\",\"text\":\"{Text}\"}}";
 
         public static implicit operator string(Choice choice) => choice.Text;
     }

diff --git a/Runtime/Completions/CompletionRequest.cs b/Runtime/Completions/CompletionRequest.cs
@@ -2,6 +2,7 @@
 
 using Newtonsoft.Json;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace OpenAI
@@ -146,6 +147,21 @@ public string StopSequence
             }
         }
 
+        /// <summary>
+        /// The logit bias dictionary of token bias values for modifying likelihoods. Positive biases increases the likelihood of 
+        /// generating a token, while negative biases decreases the probability of a token. Very large biases (e.g. -100,100) can
+        /// either eliminate or force a token to be generated.
+        /// </summary>
+        [JsonProperty("logit_bias")]
+        public Dictionary<string, double> LogitBias { get; set; }
+
+        /// <summary>
+        /// How many different completions to generate.  Interacts with <see cref="NumChoicesPerPrompt"/> to generate top 
+        /// NumChoicesPerPrompt out of BestOf. In cases where both are set, BestOf should be greater than NumChoicesPerPrompt.
+        /// </summary>
+        [JsonProperty("best_of")]
+        public int? BestOf { get; set; }
+
         /// <summary>
         /// This allows you to set default parameters for every request, for example to set a default temperature or max tokens.
         /// For every request, if you do not have a parameter set on the request but do have it set here as a default,
@@ -180,6 +196,8 @@ public CompletionRequest(CompletionRequest basedOn)
             LogProbabilities = basedOn.LogProbabilities ?? DefaultCompletionRequestArgs?.LogProbabilities;
             Echo = basedOn.Echo ?? DefaultCompletionRequestArgs?.Echo;
             StopSequences = basedOn.StopSequences ?? DefaultCompletionRequestArgs?.StopSequences;
+            LogitBias = basedOn.LogitBias ?? DefaultCompletionRequestArgs?.LogitBias;
+            BestOf = basedOn.BestOf ?? DefaultCompletionRequestArgs?.BestOf;
         }
 
         /// <summary>
@@ -207,6 +225,8 @@ public CompletionRequest(CompletionRequest basedOn)
         /// <param name="echo">Echo back the prompt in addition to the completion.</param>
         /// <param name="stopSequences">One or more sequences where the API will stop generating further tokens.
         /// The returned text will not contain the stop sequence.</param>
+        /// <param name="logitBias">A dictionary of logit bias to influence the probability of generating a token.</param>
+        /// <param name="bestOf">Returns the top bestOf results based on the best probability.</param>
         public CompletionRequest(
             string prompt = null,
             string[] prompts = null,
@@ -218,7 +238,9 @@ public CompletionRequest(
             double? frequencyPenalty = null,
             int? logProbabilities = null,
             bool? echo = null,
-            string[] stopSequences = null)
+            string[] stopSequences = null,
+            Dictionary<string, double> logitBias = null,
+            int? bestOf = null)
         {
             if (prompt != null)
             {
@@ -242,6 +264,8 @@ public CompletionRequest(
             LogProbabilities = logProbabilities ?? DefaultCompletionRequestArgs?.LogProbabilities;
             Echo = echo ?? DefaultCompletionRequestArgs?.Echo;
             StopSequences = stopSequences ?? DefaultCompletionRequestArgs?.StopSequences;
+            LogitBias = logitBias ?? DefaultCompletionRequestArgs?.LogitBias;
+            BestOf = bestOf ?? DefaultCompletionRequestArgs?.BestOf;
         }
     }
 }
diff --git a/Runtime/OpenAIAuthentication.cs b/Runtime/OpenAIAuthentication.cs
@@ -3,6 +3,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using UnityEngine;
 
 namespace OpenAI
 {
@@ -53,9 +54,13 @@ public static OpenAIAuthentication Default
         }
 
         private static OpenAIAuthentication LoadFromAsset()
-            => (from asset in UnityEngine.Object.FindObjectsOfType<OpenAIConfigurationSettings>()
-                where !string.IsNullOrWhiteSpace(asset.ApiKey) && !string.IsNullOrWhiteSpace(asset.ApiKey)
+        {
+            var assets = UnityEngine.Object.FindObjectsOfType<OpenAIConfigurationSettings>().ToList();
+            assets.AddRange(Resources.FindObjectsOfTypeAll<OpenAIConfigurationSettings>().ToList());
+            return (from asset in assets where !string.IsNullOrWhiteSpace(asset.ApiKey) &&
+                                               !string.IsNullOrWhiteSpace(asset.ApiKey)
                 select new OpenAIAuthentication(asset.ApiKey)).FirstOrDefault();
+        }
 
 
         /// <summary>

diff --git a/Tests/EnginesTestFixture.cs b/Tests/EnginesTestFixture.cs
@@ -1,7 +1,9 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using System;
 using NUnit.Framework;
 using System.Collections;
+using UnityEngine;
 using UnityEngine.TestTools;
 
 namespace OpenAI.Tests
@@ -27,15 +29,21 @@ public IEnumerator Test_2_RetrieveEngineDetails()
         {
             yield return AwaitTestUtilities.Await(async () =>
             {
-                var api = new OpenAIClient(Engine.Davinci);
-
+                var api = new OpenAIClient();
                 var engines = await api.EnginesEndpoint.GetEnginesAsync();
                 Assert.IsNotEmpty(engines);
 
                 foreach (var engine in engines)
                 {
-                    var result = await api.EnginesEndpoint.GetEngineDetailsAsync(engine.EngineName);
-                    Assert.IsNotNull(result);
+                    try
+                    {
+                        var result = await api.EnginesEndpoint.GetEngineDetailsAsync(engine.EngineName);
+                        Assert.IsNotNull(result);
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.LogWarning($"Failed to retrieve engine data for {engine.EngineName}\n{e}");
+                    }
                 }
             });
         }

diff --git a/package.json b/package.json
@@ -3,8 +3,8 @@
   "displayName": "OpenAI",
   "description": "An OpenAI package for the Unity Game Engine.",
   "keywords": [],
-  "version": "1.0.0-preview.1",
-  "unity": "2019.4",
+  "version": "1.0.0",
+  "unity": "2020.3",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "url": "https://github.com/StephenHodgson"
   },
   "dependencies": {
-    "com.unity.nuget.newtonsoft-json": "2.0.1-preview.1"
+    "com.unity.nuget.newtonsoft-json": "3.0.2"
   },
   "publishConfig": {
     "registry": "https://package.openupm.com"