n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-28 14:54:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash related to transformer suggestions

Browse Source
This commit is contained in:
Aleksandras Kostarevas 2024-04-11 00:03:22 -05:00
parent a225907b4c
commit 5ba72b33cf
2 changed files with 53 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/org/futo/inputmethod/keyboard/KeyboardSwitcher.java
View File

@ -47,6 +47,7 @@ import org.futo.inputmethod.latin.utils.ResourceUtils;
import org.futo.inputmethod.latin.utils.ScriptUtils;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
private static final String TAG = KeyboardSwitcher.class.getSimpleName();
@ -183,6 +184,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
hasMultipleEnabledIMEsOrSubtypes);
}
@Nullable
public Keyboard getKeyboard() {
if (mKeyboardView != null) {
return mKeyboardView.getKeyboard();

95
java/src/org/futo/inputmethod/latin/xlm/LanguageModelFacilitator.kt
View File

@ -170,13 +170,58 @@ public class LanguageModelFacilitator(
}
}
private suspend fun runLanguageModel(values: PredictionInputValues): ArrayList<SuggestedWordInfo>? {
val locale = dictionaryFacilitator.locale ?: return null
if (languageModel == null || (languageModel?.locale?.language != locale.language)) {
Log.d(
"LanguageModelFacilitator",
"Calling closeInternalLocked on model due to seeming locale change"
)
languageModel?.closeInternalLocked()
languageModel = null
// TODO: Cache value so we're not hitting this repeatedly
val options = ModelPaths.getModelOptions(context)
val model = options[locale.language]
if (model != null) {
languageModel = LanguageModel(context, lifecycleScope, model, locale)
} else {
Log.d("LanguageModelFacilitator", "no model for ${locale.language}")
return null
}
}
val settingsValues = settings.current ?: return null
val keyboard = keyboardSwitcher.keyboard ?: return null
val settingsForPrediction = SettingsValuesForSuggestion(
settingsValues.mBlockPotentiallyOffensive,
settingsValues.mTransformerPredictionEnabled
)
val proximityInfoHandle = keyboard.proximityInfo.nativeProximityInfo
val autocorrectThreshold = context.getSetting(AutocorrectThresholdSetting)
return languageModel!!.getSuggestions(
values.composedData,
values.ngramContext,
keyboardSwitcher.mainKeyboardView.mKeyDetector,
settingsForPrediction,
proximityInfoHandle,
-1,
autocorrectThreshold,
floatArrayOf(),
userDictionary.getWords().map { it.word },
suggestionBlacklist.currentBlacklist.toTypedArray<String>()
)
}
private suspend fun processUpdateSuggestionStrip(values: PredictionInputValues) {
if(keyboardSwitcher.keyboard == null) return
computationSemaphore.acquire()
try {
val autocorrectThreshold = context.getSetting(AutocorrectThresholdSetting)
var transformerWeight = context.getSetting(BinaryDictTransformerWeightSetting)
val holder = AsyncResultHolder<SuggestedWords?>("Suggest")
@ -196,50 +241,13 @@ public class LanguageModelFacilitator(
inputLogic.mSuggestionStripViewAccessor.setNeutralSuggestionStrip()
}
val locale = dictionaryFacilitator.locale
if(languageModel == null || (languageModel?.locale?.language != locale.language)) {
Log.d("LanguageModelFacilitator", "Calling closeInternalLocked on model due to seeming locale change")
languageModel?.closeInternalLocked()
languageModel = null
// TODO: Cache value so we're not hitting this repeatedly
val options = ModelPaths.getModelOptions(context)
val model = options[locale.language]
if(model != null) {
languageModel = LanguageModel(context, lifecycleScope, model, locale)
} else {
Log.d("LanguageModelFacilitator", "no model for ${locale.language}")
return
}
}
val settingsValues = settings.current
val keyboard = keyboardSwitcher.keyboard
val settingsForPrediction = SettingsValuesForSuggestion(
settingsValues.mBlockPotentiallyOffensive,
settingsValues.mTransformerPredictionEnabled
)
val proximityInfoHandle = keyboard.proximityInfo.nativeProximityInfo
val suggestionResults = SuggestionResults(
14, values.ngramContext.isBeginningOfSentenceContext, false)
val lmSuggestions = languageModel!!.getSuggestions(
values.composedData,
values.ngramContext,
keyboardSwitcher.mainKeyboardView.mKeyDetector,
settingsForPrediction,
proximityInfoHandle,
-1,
autocorrectThreshold,
floatArrayOf(),
userDictionary.getWords().map { it.word },
suggestionBlacklist.currentBlacklist.toTypedArray()
)
val lmSuggestions = runLanguageModel(values)
if(lmSuggestions == null) {
//inputLogic.mSuggestionStripViewAccessor.setNeutralSuggestionStrip()
holder.get(null, Constants.GET_SUGGESTED_WORDS_TIMEOUT.toLong())?.let { results ->
job.cancel()
inputLogic.mSuggestionStripViewAccessor.showSuggestionStrip(results)
@ -272,9 +280,6 @@ public class LanguageModelFacilitator(
suggestionBlacklist.isSuggestedWordOk(it)
}
//Log.d("LanguageModelFacilitator", "suggestedWordsDict = ${suggestedWordsDictList?.map { "$it ${it.mScore}" }}")
//Log.d("LanguageModelFacilitator", "lmSuggestions = ${lmSuggestions.map { "$it ${it.mScore}" }}")
val maxWordDict = suggestedWordsDictList?.maxByOrNull {
if(it == suggestedWordsDict.typedWordInfo) { Int.MIN_VALUE } else { it.mScore }
}
@ -332,8 +337,10 @@ public class LanguageModelFacilitator(
}
}
//Log.d("LanguageModelFacilitator", "final suggestionResults = ${suggestionResults.map { "$it ${it.mScore}" }}")
val wordComposer = inputLogic.mWordComposer
val settingsValues = settings.current ?: return
val locale = dictionaryFacilitator.locale ?: return
val wordComposer = inputLogic.mWordComposer ?: return
val suggestedWords = Suggest.obtainNonBatchedInputSuggestedWords(
wordComposer, values.inputStyle, true, -1, locale, suggestionResults, settingsValues.mAutoCorrectionThreshold)