Squashed commit of the following:

commit 0a669a9
Author: Sercan Altundas <srcnalt@users.noreply.github.com>
Date:   Tue Feb 21 00:25:24 2023 +0200

    chore: tests are updated

commit 3cbf63b
Author: Sercan Altundas <srcnalt@users.noreply.github.com>
Date:   Tue Feb 21 00:25:13 2023 +0200

    feat: form field helper methods are updated

commit 5517326
Author: Sercan Altundas <srcnalt@users.noreply.github.com>
Date:   Tue Feb 21 00:24:51 2023 +0200

    feat: form request updated

Author: srcnalt

Runtime/OpenAIApi.cs

@@ -3,12 +3,9 @@
 using Newtonsoft.Json;
 using System.Threading.Tasks;
 using UnityEngine.Networking;
+using System.Collections.Generic;
 using Newtonsoft.Json.Serialization;
 
-#if !UNITY_WEBGL
-using System.Net.Http;
-#endif
-
 namespace OpenAI
 {
     public class OpenAIApi
@@ -88,24 +85,32 @@ private async Task<T> DispatchRequest<T>(string path, string method, byte[] payl
             return data;
         }
 
-        #if !UNITY_WEBGL
         /// <summary>
         ///     Dispatches an HTTP request to the specified path with a multi-part data form.
         /// </summary>
         /// <param name="path">The path to send the request to.</param>
         /// <param name="form">A multi-part data form to upload with the request.</param>
         /// <typeparam name="T">Response type of the request.</typeparam>
         /// <returns>A Task containing the response from the request as the specified type.</returns>
-        private async Task<T> DispatchRequest<T>(string path, MultipartFormDataContent form) where T: IResponse
+        private async Task<T> DispatchRequest<T>(string path, List<IMultipartFormSection> form) where T: IResponse
         {
-            var client = new HttpClient();
-            client.SetHeaders(Configuration, ContentType.MultipartFormData);
-            
-            var response = await client.PostAsync(path, form);
-            var content = await response.Content.ReadAsStringAsync();
+            T data;
 
-            var data = JsonConvert.DeserializeObject<T>(content, jsonSerializerSettings);
+            using (var request = new UnityWebRequest(path, "POST"))
+            {
+                request.SetHeaders(Configuration);
+                var boundary = UnityWebRequest.GenerateBoundary();
+                var formSections = UnityWebRequest.SerializeFormSections(form, boundary);
+                var contentType = $"{ContentType.MultipartFormData}; boundary={Encoding.UTF8.GetString(boundary)}";
+                request.uploadHandler = new UploadHandlerRaw(formSections) {contentType = contentType};
+                request.downloadHandler = (DownloadHandler) new DownloadHandlerBuffer();
+                var asyncOperation = request.SendWebRequest();
 
+                while (!asyncOperation.isDone) await Task.Yield();
+                
+                data = JsonConvert.DeserializeObject<T>(request.downloadHandler.text, jsonSerializerSettings);
+            }
+            
             if (data != null && data.Error != null)
             {
                 ApiError error = data.Error;
@@ -114,7 +119,6 @@ private async Task<T> DispatchRequest<T>(string path, MultipartFormDataContent f
 
             return data;
         }
-        #endif
 
         /// <summary>
         ///     Create byte array payload from the given request object that contains the parameters.
@@ -184,7 +188,6 @@ public async Task<CreateImageResponse> CreateImage(CreateImageRequest request)
             return await DispatchRequest<CreateImageResponse>(path, UnityWebRequest.kHttpVerbPOST, payload);
         }
 
-        #if !UNITY_WEBGL
         /// <summary>
         ///     Creates an edited or extended image given an original image and a prompt.
         /// </summary>
@@ -193,16 +196,15 @@ public async Task<CreateImageResponse> CreateImage(CreateImageRequest request)
         public async Task<CreateImageResponse> CreateImageEdit(CreateImageEditRequest request)
         {
             var path = $"{BASE_PATH}/images/edits";
-            
-            var form = new MultipartFormDataContent();
+
+            var form = new List<IMultipartFormSection>();
             form.AddImage(request.Image, "image");
             form.AddImage(request.Mask, "mask");
             form.AddValue(request.Prompt, "prompt");
             form.AddValue(request.N, "n");
             form.AddValue(request.Size, "size");
             form.AddValue(request.ResponseFormat, "response_format");
-            form.AddValue(request.User, "user");
-
+            
             return await DispatchRequest<CreateImageResponse>(path, form);
         }
 
@@ -215,15 +217,15 @@ public async Task<CreateImageResponse> CreateImageVariation(CreateImageVariation
         {
             var path = $"{BASE_PATH}/images/variations";
 
-            var form = new MultipartFormDataContent();
+            var form = new List<IMultipartFormSection>();
             form.AddImage(request.Image, "image");
             form.AddValue(request.N, "n");
             form.AddValue(request.Size, "size");
             form.AddValue(request.ResponseFormat, "response_format");
             form.AddValue(request.User, "user");
+            
             return await DispatchRequest<CreateImageResponse>(path, form);
         }
-        #endif
 
         /// <summary>
         ///     Creates an embedding vector representing the input text.
@@ -247,7 +249,6 @@ public async Task<ListFilesResponse> ListFiles()
             return await DispatchRequest<ListFilesResponse>(path, UnityWebRequest.kHttpVerbGET);
         }
 
-        #if !UNITY_WEBGL
         /// <summary>
         ///     Upload a file that contains document(s) to be used across various endpoints/features.
         ///     Currently, the size of all the files uploaded by one organization can be up to 1 GB.
@@ -259,13 +260,12 @@ public async Task<OpenAIFile> CreateFile(CreateFileRequest request)
         {
             var path = $"{BASE_PATH}/files";
 
-            var form = new MultipartFormDataContent();
+            var form = new List<IMultipartFormSection>();
             form.AddJsonl(request.File, "file");
             form.AddValue(request.Purpose, "purpose");
 
             return await DispatchRequest<OpenAIFileResponse>(path, form);
         }
-        #endif
 
         /// <summary>
         ///     Delete a file.

Runtime/Utils/ExtensionMethods.cs

@@ -1,90 +1,74 @@
 using System.IO;
 using UnityEngine.Networking;
-
-#if !UNITY_WEBGL
-using System.Net.Http;
-using System.Net.Http.Headers;
-using UnityEngine;
-#endif
+using System.Collections.Generic;
 
 namespace OpenAI
 {
     public static class ExtensionMethods
     {
-        #if !UNITY_WEBGL
         /// <summary>
         ///     Read a PNG file and add it to this form.
         /// </summary>
-        /// <param name="form">This form.</param>
+        /// <param name="form">List of multipart form sections.</param>
         /// <param name="path">Path of the file to read.</param>
         /// <param name="name">Name of the form field.</param>
-        public static void AddImage(this MultipartFormDataContent form, string path, string name)
+        public static void AddImage(this List<IMultipartFormSection> form, string path, string name)
         {
             if (path != null)
             {
-                var imageContent = new ByteArrayContent(File.ReadAllBytes(path));
-                imageContent.Headers.ContentType = MediaTypeHeaderValue.Parse("image/png");
-                form.Add(imageContent, name, $"{name}.png");
+                var data = File.ReadAllBytes(path);
+                var fileName = Path.GetFileName(path);
+                form.Add(new MultipartFormFileSection(name, data, fileName, "image/png"));
             }
         }
 
         /// <summary>
         ///     Read a JSONL file and add it to this form.
         /// </summary>
-        /// <param name="form">This form.</param>
+        /// <param name="form">List of multipart form sections.</param>
         /// <param name="path">Path of the file to read.</param>
         /// <param name="name">Name of the form field.</param>
-        public static void AddJsonl(this MultipartFormDataContent form, string path, string name)
+        public static void AddJsonl(this List<IMultipartFormSection> form, string path, string name)
         {
             if (path != null)
             {
-                var fileContent = new ByteArrayContent(File.ReadAllBytes(path));
-                fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json");
-                form.Add(fileContent, name, Path.GetFileName(path));
+                var data = File.ReadAllBytes(path);
+                var fileName = Path.GetFileName(path);
+                form.Add(new MultipartFormFileSection(name, data, fileName, "application/json"));
             }
         }
 
         /// <summary>
         ///     Add a primitive value to the form.
         /// </summary>
-        /// <param name="form">This form.</param>
+        /// <param name="form">List of multipart form sections.</param>
         /// <param name="value">Value of the form field.</param>
         /// <param name="name">Name of the form field.</param>
-        public static void AddValue(this MultipartFormDataContent form, object value, string name)
+        public static void AddValue(this List<IMultipartFormSection> form, object value, string name)
         {
             if (value != null)
             {
-                form.Add(new StringContent(value.ToString()), name);
+                form.Add(new MultipartFormDataSection(name, value.ToString()));
             }
         }
 
         /// <summary>
         ///     Set headers of the HTTP request with user credentials.
         /// </summary>
-        /// <param name="client">this HttpClient</param>
+        /// <param name="request">this UnityWebRequest</param>
         /// <param name="configuration">Configuration file that contains user credentials.</param>
         /// <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)
+        public static void SetHeaders(this UnityWebRequest request, Configuration configuration, string type = null)
         {
             if (configuration.Auth.Organization != null)
             {
-                client.DefaultRequestHeaders.Add("OpenAI-Organization", configuration.Auth.Organization);
+                request.SetRequestHeader("OpenAI-Organization", configuration.Auth.Organization);
             }
-            client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", configuration.Auth.ApiKey);
-            client.DefaultRequestHeaders.Accept.Clear();
-            client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue(type));
-        }
-        #endif
-
-        // TODO: summary
-        public static void SetHeaders(this UnityWebRequest request, Configuration configuration, string type)
-        {
-            if (configuration.Auth.Organization != null)
+            if (type != null)
             {
-                request.SetRequestHeader("OpenAI-Organization", configuration.Auth.Organization);
+                request.SetRequestHeader("Content-Type", type);
             }
             request.SetRequestHeader("Authorization", "Bearer " + configuration.Auth.ApiKey);
-            request.SetRequestHeader("Content-Type", type);
         }
     }
 }

Tests/FilesApiTests.cs

@@ -8,9 +8,7 @@ public class FilesApiTests
     {
         private OpenAIApi openai = new OpenAIApi();
         private string createdFileId;
-
 
-        #if !UNITY_WEBGL
         [Test, Order(0)]
         public async Task Create_File()
         {
@@ -24,7 +22,6 @@ public async Task Create_File()
 
             createdFileId = file.Id;
         }
-        #endif
 
         [Test, Order(1)]
         public async Task List_Files()

Tests/FineTunesApiTests.cs

@@ -18,7 +18,6 @@ private async Task DeleteTrainingFile()
             await openai.DeleteFile(trainingFileId);
         }
 
-        #if !UNITY_WEBGL
         private async Task CreateTrainingFile()
         {
             var req = new CreateFileRequest
@@ -65,7 +64,6 @@ public async Task Cancel_FineTune()
 
             await DeleteTrainingFile();
         }
-        #endif
 
         [Test, Order(1)]
         public async Task List_FineTunes()

Tests/ImagesApiTests.cs

@@ -20,9 +20,7 @@ public async Task Create_Image()
             var res = await openai.CreateImage(req);
             Assert.NotNull(res.Data);
         }
-
 
-        #if !UNITY_WEBGL
         [Test]
         public async Task Create_Image_Edit()
         {
@@ -50,6 +48,5 @@ public async Task Create_Image_Variation()
             var res = await openai.CreateImageVariation(req);
             Assert.NotNull(res.Data);
         }
-        #endif
     }
 }