π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Hash download files off the heap and group the migration inputs
Manav Rathib7d81c1fb19c
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 7a341ded34..daa5d8fad6 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@@ -8,6 +8,7 @@ import io.ente.ensu.bindings.ModelDownloadCoreimport io.ente.ensu.bindings.ModelDownloadProgressimport io.ente.ensu.bindings.LlmExceptionimport io.ente.ensu.bindings.ModelDownloadTarget+import io.ente.ensu.bindings.EnsuLegacyModelsimport io.ente.ensu.bindings.migrateEnsuLegacyModelsimport io.ente.ensu.bindings.uniffiEnsureInitializedimport io.ente.ensu.config.loadConfigDefaults@@ -58,10 +59,12 @@ class ModelDownloader(context: Context) {File(appContext.filesDir, "llm").deleteRecursively()return migrateEnsuLegacyModels(modelsDir.absolutePath,- legacyDir?.absolutePath,- legacyTranscriptionDir.absolutePath,- legacyModelUrl,- legacyMmprojUrl,+ EnsuLegacyModels(+ legacyDir?.absolutePath,+ legacyTranscriptionDir.absolutePath,+ legacyModelUrl,+ legacyMmprojUrl+ ),targets,transcriptionModelTarget,voiceActivityModelTargetdiff --git a/mobile/native/apple/apps/ensu/Ensu/Services/ModelDownloader.swift b/mobile/native/apple/apps/ensu/Ensu/Services/ModelDownloader.swiftindex 891d49d8fa..a8553a7fbb 100644--- a/mobile/native/apple/apps/ensu/Ensu/Services/ModelDownloader.swift+++ b/mobile/native/apple/apps/ensu/Ensu/Services/ModelDownloader.swift@@ -35,10 +35,12 @@ final class ModelDownloader {: nillet 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"),+ legacy: EnsuLegacyModels(+ llmDir: baseDir.appendingPathComponent("llm", isDirectory: true).path,+ transcriptionDir: baseDir.appendingPathComponent("transcription", isDirectory: true).path,+ modelUrl: legacyModelUrl,+ mmprojUrl: settings.string(forKey: "ensu.model.mmproj")+ ),llmTargets: Self.migrationTargets(),transcriptionModel: transcriptionModelTarget,voiceActivityModel: voiceActivityModelTargetdiff --git a/rust/bindings/uniffi/ensu/src/model_downloader.rs b/rust/bindings/uniffi/ensu/src/model_downloader.rsindex 07524c2a75..6a59a8d60b 100644--- a/rust/bindings/uniffi/ensu/src/model_downloader.rs+++ b/rust/bindings/uniffi/ensu/src/model_downloader.rs@@ -82,13 +82,18 @@ pub trait ModelDownloadCallback: Send + Sync {fn is_cancelled(&self) -> bool;}+#[derive(uniffi::Record)]+pub struct EnsuLegacyModels {+ pub llm_dir: Option<String>,+ pub transcription_dir: String,+ pub model_url: Option<String>,+ pub mmproj_url: Option<String>,+}+#[uniffi::export]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>,+ legacy: EnsuLegacyModels,llm_targets: Vec<ModelDownloadTarget>,transcription_model: ModelDownloadTarget,voice_activity_model: ModelDownloadTarget,@@ -97,8 +102,8 @@ pub fn migrate_ensu_legacy_models(llm_targets.into_iter().map(Into::into).collect();ente_model_download::migrate_ensu_legacy_models(Path::new(&models_dir),- llm_legacy_dir.as_deref().map(Path::new),- Path::new(&transcription_legacy_dir),+ legacy.llm_dir.as_deref().map(Path::new),+ Path::new(&legacy.transcription_dir),&llm_targets,&transcription_model.into(),&voice_activity_model.into(),@@ -106,8 +111,8 @@ pub fn migrate_ensu_legacy_models(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(),+ legacy.model_url.as_deref()?,+ legacy.mmproj_url.as_deref(),)}diff --git a/rust/crates/model-download/src/download.rs b/rust/crates/model-download/src/download.rsindex 35f5f7da20..0b598698dc 100644--- a/rust/crates/model-download/src/download.rs+++ b/rust/crates/model-download/src/download.rs@@ -698,7 +698,6 @@ async fn download_file_single(unreachable!("the final attempt returns")}-#[allow(clippy::too_many_arguments)]async fn download_file_ranged(client: &Client,target: &Target,@@ -1587,7 +1586,7 @@ pub fn sha256_file(path: &Path) -> Result<String, Error> {use std::io::Read;let mut file = File::open(path)?;let mut hasher = Sha256::new();- let mut buffer = [0u8; 1024 * 1024];+ let mut buffer = vec![0u8; 1024 * 1024];loop {let read = file.read(&mut buffer)?;if read == 0 {diff --git a/rust/crates/model-download/src/downloader.rs b/rust/crates/model-download/src/downloader.rsindex 9f7f3510b3..80a84a4588 100644--- a/rust/crates/model-download/src/downloader.rs+++ b/rust/crates/model-download/src/downloader.rs@@ -670,13 +670,6 @@ mod tests {}}- 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();@@ -953,7 +946,7 @@ mod tests {let models_dir = base.join("models");let preset = target("qwen-2b-q8");- migrate_legacy_dir(&models_dir, &legacy, &[preset.clone()]);+ migrate_legacy_dir(&models_dir, &legacy, std::slice::from_ref(&preset));let downloader = ModelDownloader::new(&models_dir);assert_eq!(@@ -1018,7 +1011,7 @@ mod tests {b"GGUFkeep",);- migrate_flat_models_dir(&models_dir, &[preset.clone()]);+ migrate_flat_models_dir(&models_dir, std::slice::from_ref(&preset));assert_eq!(fs::read(downloader.model_path(&preset)).unwrap(),@@ -1040,7 +1033,7 @@ mod tests {.count();assert_eq!(root_files, 0);- migrate_flat_models_dir(&models_dir, &[preset.clone()]);+ migrate_flat_models_dir(&models_dir, std::slice::from_ref(&preset));assert_eq!(fs::read(downloader.model_path(&preset)).unwrap(),b"GGUFmain"