π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Resolve model presets against a single canonical catalog
Manav Rathi4c3403bebe16
diff --git a/rust/crates/ensu/src/config.rs b/rust/crates/ensu/src/config.rsindex dc21fb775a..167b377d33 100644--- a/rust/crates/ensu/src/config.rs+++ b/rust/crates/ensu/src/config.rs@@ -133,19 +133,44 @@ fn silero_vad_v4() -> ModelPreset {}}-pub fn defaults() -> Defaults {- let mobile_default_model = lfm_vl_1_6b();- let desktop_default_model = gemma_4_e4b_q4km();+pub(crate) fn llm_catalog() -> Vec<ModelPreset> {+ vec![+ lfm_vl_1_6b(),+ qwen_0_8b(),+ qwen_2b_q8(),+ qwen_4b_q4km(),+ gemma_4_e4b_q4km(),+ gemma_4_e2b_q4km(),+ ]+}+pub fn defaults() -> Defaults {+ let catalog = llm_catalog();+ let preset = |id: &str| -> ModelPreset {+ catalog+ .iter()+ .find(|preset| preset.id == id)+ .expect("preset id is in the catalog")+ .clone()+ };Defaults {mobile_system_prompt_body: MOBILE_SYSTEM_PROMPT_BODY.to_string(),desktop_system_prompt_body: DESKTOP_SYSTEM_PROMPT_BODY.to_string(),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![qwen_0_8b(), qwen_2b_q8(), gemma_4_e2b_q4km()],- desktop_default_model,- desktop_model_presets: vec![qwen_4b_q4km(), lfm_vl_1_6b(), qwen_0_8b(), qwen_2b_q8()],+ mobile_default_model: preset("lfm-vl-1.6b"),+ mobile_model_presets: vec![+ preset("qwen-0.8b"),+ preset("qwen-2b-q8"),+ preset("gemma-4-e2b-q4km"),+ ],+ desktop_default_model: preset("gemma-4-e4b-q4km"),+ desktop_model_presets: vec![+ preset("qwen-4b-q4km"),+ preset("lfm-vl-1.6b"),+ preset("qwen-0.8b"),+ preset("qwen-2b-q8"),+ ],transcription_model: parakeet_v3_int8(),voice_activity_model: silero_vad_v4(),}@@ -154,40 +179,26 @@ pub fn defaults() -> Defaults {#[cfg(test)]mod tests {use super::*;- use std::collections::HashMap;+ use std::collections::{HashMap, HashSet};#[test]- fn preset_ids_key_unique_artifacts() {- let defaults = defaults();- let all = std::iter::once(&defaults.mobile_default_model)- .chain(defaults.mobile_model_presets.iter())- .chain(std::iter::once(&defaults.desktop_default_model))- .chain(defaults.desktop_model_presets.iter())- .chain([- &defaults.transcription_model,- &defaults.voice_activity_model,- ]);- let mut seen: HashMap<&str, (&str, Option<&str>)> = HashMap::new();- for preset in all {- let artifact = (preset.url.as_str(), preset.mmproj_url.as_deref());- if let Some(existing) = seen.insert(preset.id.as_str(), artifact) {- assert_eq!(- existing, artifact,- "preset id {} aliases different artifacts",- preset.id- );- }+ fn model_ids_are_unique() {+ let mut seen = HashSet::new();+ for preset in llm_catalog()+ .into_iter()+ .chain([parakeet_v3_int8(), silero_vad_v4()])+ {+ assert!(+ seen.insert(preset.id.clone()),+ "duplicate model id {}",+ preset.id+ );}}#[test]- fn presets_pair_mmproj_url_with_checksum() {- let defaults = defaults();- let all = std::iter::once(&defaults.mobile_default_model)- .chain(defaults.mobile_model_presets.iter())- .chain(std::iter::once(&defaults.desktop_default_model))- .chain(defaults.desktop_model_presets.iter());- for preset in all {+ fn catalog_presets_pair_mmproj_url_with_checksum() {+ for preset in llm_catalog() {let has_url = preset.mmproj_url.as_deref()@@ -205,14 +216,10 @@ mod tests {}#[test]- fn preset_artifacts_resolve_unambiguously() {- let defaults = defaults();+ fn catalog_artifacts_resolve_unambiguously() {+ let catalog = llm_catalog();let mut seen: HashMap<(&str, Option<&str>), &str> = HashMap::new();- for preset in defaults- .mobile_model_presets- .iter()- .chain(defaults.desktop_model_presets.iter())- {+ for preset in &catalog {let artifact = (preset.url.as_str(), preset.mmproj_url.as_deref());if let Some(existing) = seen.insert(artifact, preset.id.as_str()) {assert_eq!(@@ -223,4 +230,9 @@ mod tests {}}}++ #[test]+ fn defaults_views_select_from_the_catalog() {+ defaults();+ }}diff --git a/rust/crates/ensu/src/model/migrations.rs b/rust/crates/ensu/src/model/migrations.rsindex a4495b0d30..425005a7ee 100644--- a/rust/crates/ensu/src/model/migrations.rs+++ b/rust/crates/ensu/src/model/migrations.rs@@ -6,7 +6,7 @@ use std::path::{Path, PathBuf};use ente_model_download::{ModelDownloader, ModelTarget};use sha2::{Digest, Sha256};-use crate::config::{self, ModelPreset};+use crate::config;use crate::model::{self, InvalidPreset, trimmed};pub struct LegacyModels {@@ -17,12 +17,9 @@ pub struct LegacyModels {}pub fn migrate_mobile_models(models_dir: &Path, legacy: LegacyModels) -> Option<String> {- let defaults = config::defaults();let store = ModelDownloader::new(models_dir);if let Some(llm_dir) = &legacy.llm_dir- && let Ok(targets) = llm_targets(- std::iter::once(&defaults.mobile_default_model).chain(&defaults.mobile_model_presets),- )+ && let Ok(targets) = llm_targets(){migrate_legacy_dir(&store, llm_dir, &targets);}@@ -32,11 +29,7 @@ pub fn migrate_mobile_models(models_dir: &Path, legacy: LegacyModels) -> Option<&model::transcription_target(),&model::voice_activity_target(),);- legacy_selected_preset_id(- &defaults.mobile_model_presets,- legacy.model_url.as_deref()?,- legacy.mmproj_url.as_deref(),- )+ legacy_selected_preset_id(legacy.model_url.as_deref()?, legacy.mmproj_url.as_deref())}pub fn migrate_desktop_models(@@ -44,46 +37,28 @@ pub fn migrate_desktop_models(model_url: Option<&str>,mmproj_url: Option<&str>,) -> Option<String> {- let defaults = config::defaults();- let selected = model_url.and_then(|model_url| {- legacy_selected_preset_id(- 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),- model_url,- mmproj_url,- )- });- if let Ok(targets) = llm_targets(- 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),- ) {+ let selected = model_url.and_then(|model_url| legacy_selected_preset_id(model_url, mmproj_url));+ if let Ok(targets) = llm_targets() {migrate_flat_models_dir(models_dir, &targets);}selected}-fn llm_targets<'a>(- presets: impl Iterator<Item = &'a ModelPreset>,-) -> Result<Vec<ModelTarget>, InvalidPreset> {- presets.map(model::llm_target).collect()+fn llm_targets() -> Result<Vec<ModelTarget>, InvalidPreset> {+ config::llm_catalog()+ .iter()+ .map(model::llm_target)+ .collect()}-fn legacy_selected_preset_id<'a>(- presets: impl IntoIterator<Item = &'a ModelPreset>,- model_url: &str,- mmproj_url: Option<&str>,-) -> Option<String> {+fn legacy_selected_preset_id(model_url: &str, mmproj_url: Option<&str>) -> Option<String> {let mmproj_url = trimmed(mmproj_url);- presets+ config::llm_catalog().into_iter().find(|preset| {preset.url == model_url && trimmed(preset.mmproj_url.as_deref()) == mmproj_url})- .map(|preset| preset.id.clone())+ .map(|preset| preset.id)}fn migrate_legacy_dir(store: &ModelDownloader, legacy_dir: &Path, targets: &[ModelTarget]) {@@ -309,6 +284,7 @@ mod tests {use ente_model_download::ModelFile;use super::*;+ use crate::config::ModelPreset;use crate::model;fn scratch_dir(name: &str) -> PathBuf {diff --git a/rust/crates/ensu/src/model/mod.rs b/rust/crates/ensu/src/model/mod.rsindex 97e4e83089..c970fa9412 100644--- a/rust/crates/ensu/src/model/mod.rs+++ b/rust/crates/ensu/src/model/mod.rs@@ -45,23 +45,19 @@ pub(crate) fn llm_target(preset: &ModelPreset) -> Result<ModelTarget, InvalidPre}pub fn mobile_llm_target(model_id: &str) -> Result<ModelTarget, InvalidPreset> {- let defaults = config::defaults();- let preset = defaults- .mobile_model_presets- .iter()+ let preset = config::llm_catalog()+ .into_iter().find(|preset| preset.id == model_id)- .unwrap_or(&defaults.mobile_default_model);- llm_target(preset)+ .unwrap_or_else(|| config::defaults().mobile_default_model);+ llm_target(&preset)}pub fn desktop_llm_target(model_id: &str) -> Result<ModelTarget, InvalidPreset> {- let defaults = config::defaults();- let preset = std::iter::once(&defaults.mobile_default_model)- .chain(&defaults.mobile_model_presets)- .chain(&defaults.desktop_model_presets)+ let preset = config::llm_catalog()+ .into_iter().find(|preset| preset.id == model_id)- .unwrap_or(&defaults.desktop_default_model);- llm_target(preset)+ .unwrap_or_else(|| config::defaults().desktop_default_model);+ llm_target(&preset)}pub fn transcription_target() -> ModelTarget {@@ -152,50 +148,37 @@ mod tests {}#[test]- fn mobile_llm_target_resolves_or_falls_back_to_default() {+ fn llm_targets_resolve_catalog_ids_or_fall_back_to_defaults() {let defaults = crate::config::defaults();- for preset in &defaults.mobile_model_presets {+ for preset in crate::config::llm_catalog() {assert_eq!(mobile_llm_target(&preset.id).unwrap(),- llm_target(preset).unwrap(),+ llm_target(&preset).unwrap(),"{}",preset.id);- }- let default = llm_target(&defaults.mobile_default_model).unwrap();- assert_eq!(mobile_llm_target("").unwrap(), default);- assert_eq!(mobile_llm_target("no-such-model").unwrap(), default);- }-- #[test]- fn desktop_llm_target_resolves_union_or_falls_back_to_default() {- let defaults = crate::config::defaults();- for preset in 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)- {assert_eq!(desktop_llm_target(&preset.id).unwrap(),- llm_target(preset).unwrap(),+ llm_target(&preset).unwrap(),"{}",preset.id);}- let default = llm_target(&defaults.desktop_default_model).unwrap();- assert_eq!(desktop_llm_target("").unwrap(), default);- assert_eq!(desktop_llm_target("no-such-model").unwrap(), default);+ let mobile_default = llm_target(&defaults.mobile_default_model).unwrap();+ assert_eq!(mobile_llm_target("").unwrap(), mobile_default);+ assert_eq!(mobile_llm_target("no-such-model").unwrap(), mobile_default);+ let desktop_default = llm_target(&defaults.desktop_default_model).unwrap();+ assert_eq!(desktop_llm_target("").unwrap(), desktop_default);+ assert_eq!(+ desktop_llm_target("no-such-model").unwrap(),+ desktop_default+ );}#[test]- fn all_config_presets_produce_valid_targets() {- let defaults = crate::config::defaults();- for preset in 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)- {- llm_target(preset).expect("config preset");+ fn all_catalog_presets_produce_valid_targets() {+ for preset in crate::config::llm_catalog() {+ llm_target(&preset).expect("catalog preset");}}}