Skip to content

Commit af64b7f

Browse files
committed
fix(is-11): set gpt-3.5-turbo is default
1 parent fd17aa4 commit af64b7f

File tree

4 files changed

+6
-30
lines changed

4 files changed

+6
-30
lines changed

.idea/misc.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/java/com/chatgptlite/wanted/constants/Constants.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ const val urlToImageAuthor = "https://avatars.githubusercontent.com/u/60530946?v
77
const val urlToAvatarGPT = "https://gptapk.com/wp-content/uploads/2023/02/chatgpt-icon.png"
88
const val urlToGithub = "https://github.com/lambiengcode"
99

10-
const val matchResultString = "\"text\":"
11-
const val matchResultTurboString = "\"content\":"
1210
const val conversationTestTag = "ConversationTestTag"

app/src/main/java/com/chatgptlite/wanted/data/remote/OpenAIRepositoryImpl.kt

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
package com.chatgptlite.wanted.data.remote
22

33
import android.util.Log
4-
import com.chatgptlite.wanted.constants.matchResultString
54
import com.chatgptlite.wanted.data.api.OpenAIApi
65
import com.chatgptlite.wanted.models.TextCompletionsParam
76
import com.chatgptlite.wanted.models.toJson
8-
import com.google.gson.Gson
9-
import com.google.gson.JsonObject
107
import kotlinx.coroutines.Dispatchers
118
import kotlinx.coroutines.flow.Flow
129
import kotlinx.coroutines.flow.callbackFlow
@@ -84,32 +81,14 @@ class OpenAIRepositoryImpl @Inject constructor(
8481
}
8582

8683
private fun lookupDataFromResponse(jsonString: String): String {
87-
val splitsJsonString = jsonString.split("[{")
88-
89-
val indexOfResult: Int = splitsJsonString.indexOfLast {
90-
it.contains(matchResultString)
91-
}
92-
93-
val textSplits =
94-
if (indexOfResult == -1) listOf() else splitsJsonString[indexOfResult].split(",")
95-
96-
val indexOfText: Int = textSplits.indexOfLast {
97-
it.contains(matchResultString)
98-
}
99-
100-
if (indexOfText != -1) {
101-
try {
102-
val gson = Gson()
103-
val jsonObject =
104-
gson.fromJson("{${textSplits[indexOfText]}}", JsonObject::class.java)
84+
val regex = """"text"\s*:\s*"([^"]+)"""".toRegex()
85+
val matchResult = regex.find(jsonString)
10586

106-
return jsonObject.get("text").asString
107-
} catch (e: java.lang.Exception) {
108-
println(e.localizedMessage)
109-
}
87+
if (matchResult != null && matchResult.groupValues.size > 1) {
88+
return matchResult.groupValues[1]
11089
}
11190

112-
return ""
91+
return " "
11392
}
11493

11594
private fun lookupDataFromResponseTurbo(jsonString: String): String {

app/src/main/java/com/chatgptlite/wanted/models/TextCompletionsParam.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ data class TextCompletionsParam(
1818
@SerializedName("maxTokens")
1919
val maxTokens: Int = 2048,
2020
@SerializedName("model")
21-
val model: GPTModel = GPTModel.gpt4,
21+
val model: GPTModel = GPTModel.gpt35Turbo,
2222
@SerializedName("messages")
2323
val messagesTurbo: List<MessageTurbo> = emptyList(),
2424
) {

0 commit comments

Comments
 (0)