π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
put embedding model download behind feature flag
laurenspriem66b5ac5bf213
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 114edf00b6..e24386fdcf 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@@ -17,6 +17,7 @@ import io.ente.ensu.bindings.llmCancelimport io.ente.ensu.bindings.llmInitBackendimport io.ente.ensu.device.AndroidDeviceCapabilityProviderimport io.ente.ensu.device.requireChatSupported+import io.ente.ensu.settings.IS_ENSU_PACKS_ENABLEDimport java.io.Fileimport kotlin.math.maximport kotlinx.coroutines.Dispatchers@@ -79,7 +80,7 @@ class LlmProvider(deviceCapabilityProvider.chatCapability().requireChatSupported()val missingTargets = modelLoadMutex.withLock {val embeddingReady = isEmbeddingModelReady()- if (!embeddingReady) {+ if (IS_ENSU_PACKS_ENABLED && !embeddingReady) {val embeddingFile = downloader.llmModelPath(embeddingDownloadTarget)if (embeddingFile?.exists() == true) {downloader.removeDownloaded(embeddingDownloadTarget)@@ -88,14 +89,14 @@ class LlmProvider(buildList {if (!isChatModelReady(selection)) add(selection.modelTarget)- if (!isEmbeddingModelReady()) add(embeddingDownloadTarget)+ if (IS_ENSU_PACKS_ENABLED && !isEmbeddingModelReady()) add(embeddingDownloadTarget)}}if (missingTargets.isNotEmpty()) {downloader.download(missingTargets, onProgress)}modelLoadMutex.withLock {- if (!isEmbeddingModelReady()) {+ if (IS_ENSU_PACKS_ENABLED && !isEmbeddingModelReady()) {downloader.removeDownloaded(embeddingDownloadTarget)throw RequiredModelValidationError(knowledgeEmbedding.targetId)}diff --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 7d15ac0579..06b41a85ad 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@@ -10,6 +10,7 @@ import io.ente.ensu.bindings.mobileLlmTargetimport io.ente.ensu.device.isChatSupportedimport io.ente.ensu.logging.FileLogRepositoryimport io.ente.ensu.logging.LogLevel+import io.ente.ensu.settings.IS_ENSU_PACKS_ENABLEDimport io.ente.ensu.settings.SessionPreferencesDataStoreimport kotlinx.coroutines.CoroutineScopeimport kotlinx.coroutines.Job@@ -81,7 +82,7 @@ internal class ModelSettingsActions(val selection = resolveSelection(state.value.modelSettings)val chatReady = llmProvider.isChatModelReady(selection)val embeddingReady = llmProvider.isEmbeddingModelReady()- val isDownloaded = chatReady && embeddingReady+ val isDownloaded = chatReady && (!IS_ENSU_PACKS_ENABLED || embeddingReady)if (isDownloaded) {persistModelDownloadRequested(false)}@@ -119,7 +120,11 @@ internal class ModelSettingsActions(}val chatSize = if (chatReady) 0L else modelDownloader.estimateDownloadSize(selection.modelTarget)- val embeddingSize = if (embeddingReady) 0L else llmProvider.estimateEmbeddingDownloadSize()+ val embeddingSize = if (!IS_ENSU_PACKS_ENABLED || embeddingReady) {+ 0L+ } else {+ llmProvider.estimateEmbeddingDownloadSize()+ }val size = if (chatSize == null || embeddingSize == null) {null} else {@@ -144,7 +149,8 @@ internal class ModelSettingsActions(if (!userInitiated && !currentState.chat.hasRequestedModelDownload) returnval selection = resolveSelection(currentState.modelSettings)- val isDownloaded = llmProvider.isChatModelReady(selection) && llmProvider.isEmbeddingModelReady()+ val isDownloaded = llmProvider.isChatModelReady(selection) &&+ (!IS_ENSU_PACKS_ENABLED || llmProvider.isEmbeddingModelReady())if (isDownloaded) {state.update { appState ->appState.copy(diff --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 ac491feadf..7b9c7a1ec8 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@@ -43,7 +43,7 @@ import io.ente.ensu.designsystem.EnsuSpacingimport io.ente.ensu.designsystem.EnsuTypographyimport io.ente.ensu.designsystem.HugeIcons-private const val IS_ENSU_PACKS_ENABLED = false+internal const val IS_ENSU_PACKS_ENABLED = false@Composablefun SettingsScreen(diff --git a/mobile/native/apple/apps/ensu/Ensu/Services/LlmProvider.swift b/mobile/native/apple/apps/ensu/Ensu/Services/LlmProvider.swiftindex e9feeae763..5c859f9ef9 100644--- a/mobile/native/apple/apps/ensu/Ensu/Services/LlmProvider.swift+++ b/mobile/native/apple/apps/ensu/Ensu/Services/LlmProvider.swift@@ -141,7 +141,8 @@ final class LlmProvider {}func isModelDownloaded(_ selection: LlmModelSelection) -> Bool {- downloader.isDownloaded(selection.modelTarget) && isEmbeddingModelReady()+ downloader.isDownloaded(selection.modelTarget) &&+ (!isEnsuPacksEnabled || isEmbeddingModelReady())}func missingModelDownloadSize(_ selection: LlmModelSelection) async -> Int64? {@@ -152,7 +153,7 @@ final class LlmProvider {}total += chatSize}- if !isEmbeddingModelReady() {+ if isEnsuPacksEnabled && !isEmbeddingModelReady() {guard let embeddingSize = await downloader.estimateDownloadSize(embeddingDownloadTarget) else {return nil}@@ -172,13 +173,13 @@ final class LlmProvider {let missingTargets: [ModelTarget] = try await modelLoadGate.withLock {let embeddingReady = isEmbeddingModelReady()- if !embeddingReady {+ if isEnsuPacksEnabled && !embeddingReady {_ = downloader.removeDownloaded(embeddingDownloadTarget)}return [downloader.isDownloaded(selection.modelTarget) ? nil : selection.modelTarget,- embeddingReady ? nil : embeddingDownloadTarget,+ (!isEnsuPacksEnabled || embeddingReady) ? nil : embeddingDownloadTarget,].compactMap { $0 }}@@ -187,7 +188,7 @@ final class LlmProvider {}try await modelLoadGate.withLock {- guard isEmbeddingModelReady() else {+ guard !isEnsuPacksEnabled || isEmbeddingModelReady() else {_ = downloader.removeDownloaded(embeddingDownloadTarget)throw RequiredModelValidationError(targetId: knowledgeEmbedding.targetId)}diff --git a/mobile/native/apple/apps/ensu/Ensu/Settings/SettingsView.swift b/mobile/native/apple/apps/ensu/Ensu/Settings/SettingsView.swiftindex 3b98e82358..5f074e2bef 100644--- a/mobile/native/apple/apps/ensu/Ensu/Settings/SettingsView.swift+++ b/mobile/native/apple/apps/ensu/Ensu/Settings/SettingsView.swift@@ -1,7 +1,7 @@import SwiftUIimport Foundation-private let isEnsuPacksEnabled = false+let isEnsuPacksEnabled = falsestruct SettingsView: View {@ObservedObject var knowledgeStore: KnowledgeStore