add wrapped io error and error parsing from json

Author: CJCrafter

src/main/kotlin/com/cjcrafter/openai/OpenAI.kt

@@ -4,6 +4,8 @@ import com.cjcrafter.openai.chat.ChatRequest
 import com.cjcrafter.openai.chat.ChatResponse
 import com.cjcrafter.openai.chat.ChatResponseChunk
 import com.cjcrafter.openai.chat.ChatUser
+import com.cjcrafter.openai.exception.OpenAIError
+import com.cjcrafter.openai.exception.WrappedIOError
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonObject
@@ -61,10 +63,9 @@ class OpenAI @JvmOverloads constructor(
      *
      * @param request The input information for ChatGPT.
      * @return The returned response.
-     * @throws IOException              If an IO Exception occurs.
-     * @throws IllegalArgumentException If the input arguments are invalid.
+     * @throws OpenAIError Invalid request/timeout/io/etc.
      */
-    @Throws(IOException::class)
+    @Throws(OpenAIError::class)
     fun createChatCompletion(request: ChatRequest): ChatResponse {
         request.stream = false // use streamResponse for stream=true
         val httpRequest = buildRequest(request)
@@ -77,11 +78,12 @@ class OpenAI @JvmOverloads constructor(
                 // Servers respond to API calls with json blocks. Since raw JSON isn't
                 // very developer friendly, we wrap for easy data access.
                 rootObject = JsonParser.parseString(response.body!!.string()).asJsonObject
-                require(!rootObject!!.has("error")) { rootObject!!.get("error").asJsonObject["message"].asString }
+                if (rootObject!!.has("error"))
+                    throw OpenAIError.fromJson(rootObject!!.get("error").asJsonObject)
                 return ChatResponse(rootObject!!)
             }
-        } catch (ex: Throwable) {
-            throw ex
+        } catch (ex: IOException) {
+            throw WrappedIOError(ex)
         }
     }
 

src/main/kotlin/com/cjcrafter/openai/exception/OpenAIError.kt

@@ -13,10 +13,12 @@ abstract class OpenAIError : Exception {
         this.param = param
         this.code = code
     }
+
     constructor(param: JsonElement?, code: String?, message: String, cause: Throwable?) : super(message, cause) {
         this.param = param
         this.code = code
     }
+
     constructor(param: JsonElement?, code: String?, cause: Throwable?) : super(cause) {
         this.param = param
         this.code = code
@@ -27,9 +29,9 @@ abstract class OpenAIError : Exception {
         @JvmStatic
         fun fromJson(json: JsonObject) : OpenAIError {
             val message = json["message"].asString
-            val type = json["type"].asString
-            val param = json["param"]
-            val code = json["code"].asString
+            val type = if (json["type"].isJsonNull) null else json["type"].asString
+            val param = if (json["param"].isJsonNull) null else json["param"]
+            val code = if (json["code"].isJsonNull) null else json["code"].asString
 
             // TODO add more error types
             return when (json["type"].asString) {

src/main/kotlin/com/cjcrafter/openai/exception/WrappedIOError.kt

@@ -0,0 +1,5 @@
+package com.cjcrafter.openai.exception
+
+import java.io.IOException
+
+class WrappedIOError(val exception: IOException) : OpenAIError(null, null, exception.message ?: "")

src/test/java/JavaChatTest.java

@@ -1,5 +1,6 @@
 import com.cjcrafter.openai.OpenAI;
 import com.cjcrafter.openai.chat.*;
+import com.cjcrafter.openai.exception.OpenAIError;
 import io.github.cdimascio.dotenv.Dotenv;
 
 import java.io.IOException;
@@ -9,7 +10,7 @@
 
 public class JavaChatTest {
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) throws OpenAIError {
         Scanner scan = new Scanner(System.in);
 
         // This is the prompt that the bot will refer back to for every message.

src/test/java/com/cjcrafter/openai/ExceptionTests.java

@@ -1,6 +1,7 @@
 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;
 
@@ -18,9 +19,9 @@ void test_invalidModel() {
         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);
-        ChatBot bot = new ChatBot(key);
+        OpenAI openai = new OpenAI(key);
 
-        assertThrows(Throwable.class, () -> bot.generateResponse(request));
+        assertThrows(InvalidRequestError.class, () -> openai.createChatCompletion(request));
     }
 
     @Test
@@ -30,8 +31,8 @@ void test_invalidToken() {
         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);
-        ChatBot bot = new ChatBot(key);
+        OpenAI openai = new OpenAI(key);
 
-        assertThrows(Throwable.class, () -> bot.generateResponse(request));
+        assertThrows(InvalidRequestError.class, () -> openai.createChatCompletion(request));
     }
 }