gson serialization testing/fixes

Author: CJCrafter

src/main/kotlin/com/cjcrafter/openai/chat/ChatMessage.kt

@@ -34,7 +34,7 @@ data class ChatMessage(var role: ChatUser, var content: String) {
          */
         @JvmStatic
         fun String.toAssistantMessage(): ChatMessage {
-            return ChatMessage(ChatUser.SYSTEM, this)
+            return ChatMessage(ChatUser.ASSISTANT, this)
         }
     }
 }

src/main/kotlin/com/cjcrafter/openai/gson/ChatChoiceChunkAdapter.kt

@@ -24,7 +24,7 @@ class ChatChoiceChunkAdapter : TypeAdapter<ChatChoiceChunk?>() {
             if (value.finishReason == null) {
                 writer.nullValue()
             } else {
-                writer.value(value.finishReason!!.name)
+                writer.value(value.finishReason!!.name.lowercase())
             }
             writer.endObject()
         }

src/main/kotlin/com/cjcrafter/openai/gson/FinishReasonAdapter.kt

@@ -12,7 +12,7 @@ class FinishReasonAdapter : TypeAdapter<FinishReason?>() {
         if (value == null) {
             writer.nullValue()
         } else {
-            writer.value(value.name)
+            writer.value(value.name.lowercase())
         }
     }
 

src/test/kotlin/com/cjcrafter/openai/ExceptionTests.kt

@@ -1,38 +1,29 @@
-package com.cjcrafter.openai;
+package com.cjcrafter.openai
 
-import com.cjcrafter.openai.chat.*;
-import com.cjcrafter.openai.exception.InvalidRequestError;
-import io.github.cdimascio.dotenv.Dotenv;
-import org.junit.jupiter.api.Test;
+import com.cjcrafter.openai.chat.ChatMessage.Companion.toSystemMessage
+import com.cjcrafter.openai.chat.ChatRequest
+import com.cjcrafter.openai.exception.InvalidRequestError
+import io.github.cdimascio.dotenv.Dotenv
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
 
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-public class ExceptionTests {
+class ExceptionTests {
 
     @Test
-    void test_invalidModel() {
-        String key = Dotenv.load().get("OPENAI_TOKEN");
-
-        String initialPrompt = "Just say hi";
-        List<ChatMessage> messages = new ArrayList<>(List.of(new ChatMessage(ChatUser.SYSTEM, initialPrompt)));
-        ChatRequest request = new ChatRequest("gpt-238974-invalid-model", messages);
-        OpenAI openai = new OpenAI(key);
-
-        assertThrows(InvalidRequestError.class, () -> openai.createChatCompletion(request));
+    fun test_invalidModel() {
+        val key = Dotenv.load()["OPENAI_TOKEN"]
+        val messages = mutableListOf("Just say hi".toSystemMessage())
+        val request = ChatRequest("gpt-238974-invalid-model", messages)
+        val openai = OpenAI(key)
+        Assertions.assertThrows(InvalidRequestError::class.java) { openai.createChatCompletion(request) }
     }
 
     @Test
-    void test_invalidToken() {
-        String key = "sk-Thisisaninvalidtoken";
-
-        String initialPrompt = "Just say hi";
-        List<ChatMessage> messages = new ArrayList<>(List.of(new ChatMessage(ChatUser.SYSTEM, initialPrompt)));
-        ChatRequest request = new ChatRequest("gpt-3.5-turbo", messages);
-        OpenAI openai = new OpenAI(key);
-
-        assertThrows(InvalidRequestError.class, () -> openai.createChatCompletion(request));
+    fun test_invalidToken() {
+        val key = "sk-Thisisaninvalidtoken"
+        val messages = mutableListOf("Just say hi".toSystemMessage())
+        val request = ChatRequest("gpt-3.5-turbo", messages)
+        val openai = OpenAI(key)
+        Assertions.assertThrows(InvalidRequestError::class.java) { openai.createChatCompletion(request) }
     }
-}
+}

src/test/kotlin/com/cjcrafter/openai/GsonTests.kt

@@ -0,0 +1,58 @@
+package com.cjcrafter.openai
+
+import com.cjcrafter.openai.chat.*
+import com.cjcrafter.openai.chat.ChatMessage.Companion.toAssistantMessage
+import com.cjcrafter.openai.chat.ChatMessage.Companion.toSystemMessage
+import com.google.gson.Gson
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.Arguments
+import org.junit.jupiter.params.provider.MethodSource
+import java.util.stream.Stream
+
+class GsonTests {
+
+    private var gson: Gson? = null
+
+    @BeforeEach
+    fun setUp() {
+        gson = OpenAI.createGson()
+    }
+
+    @AfterEach
+    fun tearDown() {
+        gson = null
+    }
+
+    @ParameterizedTest
+    @MethodSource("provide_json")
+    fun test_toJson(json: String, obj: Any, clazz: Class<Any>) {
+        Assertions.assertEquals(json, gson!!.toJson(obj))
+    }
+
+    @ParameterizedTest
+    @MethodSource("provide_json")
+    fun test_fromJson(json: String, obj: Any, clazz: Class<Any>) {
+        Assertions.assertEquals(obj, gson!!.fromJson(json, clazz))
+    }
+
+    companion object {
+        @JvmStatic
+        private fun provide_json(): Stream<Arguments> {
+            return Stream.of(
+                Arguments.of(
+                    "{\"model\":\"gpt-3.5-turbo\",\"messages\":[{\"role\":\"system\",\"content\":\"You are a ChatBot\"}]}",
+                    ChatRequest(model="gpt-3.5-turbo", messages = mutableListOf("You are a ChatBot".toSystemMessage())),
+                    ChatRequest::class.java
+                ),
+                Arguments.of(
+                    "{\"id\":\"chatcmpl-123\",\"created\":1677652288,\"choices\":[{\"index\":0,\"message\":{\"role\":\"assistant\",\"content\":\"Hello there, how may I assist you today?\"},\"finish_reason\":\"stop\"}],\"usage\":{\"prompt_tokens\":9,\"completion_tokens\":12,\"total_tokens\":21}}",
+                    ChatResponse("chatcmpl-123", 1677652288L, mutableListOf(ChatChoice(0, "Hello there, how may I assist you today?".toAssistantMessage(), FinishReason.STOP)), ChatUsage(9, 12, 21)),
+                    ChatResponse::class.java
+                )
+            )
+        }
+    }
+}