happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LLama: update engine state after handling the cancellation of sendUserPrompt

This commit is contained in:
Han Yin 2025-04-16 15:21:35 -07:00
parent 06448a60a5
commit 46859c10f0
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
examples/llama.android/llama/src/main/java/android/llama/cpp/LLamaAndroid.kt
View File

@ -3,6 +3,7 @@ package android.llama.cpp
import android.llama.cpp.InferenceEngine.State
import android.llama.cpp.LLamaAndroid.Companion.instance
import android.util.Log
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
@ -134,24 +135,34 @@ class LLamaAndroid private constructor() : InferenceEngine {
"User prompt discarded due to: ${_state.value}"
}
Log.i(TAG, "Sending user prompt...")
_state.value = State.ProcessingUserPrompt
processUserPrompt(message, predictLength).let { result ->
if (result != 0) {
Log.e(TAG, "Failed to process user prompt: $result")
return@flow
try {
Log.i(TAG, "Sending user prompt...")
_state.value = State.ProcessingUserPrompt
processUserPrompt(message, predictLength).let { result ->
if (result != 0) {
Log.e(TAG, "Failed to process user prompt: $result")
return@flow
}
}
}
Log.i(TAG, "User prompt processed! Generating assistant prompt...")
_state.value = State.Generating
while (true) {
generateNextToken()?.let { utf8token ->
if (utf8token.isNotEmpty()) emit(utf8token)
} ?: break
Log.i(TAG, "User prompt processed. Generating assistant prompt...")
_state.value = State.Generating
while (true) {
generateNextToken()?.let { utf8token ->
if (utf8token.isNotEmpty()) emit(utf8token)
} ?: break
}
Log.i(TAG, "Assistant generation complete. Awaiting user prompt...")
_state.value = State.AwaitingUserPrompt
} catch (e: CancellationException) {
Log.i(TAG, "Generation cancelled by user.")
_state.value = State.AwaitingUserPrompt
throw e
} catch (e: Exception) {
Log.e(TAG, "Error during generation!", e)
_state.value = State.Error(e.message ?: "Unknown error")
throw e
}
Log.i(TAG, "Assistant generation complete! Awaiting user prompt...")
_state.value = State.AwaitingUserPrompt
}.flowOn(llamaDispatcher)
/**