Configuration Loading Updates (#6)

**Added**
- Auth data type for API key and organization info.
- File check for auth.json.
- Caching configuration object instead of creating it after script compilation.

**Changed**
- DallE sample project scene name changed.

Author: srcnalt

README.md

@@ -51,7 +51,7 @@ private async void SendRequest()
     var request = new CreateCompletionRequest{
         Model="text-davinci-003",
         Prompt="Say this is a test",
-    }
+    };
     var response = await openai.CreateCompletion(request);
 }
 ```

Runtime/Configuration.cs

@@ -1,29 +1,38 @@
 using System;
 using System.IO;
+using UnityEngine;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Serialization;
 
 namespace OpenAI
 {
     public class Configuration
     {
-        public string ApiKey { get; }
-        public string Organization { get; }
+        public Auth Auth { get; }
+        
+        /// Used for serializing and deserializing PascalCase request object fields into snake_case format for JSON. Ignores null fields when creating JSON strings.
+        private readonly JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings()
+        {
+            NullValueHandling = NullValueHandling.Ignore, 
+            ContractResolver = new DefaultContractResolver()
+            {
+                NamingStrategy = new CustomNamingStrategy()
+            }
+        };
 
         public Configuration()
         {
-            var path = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-            var json = File.ReadAllText($"{path}/.openai/auth.json");
-            var auth = JsonConvert.DeserializeObject<JToken>(json);
+            var userPath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+            var authPath = $"{userPath}/.openai/auth.json";
 
-            if (auth != null)
+            if (File.Exists(authPath))
             {
-                ApiKey = auth["api_key"]!.Value<string>();
-                Organization = auth["organization"]!.Value<string>();
+                var json = File.ReadAllText(authPath);
+                Auth = JsonConvert.DeserializeObject<Auth>(json, jsonSerializerSettings);
             }
             else
             {
-                throw new Exception("auth.json could not be found.");
+                Debug.LogError($"auth.json does not exist. Please check https://github.com/srcnalt/OpenAI-Unity#saving-your-credentials");
             }
         }
     }

Runtime/DataTypes.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace OpenAI
 {
@@ -42,6 +43,13 @@ public class ApiError
         public object Param;
         public object Code;
     }
+
+    public struct Auth
+    {
+        [JsonRequired]
+        public string ApiKey { get; set; }
+        public string Organization { get; set; }
+    }
     #endregion
 
     #region Models API Data Types

Runtime/OpenAIApi.cs

@@ -15,8 +15,9 @@ public class OpenAIApi
         ///     Remember that your API key is a secret! Do not share it with others or expose it in any client-side code (browsers, apps).
         ///     Production requests must be routed through your own backend server where your API key can be securely loaded from an environment variable or key management service.
         /// </summary>
-        private readonly Configuration configuration = new Configuration();
-        
+        private Configuration configuration; 
+        private Configuration Configuration => configuration ??= new Configuration();
+
         /// OpenAI API base path for requests.
         private const string BASE_PATH = "https://api.openai.com/v1";
 
@@ -42,7 +43,7 @@ public class OpenAIApi
         private async Task<T> DispatchRequest<T>(string path, HttpMethod method, byte[] payload = null) where T: IResponse
         {
             var client = new HttpClient();
-            client.SetHeaders(configuration, ContentType.ApplicationJson);
+            client.SetHeaders(Configuration, ContentType.ApplicationJson);
 
             var request = new HttpRequestMessage(method, path);
             if (payload != null)
@@ -75,7 +76,7 @@ private async Task<T> DispatchRequest<T>(string path, HttpMethod method, byte[]
         private async Task<T> DispatchRequest<T>(string path, MultipartFormDataContent form) where T: IResponse
         {
             var client = new HttpClient();
-            client.SetHeaders(configuration, ContentType.MultipartFormData);
+            client.SetHeaders(Configuration, ContentType.MultipartFormData);
 
             var response = await client.PostAsync(path, form);
             var content = await response.Content.ReadAsStringAsync();

Runtime/Utils/ExtensionMethods.cs

@@ -60,11 +60,11 @@ public static void AddValue(this MultipartFormDataContent form, object value, st
         /// <param name="type">The value of the Accept header for an HTTP request.</param>
         public static void SetHeaders(this HttpClient client, Configuration configuration, string type)
         {
-            if (configuration.Organization != null)
+            if (configuration.Auth.Organization != null)
             {
-                client.DefaultRequestHeaders.Add("OpenAI-Organization", configuration.Organization);
+                client.DefaultRequestHeaders.Add("OpenAI-Organization", configuration.Auth.Organization);
             }
-            client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", configuration.ApiKey);
+            client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", configuration.Auth.ApiKey);
             client.DefaultRequestHeaders.Accept.Clear();
             client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue(type));
         }

Samples~/DallE/DallE.unity renamed to Samples~/DallE/DallE Sample.unity

@@ -1,6 +1,6 @@
 {
   "name": "com.srcnalt.openai-unity",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "displayName": "OpenAI Unity",
   "description": "An unofficial OpenAI Unity Package that aims to help you use OpenAI API directly in Unity Game engine.",
   "unity": "2020.3",