π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[ensu] Simplify model and settings integration
setalpb2e60e40f736
diff --git a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/AppStore.kt b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/AppStore.ktindex ff418a19ac..595e187b40 100644--- a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/AppStore.kt+++ b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/AppStore.kt@@ -34,7 +34,7 @@ class AppStore(private val sessionPreferences: SessionPreferencesDataStore,private val chatRepository: ChatRepository,private val llmProvider: LlmProvider,- private val knowledgeProvider: KnowledgeProvider,+ knowledgeProvider: KnowledgeProvider,val modelDownloader: ModelDownloader,val transcriber: Transcriber,private val deviceCapabilityProvider: AndroidDeviceCapabilityProvider,@@ -55,14 +55,7 @@ class AppStore(logRepository = logRepository)private val modelSettingsActions =- ModelSettingsActions(- _state,- sessionPreferences,- llmProvider,- modelDownloader,- logRepository,- configDefaults- )+ ModelSettingsActions(_state, sessionPreferences, llmProvider, modelDownloader, logRepository, configDefaults)private val chatActions = ChatStoreActions(state = _state,sessionPreferences = sessionPreferences,@@ -176,13 +169,11 @@ class AppStore(fun refreshModelDownloadInfo() = modelSettingsActions.refreshModelDownloadInfo()- fun downloadOrUpdateKnowledgePack(stableId: String) =- knowledgeStore.downloadOrUpdate(stableId)+ fun downloadOrUpdateKnowledgePack(stableId: String) = knowledgeStore.downloadOrUpdate(stableId)fun cancelKnowledgePackDownload(stableId: String) = knowledgeStore.cancel(stableId)- fun setKnowledgePackEnabled(stableId: String, enabled: Boolean) =- knowledgeStore.setEnabled(stableId, enabled)+ fun setKnowledgePackEnabled(stableId: String, enabled: Boolean) = knowledgeStore.setEnabled(stableId, enabled)fun cancelDownload() {chatActions.cancelGenerationForDownload()diff --git a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/EnsuApplication.kt b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/EnsuApplication.ktindex f43cb02c80..62694336f8 100644--- a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/EnsuApplication.kt+++ b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/EnsuApplication.kt@@ -7,9 +7,7 @@ import io.ente.ensu.llm.ModelDownloaderclass EnsuApplication : Application() {val modelDownloader by lazy { ModelDownloader(this) }- val knowledgeProvider by lazy {- KnowledgeProvider(noBackupFilesDir.resolve("knowledge"))- }+ val knowledgeProvider by lazy { KnowledgeProvider(noBackupFilesDir.resolve("knowledge")) }val transcriber by lazy {Transcriber(modelDownloader.modelDir(modelDownloader.transcriptionTarget).absolutePath,diff --git a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatMessages.kt b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatMessages.ktindex cc6e566976..88890adfd9 100644--- a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatMessages.kt+++ b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatMessages.kt@@ -7,6 +7,7 @@ import androidx.compose.animation.scaleInimport androidx.compose.animation.shrinkVerticallyimport androidx.compose.animation.core.tweenimport androidx.compose.foundation.background+import androidx.compose.foundation.clickableimport androidx.compose.foundation.gestures.detectTapGesturesimport androidx.compose.foundation.gestures.scrollByimport androidx.compose.foundation.isSystemInDarkTheme@@ -31,13 +32,12 @@ import androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.layout.widthInimport androidx.compose.foundation.layout.wrapContentSize-import androidx.compose.foundation.clickableimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.itemsimport androidx.compose.foundation.lazy.rememberLazyListState+import androidx.compose.material3.AlertDialogimport androidx.compose.material3.Buttonimport androidx.compose.material3.ButtonDefaults-import androidx.compose.material3.AlertDialogimport androidx.compose.material3.DropdownMenuItemimport androidx.compose.material3.HorizontalDividerimport androidx.compose.material3.Icon@@ -101,7 +101,7 @@ internal fun MessageList(streamingResponse: String,streamingParentId: String?,isGenerating: Boolean,- requiredModelsReady: Boolean,+ isModelDownloaded: Boolean,isModelStateKnown: Boolean,isChatUnsupported: Boolean,isDownloading: Boolean,@@ -116,7 +116,7 @@ internal fun MessageList(onOpenAttachment: (Attachment) -> Unit,onStartDownload: (Boolean) -> Unit) {- if (isModelStateKnown && !requiredModelsReady && !isChatUnsupported) {+ if (isModelStateKnown && !isModelDownloaded && !isChatUnsupported) {DownloadOnboarding(modifier = modifier,isDownloading = isDownloading,@@ -633,8 +633,6 @@ private fun AssistantMessageBubble() {val clipboard = LocalClipboardManager.currentval parsed = remember(message.text) { parseAssistantText(message.text) }- val cleanMessageText = parsed.text- val sourceLabel = parsed.sourceLabelval haptic = rememberHaptics()var showMenu by remember { mutableStateOf(false) }var showSources by remember { mutableStateOf(false) }@@ -647,7 +645,7 @@ private fun AssistantMessageBubble(if (!message.isSynthetic) {add(MessageAction("Copy", HugeIcons.Copy01Icon) {haptic.perform(HapticFeedbackType.TextHandleMove)- clipboard.setText(AnnotatedString(stripHiddenMessageParts(cleanMessageText)))+ clipboard.setText(AnnotatedString(stripHiddenMessageParts(parsed.text)))})}if (!message.isSynthetic || isLastMessage) {@@ -675,11 +673,11 @@ private fun AssistantMessageBubble(.padding(horizontal = EnsuSpacing.sm.dp, vertical = EnsuSpacing.md.dp)) {MarkdownView(- markdown = stripHiddenMessageParts(cleanMessageText),+ markdown = stripHiddenMessageParts(parsed.text),enableSelection = false)- sourceLabel?.let { label ->+ parsed.sourceLabel?.let { label ->Spacer(modifier = Modifier.height(EnsuSpacing.sm.dp))Surface(color = EnsuColor.fillFaint(),diff --git a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatState.kt b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatState.ktindex 5d0a9d74ea..f5405ed8f5 100644--- a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatState.kt+++ b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatState.kt@@ -25,7 +25,7 @@ data class ChatState(val isProcessingAttachments: Boolean = false,val transientAssistantError: String? = null,val transientAssistantParentId: String? = null,- val requiredModelsReady: Boolean = false,+ val isModelDownloaded: Boolean = false,val isModelStateKnown: Boolean = false,val modelDownloadSizeBytes: Long? = null,val hasRequestedModelDownload: Boolean = false,diff --git a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatStoreActions.kt b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatStoreActions.ktindex a2693741e4..2b9cdea940 100644--- a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatStoreActions.kt+++ b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatStoreActions.kt@@ -636,7 +636,7 @@ internal class ChatStoreActions(knowledgeHistorySelection != null &&!knowledgeHistorySelection.wasTrimmedval historySelection = if (useKnowledge) {- knowledgeHistorySelection!!+ knowledgeHistorySelection ?: normalHistorySelection} else {normalHistorySelection}diff --git a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatView.kt b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatView.ktindex a3fd2ac2dc..e4aee15fbe 100644--- a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatView.kt+++ b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatView.kt@@ -105,7 +105,7 @@ fun ChatView(}val canStartVoiceInput = !chatState.isGenerating &&!chatState.isDownloading &&- chatState.requiredModelsReady &&+ chatState.isModelDownloaded &&!isChatUnsupported &&editingMessage == nullval latestCanStartVoiceInput by rememberUpdatedState(canStartVoiceInput)@@ -127,14 +127,14 @@ fun ChatView(}val showDownloadOnboarding by remember(- chatState.requiredModelsReady,+ chatState.isModelDownloaded,chatState.isModelStateKnown,chatState.isGenerating,isChatUnsupported) {derivedStateOf {chatState.isModelStateKnown &&- !chatState.requiredModelsReady &&+ !chatState.isModelDownloaded &&!chatState.isGenerating &&!isChatUnsupported}@@ -145,7 +145,7 @@ fun ChatView(var focusRequestId by remember { mutableStateOf(0) }var wasDrawerOpen by remember { mutableStateOf(false) }- val shouldAutoFocusInput = chatState.requiredModelsReady &&+ val shouldAutoFocusInput = chatState.isModelDownloaded &&!showDownloadOnboarding &&!isChatUnsupported &&!chatState.isDownloading &&@@ -168,7 +168,7 @@ fun ChatView(}if (wasDrawerOpen) {- val shouldRestoreFocus = chatState.requiredModelsReady &&+ val shouldRestoreFocus = chatState.isModelDownloaded &&!showDownloadOnboarding &&!isChatUnsupported &&!chatState.isDownloading &&@@ -220,7 +220,7 @@ fun ChatView(streamingResponse = chatState.streamingResponse,streamingParentId = chatState.streamingParentId,isGenerating = chatState.isGenerating,- requiredModelsReady = chatState.requiredModelsReady,+ isModelDownloaded = chatState.isModelDownloaded,isModelStateKnown = chatState.isModelStateKnown,isChatUnsupported = isChatUnsupported,isDownloading = chatState.isDownloading,diff --git a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/LlmProvider.kt b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/LlmProvider.ktindex 025c34c85c..30a70ae9aa 100644--- a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/LlmProvider.kt+++ b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/llm/LlmProvider.kt@@ -170,9 +170,7 @@ class LlmProvider(val embeddingModel = LlmModel.load(LlmModelLoadParams(- modelPath = requireNotNull(- downloader.llmModelPath(embeddingDownloadTarget)- ).absolutePath,+ modelPath = requireNotNull(downloader.llmModelPath(embeddingDownloadTarget)).absolutePath,nGpuLayers = 0,useMmap = true,useMlock = falsediff --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 96f374a5d4..ef1ee5aac6 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@@ -81,25 +81,25 @@ internal class ModelSettingsActions(val selection = resolveSelection(state.value.modelSettings)val chatReady = llmProvider.isChatModelReady(selection)val embeddingReady = llmProvider.isEmbeddingModelReady()- val requiredModelsReady = chatReady && embeddingReady- if (requiredModelsReady) {+ val isDownloaded = chatReady && embeddingReady+ if (isDownloaded) {persistModelDownloadRequested(false)}state.update { appState ->appState.copy(chat = appState.chat.copy(- requiredModelsReady = requiredModelsReady,- isDownloading = if (requiredModelsReady) false else appState.chat.isDownloading,- downloadPercent = if (requiredModelsReady) null else appState.chat.downloadPercent,- downloadStatus = if (requiredModelsReady) null else appState.chat.downloadStatus,- downloadPhase = if (requiredModelsReady) null else appState.chat.downloadPhase,- modelDownloadSizeBytes = if (requiredModelsReady) null else appState.chat.modelDownloadSizeBytes,- hasRequestedModelDownload = appState.chat.hasRequestedModelDownload || requiredModelsReady+ isModelDownloaded = isDownloaded,+ isDownloading = if (isDownloaded) false else appState.chat.isDownloading,+ downloadPercent = if (isDownloaded) null else appState.chat.downloadPercent,+ downloadStatus = if (isDownloaded) null else appState.chat.downloadStatus,+ downloadPhase = if (isDownloaded) null else appState.chat.downloadPhase,+ modelDownloadSizeBytes = if (isDownloaded) null else appState.chat.modelDownloadSizeBytes,+ hasRequestedModelDownload = appState.chat.hasRequestedModelDownload || isDownloaded))}- if (requiredModelsReady) return+ if (isDownloaded) returnval scope = scope ?: returnscope.launch {@@ -110,6 +110,8 @@ internal class ModelSettingsActions(chat = appState.chat.copy(isDownloading = false,downloadPercent = null,+ downloadStatus = null,+ downloadPhase = null,hasRequestedModelDownload = false))@@ -144,12 +146,12 @@ internal class ModelSettingsActions(val selection = resolveSelection(currentState.modelSettings)val wasChatReady = llmProvider.isChatModelReady(selection)val wasEmbeddingReady = llmProvider.isEmbeddingModelReady()- val requiredModelsReady = wasChatReady && wasEmbeddingReady- if (requiredModelsReady) {+ val isDownloaded = wasChatReady && wasEmbeddingReady+ if (isDownloaded) {state.update { appState ->appState.copy(chat = appState.chat.copy(- requiredModelsReady = true,+ isModelDownloaded = true,modelDownloadSizeBytes = null,hasRequestedModelDownload = if (userInitiated) true else appState.chat.hasRequestedModelDownload)@@ -158,7 +160,7 @@ internal class ModelSettingsActions(}modelDownloadJob?.cancel()- if (!requiredModelsReady) {+ if (!isDownloaded) {persistModelDownloadRequested(true)logRepository.log(LogLevel.Info,@@ -182,18 +184,16 @@ internal class ModelSettingsActions(modelDownloadJob = scope.launch {var loggedComplete = falseval progressTracker = DownloadProgressTracker(- initialPercent = if (requiredModelsReady) null else 0,- initialStatus = if (requiredModelsReady) null else "Starting download..."+ initialPercent = if (isDownloaded) null else 0,+ initialStatus = if (isDownloaded) null else "Starting download...")try {var retryCount = 0while (true) {try {- llmProvider.ensureRequiredModelsReady(- selection- ) { progress ->+ llmProvider.ensureRequiredModelsReady(selection) { progress ->val resolvedProgress = progressTracker.resolve(progress)- if (!requiredModelsReady && resolvedProgress.isFinished && !loggedComplete) {+ if (!isDownloaded && resolvedProgress.isFinished && !loggedComplete) {loggedComplete = truelogRepository.log(LogLevel.Info,@@ -209,7 +209,7 @@ internal class ModelSettingsActions(downloadPercent = resolvedProgress.percent,downloadStatus = resolvedProgress.status,downloadPhase = resolvedProgress.phase,- requiredModelsReady = if (resolvedProgress.isFinished) true else appState.chat.requiredModelsReady,+ isModelDownloaded = if (resolvedProgress.isFinished) true else appState.chat.isModelDownloaded,modelDownloadSizeBytes = if (resolvedProgress.isFinished) null else appState.chat.modelDownloadSizeBytes))@@ -231,7 +231,7 @@ internal class ModelSettingsActions(val failureMessage = if (cancelled) {"Download cancelled"} else {- userFacingDownloadError(err, requiredModelsReady)+ userFacingDownloadError(err, isDownloaded)}state.update { appState ->appState.copy(@@ -246,13 +246,13 @@ internal class ModelSettingsActions(}persistModelDownloadRequested(false)if (cancelled) {- if (!requiredModelsReady) {+ if (!isDownloaded) {logRepository.log(LogLevel.Info, "Model download cancelled", tag = "Model")}} else {logRepository.log(LogLevel.Error,- if (requiredModelsReady) "Model load failed" else "Model download failed",+ if (isDownloaded) "Model load failed" else "Model download failed",details = err.message,tag = "Model",throwable = errdiff --git a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/settings/SettingsScreen.kt b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/settings/SettingsScreen.ktindex 6b5e2b9068..e71436526c 100644--- a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/settings/SettingsScreen.kt+++ b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/settings/SettingsScreen.kt@@ -64,17 +64,17 @@ fun SettingsScreen(buildList {add(SettingsItem(- title = "Ensu Packs",- iconRes = HugeIcons.PackageIcon,- onClick = onOpenKnowledge+ title = "About",+ iconVector = Icons.Outlined.Info,+ onClick = { context.openExternalLink("https://ente.com/blog/ensu/") }))add(SettingsItem(- title = "About Ensu",- iconVector = Icons.Outlined.Info,- onClick = { context.openExternalLink("https://ente.com/blog/ensu/") }+ title = "Ensu Packs",+ iconRes = HugeIcons.PackageIcon,+ onClick = onOpenKnowledge))diff --git a/mobile/native/apple/apps/ensu/Ensu/Chat/ChatView.swift b/mobile/native/apple/apps/ensu/Ensu/Chat/ChatView.swiftindex 399791fe71..3fbadb02c1 100644--- a/mobile/native/apple/apps/ensu/Ensu/Chat/ChatView.swift+++ b/mobile/native/apple/apps/ensu/Ensu/Chat/ChatView.swift@@ -22,7 +22,7 @@ struct ChatView: View {}private var shouldAutoFocusInput: Bool {- viewModel.requiredModelsReady+ viewModel.isModelDownloaded&& !viewModel.isChatUnsupported&& !viewModel.isDownloading&& !viewModel.isGenerating@@ -116,7 +116,7 @@ struct ChatView: View {isInputFocused = falseviewState.wasDrawerOpen = true} else if viewState.wasDrawerOpen {- let shouldRestoreFocus = viewModel.requiredModelsReady+ let shouldRestoreFocus = viewModel.isModelDownloaded&& !viewModel.isChatUnsupported&& !viewModel.isDownloading&& !viewModel.isGenerating@@ -253,7 +253,7 @@ struct ChatView: View {.animation(.easeInOut(duration: 0.32))ZStack(alignment: .bottom) {- let shouldShowDownloadOnboarding = !viewModel.requiredModelsReady && !viewModel.isChatUnsupported+ let shouldShowDownloadOnboarding = !viewModel.isModelDownloaded && !viewModel.isChatUnsupportedMessageListView(messages: viewModel.messages,@@ -262,17 +262,14 @@ struct ChatView: View {isGenerating: viewModel.isGenerating,sessionId: viewModel.currentSessionId,keyboardHeight: keyboard.height,- inputBarHeight: (viewModel.requiredModelsReady || viewModel.isChatUnsupported) ? viewState.inputBarHeight : 0,+ inputBarHeight: (viewModel.isModelDownloaded || viewModel.isChatUnsupported) ? viewState.inputBarHeight : 0,emptyStateTitle: "Welcome",emptyStateSubtitle: "Start typing to begin a conversation",onEdit: { message inviewModel.beginEditing(message: message)},onCopy: { message in- let text = message.role == .assistant- ? cleanAssistantText(storedText: message.text)- : message.text- copyToPasteboard(text)+ copyToPasteboard(message.role == .assistant ? cleanAssistantText(storedText: message.text) : message.text)showToast("Copied to clipboard", duration: 1)},onRetry: { message in@@ -305,7 +302,7 @@ struct ChatView: View {}.padding(.bottom, keyboard.isVisible ? keyboard.height : 0).zIndex(1)- } else if viewModel.requiredModelsReady {+ } else if viewModel.isModelDownloaded {let shouldAutoFocus = shouldAutoFocusInputMessageInputView(diff --git a/mobile/native/apple/apps/ensu/Ensu/Chat/ChatViewModel.swift b/mobile/native/apple/apps/ensu/Ensu/Chat/ChatViewModel.swiftindex 33c1ca0aae..b9c89b6633 100644--- a/mobile/native/apple/apps/ensu/Ensu/Chat/ChatViewModel.swift+++ b/mobile/native/apple/apps/ensu/Ensu/Chat/ChatViewModel.swift@@ -66,7 +66,7 @@ final class ChatViewModel: ObservableObject {@Published var editingMessageId: UUID?@Published var downloadToast: DownloadToastState?- @Published var requiredModelsReady: Bool = false+ @Published var isModelDownloaded: Bool = false@Published var modelDownloadSizeBytes: Int64?@Published var hasRequestedModelDownload: Bool = false@Published var deviceCapability: ChatDeviceCapability = .unknown@@ -124,19 +124,10 @@ final class ChatViewModel: ObservableObject {modelDir: downloader.modelDir(downloader.transcriptionTarget).path,vadModelPath: downloader.voiceActivityModelPath().path)- let provider = LlmProvider(- downloader: downloader,- transcriber: transcriber,- knowledgeEmbedding: config.knowledgeEmbedding- )+ let provider = LlmProvider(downloader: downloader, transcriber: transcriber, knowledgeEmbedding: config.knowledgeEmbedding)let voiceTranscriber = VoiceTranscriptionService(transcriber: transcriber, downloader: downloader)- let knowledgeProvider = KnowledgeProvider(- root: baseDir.appendingPathComponent("knowledge", isDirectory: true)- )- let knowledgeStore = KnowledgeStore(- datasets: config.knowledgeDatasets,- provider: knowledgeProvider- )+ let knowledgeProvider = KnowledgeProvider(root: baseDir.appendingPathComponent("knowledge", isDirectory: true))+ let knowledgeStore = KnowledgeStore(datasets: config.knowledgeDatasets, provider: knowledgeProvider)// Chat DB + attachments.let dbDir = baseDir.appendingPathComponent("llmchat", isDirectory: true)@@ -189,6 +180,7 @@ final class ChatViewModel: ObservableObject {self.sessions = sessionsself.currentSessionId = nilself.messages = []+for session in sessions {self.messageStore[session.id] = []self.branchSelections[session.id] = [:]@@ -700,12 +692,12 @@ final class ChatViewModel: ObservableObject {downloadToast = nilmodelDownloadSizeBytes = nilhasRequestedModelDownload = false- requiredModelsReady = false+ isModelDownloaded = falsereturn}let selection = modelSettings.currentSelection()- requiredModelsReady = provider.requiredModelsReady(selection)- if requiredModelsReady {+ isModelDownloaded = provider.isModelDownloaded(selection)+ if isModelDownloaded {clearDownloadProgressMemory()modelDownloadSizeBytes = nilreturn@@ -713,7 +705,7 @@ final class ChatViewModel: ObservableObject {Task { [weak self] inguard let self else { return }- let size = await provider.missingRequiredDownloadSize(selection)+ let size = await provider.missingModelDownloadSize(selection)await MainActor.run {guard self.modelReadyKey(for: self.modelSettings.currentSelection()) == self.modelReadyKey(for: selection) else {return@@ -783,9 +775,7 @@ final class ChatViewModel: ObservableObject {var retryCount = 0while true {do {- try await provider.ensureRequiredModelsReady(- selection- ) { progress in+ try await provider.ensureRequiredModelsReady(selection) { progress inTask { @MainActor inself.handleProgress(progress)}@@ -833,8 +823,8 @@ final class ChatViewModel: ObservableObject {}let selection = modelSettings.currentSelection()- if provider.requiredModelsReady(selection) {- requiredModelsReady = true+ if provider.isModelDownloaded(selection) {+ isModelDownloaded = truemodelDownloadSizeBytes = nilreturn}@@ -848,9 +838,7 @@ final class ChatViewModel: ObservableObject {modelDownloadTask = Task {do {try await self.ensureRequiredModelsReadyShared(selection)- self.handleProgress(- DownloadProgress(percent: 100, status: "Ready", phase: .ready)- )+ self.handleProgress(DownloadProgress(percent: 100, status: "Ready", phase: .ready))} catch {if isCancellation(error) {return@@ -869,7 +857,7 @@ final class ChatViewModel: ObservableObject {offerRetryDownload: true)self.isDownloading = false- self.requiredModelsReady = false+ self.isModelDownloaded = false}}}@@ -883,8 +871,8 @@ final class ChatViewModel: ObservableObject {return}let selection = modelSettings.currentSelection()- requiredModelsReady = provider.requiredModelsReady(selection)- if !requiredModelsReady {+ isModelDownloaded = provider.isModelDownloaded(selection)+ if !isModelDownloaded {return}modelDownloadSizeBytes = nil@@ -905,7 +893,7 @@ final class ChatViewModel: ObservableObject {offerRetryDownload: true)self.isDownloading = false- self.requiredModelsReady = false+ self.isModelDownloaded = false}}}@@ -1218,34 +1206,35 @@ final class ChatViewModel: ObservableObject {temperature: self.resolveTemperature(),maxTokens: generationLimits.maxOutput,onToken: { token in- let tokenEstimate = max(1, token.count / 4)- var snapshot = ""- var shouldUpdateNow = false-- bufferLock.lock()- buffer.append(token)- tokenCount += tokenEstimate- snapshot = buffer- pendingSnapshot = snapshot- let now = Date()- shouldUpdateNow = now.timeIntervalSince(lastUiUpdate) >= uiUpdateInterval- if shouldUpdateNow {- lastUiUpdate = now- pendingSnapshot = nil- updateWorkItem?.cancel()- updateWorkItem = nil- }- bufferLock.unlock()-- if shouldUpdateNow {- Task { @MainActor in- guard self.activeGenerationId == generationId else { return }- self.streamingResponse = snapshot+ let tokenEstimate = max(1, token.count / 4)+ var snapshot = ""+ var shouldUpdateNow = false++ bufferLock.lock()+ buffer.append(token)+ tokenCount += tokenEstimate+ snapshot = buffer+ pendingSnapshot = snapshot+ let now = Date()+ shouldUpdateNow = now.timeIntervalSince(lastUiUpdate) >= uiUpdateInterval+ if shouldUpdateNow {+ lastUiUpdate = now+ pendingSnapshot = nil+ updateWorkItem?.cancel()+ updateWorkItem = nil+ }+ bufferLock.unlock()++ if shouldUpdateNow {+ Task { @MainActor in+ guard self.activeGenerationId == generationId else { return }+ self.streamingResponse = snapshot+ }+ } else {+ scheduleStreamingUpdate()}- } else {- scheduleStreamingUpdate()}- })+ )}let summary: GenerationSummarydo {@@ -1268,15 +1257,7 @@ final class ChatViewModel: ObservableObject {}}- finishGeneration(- parent: userNode,- response: buffer,- tokenCount: tokenCount,- totalTimeMs: summary.totalTimeMs,- interrupted: false,- generationId: generationId,- citations: activeCitations- )+ finishGeneration(parent: userNode, response: buffer, tokenCount: tokenCount, totalTimeMs: summary.totalTimeMs, interrupted: false, generationId: generationId, citations: activeCitations)} catch {let wasCancelled = stopRequested || isCancellation(error)if activeGenerationId == generationId && !wasCancelled {@@ -1284,15 +1265,7 @@ final class ChatViewModel: ObservableObject {logger.error("Generation failed", error, details: details)generationErrorMessage = "Response failed. Try again."}- finishGeneration(- parent: userNode,- response: buffer,- tokenCount: tokenCount,- totalTimeMs: nil,- interrupted: true,- generationId: generationId,- citations: activeCitations- )+ finishGeneration(parent: userNode, response: buffer, tokenCount: tokenCount, totalTimeMs: nil, interrupted: true, generationId: generationId, citations: activeCitations)}if embeddingAssetInvalid {refreshModelDownloadInfo()@@ -1300,15 +1273,7 @@ final class ChatViewModel: ObservableObject {}}- private func finishGeneration(- parent: MessageNode,- response: String,- tokenCount: Int,- totalTimeMs: Int64?,- interrupted: Bool,- generationId: UUID,- citations: [SourceCitation] = []- ) {+ private func finishGeneration(parent: MessageNode, response: String, tokenCount: Int, totalTimeMs: Int64?, interrupted: Bool, generationId: UUID, citations: [SourceCitation] = []) {let rawText = response.trimmingCharacters(in: .whitespacesAndNewlines)let trimmed: Stringif rawText.isEmpty {@@ -1369,11 +1334,7 @@ final class ChatViewModel: ObservableObject {messageStore[parent.sessionId, default: []].append(assistant)invalidateChildrenCache(for: parent.sessionId)updateSelection(for: parent.sessionId, parentId: parent.id, childId: assistant.id)- updateSessionPreview(- sessionId: parent.sessionId,- preview: cleanAssistantText(storedText: trimmed),- date: assistant.timestamp- )+ updateSessionPreview(sessionId: parent.sessionId, preview: cleanAssistantText(storedText: trimmed), date: assistant.timestamp)} else {logger.warning("Skipping assistant message persistence",@@ -1445,7 +1406,7 @@ final class ChatViewModel: ObservableObject {}downloadToast = DownloadToastState(phase: .ready, percent: 100, status: progress.status, offerRetryDownload: false)isDownloading = false- requiredModelsReady = provider.requiredModelsReady(modelSettings.currentSelection())+ isModelDownloaded = provider.isModelDownloaded(modelSettings.currentSelection())modelDownloadSizeBytes = nilclearDownloadProgressMemory()Task { @MainActor in@@ -1478,8 +1439,7 @@ final class ChatViewModel: ObservableObject {let firstUserMessage = sortedMessages.first(where: { $0.sender == .selfUser })?.text ?? ""let lastMessageNode = sortedMessages.lastlet lastMessage = lastMessageNode.map { message in- message.sender == .other ?- cleanAssistantText(storedText: message.text) : message.text+ message.sender == .other ? cleanAssistantText(storedText: message.text) : message.text} ?? ""let summary = summaries[session.uuid.lowercased()]let isPlaceholderTitle = session.title.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ||diff --git a/mobile/native/apple/apps/ensu/Ensu/Chat/MessageList/MessageListComponents.swift b/mobile/native/apple/apps/ensu/Ensu/Chat/MessageList/MessageListComponents.swiftindex 4da0308c9a..6ca7d8e49d 100644--- a/mobile/native/apple/apps/ensu/Ensu/Chat/MessageList/MessageListComponents.swift+++ b/mobile/native/apple/apps/ensu/Ensu/Chat/MessageList/MessageListComponents.swift@@ -250,17 +250,12 @@ struct AssistantMessageBubbleView: View {var body: some View {let parsed = parseAssistantText(storedText: message.text)- let sourceLabel = parsed.sourceLabelHStack(alignment: .bottom) {VStack(alignment: .leading, spacing: 0) {VStack(alignment: .leading, spacing: EnsuSpacing.sm) {- AssistantMessageRenderer(- text: parsed.text,- isStreaming: false,- storageId: message.id.uuidString- )+ AssistantMessageRenderer(text: parsed.text, isStreaming: false, storageId: message.id.uuidString)- if let sourceLabel {+ if let sourceLabel = parsed.sourceLabel {Button(sourceLabel) {showSources = true}@@ -345,7 +340,8 @@ private struct KnowledgeSourcesSheet: View {.font(EnsuTypography.large).foregroundStyle(EnsuColor.textPrimary)- if let section = citationSection(citation) {+ if let section = citation.section?.trimmingCharacters(in: .whitespacesAndNewlines),+ !section.isEmpty {Text(section).font(EnsuTypography.small).foregroundStyle(EnsuColor.textMuted)@@ -402,16 +398,6 @@ private struct KnowledgeSourcesSheet: View {? "1 source used in this response": "\(citations.count) sources used in this response"}-- private func citationSection(_ citation: SourceCitation) -> String? {- citation.section?.trimmingCharacters(in: .whitespacesAndNewlines).nilIfEmpty- }-}--private extension String {- var nilIfEmpty: String? {- isEmpty ? nil : self- }}private enum StreamingCursor {diff --git a/mobile/native/apple/apps/ensu/Ensu/Services/LlmProvider.swift b/mobile/native/apple/apps/ensu/Ensu/Services/LlmProvider.swiftindex d9cf6093ba..621f25ee31 100644--- a/mobile/native/apple/apps/ensu/Ensu/Services/LlmProvider.swift+++ b/mobile/native/apple/apps/ensu/Ensu/Services/LlmProvider.swift@@ -126,11 +126,7 @@ final class LlmProvider {private var currentJobId: Int64?private let modelLoadGate = AsyncSerialGate()- init(- downloader: ModelDownloader,- transcriber: Transcriber,- knowledgeEmbedding: KnowledgeEmbeddingConfig- ) {+ init(downloader: ModelDownloader, transcriber: Transcriber, knowledgeEmbedding: KnowledgeEmbeddingConfig) {self.downloader = downloaderself.transcriber = transcriberself.knowledgeEmbedding = knowledgeEmbedding@@ -144,25 +140,21 @@ final class LlmProvider {downloader.isDownloaded(embeddingDownloadTarget)}- func requiredModelsReady(_ selection: LlmModelSelection) -> Bool {+ func isModelDownloaded(_ selection: LlmModelSelection) -> Bool {downloader.isDownloaded(selection.modelTarget) && isEmbeddingModelReady()}- func missingRequiredDownloadSize(_ selection: LlmModelSelection) async -> Int64? {+ func missingModelDownloadSize(_ selection: LlmModelSelection) async -> Int64? {var total: Int64 = 0let chatMissing = !downloader.isDownloaded(selection.modelTarget)if chatMissing {- guard let chatSize = await downloader.estimateDownloadSize(- selection.modelTarget- ) else {+ guard let chatSize = await downloader.estimateDownloadSize(selection.modelTarget) else {return nil}total += chatSize}if !isEmbeddingModelReady() {- guard let embeddingSize = await downloader.estimateDownloadSize(- embeddingDownloadTarget- ) else {+ guard let embeddingSize = await downloader.estimateDownloadSize(embeddingDownloadTarget) else {return nil}total += embeddingSize@@ -380,9 +372,12 @@ final class LlmProvider {backendInitialized = true}+ guard let embeddingModelPath = downloader.llmModelPath(embeddingDownloadTarget) else {+ throw EmbeddingAssetInvalidError()+ }var embeddingModel: LlmModel? = try LlmModel.load(params: LlmModelLoadParams(- modelPath: downloader.llmModelPath(embeddingDownloadTarget)!.path,+ modelPath: embeddingModelPath.path,nGpuLayers: 0,useMmap: true,useMlock: false@@ -458,11 +453,7 @@ final class LlmProvider {func resetContext() async {try? await modelLoadGate.withLock {guard let model = loadedModel else { return }- let contextParams = LlmContextParams(- contextSize: currentContextLength.map(Int32.init),- nThreads: nil,- nBatch: nil- )+ let contextParams = LlmContextParams(contextSize: currentContextLength.map(Int32.init), nThreads: nil, nBatch: nil)loadedContext = nilloadedContext = try? model.newContext(params: contextParams)}diff --git a/mobile/native/apple/apps/ensu/Ensu/Settings/SettingsView.swift b/mobile/native/apple/apps/ensu/Ensu/Settings/SettingsView.swiftindex e47de7d5cd..75baae4018 100644--- a/mobile/native/apple/apps/ensu/Ensu/Settings/SettingsView.swift+++ b/mobile/native/apple/apps/ensu/Ensu/Settings/SettingsView.swift@@ -19,15 +19,6 @@ struct SettingsView: View {NavigationStack {ScrollView {VStack(alignment: .leading, spacing: EnsuSpacing.lg) {- ForEach(filteredItems) { item in- NavigationLink {- item.destination- } label: {- SettingsCard(title: item.title, iconName: item.iconName, showsChevron: true)- }- .buttonStyle(.plain)- }-if let aboutItem = filteredAboutItem {Button(action: aboutItem.action) {SettingsCard(title: aboutItem.title, iconName: aboutItem.iconName, showsChevron: true)@@ -35,7 +26,7 @@ struct SettingsView: View {.buttonStyle(.plain)}- ForEach(filteredUtilityItems) { item in+ ForEach(filteredItems) { item inNavigationLink {item.destination} label: {@@ -112,25 +103,34 @@ struct SettingsView: View {}private var filteredItems: [SettingsItem] {- filtered(allItems)- }-- private var filteredUtilityItems: [SettingsItem] {- filtered(utilityItems)+ guard !trimmedQuery.isEmpty else { return allItems }+ let q = trimmedQuery.lowercased()+ return allItems.filter { item in+ item.title.lowercased().contains(q)+ }}private var filteredTermsItems: [SettingsItem] {- filtered(termsItems)+ guard !trimmedQuery.isEmpty else { return termsItems }+ let q = trimmedQuery.lowercased()+ return termsItems.filter { item in+ item.title.lowercased().contains(q) ||+ item.searchTerms.contains { $0.lowercased().contains(q) }+ }}private var filteredAdvancedItems: [SettingsItem] {guard isAdvancedUnlocked else { return [] }- return filtered(advancedItems)+ guard !trimmedQuery.isEmpty else { return advancedItems }+ let q = trimmedQuery.lowercased()+ return advancedItems.filter { item in+ item.title.lowercased().contains(q)+ }}private var aboutItem: SettingsActionItem {SettingsActionItem(- title: "About Ensu",+ title: "About",iconName: "InformationCircleIcon",action: { openExternalLink("https://ente.com/blog/ensu/") })@@ -155,17 +155,8 @@ struct SettingsView: View {SettingsItem(title: "Ensu Packs",iconName: "PackageIcon",- destination: AnyView(- KnowledgeSettingsView(- store: knowledgeStore- )- )- )- ]- }-- private var utilityItems: [SettingsItem] {- [+ destination: AnyView(KnowledgeSettingsView(store: knowledgeStore))+ ),SettingsItem(title: "Logs",iconName: "Bug01Icon",@@ -185,12 +176,6 @@ struct SettingsView: View {]}- private func filtered(_ items: [SettingsItem]) -> [SettingsItem] {- guard !trimmedQuery.isEmpty else { return items }- let q = trimmedQuery.lowercased()- return items.filter { $0.matches(q) }- }-private var advancedItems: [SettingsItem] {[SettingsItem(@@ -414,22 +399,12 @@ private struct SettingsItem: Identifiable {let destination: AnyViewlet searchTerms: [String]- init(- title: String,- iconName: String,- destination: AnyView,- searchTerms: [String] = []- ) {+ init(title: String, iconName: String, destination: AnyView, searchTerms: [String] = []) {self.title = titleself.iconName = iconNameself.destination = destinationself.searchTerms = searchTerms}-- func matches(_ query: String) -> Bool {- title.lowercased().contains(query) ||- searchTerms.contains { $0.lowercased().contains(query) }- }}private struct SettingsActionItem: Identifiable {diff --git a/rust/crates/ensu/src/model/mod.rs b/rust/crates/ensu/src/model/mod.rsindex 3fd869eeda..4aba9e0dbb 100644--- a/rust/crates/ensu/src/model/mod.rs+++ b/rust/crates/ensu/src/model/mod.rs@@ -8,7 +8,6 @@ use crate::config::{self, ModelPreset};const LLM_MODEL_FILE: &str = "model.gguf";const LLM_MMPROJ_FILE: &str = "mmproj.gguf";-const EMBEDDING_MODEL_FILE: &str = "model.gguf";const VOICE_ACTIVITY_MODEL_FILE: &str = "model.onnx";#[derive(Debug, thiserror::Error)]@@ -87,7 +86,7 @@ pub fn knowledge_embedding_target() -> ModelTarget {ModelTarget::Files {id: embedding.target_id,files: vec![ModelFile {- name: EMBEDDING_MODEL_FILE.to_string(),+ name: LLM_MODEL_FILE.to_string(),url: embedding.model_url,sha256: embedding.model_sha256,}],diff --git a/rust/crates/ensu/src/retrieval/index.rs b/rust/crates/ensu/src/retrieval/index.rsindex 2d4f7c69d6..3e931f9d98 100644--- a/rust/crates/ensu/src/retrieval/index.rs+++ b/rust/crates/ensu/src/retrieval/index.rs@@ -16,10 +16,6 @@ use crate::config::{use super::{BEGIN_CONTEXT_SENTINEL, END_CONTEXT_SENTINEL, RetrievalError, normalize_single_line};-const MANIFEST_FILE: &str = KNOWLEDGE_MANIFEST_FILE;-const VECTORS_FILE: &str = KNOWLEDGE_VECTORS_FILE;-const META_FILE: &str = KNOWLEDGE_META_FILE;-const OFFSETS_FILE: &str = KNOWLEDGE_OFFSETS_FILE;const MAX_MANIFEST_BYTES: u64 = 1_048_576;const MAX_METADATA_FRAME_BYTES: u64 = 1_048_576;#[derive(Debug, Clone, PartialEq)]@@ -100,7 +96,7 @@ impl RetrievalIndex {));}- let manifest_path = directory.join(MANIFEST_FILE);+ let manifest_path = directory.join(KNOWLEDGE_MANIFEST_FILE);let manifest_metadata = regular_file_metadata(&manifest_path)?;if manifest_metadata.len() == 0 || manifest_metadata.len() > MAX_MANIFEST_BYTES {return Err(RetrievalError::InvalidPack(@@ -124,7 +120,7 @@ impl RetrievalIndex {let expected_vector_bytes = count.checked_mul(dim).ok_or_else(|| {RetrievalError::InvalidPack("vector byte length overflow".to_string())})?;- let vector_path = directory.join(VECTORS_FILE);+ let vector_path = directory.join(KNOWLEDGE_VECTORS_FILE);let vector_file = open_regular_file(&vector_path)?;let vector_length = usize::try_from(vector_file.metadata()?.len()).map_err(|_| {RetrievalError::InvalidPack("vector file is too large for this platform".to_string())@@ -135,7 +131,7 @@ impl RetrievalIndex {)));}- let metadata_path = directory.join(META_FILE);+ let metadata_path = directory.join(KNOWLEDGE_META_FILE);let metadata_file = open_regular_file(&metadata_path)?;let metadata_len = metadata_file.metadata()?.len();if metadata_len == 0 {@@ -151,7 +147,7 @@ impl RetrievalIndex {let expected_offset_bytes = offset_count.checked_mul(8).ok_or_else(|| {RetrievalError::InvalidPack("metadata offset byte length overflow".to_string())})?;- let offsets_path = directory.join(OFFSETS_FILE);+ let offsets_path = directory.join(KNOWLEDGE_OFFSETS_FILE);let offset_metadata = regular_file_metadata(&offsets_path)?;let offset_bytes = usize::try_from(offset_metadata.len()).map_err(|_| {RetrievalError::InvalidPack("metadata offsets are too large".to_string())@@ -582,9 +578,9 @@ pub(super) mod tests {.collect::<Vec<_>>().join("\n");let compressed = zstd::stream::encode_all(metadata_lines.as_bytes(), 1).unwrap();- fs::write(revision.join(META_FILE), &compressed).unwrap();+ fs::write(revision.join(KNOWLEDGE_META_FILE), &compressed).unwrap();fs::write(- revision.join(OFFSETS_FILE),+ revision.join(KNOWLEDGE_OFFSETS_FILE),[0_u64, compressed.len() as u64].into_iter().flat_map(u64::to_le_bytes)@@ -596,9 +592,9 @@ pub(super) mod tests {vectors[0] = 127_i8 as u8;vectors[contract.dim as usize] = 100_i8 as u8;vectors[contract.dim as usize * 2] = 50_i8 as u8;- fs::write(revision.join(VECTORS_FILE), vectors).unwrap();+ fs::write(revision.join(KNOWLEDGE_VECTORS_FILE), vectors).unwrap();fs::write(- revision.join(MANIFEST_FILE),+ revision.join(KNOWLEDGE_MANIFEST_FILE),serde_json::to_vec_pretty(&json!({"dataset": identity,"granularity": "test",@@ -653,11 +649,15 @@ pub(super) mod tests {#[test]fn rejects_vector_and_offset_contract_mismatches() {let pack = synthetic_pack("simplewiki-test");- fs::write(pack.revision.join(VECTORS_FILE), [0_u8]).unwrap();+ fs::write(pack.revision.join(KNOWLEDGE_VECTORS_FILE), [0_u8]).unwrap();assert!(RetrievalIndex::open(&pack.revision, &pack.expected).is_err());let pack = synthetic_pack("simplewiki-test");- fs::write(pack.revision.join(OFFSETS_FILE), 1_u64.to_le_bytes()).unwrap();+ fs::write(+ pack.revision.join(KNOWLEDGE_OFFSETS_FILE),+ 1_u64.to_le_bytes(),+ )+ .unwrap();assert!(RetrievalIndex::open(&pack.revision, &pack.expected).is_err());}