fix: Unable to choose other Chat models

Signed-off-by: Dheshan Mohandass <dheshan@mohandass.com>
L4TTiCe · Nov 18, 2023 · a08591a · a08591a
1 parent 3025ea3
commit a08591a
Show file tree

Hide file tree

Showing 14 changed files with 254 additions and 90 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -23,14 +23,14 @@ plugins {
 
 android {
     namespace = "com.mohandass.botforge"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         applicationId = "com.mohandass.botforge"
         minSdk = 28
-        targetSdk = 33
-        versionCode = 32
-        versionName = "1.3.2"
+        targetSdk = 34
+        versionCode = 33
+        versionName = "1.3.3"
 
         vectorDrawables.useSupportLibrary = true
 
@@ -50,7 +50,6 @@ android {
             isMinifyEnabled = true
             isShrinkResources = true
 
-            @Suppress("UnstableApiUsage")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
@@ -67,13 +66,12 @@ android {
         jvmTarget = "1.8"
     }
 
-    @Suppress("UnstableApiUsage")
     buildFeatures {
         compose = true
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.2.0"
+        kotlinCompilerExtensionVersion = "1.5.4"
     }
 
     packaging {
@@ -89,18 +87,18 @@ configurations {
 
 dependencies {
     val composeBomVersion = "2023.04.00"
-    val activityVersion = "1.7.0"
-    val coreVersion = "1.10.0"
-    val lifecycleVersion = "2.6.1"
-    val navVersion = "2.5.3"
-    val composeRuntimeVersion = "1.4.1"
+    val activityVersion = "1.8.1"
+    val coreVersion = "1.12.0"
+    val lifecycleVersion = "2.6.2"
+    val navVersion = "2.7.5"
+    val composeRuntimeVersion = "1.5.4"
     val datastorePreferencesVersion = "1.0.0"
-    val roomVersion = "2.5.1"
-    val daggerHiltVersion = "2.45"
-    val hiltNavVersion = "1.0.0"
+    val roomVersion = "2.6.0"
+    val daggerHiltVersion = "2.48"
+    val hiltNavVersion = "1.1.0"
     val firebaseBomVersion = "31.5.0"
     val gsonVersion = "2.10.1"
-    val openaiKotlinVersion = "3.2.1"
+    val openaiKotlinVersion = "3.5.1"
     val percentageUnitsVersion = "1.0.0"
     val prettytimeVersion = "5.0.6.Final"
     val aboutLibsRelease = "10.6.2"
@@ -109,9 +107,9 @@ dependencies {
     val coilVersion = "2.3.0"
     val markwonVersion = "4.6.2"
     val leakCanaryVersion = "2.10"
-    val okioVersion = "3.3.0"
+    val okioVersion = "3.4.0"
 
-    val playServicesAuthVersion = "20.5.0"
+    val playServicesAuthVersion = "20.7.0"
 
     // Compose BOM
     implementation(platform("androidx.compose:compose-bom:$composeBomVersion"))

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -40,3 +40,5 @@
 
 -dontwarn org.jetbrains.annotations.NotNull
 -dontwarn org.jetbrains.annotations.Nullable
+
+-dontwarn org.intellij.lang.annotations.Language
diff --git a/app/src/main/java/com/mohandass/botforge/chat/model/Message.kt b/app/src/main/java/com/mohandass/botforge/chat/model/Message.kt
@@ -38,8 +38,14 @@ data class Message(
     companion object {
         @OptIn(BetaOpenAI::class)
         fun from(message: ChatMessage): Message {
+            val text = message.content
+            var nonNullText = ""
+
+            if (text != null) {
+                nonNullText = text
+            }
             return Message(
-                text = message.content,
+                text = nonNullText,
                 role = Role.from(message.role),
                 uuid = UUID.randomUUID().toString(),
             )

diff --git a/app/src/main/java/com/mohandass/botforge/chat/model/OpenAiApi.kt b/app/src/main/java/com/mohandass/botforge/chat/model/OpenAiApi.kt
@@ -16,8 +16,14 @@ import java.util.*
 
 @OptIn(BetaOpenAI::class)
 fun ChatMessage.toMessage(): Message {
+    val text = this.content
+    var nonNullText = ""
+
+    if (text != null) {
+        nonNullText = text
+    }
     return Message(
-        text = this.content,
+        text = nonNullText,
         role = Role.from(this.role),
         uuid = UUID.randomUUID().toString(),
     )

diff --git a/app/src/main/java/com/mohandass/botforge/common/services/implementation/OpenAiService.kt b/app/src/main/java/com/mohandass/botforge/common/services/implementation/OpenAiService.kt
@@ -67,7 +67,6 @@ class OpenAiServiceImpl private constructor(
         }
     }
 
-    @OptIn(BetaOpenAI::class)
     override suspend fun getChatCompletion(
         messages: List<Message>,
     ): Message {
@@ -89,7 +88,7 @@ class OpenAiServiceImpl private constructor(
 
             val metadata = MessageMetadata(
                 openAiId = completion.id,
-                finishReason = completion.choices[0].finishReason,
+                finishReason = completion.choices[0].finishReason.toString(),
                 promptTokens = completion.usage?.promptTokens,
                 completionTokens = completion.usage?.completionTokens,
                 totalTokens = completion.usage?.totalTokens,
@@ -99,7 +98,7 @@ class OpenAiServiceImpl private constructor(
             sharedPreferencesService.incrementUsageTokens(completion.usage?.totalTokens ?: 0)
 
             return Message(
-                text = completion.choices[0].message?.content?.trim() ?: "",
+                text = completion.choices[0].message.content?.trim() ?: "",
                 role = Role.BOT,
                 metadata = metadata,
             )
@@ -109,7 +108,6 @@ class OpenAiServiceImpl private constructor(
         }
     }
 
-    @OptIn(BetaOpenAI::class)
     override suspend fun generateImage(
         prompt: String,
         n: Int,