fix(decoder): using regex for lookup response stream from open ai api

Author: lambiengcode

.idea/compiler.xml

@@ -1,7 +1,7 @@
 package com.chatgptlite.wanted.data.remote
 
+import android.util.Log
 import com.chatgptlite.wanted.constants.matchResultString
-import com.chatgptlite.wanted.constants.matchResultTurboString
 import com.chatgptlite.wanted.data.api.OpenAIApi
 import com.chatgptlite.wanted.models.TextCompletionsParam
 import com.chatgptlite.wanted.models.toJson
@@ -24,7 +24,7 @@ class OpenAIRepositoryImpl @Inject constructor(
     override fun textCompletionsWithStream(params: TextCompletionsParam): Flow<String> =
         callbackFlow {
             withContext(Dispatchers.IO) {
-                val response = (if (params.isTurbo) openAIApi.textCompletionsTurboWithStream(
+                val response = (if (params.isChatCompletions) openAIApi.textCompletionsTurboWithStream(
                     params.toJson()
                 ) else openAIApi.textCompletionsWithStream(params.toJson())).execute()
 
@@ -41,20 +41,21 @@ class OpenAIRepositoryImpl @Inject constructor(
                                 try {
                                     // Handle & convert data -> emit to client
                                     val value =
-                                        if (params.isTurbo) lookupDataFromResponseTurbo(line) else lookupDataFromResponse(
+                                        if (params.isChatCompletions) lookupDataFromResponseTurbo(line) else lookupDataFromResponse(
                                             line
                                         )
 
                                     if (value.isNotEmpty()) {
                                         trySend(value)
                                     }
                                 } catch (e: Exception) {
-
                                     e.printStackTrace()
+                                    Log.e("ChatGPT Lite BUG", e.toString())
                                 }
                             }
                         }
                     } catch (e: IOException) {
+                        Log.e("ChatGPT Lite BUG", e.toString())
                         throw Exception(e)
                     } finally {
                         withContext(Dispatchers.IO) {
@@ -69,11 +70,12 @@ class OpenAIRepositoryImpl @Inject constructor(
                         try {
                             jsonObject = JSONObject(response.errorBody()!!.string())
                             println(jsonObject)
+                            trySend("Failure! Try again. $jsonObject")
                         } catch (e: JSONException) {
                             e.printStackTrace()
                         }
                     }
-                    trySend("Failure! Try again.")
+                    trySend("Failure! Try again")
                     close()
                 }
             }
@@ -111,31 +113,13 @@ class OpenAIRepositoryImpl @Inject constructor(
     }
 
     private fun lookupDataFromResponseTurbo(jsonString: String): String {
-        val splitsJsonString = jsonString.split("[{")
+        val regex = """"content"\s*:\s*"([^"]+)"""".toRegex()
+        val matchResult = regex.find(jsonString)
 
-        val indexOfResult: Int = splitsJsonString.indexOfLast {
-            it.contains(matchResultTurboString)
+        if (matchResult != null && matchResult.groupValues.size > 1) {
+            return matchResult.groupValues[1]
         }
 
-        val textSplits =
-            if (indexOfResult == -1) listOf() else splitsJsonString[indexOfResult].split(",")
-
-        val indexOfText: Int = textSplits.indexOfLast {
-            it.contains(matchResultTurboString)
-        }
-
-        if (indexOfText != -1) {
-            try {
-                val gson = Gson()
-                val jsonObject =
-                    gson.fromJson("{${textSplits[indexOfText]}}", JsonObject::class.java)
-
-                return jsonObject.getAsJsonObject("delta").get("content").asString
-            } catch (e: java.lang.Exception) {
-                println(e.localizedMessage)
-            }
-        }
-
-        return ""
+        return " "
     }
 }

.idea/kotlinc.xml

@@ -1,8 +1,12 @@
 package com.chatgptlite.wanted.models
 
-enum class GPTModel(val model: String, val maxTokens: Int) {
-    gpt35Turbo("gpt-3.5-turbo", 4000),
-    davinci("text-davinci-003", 4000),
+enum class GPTModel(val model: String, val maxTokens: Int, val isChatCompletion: Boolean = false) {
+    gpt4("gpt-4", 8192, isChatCompletion = true),
+    gpt4v0613("gpt-4-0613", 8192, isChatCompletion = true),
+    gpt4p32k("gpt-4-32k", 32768, isChatCompletion = true),
+    gpt4p32kv0613("gpt-4-32k-0613", 32768, isChatCompletion = true),
+    gpt35Turbo("gpt-3.5-turbo", 4096),
+    davinci("text-davinci-003", 4096),
     curie("text-curie-001", 2048),
     babbage("text-babbage-001", 2048),
     ada("text-ada-001", 2048)

.idea/misc.xml

@@ -18,7 +18,7 @@ data class TextCompletionsParam(
     @SerializedName("maxTokens")
     val maxTokens: Int = 2048,
     @SerializedName("model")
-    val model: GPTModel = GPTModel.gpt35Turbo,
+    val model: GPTModel = GPTModel.gpt4,
     @SerializedName("messages")
     val messagesTurbo: List<MessageTurbo> = emptyList(),
 ) {
@@ -52,8 +52,8 @@ data class TextCompletionsParam(
         return result
     }
 
-    val isTurbo: Boolean
-        get() = model == GPTModel.gpt35Turbo
+    val isChatCompletions: Boolean
+        get() = model.isChatCompletion
 }
 
 fun TextCompletionsParam.toJson(): JsonObject {
@@ -62,7 +62,7 @@ fun TextCompletionsParam.toJson(): JsonObject {
     json.addProperty("stream", stream)
     json.addProperty("model", model.model)
 
-    if (model == GPTModel.gpt35Turbo) {
+    if (isChatCompletions) {
         val jsonArray = JsonArray()
         for (message in messagesTurbo) jsonArray.add(message.toJson())