Exposes supportImage and supportAudio as parameter in resetSession.

PiperOrigin-RevId: 799311930

Author: Google AI Edge Gallery

Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatModelHelper.kt

@@ -21,15 +21,13 @@ import android.graphics.Bitmap
 import android.util.Log
 import com.google.ai.edge.gallery.common.cleanUpMediapipeTaskErrorMessage
 import com.google.ai.edge.gallery.data.Accelerator
-import com.google.ai.edge.gallery.data.BuiltInTaskId
 import com.google.ai.edge.gallery.data.ConfigKeys
 import com.google.ai.edge.gallery.data.DEFAULT_MAX_TOKEN
 import com.google.ai.edge.gallery.data.DEFAULT_TEMPERATURE
 import com.google.ai.edge.gallery.data.DEFAULT_TOPK
 import com.google.ai.edge.gallery.data.DEFAULT_TOPP
 import com.google.ai.edge.gallery.data.MAX_IMAGE_COUNT
 import com.google.ai.edge.gallery.data.Model
-import com.google.ai.edge.gallery.data.Task
 import com.google.mediapipe.framework.image.BitmapImageBuilder
 import com.google.mediapipe.tasks.genai.llminference.AudioModelOptions
 import com.google.mediapipe.tasks.genai.llminference.GraphOptions
@@ -112,7 +110,7 @@ object LlmChatModelHelper {
     onDone("")
   }
 
-  fun resetSession(task: Task, model: Model) {
+  fun resetSession(model: Model, supportImage: Boolean, supportAudio: Boolean) {
     try {
       Log.d(TAG, "Resetting session for model '${model.name}'")
 
@@ -125,8 +123,8 @@ object LlmChatModelHelper {
       val topP = model.getFloatConfigValue(key = ConfigKeys.TOPP, defaultValue = DEFAULT_TOPP)
       val temperature =
         model.getFloatConfigValue(key = ConfigKeys.TEMPERATURE, defaultValue = DEFAULT_TEMPERATURE)
-      val shouldEnableImage = model.llmSupportImage && task.id == BuiltInTaskId.LLM_ASK_IMAGE
-      val shouldEnableAudio = model.llmSupportAudio && task.id == BuiltInTaskId.LLM_ASK_AUDIO
+      val shouldEnableImage = supportImage
+      val shouldEnableAudio = supportAudio
       Log.d(TAG, "Enable image: $shouldEnableImage, enable audio: $shouldEnableAudio")
       val newSession =
         LlmInferenceSession.createFromOptions(

Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmchat/LlmChatViewModel.kt

@@ -194,7 +194,17 @@ open class LlmChatViewModelBase() : ChatViewModel() {
 
       while (true) {
         try {
-          LlmChatModelHelper.resetSession(task = task, model = model)
+          val supportImage =
+            model.llmSupportImage &&
+              task.id == com.google.ai.edge.gallery.data.BuiltInTaskId.LLM_ASK_IMAGE
+          val supportAudio =
+            model.llmSupportAudio &&
+              task.id == com.google.ai.edge.gallery.data.BuiltInTaskId.LLM_ASK_AUDIO
+          LlmChatModelHelper.resetSession(
+            model = model,
+            supportImage = supportImage,
+            supportAudio = supportAudio,
+          )
           break
         } catch (e: Exception) {
           Log.d(TAG, "Failed to reset session. Trying again")

Android/src/app/src/main/java/com/google/ai/edge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt

@@ -79,7 +79,17 @@ class LlmSingleTurnViewModel @Inject constructor() : ViewModel() {
         delay(100)
       }
 
-      LlmChatModelHelper.resetSession(task = task, model = model)
+      val supportImage =
+        model.llmSupportImage &&
+          task.id == com.google.ai.edge.gallery.data.BuiltInTaskId.LLM_ASK_IMAGE
+      val supportAudio =
+        model.llmSupportAudio &&
+          task.id == com.google.ai.edge.gallery.data.BuiltInTaskId.LLM_ASK_AUDIO
+      LlmChatModelHelper.resetSession(
+        model = model,
+        supportImage = supportImage,
+        supportAudio = supportAudio,
+      )
       delay(500)
 
       // Run inference.