π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Select models by preset id and drop custom model URLs
Manav Rathi0bebfa51c537
diff --git a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/AppViewModel.kt b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/AppViewModel.ktindex f22c1441ed..110d80cfcd 100644--- a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/AppViewModel.kt+++ b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/AppViewModel.kt@@ -63,12 +63,16 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {logRepository.log(LogLevel.Info, launchMessage, tag = "App")viewModelScope.launch {+ runCatching {+ advancedSettingsDataStore.migrateLegacyModelSelection { url, mmproj ->+ withContext(Dispatchers.IO) {+ modelDownloader.migrate(migrationTargets(), url, mmproj)+ }+ }+ }val initialSettings = runCatching {advancedSettingsDataStore.settingsFlow.first()}.getOrDefault(AdvancedSettingsSnapshot())- withContext(Dispatchers.IO) {- modelDownloader.migrate(migrationTargets(initialSettings.modelSettings))- }store.applyPersistedSettings(developerSettings = initialSettings.developerSettings,modelSettings = initialSettings.modelSettings@@ -88,21 +92,11 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {}}- private fun migrationTargets(settings: ModelSettingsState): List<ModelDownloadTarget> {+ private fun migrationTargets(): List<ModelDownloadTarget> {val presets = listOf(configDefaults.mobileDefaultModel) + configDefaults.mobileModelPresets- val targets = presets- .map { ModelDownloadTarget.Gguf(it.id, it.url, it.sha256, it.mmprojUrl, it.mmprojSha256) }- .toMutableList()- if (settings.useCustomModel && settings.modelUrl.isNotBlank()) {- targets += ModelDownloadTarget.Gguf(- "custom:${settings.modelUrl}",- settings.modelUrl,- settings.modelSha256.trim().takeIf { it.isNotEmpty() },- settings.mmprojUrl.takeIf { it.isNotBlank() },- settings.mmprojSha256.trim().takeIf { it.isNotEmpty() }- )+ return presets.map {+ ModelDownloadTarget.Gguf(it.id, it.url, it.sha256, it.mmprojUrl, it.mmprojSha256)}- return targets}@Suppress("DEPRECATION")diff --git a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/LlmModels.kt b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/LlmModels.ktindex 46759b30fe..4db55bcc47 100644--- a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/LlmModels.kt+++ b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/LlmModels.kt@@ -5,7 +5,7 @@ import io.ente.ensu.bindings.ModelDownloadTargetdata class LlmModelTarget(val id: String,val url: String,- val sha256: String? = null,+ val sha256: String,val mmprojUrl: String? = null,val mmprojSha256: String? = null,val contextLength: Int? = null,diff --git a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/ModelDownloader.kt b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/ModelDownloader.ktindex 31ac02ed74..7a341ded34 100644--- a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/ModelDownloader.kt+++ b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/ModelDownloader.kt@@ -37,25 +37,31 @@ class ModelDownloader(context: Context) {transcriptionModelTarget = ModelDownloadTarget.TarGz(defaults.transcriptionModel.id,defaults.transcriptionModel.url,- requireNotNull(defaults.transcriptionModel.sha256)+ defaults.transcriptionModel.sha256)voiceActivityModelTarget = ModelDownloadTarget.File(defaults.voiceActivityModel.id,"model.onnx",defaults.voiceActivityModel.url,- requireNotNull(defaults.voiceActivityModel.sha256)+ defaults.voiceActivityModel.sha256)}fun needsMigration(): Boolean =legacyDir?.exists() == true || legacyTranscriptionDir.exists()- fun migrate(targets: List<ModelDownloadTarget>) {+ fun migrate(+ targets: List<ModelDownloadTarget>,+ legacyModelUrl: String?,+ legacyMmprojUrl: String?+ ): String? {File(appContext.filesDir, "llm").deleteRecursively()- migrateEnsuLegacyModels(+ return migrateEnsuLegacyModels(modelsDir.absolutePath,legacyDir?.absolutePath,legacyTranscriptionDir.absolutePath,+ legacyModelUrl,+ legacyMmprojUrl,targets,transcriptionModelTarget,voiceActivityModelTargetdiff --git a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/ModelSettingsActions.kt b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/ModelSettingsActions.ktindex ae13aa938c..b9d280995e 100644--- a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/ModelSettingsActions.kt+++ b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/ModelSettingsActions.kt@@ -315,34 +315,18 @@ internal class ModelSettingsActions(}fun resolveTarget(settings: ModelSettingsState): LlmModelTarget {- val useCustom = settings.useCustomModel && settings.modelUrl.isNotBlank()- val url = if (useCustom) settings.modelUrl else configDefaults.mobileDefaultModel.url- val mmproj = if (useCustom) {- settings.mmprojUrl.takeIf { it.isNotBlank() }- } else {- configDefaults.mobileDefaultModel.mmprojUrl- }+ val presets = listOf(configDefaults.mobileDefaultModel) + configDefaults.mobileModelPresets+ val preset = presets.firstOrNull { it.id == settings.modelId }+ ?: configDefaults.mobileDefaultModelval contextLength = settings.contextLength.toIntOrNull()val maxTokens = settings.maxTokens.toIntOrNull()?.takeIf { it > 0 }- val preset = if (useCustom) {- (listOf(configDefaults.mobileDefaultModel) + configDefaults.mobileModelPresets)- .firstOrNull { it.url == url && it.mmprojUrl == mmproj }- } else {- configDefaults.mobileDefaultModel- }return LlmModelTarget(- id = preset?.id ?: "custom:$url",- url = url,- sha256 = preset?.sha256- ?: settings.modelSha256.trim().takeIf { it.isNotEmpty() },- mmprojUrl = mmproj,- mmprojSha256 = if (mmproj == null) {- null- } else {- preset?.mmprojSha256- ?: settings.mmprojSha256.trim().takeIf { it.isNotEmpty() }- },+ id = preset.id,+ url = preset.url,+ sha256 = preset.sha256,+ mmprojUrl = preset.mmprojUrl,+ mmprojSha256 = preset.mmprojSha256,contextLength = contextLength,maxTokens = maxTokens)diff --git a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/ModelSettingsScreen.kt b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/ModelSettingsScreen.ktindex 96aea1c15d..3cc161bc62 100644--- a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/ModelSettingsScreen.kt+++ b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/ModelSettingsScreen.kt@@ -52,65 +52,19 @@ fun ModelSettingsScreen(ModelChoice(id = DEFAULT_OPTION_ID,title = defaults.mobileDefaultModel.title,- url = defaults.mobileDefaultModel.url,- mmproj = defaults.mobileDefaultModel.mmprojUrl,isDefault = true)) + defaults.mobileModelPresets.map { preset ->ModelChoice(id = preset.id,- title = preset.title,- url = preset.url,- mmproj = preset.mmprojUrl+ title = preset.title)- } + listOf(- ModelChoice(- id = CUSTOM_OPTION_ID,- title = "Custom",- isCustom = true- )- )+ }}var selectedModelId by remember(state) {mutableStateOf(initialSelectionId(state, modelChoices))}- var customModelUrl by remember(state) {- mutableStateOf(- if (state.useCustomModel && modelChoices.none { !it.isCustom && it.url == state.modelUrl }) {- state.modelUrl- } else {- ""- }- )- }- var customMmprojUrl by remember(state) {- mutableStateOf(- if (state.useCustomModel && modelChoices.none { !it.isCustom && it.url == state.modelUrl }) {- state.mmprojUrl- } else {- ""- }- )- }- var customModelSha by remember(state) {- mutableStateOf(- if (state.useCustomModel && modelChoices.none { !it.isCustom && it.url == state.modelUrl }) {- state.modelSha256- } else {- ""- }- )- }- var customMmprojSha by remember(state) {- mutableStateOf(- if (state.useCustomModel && modelChoices.none { !it.isCustom && it.url == state.modelUrl }) {- state.mmprojSha256- } else {- ""- }- )- }var contextLength by remember(state) { mutableStateOf(state.contextLength) }var maxTokens by remember(state) { mutableStateOf(state.maxTokens) }var temperature by remember(state) { mutableStateOf(state.temperature) }@@ -124,14 +78,6 @@ fun ModelSettingsScreen(var isModelMenuExpanded by remember { mutableStateOf(false) }val selectedModel = modelChoices.firstOrNull { it.id == selectedModelId } ?: modelChoices.first()- val isCustomSelected = selectedModel.isCustom- val shaPattern = remember { Regex("[0-9a-fA-F]{64}") }- val canSave = !isCustomSelected ||- (- customModelUrl.isNotBlank() &&- shaPattern.matches(customModelSha.trim()) &&- (customMmprojUrl.isBlank() || shaPattern.matches(customMmprojSha.trim()))- )Column(modifier = Modifier@@ -142,7 +88,7 @@ fun ModelSettingsScreen(SectionHeader("Select model")Spacer(modifier = Modifier.height(EnsuSpacing.xs.dp))Text(- text = "Choose a built-in model or switch to Custom.",+ text = "Choose a built-in model.",style = EnsuTypography.small,color = EnsuColor.textMuted())@@ -174,66 +120,12 @@ fun ModelSettingsScreen(onClick = {selectedModelId = choice.idisModelMenuExpanded = false- if (choice.isCustom) {- customModelUrl = ""- customMmprojUrl = ""- customModelSha = ""- customMmprojSha = ""- }})}}}- AnimatedVisibility(isCustomSelected) {- Column {- Spacer(modifier = Modifier.height(EnsuSpacing.lg.dp))- Text(text = "Model .gguf URL", style = EnsuTypography.small, color = EnsuColor.textMuted())- Spacer(modifier = Modifier.height(EnsuSpacing.xs.dp))- OutlinedTextField(- value = customModelUrl,- onValueChange = { customModelUrl = it },- placeholder = { Text(text = "https://huggingface.co/...") },- modifier = Modifier.fillMaxWidth()- )-- Spacer(modifier = Modifier.height(EnsuSpacing.md.dp))- Text(text = "Model SHA-256", style = EnsuTypography.small, color = EnsuColor.textMuted())- Spacer(modifier = Modifier.height(EnsuSpacing.xs.dp))- OutlinedTextField(- value = customModelSha,- onValueChange = { customModelSha = it },- placeholder = { Text(text = "Checksum from the model page") },- modifier = Modifier.fillMaxWidth()- )-- Spacer(modifier = Modifier.height(EnsuSpacing.md.dp))- Text(text = "mmproj .gguf URL", style = EnsuTypography.small, color = EnsuColor.textMuted())- Spacer(modifier = Modifier.height(EnsuSpacing.xs.dp))- OutlinedTextField(- value = customMmprojUrl,- onValueChange = { customMmprojUrl = it },- placeholder = { Text(text = "(optional for multimodal)") },- modifier = Modifier.fillMaxWidth()- )-- AnimatedVisibility(customMmprojUrl.isNotBlank()) {- Column {- Spacer(modifier = Modifier.height(EnsuSpacing.md.dp))- Text(text = "mmproj SHA-256", style = EnsuTypography.small, color = EnsuColor.textMuted())- Spacer(modifier = Modifier.height(EnsuSpacing.xs.dp))- OutlinedTextField(- value = customMmprojSha,- onValueChange = { customMmprojSha = it },- placeholder = { Text(text = "Checksum from the model page") },- modifier = Modifier.fillMaxWidth()- )- }- }- }- }-Spacer(modifier = Modifier.height(EnsuSpacing.lg.dp))ExpandButton(title = "Advanced limits",@@ -298,43 +190,16 @@ fun ModelSettingsScreen(Button(onClick = {- val savedState = when {- selectedModel.isDefault -> state.copy(- useCustomModel = false,- modelUrl = "",- modelSha256 = "",- mmprojUrl = "",- mmprojSha256 = "",- contextLength = contextLength,- maxTokens = maxTokens,- temperature = temperature- )- selectedModel.isCustom -> state.copy(- useCustomModel = true,- modelUrl = customModelUrl,- modelSha256 = customModelSha.trim(),- mmprojUrl = customMmprojUrl,- mmprojSha256 = customMmprojSha.trim(),- contextLength = contextLength,- maxTokens = maxTokens,- temperature = temperature- )- else -> state.copy(- useCustomModel = true,- modelUrl = selectedModel.url.orEmpty(),- modelSha256 = "",- mmprojUrl = selectedModel.mmproj.orEmpty(),- mmprojSha256 = "",- contextLength = contextLength,- maxTokens = maxTokens,- temperature = temperature- )- }+ val savedState = state.copy(+ modelId = selectedModel.id.takeUnless { selectedModel.isDefault }.orEmpty(),+ contextLength = contextLength,+ maxTokens = maxTokens,+ temperature = temperature+ )onSave(savedState)Toast.makeText(context, "Model settings saved", Toast.LENGTH_SHORT).show()},modifier = Modifier.fillMaxWidth(),- enabled = canSave,colors = ButtonDefaults.buttonColors(containerColor = EnsuColor.accent())) {Text(text = "Save Model Settings", style = EnsuTypography.body)@@ -345,8 +210,6 @@ fun ModelSettingsScreen(TextButton(onClick = {onReset()selectedModelId = DEFAULT_OPTION_ID- customModelUrl = ""- customMmprojUrl = ""contextLength = ""maxTokens = ""temperature = ""@@ -390,19 +253,14 @@ private fun ExpandButton(private data class ModelChoice(val id: String,val title: String,- val url: String? = null,- val mmproj: String? = null,- val isDefault: Boolean = false,- val isCustom: Boolean = false+ val isDefault: Boolean = false)private fun initialSelectionId(state: ModelSettingsState,choices: List<ModelChoice>): String {- if (!state.useCustomModel || state.modelUrl.isBlank()) return DEFAULT_OPTION_ID- return choices.firstOrNull { !it.isCustom && it.url == state.modelUrl }?.id ?: CUSTOM_OPTION_ID+ return choices.firstOrNull { it.id == state.modelId }?.id ?: DEFAULT_OPTION_ID}private const val DEFAULT_OPTION_ID = "default"-private const val CUSTOM_OPTION_ID = "custom"diff --git a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/ModelSettingsState.kt b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/ModelSettingsState.ktindex 1c8e145706..8278e1b0e1 100644--- a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/ModelSettingsState.kt+++ b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/ModelSettingsState.kt@@ -1,11 +1,7 @@package io.ente.ensu.llmdata class ModelSettingsState(- val useCustomModel: Boolean = false,- val modelUrl: String = "",- val modelSha256: String = "",- val mmprojUrl: String = "",- val mmprojSha256: String = "",+ val modelId: String = "",val contextLength: String = "",val maxTokens: String = "",val temperature: String = "",diff --git a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/settings/AdvancedSettingsDataStore.kt b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/settings/AdvancedSettingsDataStore.ktindex 9535430bbc..2bc79dfb76 100644--- a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/settings/AdvancedSettingsDataStore.kt+++ b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/settings/AdvancedSettingsDataStore.kt@@ -8,6 +8,7 @@ import androidx.datastore.preferences.preferencesDataStoreimport io.ente.ensu.settings.DeveloperSettingsStateimport io.ente.ensu.llm.ModelSettingsStateimport kotlinx.coroutines.CoroutineScope+import kotlinx.coroutines.flow.firstimport kotlinx.coroutines.Dispatchersimport kotlinx.coroutines.SupervisorJobimport kotlinx.coroutines.flow.Flow@@ -31,11 +32,7 @@ class AdvancedSettingsDataStore(private val context: Context) {systemPrompt = prefs[Keys.systemPrompt].orEmpty()),modelSettings = ModelSettingsState(- useCustomModel = prefs[Keys.useCustomModel] ?: false,- modelUrl = prefs[Keys.modelUrl].orEmpty(),- modelSha256 = prefs[Keys.modelSha256].orEmpty(),- mmprojUrl = prefs[Keys.mmprojUrl].orEmpty(),- mmprojSha256 = prefs[Keys.mmprojSha256].orEmpty(),+ modelId = prefs[Keys.modelId].orEmpty(),contextLength = prefs[Keys.contextLength].orEmpty(),maxTokens = prefs[Keys.maxTokens].orEmpty(),temperature = prefs[Keys.temperature].orEmpty()@@ -43,6 +40,26 @@ class AdvancedSettingsDataStore(private val context: Context) {)}+ suspend fun migrateLegacyModelSelection(+ migrate: suspend (legacyModelUrl: String?, legacyMmprojUrl: String?) -> String?+ ) {+ val useCustomModel = booleanPreferencesKey("use_custom_model")+ val modelUrl = stringPreferencesKey("model_url")+ val mmprojUrl = stringPreferencesKey("mmproj_url")+ val prefs = context.advancedSettingsPreferences.data.first()+ val pending = prefs[Keys.modelId] == null+ val url = prefs[modelUrl].takeIf { pending && prefs[useCustomModel] == true }+ val presetId = migrate(url, prefs[mmprojUrl])+ context.advancedSettingsPreferences.edit { prefs ->+ if (pending && prefs[Keys.modelId] == null) {+ prefs[Keys.modelId] = presetId.orEmpty()+ }+ prefs.remove(useCustomModel)+ prefs.remove(modelUrl)+ prefs.remove(mmprojUrl)+ }+ }+suspend fun unlockAdvancedSettings() {context.advancedSettingsPreferences.edit { prefs ->prefs[Keys.advancedUnlocked] = true@@ -69,11 +86,7 @@ class AdvancedSettingsDataStore(private val context: Context) {suspend fun saveModelSettings(settings: ModelSettingsState) {context.advancedSettingsPreferences.edit { prefs ->- prefs[Keys.useCustomModel] = settings.useCustomModel- prefs[Keys.modelUrl] = settings.modelUrl- prefs[Keys.modelSha256] = settings.modelSha256- prefs[Keys.mmprojUrl] = settings.mmprojUrl- prefs[Keys.mmprojSha256] = settings.mmprojSha256+ prefs[Keys.modelId] = settings.modelIdprefs[Keys.contextLength] = settings.contextLengthprefs[Keys.maxTokens] = settings.maxTokensprefs[Keys.temperature] = settings.temperature@@ -88,11 +101,7 @@ class AdvancedSettingsDataStore(private val context: Context) {suspend fun resetModelSettings() {context.advancedSettingsPreferences.edit { prefs ->- prefs[Keys.useCustomModel] = false- prefs[Keys.modelUrl] = ""- prefs[Keys.modelSha256] = ""- prefs[Keys.mmprojUrl] = ""- prefs[Keys.mmprojSha256] = ""+ prefs[Keys.modelId] = ""prefs[Keys.contextLength] = ""prefs[Keys.maxTokens] = ""prefs[Keys.temperature] = ""@@ -109,11 +118,7 @@ class AdvancedSettingsDataStore(private val context: Context) {private object Keys {val advancedUnlocked = booleanPreferencesKey("advanced_unlocked")val systemPrompt = stringPreferencesKey("system_prompt")- val useCustomModel = booleanPreferencesKey("use_custom_model")- val modelUrl = stringPreferencesKey("model_url")- val modelSha256 = stringPreferencesKey("model_sha256")- val mmprojUrl = stringPreferencesKey("mmproj_url")- val mmprojSha256 = stringPreferencesKey("mmproj_sha256")+ val modelId = stringPreferencesKey("model_id")val contextLength = stringPreferencesKey("context_length")val maxTokens = stringPreferencesKey("max_tokens")val temperature = stringPreferencesKey("temperature")diff --git a/mobile/native/apple/apps/ensu/Ensu/Chat/ChatView.swift b/mobile/native/apple/apps/ensu/Ensu/Chat/ChatView.swiftindex 9c823b260b..79f198a0f4 100644--- a/mobile/native/apple/apps/ensu/Ensu/Chat/ChatView.swift+++ b/mobile/native/apple/apps/ensu/Ensu/Chat/ChatView.swift@@ -44,7 +44,7 @@ struct ChatView: View {}private var modelSettingsSignature: String {- "\(modelSettings.useCustomModel)|\(modelSettings.modelUrl)|\(modelSettings.mmprojUrl)"+ modelSettings.modelId}private let drawerWidth: CGFloat = 320diff --git a/mobile/native/apple/apps/ensu/Ensu/Chat/ChatViewModel.swift b/mobile/native/apple/apps/ensu/Ensu/Chat/ChatViewModel.swiftindex 1a7eb57a86..6931acf967 100644--- a/mobile/native/apple/apps/ensu/Ensu/Chat/ChatViewModel.swift+++ b/mobile/native/apple/apps/ensu/Ensu/Chat/ChatViewModel.swift@@ -82,7 +82,7 @@ final class ChatViewModel: ObservableObject {private let attachmentsDir: URLprivate let chatDbPath: Stringprivate let chatDbKey: Data- private let modelSettings = ModelSettingsStore.shared+ private let modelSettings: ModelSettingsStoreprivate var messageStore: [UUID: [MessageNode]] = [:]private var branchSelections: [UUID: [String: UUID]] = [:]@@ -114,6 +114,8 @@ final class ChatViewModel: ObservableObject {?? FileManager.default.temporaryDirectorylet downloader = ModelDownloader()+ // Must initialize after the downloader migrates the persisted selection.+ self.modelSettings = ModelSettingsStore.sharedlet transcriber = Transcriber(modelDir: downloader.modelPath(target: downloader.transcriptionModelTarget).path,vadModelPath: downloader.modelPath(target: downloader.voiceActivityModelTarget).pathdiff --git a/mobile/native/apple/apps/ensu/Ensu/ModelSettings/ModelSettingsView.swift b/mobile/native/apple/apps/ensu/Ensu/ModelSettings/ModelSettingsView.swiftindex c0dbfe13e7..9f645ef79e 100644--- a/mobile/native/apple/apps/ensu/Ensu/ModelSettings/ModelSettingsView.swift+++ b/mobile/native/apple/apps/ensu/Ensu/ModelSettings/ModelSettingsView.swift@@ -7,18 +7,10 @@ struct ModelSettingsView: View {@ObservedObject private var settings = ModelSettingsStore.shared@State private var selectedModelId: String = defaultOptionId- @State private var customModelUrl: String = ""- @State private var customMmprojUrl: String = ""- @State private var customModelSha: String = ""- @State private var customMmprojSha: String = ""@State private var contextLength: String = ""@State private var maxTokens: String = ""@State private var temperature: String = ""- @State private var urlError: String?- @State private var mmprojError: String?- @State private var shaError: String?- @State private var mmprojShaError: String?@State private var contextError: String?@State private var maxTokensError: String?@State private var temperatureError: String?@@ -32,27 +24,10 @@ struct ModelSettingsView: View {let defaultModel = defaults.mobileDefaultModellet presets = defaults.mobileModelPresetsreturn [- ModelChoice(- id: Self.defaultOptionId,- name: defaultModel.title,- url: defaultModel.url,- mmproj: defaultModel.mmprojUrl,- isDefault: true- )+ ModelChoice(id: Self.defaultOptionId, name: defaultModel.title, isDefault: true)] + presets.map { preset in- ModelChoice(- id: preset.id,- name: preset.title,- url: preset.url,- mmproj: preset.mmprojUrl- )- } + [- ModelChoice(- id: Self.customOptionId,- name: "Custom",- isCustom: true- )- ]+ ModelChoice(id: preset.id, name: preset.title)+ }}()init(embeddedInNavigation: Bool = false) {@@ -90,10 +65,6 @@ struct ModelSettingsView: View {}.onAppear {selectedModelId = initialSelectionId()- customModelUrl = isStoredCustomModel ? settings.modelUrl : ""- customMmprojUrl = isStoredCustomModel ? settings.mmprojUrl : ""- customModelSha = isStoredCustomModel ? settings.modelSha256 : ""- customMmprojSha = isStoredCustomModel ? settings.mmprojSha256 : ""contextLength = settings.contextLengthmaxTokens = settings.maxTokenstemperature = settings.temperature@@ -108,26 +79,16 @@ struct ModelSettingsView: View {}}- private var isStoredCustomModel: Bool {- settings.useCustomModel &&- !settings.modelUrl.isEmpty &&- !modelChoices.contains(where: { !$0.isCustom && $0.url == settings.modelUrl })- }-private var selectedModel: ModelChoice {modelChoices.first(where: { $0.id == selectedModelId }) ?? modelChoices[0]}- private var canSave: Bool {- !selectedModel.isCustom || !customModelUrl.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty- }-private var content: some View {ScrollView {VStack(alignment: .leading, spacing: EnsuSpacing.xxl) {sectionHeader("Select model")- Text("Choose a built-in model or switch to Custom.")+ Text("Choose a built-in model.").font(EnsuTypography.small).foregroundStyle(EnsuColor.textMuted).frame(maxWidth: .infinity, alignment: .leading)@@ -138,52 +99,6 @@ struct ModelSettingsView: View {}}.pickerStyle(.menu)- .onChange(of: selectedModelId) { newValue in- if newValue == Self.customOptionId {- customModelUrl = ""- customMmprojUrl = ""- customModelSha = ""- customMmprojSha = ""- }- }-- if selectedModel.isCustom {- VStack(spacing: EnsuSpacing.md) {- field(- label: "Model .gguf URL",- hint: "https://huggingface.co/...",- text: $customModelUrl,- error: urlError,- keyboardType: .URL- )-- field(- label: "Model SHA-256",- hint: "Checksum from the model page",- text: $customModelSha,- error: shaError,- keyboardType: .default- )-- field(- label: "mmproj .gguf URL",- hint: "(optional for multimodal)",- text: $customMmprojUrl,- error: mmprojError,- keyboardType: .URL- )-- if !customMmprojUrl.isEmpty {- field(- label: "mmproj SHA-256",- hint: "Checksum from the model page",- text: $customMmprojSha,- error: mmprojShaError,- keyboardType: .default- )- }- }- }sectionToggle(title: "Advanced limits",@@ -231,7 +146,7 @@ struct ModelSettingsView: View {Divider().background(EnsuColor.border)VStack(spacing: EnsuSpacing.md) {- PrimaryButton(text: "Save Model Settings", isLoading: isSaving, isEnabled: !isSaving && canSave) {+ PrimaryButton(text: "Save Model Settings", isLoading: isSaving, isEnabled: !isSaving) {saveTapped()}@@ -252,10 +167,7 @@ struct ModelSettingsView: View {}private func initialSelectionId() -> String {- if !settings.useCustomModel || settings.modelUrl.isEmpty {- return Self.defaultOptionId- }- return modelChoices.first(where: { !$0.isCustom && $0.url == settings.modelUrl })?.id ?? Self.customOptionId+ modelChoices.first(where: { $0.id == settings.modelId })?.id ?? Self.defaultOptionId}private func sectionHeader(_ title: String) -> some View {@@ -316,10 +228,6 @@ struct ModelSettingsView: View {}private func saveTapped() {- urlError = nil- mmprojError = nil- shaError = nil- mmprojShaError = nilcontextError = nilmaxTokensError = niltemperatureError = nil@@ -329,34 +237,12 @@ struct ModelSettingsView: View {isSaving = trueTask { @MainActor intry? await Task.sleep(nanoseconds: 200_000_000)- if selectedModel.isDefault {- settings.useCustomModel = false- settings.modelUrl = ""- settings.mmprojUrl = ""- settings.contextLength = contextLength- settings.maxTokens = maxTokens- settings.temperature = temperature- } else if selectedModel.isCustom {- settings.saveCustomModel(- url: customModelUrl,- sha256: customModelSha.trimmingCharacters(in: .whitespaces),- mmproj: customMmprojUrl,- mmprojSha256: customMmprojSha.trimmingCharacters(in: .whitespaces),- contextLength: contextLength,- maxTokens: maxTokens,- temperature: temperature- )- } else {- settings.saveCustomModel(- url: selectedModel.url ?? "",- sha256: "",- mmproj: selectedModel.mmproj ?? "",- mmprojSha256: "",- contextLength: contextLength,- maxTokens: maxTokens,- temperature: temperature- )- }+ settings.saveModel(+ id: selectedModel.isDefault ? "" : selectedModel.id,+ contextLength: contextLength,+ maxTokens: maxTokens,+ temperature: temperature+ )isSaving = falsetoastTask?.cancel()toastTask = presentToast("Model settings saved") { message in@@ -368,10 +254,6 @@ struct ModelSettingsView: View {private func resetTapped() {settings.resetToDefault()selectedModelId = Self.defaultOptionId- customModelUrl = ""- customMmprojUrl = ""- customModelSha = ""- customMmprojSha = ""contextLength = ""maxTokens = ""temperature = ""@@ -384,31 +266,6 @@ struct ModelSettingsView: View {private func validate() -> Bool {var isValid = true- if selectedModel.isCustom && customModelUrl.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {- urlError = "Enter a Hugging Face .gguf URL"- isValid = false- }-- if selectedModel.isCustom && !customModelUrl.isEmpty && !isValidHuggingFaceUrl(customModelUrl) {- urlError = "Enter a valid Hugging Face .gguf URL"- isValid = false- }-- if selectedModel.isCustom && !customMmprojUrl.isEmpty && !isValidHuggingFaceUrl(customMmprojUrl) {- mmprojError = "Enter a valid Hugging Face .gguf URL"- isValid = false- }-- if selectedModel.isCustom && !isValidSha256(customModelSha) {- shaError = "Enter the model's SHA-256 checksum"- isValid = false- }-- if selectedModel.isCustom && !customMmprojUrl.isEmpty && !isValidSha256(customMmprojSha) {- mmprojShaError = "Enter the mmproj's SHA-256 checksum"- isValid = false- }-if !contextLength.isEmpty, Int(contextLength) == nil {contextError = "Enter a valid integer"isValid = false@@ -432,42 +289,17 @@ struct ModelSettingsView: View {return isValid}- private func isValidSha256(_ value: String) -> Bool {- let trimmed = value.trimmingCharacters(in: .whitespaces)- return trimmed.count == 64 && trimmed.allSatisfy(\.isHexDigit)- }-- private func isValidHuggingFaceUrl(_ urlString: String) -> Bool {- guard let url = URL(string: urlString) else { return false }- guard url.host?.contains("huggingface.co") == true else { return false }- return url.path.lowercased().hasSuffix(".gguf")- }-private static let defaultOptionId = "default"- private static let customOptionId = "custom"}private struct ModelChoice: Identifiable {let id: Stringlet name: String- let url: String?- let mmproj: String?let isDefault: Bool- let isCustom: Bool-- init(- id: String,- name: String,- url: String? = nil,- mmproj: String? = nil,- isDefault: Bool = false,- isCustom: Bool = false- ) {++ init(id: String, name: String, isDefault: Bool = false) {self.id = idself.name = name- self.url = url- self.mmproj = mmprojself.isDefault = isDefault- self.isCustom = isCustom}}diff --git a/mobile/native/apple/apps/ensu/Ensu/Services/LlmProvider.swift b/mobile/native/apple/apps/ensu/Ensu/Services/LlmProvider.swiftindex 14f8cbf520..ece2eda881 100644--- a/mobile/native/apple/apps/ensu/Ensu/Services/LlmProvider.swift+++ b/mobile/native/apple/apps/ensu/Ensu/Services/LlmProvider.swift@@ -3,7 +3,7 @@ import Foundationstruct LlmModelTarget: Equatable {let id: Stringlet url: String- let sha256: String?+ let sha256: Stringlet mmprojUrl: String?let mmprojSha256: String?let contextLength: Int?diff --git a/mobile/native/apple/apps/ensu/Ensu/Services/ModelDownloader.swift b/mobile/native/apple/apps/ensu/Ensu/Services/ModelDownloader.swiftindex 7925dfad41..891d49d8fa 100644--- a/mobile/native/apple/apps/ensu/Ensu/Services/ModelDownloader.swift+++ b/mobile/native/apple/apps/ensu/Ensu/Services/ModelDownloader.swift@@ -20,22 +20,35 @@ final class ModelDownloader {transcriptionModelTarget = .tarGz(id: defaults.transcriptionModel.id,url: defaults.transcriptionModel.url,- sha256: defaults.transcriptionModel.sha256!+ sha256: defaults.transcriptionModel.sha256)voiceActivityModelTarget = .file(id: defaults.voiceActivityModel.id,name: "model.onnx",url: defaults.voiceActivityModel.url,- sha256: defaults.voiceActivityModel.sha256!+ sha256: defaults.voiceActivityModel.sha256)- migrateEnsuLegacyModels(+ let settings = UserDefaults.standard+ let pendingSelection = settings.object(forKey: "ensu.model.id") == nil+ let legacyModelUrl = pendingSelection && settings.bool(forKey: "ensu.model.use_custom")+ ? settings.string(forKey: "ensu.model.url")+ : nil+ let presetId = migrateEnsuLegacyModels(modelsDir: modelsDir.path,llmLegacyDir: baseDir.appendingPathComponent("llm", isDirectory: true).path,transcriptionLegacyDir: baseDir.appendingPathComponent("transcription", isDirectory: true).path,+ legacyModelUrl: legacyModelUrl,+ legacyMmprojUrl: settings.string(forKey: "ensu.model.mmproj"),llmTargets: Self.migrationTargets(),transcriptionModel: transcriptionModelTarget,voiceActivityModel: voiceActivityModelTarget)+ if pendingSelection {+ settings.set(presetId ?? "", forKey: "ensu.model.id")+ }+ settings.removeObject(forKey: "ensu.model.use_custom")+ settings.removeObject(forKey: "ensu.model.url")+ settings.removeObject(forKey: "ensu.model.mmproj")var excludedDir = modelsDirvar values = URLResourceValues()values.isExcludedFromBackup = true@@ -51,7 +64,7 @@ final class ModelDownloader {@MainActorprivate static func migrationTargets() -> [ModelDownloadTarget] {let config = ConfigDefaults.shared- var targets = ([config.mobileDefaultModel] + config.mobileModelPresets).map {+ return ([config.mobileDefaultModel] + config.mobileModelPresets).map {ModelDownloadTarget.gguf(id: $0.id,url: $0.url,@@ -60,17 +73,6 @@ final class ModelDownloader {mmprojSha256: $0.mmprojSha256)}- let settings = ModelSettingsStore.shared- if settings.useCustomModel && !settings.modelUrl.isEmpty {- targets.append(.gguf(- id: "custom:\(settings.modelUrl)",- url: settings.modelUrl,- sha256: nil,- mmprojUrl: settings.mmprojUrl.isEmpty ? nil : settings.mmprojUrl,- mmprojSha256: nil- ))- }- return targets}func modelPath(target: ModelDownloadTarget) -> URL {diff --git a/mobile/native/apple/apps/ensu/Ensu/Services/ModelSettingsStore.swift b/mobile/native/apple/apps/ensu/Ensu/Services/ModelSettingsStore.swiftindex a3e0e12da4..e58004921f 100644--- a/mobile/native/apple/apps/ensu/Ensu/Services/ModelSettingsStore.swift+++ b/mobile/native/apple/apps/ensu/Ensu/Services/ModelSettingsStore.swift@@ -53,19 +53,7 @@ final class ModelSettingsStore: ObservableObject {static let shared = ModelSettingsStore()static let highRAMThresholdBytes: UInt64 = 16 * 1024 * 1024 * 1024- @Published var useCustomModel: Bool {- didSet { persist() }- }- @Published var modelUrl: String {- didSet { persist() }- }- @Published var mmprojUrl: String {- didSet { persist() }- }- @Published var modelSha256: String {- didSet { persist() }- }- @Published var mmprojSha256: String {+ @Published var modelId: String {didSet { persist() }}@Published var contextLength: String {@@ -84,80 +72,44 @@ final class ModelSettingsStore: ObservableObject {private let defaults = UserDefaults.standardprivate init() {- self.useCustomModel = defaults.bool(forKey: Keys.useCustomModel)- self.modelUrl = defaults.string(forKey: Keys.modelUrl) ?? ""- self.mmprojUrl = defaults.string(forKey: Keys.mmprojUrl) ?? ""- self.modelSha256 = defaults.string(forKey: Keys.modelSha256) ?? ""- self.mmprojSha256 = defaults.string(forKey: Keys.mmprojSha256) ?? ""+ self.modelId = defaults.string(forKey: Keys.modelId) ?? ""self.contextLength = defaults.string(forKey: Keys.contextLength) ?? ""self.maxTokens = defaults.string(forKey: Keys.maxTokens) ?? ""self.temperature = defaults.string(forKey: Keys.temperature) ?? ""self.systemPromptBody = defaults.string(forKey: Keys.systemPromptBody) ?? ""}- func saveCustomModel(- url: String,- sha256: String,- mmproj: String,- mmprojSha256: String,- contextLength: String,- maxTokens: String,- temperature: String- ) {- useCustomModel = true- modelUrl = url- mmprojUrl = mmproj- self.modelSha256 = sha256- self.mmprojSha256 = mmprojSha256+ func saveModel(id: String, contextLength: String, maxTokens: String, temperature: String) {+ modelId = idself.contextLength = contextLengthself.maxTokens = maxTokensself.temperature = temperature}func resetToDefault() {- useCustomModel = false- modelUrl = ""- mmprojUrl = ""- modelSha256 = ""- mmprojSha256 = ""+ modelId = ""contextLength = ""maxTokens = ""temperature = ""}func currentTarget() -> LlmModelTarget {- let useCustom = useCustomModel && !modelUrl.isEmptylet defaults = ConfigDefaults.sharedlet defaultModel = Self.platformDefaultModel- let url = useCustom ? modelUrl : defaultModel.url- let mmproj = useCustom ? (mmprojUrl.isEmpty ? nil : mmprojUrl) : defaultModel.mmprojUrl- let context = Int(contextLength)- let maxOutput = Int(maxTokens).flatMap { $0 > 0 ? $0 : nil }- let preset: ConfigModelPreset?- if useCustom {- let presets = [defaultModel] + defaults.mobileModelPresets- preset = presets.first(where: { $0.url == url && $0.mmprojUrl == mmproj })- } else {- preset = defaultModel- }- let trimmedSha = modelSha256.trimmingCharacters(in: .whitespaces)- let trimmedMmprojSha = mmprojSha256.trimmingCharacters(in: .whitespaces)+ let presets = [defaultModel] + defaults.mobileModelPresets+ let preset = presets.first(where: { $0.id == modelId }) ?? defaultModelreturn LlmModelTarget(- id: preset?.id ?? "custom:\(url)",- url: url,- sha256: preset?.sha256 ?? (trimmedSha.isEmpty ? nil : trimmedSha),- mmprojUrl: mmproj,- mmprojSha256: mmproj == nil- ? nil- : preset?.mmprojSha256 ?? (trimmedMmprojSha.isEmpty ? nil : trimmedMmprojSha),- contextLength: context,- maxTokens: maxOutput+ id: preset.id,+ url: preset.url,+ sha256: preset.sha256,+ mmprojUrl: preset.mmprojUrl,+ mmprojSha256: preset.mmprojSha256,+ contextLength: Int(contextLength),+ maxTokens: Int(maxTokens).flatMap { $0 > 0 ? $0 : nil })}static var defaultModelName: String { platformDefaultModel.title }- static var defaultModelUrl: String { platformDefaultModel.url }- static var defaultMmprojUrl: String? { platformDefaultModel.mmprojUrl }static var defaultSystemPromptBody: String { platformSystemPromptBody }static func currentSystemPromptBody() -> String {@@ -179,11 +131,7 @@ final class ModelSettingsStore: ObservableObject {}private func persist() {- defaults.set(useCustomModel, forKey: Keys.useCustomModel)- defaults.set(modelUrl, forKey: Keys.modelUrl)- defaults.set(mmprojUrl, forKey: Keys.mmprojUrl)- defaults.set(modelSha256, forKey: Keys.modelSha256)- defaults.set(mmprojSha256, forKey: Keys.mmprojSha256)+ defaults.set(modelId, forKey: Keys.modelId)defaults.set(contextLength, forKey: Keys.contextLength)defaults.set(maxTokens, forKey: Keys.maxTokens)defaults.set(temperature, forKey: Keys.temperature)@@ -191,11 +139,7 @@ final class ModelSettingsStore: ObservableObject {}fileprivate enum Keys {- static let useCustomModel = "ensu.model.use_custom"- static let modelUrl = "ensu.model.url"- static let mmprojUrl = "ensu.model.mmproj"- static let modelSha256 = "ensu.model.sha256"- static let mmprojSha256 = "ensu.model.mmproj_sha256"+ static let modelId = "ensu.model.id"static let contextLength = "ensu.model.context"static let maxTokens = "ensu.model.max_tokens"static let temperature = "ensu.model.temperature"diff --git a/rust/apps/ensu/src-tauri/src/commands/llm.rs b/rust/apps/ensu/src-tauri/src/commands/llm.rsindex 09b154a276..b3bcd8095f 100644--- a/rust/apps/ensu/src-tauri/src/commands/llm.rs+++ b/rust/apps/ensu/src-tauri/src/commands/llm.rs@@ -38,7 +38,7 @@ impl ModelDownloadState {pub struct ModelTarget {id: String,url: String,- sha256: Option<String>,+ sha256: String,mmproj_url: Option<String>,mmproj_sha256: Option<String>,}@@ -274,11 +274,22 @@ pub fn llm_model_status(#[tauri::command]pub async fn llm_migrate_models(state: TauriState<'_, ModelDownloadState>,- custom_targets: Vec<ModelTarget>,-) -> Result<(), ApiError> {+ legacy_model_url: Option<String>,+ legacy_mmproj_url: Option<String>,+) -> Result<Option<String>, ApiError> {let models_dir = state.models_dir.clone();let defaults = ente_ensu::config::defaults();- let mut targets: Vec<ModelDownloadTarget> = std::iter::once(defaults.mobile_default_model)+ let selected = legacy_model_url.as_deref().and_then(|model_url| {+ ente_ensu::config::legacy_selected_preset_id(+ defaults+ .mobile_model_presets+ .iter()+ .chain(defaults.desktop_model_presets.iter()),+ model_url,+ legacy_mmproj_url.as_deref(),+ )+ });+ let targets: Vec<ModelDownloadTarget> = std::iter::once(defaults.mobile_default_model).chain(defaults.mobile_model_presets).chain(std::iter::once(defaults.desktop_default_model)).chain(defaults.desktop_model_presets)@@ -290,11 +301,11 @@ pub async fn llm_migrate_models(mmproj_sha256: preset.mmproj_sha256,}).collect();- targets.extend(custom_targets.into_iter().map(Into::into));async_runtime::spawn_blocking(move || migrate_flat_models_dir(&models_dir, &targets)).await- .map_err(|_| fs_thread_error())+ .map_err(|_| fs_thread_error())?;+ Ok(selected)}#[tauri::command]diff --git a/rust/bindings/uniffi/ensu/src/config.rs b/rust/bindings/uniffi/ensu/src/config.rsindex 038af5f720..fa6ae09049 100644--- a/rust/bindings/uniffi/ensu/src/config.rs+++ b/rust/bindings/uniffi/ensu/src/config.rs@@ -5,7 +5,7 @@ pub struct ConfigModelPreset {pub id: String,pub title: String,pub url: String,- pub sha256: Option<String>,+ pub sha256: String,pub mmproj_url: Option<String>,pub mmproj_sha256: Option<String>,}diff --git a/rust/bindings/uniffi/ensu/src/model_downloader.rs b/rust/bindings/uniffi/ensu/src/model_downloader.rsindex 532e799528..07524c2a75 100644--- a/rust/bindings/uniffi/ensu/src/model_downloader.rs+++ b/rust/bindings/uniffi/ensu/src/model_downloader.rs@@ -9,7 +9,7 @@ pub enum ModelDownloadTarget {Gguf {id: String,url: String,- sha256: Option<String>,+ sha256: String,mmproj_url: Option<String>,mmproj_sha256: Option<String>,},@@ -87,10 +87,12 @@ pub fn migrate_ensu_legacy_models(models_dir: String,llm_legacy_dir: Option<String>,transcription_legacy_dir: String,+ legacy_model_url: Option<String>,+ legacy_mmproj_url: Option<String>,llm_targets: Vec<ModelDownloadTarget>,transcription_model: ModelDownloadTarget,voice_activity_model: ModelDownloadTarget,-) {+) -> Option<String> {let llm_targets: Vec<ente_model_download::ModelDownloadTarget> =llm_targets.into_iter().map(Into::into).collect();ente_model_download::migrate_ensu_legacy_models(@@ -101,6 +103,12 @@ pub fn migrate_ensu_legacy_models(&transcription_model.into(),&voice_activity_model.into(),);+ let defaults = ente_ensu::config::defaults();+ ente_ensu::config::legacy_selected_preset_id(+ &defaults.mobile_model_presets,+ legacy_model_url.as_deref()?,+ legacy_mmproj_url.as_deref(),+ )}#[derive(uniffi::Object)]diff --git a/rust/crates/ensu/src/config.rs b/rust/crates/ensu/src/config.rsindex ad3f277dad..147bb65358 100644--- a/rust/crates/ensu/src/config.rs+++ b/rust/crates/ensu/src/config.rs@@ -3,7 +3,7 @@ pub struct ModelPreset {pub id: String,pub title: String,pub url: String,- pub sha256: Option<String>,+ pub sha256: String,pub mmproj_url: Option<String>,pub mmproj_sha256: Option<String>,}@@ -27,12 +27,27 @@ const MOBILE_SYSTEM_PROMPT_BODY: &str = "You are Ensu, an AI assistant built byconst DESKTOP_SYSTEM_PROMPT_BODY: &str = MOBILE_SYSTEM_PROMPT_BODY;const SESSION_SUMMARY_SYSTEM_PROMPT: &str = "You create concise chat titles. Given the provided message, summarize the user's goal in 5-7 words. Use plain words. Don't use markdown characters in the title. No quotes, no emojis, no trailing punctuation, and output only the title.";+pub fn legacy_selected_preset_id<'a>(+ presets: impl IntoIterator<Item = &'a ModelPreset>,+ model_url: &str,+ mmproj_url: Option<&str>,+) -> Option<String> {+ fn trim(url: Option<&str>) -> Option<&str> {+ url.map(str::trim).filter(|url| !url.is_empty())+ }+ let mmproj_url = trim(mmproj_url);+ presets+ .into_iter()+ .find(|preset| preset.url == model_url && trim(preset.mmproj_url.as_deref()) == mmproj_url)+ .map(|preset| preset.id.clone())+}+fn lfm_vl_1_6b() -> ModelPreset {ModelPreset {id: "lfm-vl-1.6b".to_string(),title: "LFM 2.5 VL 1.6B (Q4_0)".to_string(),url: "https://huggingface.co/LiquidAI/LFM2.5-VL-1.6B-GGUF/resolve/main/LFM2.5-VL-1.6B-Q4_0.gguf?download=true".to_string(),- sha256: Some("8186364a4e7c3ad30f6dd3d3b7a4e0074c77dd91eed6cad5d8be9090ce285804".to_string()),+ sha256: "8186364a4e7c3ad30f6dd3d3b7a4e0074c77dd91eed6cad5d8be9090ce285804".to_string(),mmproj_url: Some("https://huggingface.co/LiquidAI/LFM2.5-VL-1.6B-GGUF/resolve/main/mmproj-LFM2.5-VL-1.6b-Q8_0.gguf".to_string(),@@ -41,23 +56,12 @@ fn lfm_vl_1_6b() -> ModelPreset {}}-fn lfm_1_2b() -> ModelPreset {- ModelPreset {- id: "lfm-1.2b".to_string(),- title: "LFM 2.5 1.2B Instruct (Q4_0)".to_string(),- url: "https://huggingface.co/LiquidAI/LFM2.5-1.2B-GGUF/resolve/main/LFM2.5-1.2B-Q4_0.gguf?download=true".to_string(),- sha256: None,- mmproj_url: None,- mmproj_sha256: None,- }-}-fn qwen_0_8b() -> ModelPreset {ModelPreset {id: "qwen-0.8b".to_string(),title: "Qwen 3.5 0.8B (Q4_K_M)".to_string(),url: "https://huggingface.co/unsloth/Qwen3.5-0.8B-GGUF/resolve/main/Qwen3.5-0.8B-Q4_K_M.gguf?download=true".to_string(),- sha256: Some("bd258782e35f7f458f8aced1adc053e6e92e89bc735ba3be89d38a06121dc517".to_string()),+ sha256: "bd258782e35f7f458f8aced1adc053e6e92e89bc735ba3be89d38a06121dc517".to_string(),mmproj_url: Some("https://huggingface.co/unsloth/Qwen3.5-0.8B-GGUF/resolve/main/mmproj-F16.gguf".to_string(),@@ -71,7 +75,7 @@ fn qwen_2b_q8() -> ModelPreset {id: "qwen-2b-q8".to_string(),title: "Qwen 3.5 2B (Q8_0)".to_string(),url: "https://huggingface.co/unsloth/Qwen3.5-2B-GGUF/resolve/main/Qwen3.5-2B-Q8_0.gguf?download=true".to_string(),- sha256: Some("1b04acba824817554f4ce23639bc8495ff70453b8fcb047900c731521021f2c1".to_string()),+ sha256: "1b04acba824817554f4ce23639bc8495ff70453b8fcb047900c731521021f2c1".to_string(),mmproj_url: Some("https://huggingface.co/unsloth/Qwen3.5-2B-GGUF/resolve/main/mmproj-F16.gguf".to_string(),@@ -85,7 +89,7 @@ fn qwen_4b_q4km() -> ModelPreset {id: "qwen-4b-q4km".to_string(),title: "Qwen 3.5 4B (Q4_K_M)".to_string(),url: "https://huggingface.co/unsloth/Qwen3.5-4B-GGUF/resolve/main/Qwen3.5-4B-Q4_K_M.gguf?download=true".to_string(),- sha256: Some("00fe7986ff5f6b463e62455821146049db6f9313603938a70800d1fb69ef11a4".to_string()),+ sha256: "00fe7986ff5f6b463e62455821146049db6f9313603938a70800d1fb69ef11a4".to_string(),mmproj_url: Some("https://huggingface.co/unsloth/Qwen3.5-4B-GGUF/resolve/main/mmproj-F16.gguf".to_string(),@@ -99,7 +103,7 @@ fn gemma_4_e4b_q4km() -> ModelPreset {id: "gemma-4-e4b-q4km".to_string(),title: "Gemma 4 E4B (Q4_K_M)".to_string(),url: "https://huggingface.co/unsloth/gemma-4-E4B-it-GGUF/resolve/main/gemma-4-E4B-it-Q4_K_M.gguf?download=true".to_string(),- sha256: Some("519b9793ed6ce0ff530f1b7c96e848e08e49e7af4d57bb97f76215963a54146d".to_string()),+ sha256: "519b9793ed6ce0ff530f1b7c96e848e08e49e7af4d57bb97f76215963a54146d".to_string(),mmproj_url: Some("https://huggingface.co/unsloth/gemma-4-E4B-it-GGUF/resolve/main/mmproj-F16.gguf".to_string(),@@ -113,7 +117,7 @@ fn gemma_4_e2b_q4km() -> ModelPreset {id: "gemma-4-e2b-q4km".to_string(),title: "Gemma 4 E2B (Q4_K_M)".to_string(),url: "https://huggingface.co/unsloth/gemma-4-E2B-it-GGUF/resolve/main/gemma-4-E2B-it-Q4_K_M.gguf?download=true".to_string(),- sha256: Some("9378bc471710229ef165709b62e34bfb62231420ddaf6d729e727305b5b8672d".to_string()),+ sha256: "9378bc471710229ef165709b62e34bfb62231420ddaf6d729e727305b5b8672d".to_string(),mmproj_url: Some("https://huggingface.co/unsloth/gemma-4-E2B-it-GGUF/resolve/main/mmproj-F16.gguf".to_string(),@@ -127,9 +131,7 @@ fn parakeet_v3_int8() -> ModelPreset {id: "parakeet-v3-int8".to_string(),title: "Transcription model".to_string(),url: "https://models.ente.io/parakeet-v3-int8.tar.gz".to_string(),- sha256: Some(- "43d37191602727524a7d8c6da0eef11c4ba24320f5b4730f1a2497befc2efa77".to_string(),- ),+ sha256: "43d37191602727524a7d8c6da0eef11c4ba24320f5b4730f1a2497befc2efa77".to_string(),mmproj_url: None,mmproj_sha256: None,}@@ -140,9 +142,7 @@ fn silero_vad_v4() -> ModelPreset {id: "silero-vad-v4".to_string(),title: "Voice activity model".to_string(),url: "https://models.ente.io/silero_vad_v4.onnx".to_string(),- sha256: Some(- "a35ebf52fd3ce5f1469b2a36158dba761bc47b973ea3382b3186ca15b1f5af28".to_string(),- ),+ sha256: "a35ebf52fd3ce5f1469b2a36158dba761bc47b973ea3382b3186ca15b1f5af28".to_string(),mmproj_url: None,mmproj_sha256: None,}@@ -158,15 +158,9 @@ pub fn defaults() -> Defaults {system_prompt_date_placeholder: SYSTEM_PROMPT_DATE_PLACEHOLDER.to_string(),session_summary_system_prompt: SESSION_SUMMARY_SYSTEM_PROMPT.to_string(),mobile_default_model,- mobile_model_presets: vec![lfm_1_2b(), qwen_0_8b(), qwen_2b_q8(), gemma_4_e2b_q4km()],+ mobile_model_presets: vec![qwen_0_8b(), qwen_2b_q8(), gemma_4_e2b_q4km()],desktop_default_model,- desktop_model_presets: vec![- qwen_4b_q4km(),- lfm_vl_1_6b(),- lfm_1_2b(),- qwen_0_8b(),- qwen_2b_q8(),- ],+ desktop_model_presets: vec![qwen_4b_q4km(), lfm_vl_1_6b(), qwen_0_8b(), qwen_2b_q8()],transcription_model: parakeet_v3_int8(),voice_activity_model: silero_vad_v4(),}@@ -200,4 +194,24 @@ mod tests {}}}++ #[test]+ fn preset_artifacts_resolve_unambiguously() {+ let defaults = defaults();+ let mut seen: HashMap<(&str, Option<&str>), &str> = HashMap::new();+ for preset in defaults+ .mobile_model_presets+ .iter()+ .chain(defaults.desktop_model_presets.iter())+ {+ let artifact = (preset.url.as_str(), preset.mmproj_url.as_deref());+ if let Some(existing) = seen.insert(artifact, preset.id.as_str()) {+ assert_eq!(+ existing, preset.id,+ "presets {existing} and {} share an artifact",+ preset.id+ );+ }+ }+ }}diff --git a/rust/crates/model-download/src/downloader.rs b/rust/crates/model-download/src/downloader.rsindex 6e18c53b0c..9f7f3510b3 100644--- a/rust/crates/model-download/src/downloader.rs+++ b/rust/crates/model-download/src/downloader.rs@@ -16,7 +16,7 @@ pub enum ModelDownloadTarget {Gguf {id: String,url: String,- sha256: Option<String>,+ sha256: String,mmproj_url: Option<String>,mmproj_sha256: Option<String>,},@@ -81,12 +81,8 @@ impl ModelDownloader {pub fn mmproj_path(&self, target: &ModelDownloadTarget) -> Option<PathBuf> {match target {- ModelDownloadTarget::Gguf {- id,- url,- mmproj_url,- ..- } => gguf::mmproj_path(&self.models_dir, id, url, mmproj_url.as_deref()),+ ModelDownloadTarget::Gguf { mmproj_url, .. } => gguf::trimmed(mmproj_url.as_deref())+ .map(|_| storage_dir(&self.models_dir, target).join("mmproj.gguf")),_ => None,}}@@ -119,7 +115,7 @@ impl ModelDownloader {}pub fn remove_downloaded(&self, target: &ModelDownloadTarget) -> bool {- if checked_file_name(&storage_key(target)).is_err() {+ if checked_file_name(storage_key(target)).is_err() {return false;}let dir = storage_dir(&self.models_dir, target);@@ -228,15 +224,11 @@ impl ModelDownloader {}}-fn storage_key(target: &ModelDownloadTarget) -> String {+fn storage_key(target: &ModelDownloadTarget) -> &str {match target {- ModelDownloadTarget::Gguf {- id,- url,- mmproj_url,- ..- } => gguf::storage_key(id, url, mmproj_url.as_deref()),- ModelDownloadTarget::TarGz { id, .. } | ModelDownloadTarget::Files { id, .. } => id.clone(),+ ModelDownloadTarget::Gguf { id, .. }+ | ModelDownloadTarget::TarGz { id, .. }+ | ModelDownloadTarget::Files { id, .. } => id,}}@@ -274,20 +266,19 @@ fn download_targets(mmproj_url,mmproj_sha256,} => {- checked_file_name(&storage_key(target))?;- let sha256 = sha256- .as_deref()- .ok_or_else(|| checksum_required(id, url))?;+ checked_file_name(id)?;let mut targets = vec![Target {label: "Model".to_string(),url: url.clone(),destination_path: dir.join("model.gguf").display().to_string(),- sha256: sha256.to_string(),+ sha256: sha256.clone(),}];if let Some(mmproj_url) = gguf::trimmed(mmproj_url.as_deref()) {- let mmproj_sha256 = mmproj_sha256- .as_deref()- .ok_or_else(|| checksum_required(id, mmproj_url))?;+ let mmproj_sha256 = gguf::trimmed(mmproj_sha256.as_deref()).ok_or_else(|| {+ download::Error::InvalidTarget(format!(+ "{id} has a mmproj URL without a mmproj checksum"+ ))+ })?;targets.push(Target {label: "Mmproj".to_string(),url: mmproj_url.to_string(),@@ -316,7 +307,6 @@ fn download_targets(}ModelDownloadTarget::Files { id, files } => {checked_file_name(id)?;- checked_file_name(&storage_key(target))?;if files.is_empty() {return Err(download::Error::InvalidTarget(format!("{id} has no files")));}@@ -343,10 +333,6 @@ fn download_targets(}}-fn checksum_required(id: &str, url: &str) -> download::Error {- download::Error::Validation(format!("{id} needs a checksum to download {url}"))-}-fn checked_file_name(name: &str) -> Result<(), download::Error> {if !name.is_empty()&& name != "."@@ -448,9 +434,7 @@ fn migrate_legacy_dir(models_dir: &Path, legacy_dir: &Path, targets: &[ModelDownif !legacy_dir.exists() {return;}- let legacy_models = legacy_dir.join("models");- let hashed_dirs = [legacy_models.join("custom")];- if adopt_targets(models_dir, targets, &hashed_dirs, &legacy_models) {+ if adopt_targets(models_dir, targets, &[], &legacy_dir.join("models")) {let _ = fs::remove_dir_all(legacy_dir);}}@@ -459,7 +443,7 @@ pub fn migrate_flat_models_dir(models_dir: &Path, targets: &[ModelDownloadTargetif !models_dir.exists() {return;}- let hashed_dirs = [models_dir.join("custom"), models_dir.to_path_buf()];+ let hashed_dirs = [models_dir.to_path_buf()];if !adopt_targets(models_dir, targets, &hashed_dirs, models_dir) {return;}@@ -557,37 +541,36 @@ fn adopt_targets(let mut plans: Vec<Vec<(String, &str, PathBuf)>> = Vec::new();for target in targets {let ModelDownloadTarget::Gguf {- id,- url,- mmproj_url,- ..+ url, mmproj_url, ..} = targetelse {continue;};- let mmproj_url = mmproj_url.as_deref();- let mut plan = vec![(- url.clone(),- "model.gguf",- gguf::model_path(models_dir, id, url, mmproj_url),- )];- if let Some(dest) = gguf::mmproj_path(models_dir, id, url, mmproj_url) {- plan.push((- gguf::trimmed(mmproj_url).unwrap().to_string(),- "mmproj.gguf",- dest,- ));+ let dir = storage_dir(models_dir, target);+ let mut plan = vec![(url.clone(), "model.gguf", dir.join("model.gguf"))];+ if let Some(mmproj) = gguf::trimmed(mmproj_url.as_deref()) {+ plan.push((mmproj.to_string(), "mmproj.gguf", dir.join("mmproj.gguf")));}plans.push(plan);}let mut basename_urls: HashMap<String, HashSet<&str>> = HashMap::new();- for plan in &plans {- for (url, fallback, _) in plan {+ for target in targets {+ let ModelDownloadTarget::Gguf {+ url, mmproj_url, ..+ } = target+ else {+ continue;+ };+ let files = [+ Some((url.as_str(), "model.gguf")),+ gguf::trimmed(mmproj_url.as_deref()).map(|url| (url, "mmproj.gguf")),+ ];+ for (url, fallback) in files.into_iter().flatten() {basename_urls.entry(gguf::filename_for_url(url, fallback)).or_default()- .insert(url.as_str());+ .insert(url);}}@@ -681,19 +664,26 @@ mod tests {ModelDownloadTarget::Gguf {id: id.to_string(),url: "https://example.org/models/main.gguf?download=true".to_string(),- sha256: Some(test_sha()),+ sha256: test_sha(),mmproj_url: Some("https://example.org/models/mmproj.gguf".to_string()),mmproj_sha256: Some(test_sha()),}}+ fn target_id(target: &ModelDownloadTarget) -> Option<&str> {+ match target {+ ModelDownloadTarget::Gguf { id, .. } => Some(id),+ _ => None,+ }+ }+fn write_gguf(path: &Path, content: &[u8]) {fs::create_dir_all(path.parent().unwrap()).unwrap();fs::write(path, content).unwrap();}#[test]- fn paths_are_keyed_by_preset_id_or_custom_pair_hash() {+ fn paths_are_keyed_by_preset_id() {let dir = scratch_dir("paths");let downloader = ModelDownloader::new(&dir);@@ -706,31 +696,6 @@ mod tests {Some(dir.join("qwen-2b-q8/mmproj.gguf")));- let custom = downloader.model_path(&target("custom:1"));- let key = custom- .parent()- .unwrap()- .file_name()- .unwrap()- .to_string_lossy()- .into_owned();- assert!(key.starts_with("custom-"));- assert_eq!(key.len(), "custom-".len() + 16);- assert_eq!(custom.file_name().unwrap(), "model.gguf");- assert_eq!(- downloader.mmproj_path(&target("custom:1")),- Some(custom.with_file_name("mmproj.gguf"))- );-- let other_mmproj = ModelDownloadTarget::Gguf {- id: "custom:1".to_string(),- url: "https://example.org/models/main.gguf?download=true".to_string(),- sha256: Some(test_sha()),- mmproj_url: Some("https://example.org/models/other.gguf".to_string()),- mmproj_sha256: Some(test_sha()),- };- assert_ne!(downloader.model_path(&other_mmproj), custom);-let _ = fs::remove_dir_all(dir);}@@ -978,34 +943,17 @@ mod tests {let base = scratch_dir("migrate");let legacy = base.join("llm");let legacy_models = legacy.join("models");- fs::create_dir_all(legacy_models.join("custom")).unwrap();+ fs::create_dir_all(&legacy_models).unwrap();fs::write(legacy_models.join("main.gguf"), b"GGUFmain").unwrap();fs::write(legacy_models.join("mmproj.gguf"), b"GGUFmmproj").unwrap();-- let custom_url = "https://example.org/custom/other-main.gguf";- let custom = ModelDownloadTarget::Gguf {- id: "custom:1".to_string(),- url: custom_url.to_string(),- sha256: Some(test_sha()),- mmproj_url: None,- mmproj_sha256: Some(test_sha()),- };- fs::write(- legacy_models- .join("custom")- .join(format!("{}_other-main.gguf", gguf::sha256_hex(custom_url))),- b"GGUFcustom",- )- .unwrap();-fs::write(legacy_models.join("main.gguf.tmp"), b"GGUFpartial").unwrap();fs::write(legacy_models.join("main.gguf.metadata.json"), b"{}").unwrap();fs::write(legacy_models.join("orphan.gguf"), b"GGUForphan").unwrap();let models_dir = base.join("models");let preset = target("qwen-2b-q8");- migrate_legacy_dir(&models_dir, &legacy, &[preset.clone(), custom.clone()]);+ migrate_legacy_dir(&models_dir, &legacy, &[preset.clone()]);let downloader = ModelDownloader::new(&models_dir);assert_eq!(@@ -1016,11 +964,7 @@ mod tests {fs::read(downloader.mmproj_path(&preset).unwrap()).unwrap(),b"GGUFmmproj");- assert_eq!(- fs::read(downloader.model_path(&custom)).unwrap(),- b"GGUFcustom"- );- assert_eq!(fs::read_dir(&models_dir).unwrap().count(), 2);+ assert_eq!(fs::read_dir(&models_dir).unwrap().count(), 1);assert!(!legacy.exists());let _ = fs::remove_dir_all(base);@@ -1039,7 +983,7 @@ mod tests {let targets = ["a", "b"].map(|name| ModelDownloadTarget::Gguf {id: format!("preset-{name}"),url: format!("https://example.org/{name}/{name}.gguf"),- sha256: Some(test_sha()),+ sha256: test_sha(),mmproj_url: Some(format!("https://example.org/{name}/mmproj-F16.gguf")),mmproj_sha256: Some(test_sha()),});@@ -1066,22 +1010,6 @@ mod tests {);fs::write(models_dir.join(mmproj_hashed), b"GGUFmm").unwrap();- let custom_url = "https://example.org/custom/other-main.gguf";- let custom = ModelDownloadTarget::Gguf {- id: "custom:1".to_string(),- url: custom_url.to_string(),- sha256: Some(test_sha()),- mmproj_url: None,- mmproj_sha256: Some(test_sha()),- };- fs::write(- models_dir- .join("custom")- .join(format!("{}_other-main.gguf", gguf::sha256_hex(custom_url))),- b"GGUFcustom",- )- .unwrap();-fs::write(models_dir.join("orphan.gguf"), b"GGUForphan").unwrap();fs::write(models_dir.join("main.gguf.tmp"), b"GGUFpartial").unwrap();let downloader = ModelDownloader::new(&models_dir);@@ -1090,7 +1018,7 @@ mod tests {b"GGUFkeep",);- migrate_flat_models_dir(&models_dir, &[preset.clone(), custom.clone()]);+ migrate_flat_models_dir(&models_dir, &[preset.clone()]);assert_eq!(fs::read(downloader.model_path(&preset)).unwrap(),@@ -1100,10 +1028,6 @@ mod tests {fs::read(downloader.mmproj_path(&preset).unwrap()).unwrap(),b"GGUFmm");- assert_eq!(- fs::read(downloader.model_path(&custom)).unwrap(),- b"GGUFcustom"- );assert_eq!(fs::read(models_dir.join("other-key/model.gguf")).unwrap(),b"GGUFkeep"@@ -1116,7 +1040,7 @@ mod tests {.count();assert_eq!(root_files, 0);- migrate_flat_models_dir(&models_dir, &[preset.clone(), custom]);+ migrate_flat_models_dir(&models_dir, &[preset.clone()]);assert_eq!(fs::read(downloader.model_path(&preset)).unwrap(),b"GGUFmain"@@ -1156,7 +1080,7 @@ mod tests {let targets = ["a", "b"].map(|name| ModelDownloadTarget::Gguf {id: format!("preset-{name}"),url: format!("https://example.org/{name}/{name}.gguf"),- sha256: Some(test_sha()),+ sha256: test_sha(),mmproj_url: Some(format!("https://example.org/{name}/mmproj-F16.gguf")),mmproj_sha256: Some(test_sha()),});@@ -1221,7 +1145,7 @@ mod tests {let targets = ["a", "b"].map(|name| ModelDownloadTarget::Gguf {id: format!("preset-{name}"),url: format!("https://example.org/{name}/{name}.gguf"),- sha256: Some(test_sha()),+ sha256: test_sha(),mmproj_url: Some(format!("https://example.org/{name}/mmproj-F16.gguf")),mmproj_sha256: Some(test_sha()),});diff --git a/rust/crates/model-download/src/gguf.rs b/rust/crates/model-download/src/gguf.rsindex d8b21c151a..9a3a9a0ea3 100644--- a/rust/crates/model-download/src/gguf.rs+++ b/rust/crates/model-download/src/gguf.rs@@ -1,46 +1,9 @@use std::fs::File;use std::io::Read;-use std::path::{Path, PathBuf};+use std::path::Path;use sha2::{Digest, Sha256};-pub(crate) fn storage_key(id: &str, url: &str, mmproj_url: Option<&str>) -> String {- if id.starts_with("custom") {- let pair = format!("{url}\n{}", trimmed(mmproj_url).unwrap_or(""));- format!("custom-{}", &sha256_hex(&pair)[..16])- } else {- id.to_string()- }-}--pub(crate) fn model_dir(- models_dir: &Path,- id: &str,- url: &str,- mmproj_url: Option<&str>,-) -> PathBuf {- models_dir.join(storage_key(id, url, mmproj_url))-}--pub(crate) fn model_path(- models_dir: &Path,- id: &str,- url: &str,- mmproj_url: Option<&str>,-) -> PathBuf {- model_dir(models_dir, id, url, mmproj_url).join("model.gguf")-}--pub(crate) fn mmproj_path(- models_dir: &Path,- id: &str,- url: &str,- mmproj_url: Option<&str>,-) -> Option<PathBuf> {- trimmed(mmproj_url)?;- Some(model_dir(models_dir, id, url, mmproj_url).join("mmproj.gguf"))-}-pub(crate) fn looks_like_gguf(path: &Path) -> bool {let mut file = match File::open(path) {Ok(file) => file,diff --git a/web/apps/ensu/src/components/chat/ChatDialogs.tsx b/web/apps/ensu/src/components/chat/ChatDialogs.tsxindex 69d46c1e3f..fb98c5fafd 100644--- a/web/apps/ensu/src/components/chat/ChatDialogs.tsx+++ b/web/apps/ensu/src/components/chat/ChatDialogs.tsx@@ -38,9 +38,8 @@ interface IconProps {}interface SuggestedModel {+ id: string;name: string;- url: string;- mmproj?: string;}type ModelGateStatus =@@ -54,11 +53,7 @@ type ModelGateStatus =type SxEntry = Exclude<SxProps<Theme>, readonly unknown[]>;export interface ModelSettingsDraft {- useCustomModel: boolean;- modelUrl: string;- mmprojUrl: string;- modelSha256: string;- mmprojSha256: string;+ modelId: string;contextLength: string;maxTokens: string;}@@ -86,17 +81,10 @@ export interface ChatDialogsProps {handleConfirmDeleteSession: () => void | Promise<void>;showModelSettings: boolean;closeModelSettings: () => void;- useCustomModel: boolean;+ selectedModelId: string;defaultModelName: string;- defaultModelUrl: string;- defaultModelMmproj?: string;loadedModelName: string | null;- allowMmproj: boolean;isTauriRuntime: boolean;- modelUrl: string;- mmprojUrl: string;- modelSha256: string;- mmprojSha256: string;suggestedModels: SuggestedModel[];contextLength: string;maxTokens: string;@@ -140,17 +128,10 @@ export const ChatDialogs = memo(handleConfirmDeleteSession,showModelSettings,closeModelSettings,- useCustomModel,+ selectedModelId,defaultModelName,- defaultModelUrl,- defaultModelMmproj,loadedModelName,- allowMmproj,isTauriRuntime,- modelUrl,- mmprojUrl,- modelSha256,- mmprojSha256,suggestedModels,contextLength,maxTokens,@@ -190,26 +171,8 @@ export const ChatDialogs = memo(};// --- Model settings draft state ---- const [draftUseCustomModel, setDraftUseCustomModel] =- React.useState(false);- const [draftModelUrl, setDraftModelUrl] = React.useState("");- const [draftMmprojUrl, setDraftMmprojUrl] = React.useState("");- const [draftModelSha, setDraftModelSha] = React.useState("");- const [draftMmprojSha, setDraftMmprojSha] = React.useState("");- const [draftModelShaError, setDraftModelShaError] = React.useState<- string | null- >(null);- const [draftMmprojShaError, setDraftMmprojShaError] = React.useState<- string | null- >(null);const [draftContextLength, setDraftContextLength] = React.useState("");const [draftMaxTokens, setDraftMaxTokens] = React.useState("");- const [draftModelUrlError, setDraftModelUrlError] = React.useState<- string | null- >(null);- const [draftMmprojError, setDraftMmprojError] = React.useState<- string | null- >(null);const [draftContextError, setDraftContextError] = React.useState<string | null>(null);@@ -218,7 +181,7 @@ export const ChatDialogs = memo(>(null);const [showAdvancedLimits, setShowAdvancedLimits] =React.useState(false);- const [selectedModelId, setSelectedModelId] = React.useState("default");+ const [draftModelId, setDraftModelId] = React.useState("default");const [showBackupComingSoon, setShowBackupComingSoon] =React.useState(false);@@ -227,72 +190,31 @@ export const ChatDialogs = memo(const modelOptions = React.useMemo(() => [- {- id: "default",- name: `${defaultModelName} (Default)`,- url: defaultModelUrl,- mmproj: allowMmproj- ? (defaultModelMmproj ?? undefined)- : "",- },- ...suggestedModels- .filter((model) => model.url !== defaultModelUrl)- .map((model) => ({- id: model.url,- name: model.name,- url: model.url,- mmproj: model.mmproj,- })),- { id: "custom", name: "Custom", url: "", mmproj: "" },- ],- [- allowMmproj,- defaultModelMmproj,- defaultModelName,- defaultModelUrl,- suggestedModels,+ { id: "default", name: `${defaultModelName} (Default)` },+ ...suggestedModels,],+ [defaultModelName, suggestedModels],);- const isCustomSelected = selectedModelId === "custom";- const canSaveModelSettings =- !isCustomSelected ||- (draftModelUrl.trim().length > 0 &&- draftModelSha.trim().length > 0 &&- (!draftMmprojUrl.trim() || draftMmprojSha.trim().length > 0));// Initialize model settings draft from parent state when dialog opensReact.useEffect(() => {if (!showModelSettings) return;- setDraftUseCustomModel(useCustomModel);- setDraftModelUrl(modelUrl);- setDraftMmprojUrl(mmprojUrl);- setDraftModelSha(modelSha256);- setDraftMmprojSha(mmprojSha256);+ setDraftModelId(+ modelOptions.some((model) => model.id === selectedModelId)+ ? selectedModelId+ : "default",+ );setDraftContextLength(contextLength);setDraftMaxTokens(maxTokens);- setDraftModelUrlError(null);- setDraftMmprojError(null);- setDraftModelShaError(null);- setDraftMmprojShaError(null);setDraftContextError(null);setDraftMaxTokensError(null);- const matchedOption = useCustomModel- ? modelOptions.find((model) => model.url === modelUrl)- : undefined;- setSelectedModelId(- !useCustomModel ? "default" : (matchedOption?.id ?? "custom"),- );setShowAdvancedLimits(!!contextLength || !!maxTokens);}, [contextLength,maxTokens,- mmprojUrl,modelOptions,- modelUrl,- modelSha256,- mmprojSha256,+ selectedModelId,showModelSettings,- useCustomModel,]);// Initialize system prompt draft from parent state when dialog opens@@ -302,52 +224,6 @@ export const ChatDialogs = memo(}, [showSystemPromptSettings]); // eslint-disable-line react-hooks/exhaustive-depsconst validateModelSettings = React.useCallback(() => {- const validateUrl = (value: string) => {- if (!value) return undefined;- try {- const url = new URL(value);- if (- url.hostname !== "huggingface.co" &&- !url.hostname.endsWith(".huggingface.co")- ) {- return "URL must be a huggingface.co link";- }- if (url.pathname.includes("/blob/")) {- return "Use a direct file URL, not a /blob/ page";- }- if (!url.pathname.endsWith(".gguf")) {- return "URL must end with .gguf";- }- return undefined;- } catch {- return "Enter a valid URL";- }- };-- const modelError = draftUseCustomModel- ? draftModelUrl- ? validateUrl(draftModelUrl)- : "Required"- : undefined;- const mmprojErr =- draftUseCustomModel && isTauriRuntime- ? validateUrl(draftMmprojUrl)- : undefined;-- const validateSha = (value: string) =>- /^[0-9a-fA-F]{64}$/.test(value.trim())- ? undefined- : "Enter the file's SHA-256 checksum";- const modelShaError = isCustomSelected- ? validateSha(draftModelSha)- : undefined;- const mmprojShaErr =- isCustomSelected &&- isTauriRuntime &&- draftMmprojUrl.trim().length > 0- ? validateSha(draftMmprojSha)- : undefined;-const contextErrorValue =draftContextLength && !/^\d+$/.test(draftContextLength)? "Enter a number"@@ -369,35 +245,17 @@ export const ChatDialogs = memo(? "Must be <= context length": undefined;- setDraftModelUrlError(modelError ?? null);- setDraftMmprojError(mmprojErr ?? null);- setDraftModelShaError(modelShaError ?? null);- setDraftMmprojShaError(mmprojShaErr ?? null);setDraftContextError(contextErrorValue ?? null);setDraftMaxTokensError(maxTokensErrorValue ?? maxTokensLimitError ?? null,);return !(- modelError ||- mmprojErr ||- modelShaError ||- mmprojShaErr ||contextErrorValue ||maxTokensErrorValue ||maxTokensLimitError);- }, [- draftContextLength,- draftMaxTokens,- draftMmprojUrl,- draftModelUrl,- draftModelSha,- draftMmprojSha,- draftUseCustomModel,- isCustomSelected,- isTauriRuntime,- ]);+ }, [draftContextLength, draftMaxTokens]);return (<>@@ -827,43 +685,14 @@ export const ChatDialogs = memo(selectfullWidthlabel="Model"- value={selectedModelId}- onChange={(event) => {- const nextId = event.target.value;- const nextModel = modelOptions.find(- (model) => model.id === nextId,- );- setSelectedModelId(nextId);- if (!nextModel) return;- if (nextId === "default") {- setDraftUseCustomModel(false);- setDraftModelUrl("");- setDraftMmprojUrl("");- setDraftModelSha("");- setDraftMmprojSha("");- return;- }- setDraftUseCustomModel(true);- if (nextId === "custom") {- setDraftModelUrl("");- setDraftMmprojUrl("");- setDraftModelSha("");- setDraftMmprojSha("");- return;- }- setDraftModelUrl(nextModel.url);- setDraftModelSha("");- setDraftMmprojSha("");- setDraftMmprojUrl(- allowMmproj- ? (nextModel.mmproj ?? "")- : "",- );- }}+ value={draftModelId}+ onChange={(event) =>+ setDraftModelId(event.target.value)+ }helperText={loadedModelName? `Loaded: ${loadedModelName}`- : "Custom reveals direct Hugging Face URLs."+ : " "}>{modelOptions.map((model) => (@@ -877,80 +706,6 @@ export const ChatDialogs = memo(</TextField></Stack>- {isCustomSelected && (- <Stack sx={{ gap: 1.5 }}>- <TextField- fullWidth- label="Model .gguf URL"- placeholder="https://huggingface.co/..."- value={draftModelUrl}- onChange={(event) =>- setDraftModelUrl(- event.target.value,- )- }- error={!!draftModelUrlError}- helperText={- draftModelUrlError ?? " "- }- />- <TextField- fullWidth- label="Model SHA-256"- placeholder="Checksum from the model page"- value={draftModelSha}- onChange={(event) =>- setDraftModelSha(- event.target.value,- )- }- error={!!draftModelShaError}- helperText={- draftModelShaError ?? " "- }- />- {allowMmproj && (- <TextField- fullWidth- label="mmproj .gguf URL"- placeholder="(optional for multimodal)"- value={draftMmprojUrl}- onChange={(event) =>- setDraftMmprojUrl(- event.target.value,- )- }- error={!!draftMmprojError}- helperText={- draftMmprojError ?? " "- }- />- )}- {allowMmproj &&- draftMmprojUrl.trim().length >- 0 && (- <TextField- fullWidth- label="mmproj SHA-256"- placeholder="Checksum from the model page"- value={draftMmprojSha}- onChange={(event) =>- setDraftMmprojSha(- event.target.value,- )- }- error={- !!draftMmprojShaError- }- helperText={- draftMmprojShaError ??- " "- }- />- )}- </Stack>- )}-<Stack sx={{ gap: 1.5 }}><ButtononClick={() =>@@ -1024,18 +779,16 @@ export const ChatDialogs = memo(variant="contained"color="accent"disabled={- !canSaveModelSettings ||isSavingModel ||modelGateStatus === "downloading"}onClick={() => {if (!validateModelSettings()) return;handleSaveModel({- useCustomModel: draftUseCustomModel,- modelUrl: draftModelUrl,- mmprojUrl: draftMmprojUrl,- modelSha256: draftModelSha.trim(),- mmprojSha256: draftMmprojSha.trim(),+ modelId:+ draftModelId === "default"+ ? ""+ : draftModelId,contextLength: draftContextLength,maxTokens: draftMaxTokens,});diff --git a/web/apps/ensu/src/pages/chat.tsx b/web/apps/ensu/src/pages/chat.tsxindex 70074b1aeb..eb128801f7 100644--- a/web/apps/ensu/src/pages/chat.tsx+++ b/web/apps/ensu/src/pages/chat.tsx@@ -63,7 +63,7 @@ import { NavbarBase } from "ente-base/components/Navbar";import type { NotificationAttributes } from "ente-base/components/Notification";import { useBaseContext } from "ente-base/context";import { buildEnvEnsuDesktopVersion } from "ente-base/env";-import { getKV, removeKV, setKV } from "ente-base/kv";+import { getKV, removeKV } from "ente-base/kv";import log from "ente-base/log";import { savedLogs } from "ente-base/log-web";import { saveStringAsFile } from "ente-base/utils/web";@@ -591,17 +591,14 @@ const Page: React.FC = () => {const [showModelSettings, setShowModelSettings] = useState(false);const [showSystemPromptSettings, setShowSystemPromptSettings] =useState(false);- const [useCustomModel, setUseCustomModel] = useState(false);+const [modelSettingsLoaded, setModelSettingsLoaded] = useState(false);const [resolvedDefaultModel, setResolvedDefaultModel] =useState<ModelInfo>(DEFAULT_MODEL);const [resolvedModelPresets, setResolvedModelPresets] = useState<ResolvedModelPreset[] | null>(null);- const [modelUrl, setModelUrl] = useState("");- const [mmprojUrl, setMmprojUrl] = useState("");- const [modelSha256, setModelSha256] = useState("");- const [mmprojSha256, setMmprojSha256] = useState("");+ const [selectedModelId, setSelectedModelId] = useState("");const [contextLength, setContextLength] = useState("");const [maxTokens, setMaxTokens] = useState("");const [systemPrompt, setSystemPrompt] = useState(@@ -955,121 +952,99 @@ const Page: React.FC = () => {DEFAULT_CHAT_SYSTEM_PROMPT_BODY,);- // Only restore custom model settings when advanced settings are- // unlocked. Without this gate a user who had custom settings before- // the unlock feature was added would silently keep a hidden custom- // model with no visible way to change it.- if (!isUnlocked) {- setModelSettingsLoaded(true);- return;- }-- let raw = window.localStorage.getItem(MODEL_SETTINGS_STORAGE_KEY);- if (!raw) {- // Migrate from IndexedDB (previous storage) to localStorage- void getKV(MODEL_SETTINGS_STORAGE_KEY)- .then((kvRaw) => {- if (cancelled || !kvRaw || typeof kvRaw !== "object") {- return;- }- const migrated = JSON.stringify(kvRaw);- window.localStorage.setItem(- MODEL_SETTINGS_STORAGE_KEY,- migrated,- );- // Re-trigger the effect by reloading settings from the migrated data- const parsed = kvRaw as {- useCustomModel?: boolean;- modelUrl?: string;- mmprojUrl?: string;- modelSha256?: string;- mmprojSha256?: string;- contextLength?: string;- maxTokens?: string;- };- const isTauri = detectTauriRuntime();- const canMmproj = isTauri;- const rawContextLength = parsed.contextLength ?? "";- const clampedContextLength =- !isTauri &&- rawContextLength &&- Number(rawContextLength) > DEFAULT_WEB_CONTEXT_SIZE- ? String(DEFAULT_WEB_CONTEXT_SIZE)- : rawContextLength;- if (clampedContextLength !== rawContextLength) {- const clamped = {- ...parsed,- contextLength: clampedContextLength,- };- window.localStorage.setItem(- MODEL_SETTINGS_STORAGE_KEY,- JSON.stringify(clamped),- );- }- setUseCustomModel(!!parsed.useCustomModel);- setModelUrl(parsed.modelUrl ?? "");- setMmprojUrl(canMmproj ? (parsed.mmprojUrl ?? "") : "");- setModelSha256(parsed.modelSha256 ?? "");- setMmprojSha256(- canMmproj ? (parsed.mmprojSha256 ?? "") : "",- );- setContextLength(clampedContextLength);- setMaxTokens(parsed.maxTokens ?? "");- void removeKV(MODEL_SETTINGS_STORAGE_KEY);- })- .catch((error: unknown) => {- log.error("Failed to migrate model settings", error);- })- .finally(() => {- if (!cancelled) setModelSettingsLoaded(true);- });- return () => {- cancelled = true;- };- }- try {- const parsed = JSON.parse(raw) as {- useCustomModel?: boolean;- modelUrl?: string;- mmprojUrl?: string;- modelSha256?: string;- mmprojSha256?: string;- contextLength?: string;- maxTokens?: string;- };- const isTauri = detectTauriRuntime();- const canMmproj = isTauri;+ const applySettings = (parsed: {+ modelId?: string;+ contextLength?: string;+ maxTokens?: string;+ }) => {const rawContextLength = parsed.contextLength ?? "";const clampedContextLength =- !isTauri &&+ !detectTauriRuntime() &&rawContextLength &&Number(rawContextLength) > DEFAULT_WEB_CONTEXT_SIZE? String(DEFAULT_WEB_CONTEXT_SIZE): rawContextLength;- if (clampedContextLength !== rawContextLength) {- const nextSettings = {- useCustomModel: !!parsed.useCustomModel,- modelUrl: parsed.modelUrl ?? "",- mmprojUrl: canMmproj ? (parsed.mmprojUrl ?? "") : "",- contextLength: clampedContextLength,- maxTokens: parsed.maxTokens ?? "",- };- window.localStorage.setItem(- MODEL_SETTINGS_STORAGE_KEY,- JSON.stringify(nextSettings),+ const settings = {+ modelId: parsed.modelId ?? "",+ contextLength: clampedContextLength,+ maxTokens: parsed.maxTokens ?? "",+ };+ window.localStorage.setItem(+ MODEL_SETTINGS_STORAGE_KEY,+ JSON.stringify(settings),+ );+ if (cancelled) return;+ setSelectedModelId(settings.modelId);+ setContextLength(settings.contextLength);+ setMaxTokens(settings.maxTokens);+ };++ // Loads persisted settings and runs the one Rust model migration.+ // Settings persisted by builds that stored a model URL selection+ // convert through it once: a URL matching a current preset maps to+ // its id, anything else becomes the default.+ const loadSettings = async () => {+ let raw = window.localStorage.getItem(MODEL_SETTINGS_STORAGE_KEY);+ if (!raw) {+ // Settings from even older builds live in IndexedDB.+ const kvRaw = await getKV(MODEL_SETTINGS_STORAGE_KEY).catch(+ () => undefined,);+ if (kvRaw && typeof kvRaw === "object") {+ raw = JSON.stringify(kvRaw);+ window.localStorage.setItem(+ MODEL_SETTINGS_STORAGE_KEY,+ raw,+ );+ void removeKV(MODEL_SETTINGS_STORAGE_KEY);+ }}- setUseCustomModel(!!parsed.useCustomModel);- setModelUrl(parsed.modelUrl ?? "");- setMmprojUrl(canMmproj ? (parsed.mmprojUrl ?? "") : "");- setModelSha256(parsed.modelSha256 ?? "");- setMmprojSha256(canMmproj ? (parsed.mmprojSha256 ?? "") : "");- setContextLength(clampedContextLength);- setMaxTokens(parsed.maxTokens ?? "");- } catch (error) {- log.error("Failed to read model settings", error);- }- setModelSettingsLoaded(true);+ const parsed = raw+ ? (JSON.parse(raw) as {+ modelId?: string;+ useCustomModel?: boolean;+ modelUrl?: string;+ mmprojUrl?: string;+ contextLength?: string;+ maxTokens?: string;+ })+ : {};+ let modelId = parsed.modelId ?? "";+ if (detectTauriRuntime()) {+ const legacyModelUrl =+ parsed.modelId === undefined &&+ parsed.useCustomModel &&+ parsed.modelUrl?.trim()+ ? parsed.modelUrl.trim()+ : null;+ const { invoke } = await import("@tauri-apps/api/core");+ const converted = await invoke<string | null>(+ "llm_migrate_models",+ {+ legacyModelUrl,+ legacyMmprojUrl: legacyModelUrl+ ? parsed.mmprojUrl?.trim() || null+ : null,+ },+ );+ if (legacyModelUrl) {+ modelId = converted ?? "";+ }+ }+ applySettings({+ modelId,+ contextLength: parsed.contextLength,+ maxTokens: parsed.maxTokens,+ });+ };++ void loadSettings()+ .catch((error: unknown) => {+ log.error("Failed to load model settings", error);+ })+ .finally(() => {+ if (!cancelled) setModelSettingsLoaded(true);+ });return () => {cancelled = true;};@@ -1529,13 +1504,6 @@ const Page: React.FC = () => {};}, [currentRootSessionUuid]);- useEffect(() => {- if (isTauriRuntime) return;- if (mmprojUrl) {- setMmprojUrl("");- }- }, [isTauriRuntime, mmprojUrl]);-const filteredSessions = useMemo(() => {const query = sessionSearch.trim().toLowerCase();if (!query) return sessions;@@ -1664,7 +1632,7 @@ const Page: React.FC = () => {modelGateStatus === "downloading";const downloadSizeLabel = useMemo(() => {- if (useCustomModel) {+ if (selectedModelId) {return "Approx. size varies by model";}if (resolvedDefaultModel.sizeBytes) {@@ -1676,7 +1644,7 @@ const Page: React.FC = () => {return resolvedDefaultModel.sizeHuman? `Approx. ${resolvedDefaultModel.sizeHuman}`: "Approx. size varies by model";- }, [allowMmproj, resolvedDefaultModel, useCustomModel]);+ }, [allowMmproj, resolvedDefaultModel, selectedModelId]);const downloadStatusLabel = useMemo(() => {if (!showDownloadProgress) return null;@@ -1727,41 +1695,15 @@ const Page: React.FC = () => {}, []);const getModelSettings = useCallback((): ModelSettings => {- const customModelEnabled = useCustomModel;return {- useCustomModel: customModelEnabled,- modelUrl:- customModelEnabled && modelUrl.trim()- ? modelUrl.trim()- : undefined,- mmprojUrl:- customModelEnabled && allowMmproj && mmprojUrl.trim()- ? mmprojUrl.trim()- : undefined,- modelSha256:- customModelEnabled && modelSha256.trim()- ? modelSha256.trim()- : undefined,- mmprojSha256:- customModelEnabled && allowMmproj && mmprojSha256.trim()- ? mmprojSha256.trim()- : undefined,+ modelId: selectedModelId || undefined,contextLength: contextLength ? Number(contextLength) : undefined,maxTokens:maxTokens && Number(maxTokens) > 0? Number(maxTokens): undefined,};- }, [- useCustomModel,- modelUrl,- mmprojUrl,- modelSha256,- mmprojSha256,- contextLength,- maxTokens,- allowMmproj,- ]);+ }, [selectedModelId, contextLength, maxTokens]);const modelSettingsKey = useMemo(() => JSON.stringify(getModelSettings()),@@ -3222,49 +3164,25 @@ const Page: React.FC = () => {const handleSaveModel = useCallback((draft: {- useCustomModel: boolean;- modelUrl: string;- mmprojUrl: string;- modelSha256: string;- mmprojSha256: string;+ modelId: string;contextLength: string;maxTokens: string;}) => {setIsSavingModel(true);- const payload = {- useCustomModel: draft.useCustomModel,- modelUrl: draft.useCustomModel ? draft.modelUrl : "",- mmprojUrl:- draft.useCustomModel && isTauriRuntime- ? draft.mmprojUrl- : "",- modelSha256: draft.useCustomModel ? draft.modelSha256 : "",- mmprojSha256:- draft.useCustomModel && isTauriRuntime- ? draft.mmprojSha256- : "",- contextLength: draft.contextLength,- maxTokens: draft.maxTokens,- };if (typeof window !== "undefined") {window.localStorage.setItem(MODEL_SETTINGS_STORAGE_KEY,- JSON.stringify(payload),+ JSON.stringify(draft),);- void setKV(MODEL_SETTINGS_STORAGE_KEY, payload);}- setUseCustomModel(draft.useCustomModel);- setModelUrl(draft.modelUrl);- setMmprojUrl(draft.mmprojUrl);- setModelSha256(draft.modelSha256);- setMmprojSha256(draft.mmprojSha256);+ setSelectedModelId(draft.modelId);setContextLength(draft.contextLength);setMaxTokens(draft.maxTokens);setLoadedModelName(null);setIsSavingModel(false);setShowModelSettings(false);},- [isTauriRuntime],+ [],);const handleUseDefaultModel = useCallback(() => {@@ -3272,22 +3190,13 @@ const Page: React.FC = () => {window.localStorage.setItem(MODEL_SETTINGS_STORAGE_KEY,JSON.stringify({- useCustomModel: false,- modelUrl: "",- mmprojUrl: "",- modelSha256: "",- mmprojSha256: "",+ modelId: "",contextLength: "",maxTokens: "",}),);- void removeKV(MODEL_SETTINGS_STORAGE_KEY);}- setUseCustomModel(false);- setModelUrl("");- setMmprojUrl("");- setModelSha256("");- setMmprojSha256("");+ setSelectedModelId("");setContextLength("");setMaxTokens("");setLoadedModelName(null);@@ -4276,17 +4185,10 @@ const Page: React.FC = () => {handleConfirmDeleteSession={handleConfirmDeleteSession}showModelSettings={showModelSettings}closeModelSettings={closeModelSettings}- useCustomModel={useCustomModel}+ selectedModelId={selectedModelId}defaultModelName={resolvedDefaultModel.name}- defaultModelUrl={resolvedDefaultModel.url}- defaultModelMmproj={resolvedDefaultModel.mmprojUrl}loadedModelName={loadedModelName}- allowMmproj={allowMmproj}isTauriRuntime={isTauriRuntime}- modelUrl={modelUrl}- mmprojUrl={mmprojUrl}- modelSha256={modelSha256}- mmprojSha256={mmprojSha256}suggestedModels={suggestedModels}contextLength={contextLength}maxTokens={maxTokens}diff --git a/web/apps/ensu/src/services/llm/provider.ts b/web/apps/ensu/src/services/llm/provider.tsindex 2b7ab138de..0b24d5e10a 100644--- a/web/apps/ensu/src/services/llm/provider.ts+++ b/web/apps/ensu/src/services/llm/provider.ts@@ -50,7 +50,7 @@ interface ConfigModelPreset {id: string;title: string;url: string;- sha256?: string | null;+ sha256: string;mmprojUrl?: string | null;mmprojSha256?: string | null;}@@ -76,7 +76,7 @@ interface TauriLlmModelDownloadProgress {interface ModelTarget {id: string;url: string;- sha256?: string | null;+ sha256: string;mmprojUrl?: string | null;mmprojSha256?: string | null;}@@ -88,48 +88,59 @@ interface TauriModelStatus {}export interface ResolvedModelPreset {+ id: string;name: string;- url: string;- mmproj?: string;}-const FALLBACK_SHARED_MODEL_PRESETS: ResolvedModelPreset[] = [- {- name: "LFM 2.5 1.2B Instruct (Q4_0)",- url: "https://huggingface.co/LiquidAI/LFM2.5-1.2B-GGUF/resolve/main/LFM2.5-1.2B-Q4_0.gguf?download=true",- },+const FALLBACK_SHARED_MODEL_PRESETS: ModelInfo[] = [{+ id: "qwen-0.8b",name: "Qwen 3.5 0.8B (Q4_K_M)",url: "https://huggingface.co/unsloth/Qwen3.5-0.8B-GGUF/resolve/main/Qwen3.5-0.8B-Q4_K_M.gguf?download=true",- mmproj: "https://huggingface.co/unsloth/Qwen3.5-0.8B-GGUF/resolve/main/mmproj-F16.gguf",+ sha256: "bd258782e35f7f458f8aced1adc053e6e92e89bc735ba3be89d38a06121dc517",+ mmprojUrl:+ "https://huggingface.co/unsloth/Qwen3.5-0.8B-GGUF/resolve/main/mmproj-F16.gguf",+ mmprojSha256:+ "56e4c6cfe73b0c82e3e82bc518d7591997e61d81f723fc41a586f4fa69ea2453",},{+ id: "qwen-2b-q8",name: "Qwen 3.5 2B (Q8_0)",url: "https://huggingface.co/unsloth/Qwen3.5-2B-GGUF/resolve/main/Qwen3.5-2B-Q8_0.gguf?download=true",- mmproj: "https://huggingface.co/unsloth/Qwen3.5-2B-GGUF/resolve/main/mmproj-F16.gguf",+ sha256: "1b04acba824817554f4ce23639bc8495ff70453b8fcb047900c731521021f2c1",+ mmprojUrl:+ "https://huggingface.co/unsloth/Qwen3.5-2B-GGUF/resolve/main/mmproj-F16.gguf",+ mmprojSha256:+ "7035e9cb8d7c6a9681d07eef9a364783e86ea4cd73faab2eabb4f43a101830c7",},{+ id: "gemma-4-e2b-q4km",name: "Gemma 4 E2B (Q4_K_M)",url: "https://huggingface.co/unsloth/gemma-4-E2B-it-GGUF/resolve/main/gemma-4-E2B-it-Q4_K_M.gguf?download=true",- mmproj: "https://huggingface.co/unsloth/gemma-4-E2B-it-GGUF/resolve/main/mmproj-F16.gguf",+ sha256: "9378bc471710229ef165709b62e34bfb62231420ddaf6d729e727305b5b8672d",+ mmprojUrl:+ "https://huggingface.co/unsloth/gemma-4-E2B-it-GGUF/resolve/main/mmproj-F16.gguf",+ mmprojSha256:+ "140be8d7849741f88c50757d529b84373ee8e27052cc2236855b537f4a8215fa",},];-export const FALLBACK_MOBILE_MODEL_PRESETS: ResolvedModelPreset[] = [+export const FALLBACK_MOBILE_MODEL_PRESETS: ModelInfo[] = [...FALLBACK_SHARED_MODEL_PRESETS,];-export const FALLBACK_DESKTOP_MODEL_PRESETS: ResolvedModelPreset[] = [+export const FALLBACK_DESKTOP_MODEL_PRESETS: ModelInfo[] = [{+ id: "qwen-4b-q4km",name: "Qwen 3.5 4B (Q4_K_M)",url: "https://huggingface.co/unsloth/Qwen3.5-4B-GGUF/resolve/main/Qwen3.5-4B-Q4_K_M.gguf?download=true",- mmproj: "https://huggingface.co/unsloth/Qwen3.5-4B-GGUF/resolve/main/mmproj-F16.gguf",- },- {- name: "LFM 2.5 VL 1.6B (Q4_0)",- url: "https://huggingface.co/LiquidAI/LFM2.5-VL-1.6B-GGUF/resolve/main/LFM2.5-VL-1.6B-Q4_0.gguf?download=true",- mmproj: "https://huggingface.co/LiquidAI/LFM2.5-VL-1.6B-GGUF/resolve/main/mmproj-LFM2.5-VL-1.6b-Q8_0.gguf",+ sha256: "00fe7986ff5f6b463e62455821146049db6f9313603938a70800d1fb69ef11a4",+ mmprojUrl:+ "https://huggingface.co/unsloth/Qwen3.5-4B-GGUF/resolve/main/mmproj-F16.gguf",+ mmprojSha256:+ "cd88edcf8d031894960bb0c9c5b9b7e1fea6ebee02b9f7ce925a00d12891f864",},+ DEFAULT_MODEL,...FALLBACK_SHARED_MODEL_PRESETS,];@@ -149,7 +160,6 @@ export class LlmProvider {private useDesktopRustDefaults = false;private downloadActive = false;- private migrated?: Promise<void>;private progressListeners = new Set<(progress: DownloadProgress) => void>();private modelReady = false;private ensureInFlight?: {@@ -192,11 +202,7 @@ export class LlmProvider {const presets = this.useDesktopRustDefaults? this.configDefaults.desktopModelPresets: this.configDefaults.mobileModelPresets;- return presets.map((preset) => ({- name: preset.title,- url: preset.url,- mmproj: preset.mmprojUrl ?? undefined,- }));+ return presets.map((preset) => ({ id: preset.id, name: preset.title }));}public getBackendKind() {@@ -253,10 +259,7 @@ export class LlmProvider {};}- await this.ensureMigrated(settings);- const status = await this.modelStatus(- this.resolveTarget(model, settings),- );+ const status = await this.modelStatus(this.resolveTarget(model));return {model,modelPath: status.modelPath,@@ -278,11 +281,8 @@ export class LlmProvider {const target =this.backend.kind === "tauri"- ? this.resolveTarget(model, settings)+ ? this.resolveTarget(model): undefined;- if (target) {- await this.ensureMigrated(settings);- }const status = target ? await this.modelStatus(target) : undefined;const modelPath = status?.modelPath ?? model.url;const mmprojPath = status?.mmprojPath ?? undefined;@@ -514,7 +514,7 @@ export class LlmProvider {id: rustPreset.id,name: rustPreset.title,url: rustPreset.url,- sha256: rustPreset.sha256 ?? undefined,+ sha256: rustPreset.sha256,mmprojUrl: rustPreset.mmprojUrl ?? undefined,mmprojSha256: rustPreset.mmprojSha256 ?? undefined,};@@ -537,80 +537,52 @@ export class LlmProvider {}private resolveTargetModel(settings: ModelSettings): ModelInfo {- if (settings.useCustomModel && settings.modelUrl) {+ const preset = this.resolveConfigPreset(settings.modelId);+ if (preset) {return {- id: `custom:${settings.modelUrl}`,- name: "Custom model",- url: settings.modelUrl,- sha256: settings.modelSha256,- mmprojUrl: settings.mmprojUrl,- mmprojSha256: settings.mmprojSha256,+ id: preset.id,+ name: preset.title,+ url: preset.url,+ sha256: preset.sha256,+ mmprojUrl: preset.mmprojUrl ?? undefined,+ mmprojSha256: preset.mmprojSha256 ?? undefined,};}+ if (settings.modelId && !this.configDefaults) {+ const fallback = [+ ...FALLBACK_DESKTOP_MODEL_PRESETS,+ ...FALLBACK_MOBILE_MODEL_PRESETS,+ ].find((preset) => preset.id === settings.modelId);+ if (fallback) {+ return fallback;+ }+ }return this.defaultModel;}- private resolveMmprojUrl(model: ModelInfo, settings: ModelSettings) {- const override = settings.mmprojUrl;- if (settings.useCustomModel) {- return override && override.trim() ? override : undefined;- }- if (override !== undefined) {- return override && override.trim() ? override : undefined;+ private resolveConfigPreset(modelId: string | undefined) {+ const defaults = this.configDefaults;+ if (!defaults || !modelId) {+ return undefined;}- return model.mmprojUrl;+ return [+ defaults.mobileDefaultModel,+ defaults.desktopDefaultModel,+ ...defaults.mobileModelPresets,+ ...defaults.desktopModelPresets,+ ].find((preset) => preset.id == modelId);}- private resolveTarget(- model: ModelInfo,- settings: ModelSettings,- ): ModelTarget {- const mmprojUrl = this.resolveMmprojUrl(model, settings) ?? null;- const defaults = this.configDefaults;- const presets = defaults- ? [- defaults.mobileDefaultModel,- defaults.desktopDefaultModel,- ...defaults.mobileModelPresets,- ...defaults.desktopModelPresets,- ]- : [];- const preset = presets.find(- (preset) =>- preset.url == model.url &&- (preset.mmprojUrl ?? null) == mmprojUrl,- );+ private resolveTarget(model: ModelInfo): ModelTarget {return {- id: preset?.id ?? model.id,+ id: model.id,url: model.url,- sha256: preset?.sha256 ?? model.sha256 ?? null,- mmprojUrl,- mmprojSha256: preset?.mmprojSha256 ?? model.mmprojSha256 ?? null,+ sha256: model.sha256,+ mmprojUrl: model.mmprojUrl ?? null,+ mmprojSha256: model.mmprojSha256 ?? null,};}- private ensureMigrated(settings: ModelSettings): Promise<void> {- this.migrated ??= (async () => {- const { invoke } = await import("@tauri-apps/api/core");- const customTargets: ModelTarget[] =- settings.useCustomModel && settings.modelUrl- ? [- {- id: `custom:${settings.modelUrl}`,- url: settings.modelUrl,- mmprojUrl: settings.mmprojUrl?.trim() || null,- },- ]- : [];- await invoke("llm_migrate_models", { customTargets }).catch(- (error: unknown) => {- log.warn("LLM model migration failed", { error });- },- );- })();- return this.migrated;- }-private async modelStatus(target: ModelTarget): Promise<TauriModelStatus> {const { invoke } = await import("@tauri-apps/api/core");return invoke<TauriModelStatus>("llm_model_status", { target });diff --git a/web/apps/ensu/src/services/llm/types.ts b/web/apps/ensu/src/services/llm/types.tsindex 3cd222b92e..501084d978 100644--- a/web/apps/ensu/src/services/llm/types.ts+++ b/web/apps/ensu/src/services/llm/types.ts@@ -9,7 +9,7 @@ export interface ModelInfo {id: string;name: string;url: string;- sha256?: string;+ sha256: string;mmprojUrl?: string;mmprojSha256?: string;sizeHuman?: string;@@ -20,11 +20,7 @@ export interface ModelInfo {}export interface ModelSettings {- useCustomModel: boolean;- modelUrl?: string;- mmprojUrl?: string;- modelSha256?: string;- mmprojSha256?: string;+ modelId?: string;contextLength?: number;maxTokens?: number;}