diff --git a/Android/src/app/build.gradle.kts b/Android/src/app/build.gradle.kts index a751214..09b16e5 100644 --- a/Android/src/app/build.gradle.kts +++ b/Android/src/app/build.gradle.kts @@ -30,7 +30,7 @@ android { minSdk = 26 targetSdk = 35 versionCode = 1 - versionName = "0.9.2" + versionName = "0.9.3" // Needed for HuggingFace auth workflows. manifestPlaceholders["appAuthRedirectScheme"] = "com.google.aiedge.gallery.oauth" diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt index 7ec6cfb..90186d6 100644 --- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt +++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/home/HomeScreen.kt @@ -353,7 +353,7 @@ private fun TaskList( val linkColor = MaterialTheme.customColors.linkColor val introText = buildAnnotatedString { - append("Welcome to Google AI Edge Gallery! Explore a world of \namazing on-device models from ") + append("Welcome to Google AI Edge Gallery! Explore a world of amazing on-device models from ") withLink( link = LinkAnnotation.Url( url = "https://huggingface.co/litert-community", // Replace with the actual URL diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatConfigs.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatConfigs.kt index 58759fe..0d9c06f 100644 --- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatConfigs.kt +++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatConfigs.kt @@ -67,7 +67,7 @@ fun createLlmChatConfigs( ), SegmentedButtonConfig( key = ConfigKey.ACCELERATOR, - defaultValue = if (accelerators.contains(Accelerator.GPU)) Accelerator.GPU.label else accelerators[0].label, + defaultValue = accelerators[0].label, options = accelerators.map { it.label } ) ) diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt index 11a94b0..aa2fb78 100644 --- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt +++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatModelHelper.kt @@ -132,12 +132,8 @@ object LlmChatModelHelper { input: String, resultListener: ResultListener, cleanUpListener: CleanUpListener, - singleTurn: Boolean = false, image: Bitmap? = null, ) { - if (singleTurn) { - resetSession(model = model) - } val instance = model.instance as LlmModelInstance // Set listener. diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatViewModel.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatViewModel.kt index 91fabb3..91d6892 100644 --- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatViewModel.kt +++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmchat/LlmChatViewModel.kt @@ -61,6 +61,7 @@ open class LlmChatViewModel(curTask: Task = TASK_LLM_CHAT) : ChatViewModel(task while (model.instance == null) { delay(100) } + delay(500) // Run inference. val instance = model.instance as LlmModelInstance diff --git a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt index 9f3b677..75e4d13 100644 --- a/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt +++ b/Android/src/app/src/main/java/com/google/aiedge/gallery/ui/llmsingleturn/LlmSingleTurnViewModel.kt @@ -78,6 +78,9 @@ open class LlmSingleTurnViewModel(val task: Task = TASK_LLM_PROMPT_LAB) : ViewMo delay(100) } + LlmChatModelHelper.resetSession(model = model) + delay(500) + // Run inference. val instance = model.instance as LlmModelInstance val prefillTokens = instance.session.sizeInTokens(input) @@ -145,7 +148,6 @@ open class LlmSingleTurnViewModel(val task: Task = TASK_LLM_PROMPT_LAB) : ViewMo setInProgress(false) } }, - singleTurn = true, cleanUpListener = { setPreparing(false) setInProgress(false)