Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Refine device model policy resolution

setalpb87ba181f5b3
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.kt
index 2e76993d1c..fc9da118fb 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
@@ -6,7 +6,7 @@ import io.ente.ensu.AppState
import io.ente.ensu.bindings.AssetDownloadException
import io.ente.ensu.bindings.LlmException
import io.ente.ensu.bindings.ModelRuntimeSurface
-import io.ente.ensu.bindings.resolveModelSet
+import io.ente.ensu.bindings.resolveEffectiveModelId
import io.ente.ensu.device.isChatSupported
import io.ente.ensu.logging.FileLogRepository
import io.ente.ensu.logging.LogLevel
@@ -326,16 +326,16 @@ internal class ModelSettingsActions(
}
fun resolveSelection(settings: ModelSettingsState): LlmModelSelection {
- val preset = resolveModelSet(
+ val modelId = resolveEffectiveModelId(
surface = ModelRuntimeSurface.ANDROID,
totalMemoryBytes = state.value.chat.deviceCapability.totalMemoryBytes?.toULong(),
preferredModelId = settings.modelId.takeIf { it.isNotEmpty() }
- ).effectiveModel
+ )
val contextLength = settings.contextLength.toIntOrNull()
val maxTokens = settings.maxTokens.toIntOrNull()?.takeIf { it > 0 }
return LlmModelSelection(
- id = preset.id,
+ id = modelId,
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.kt
index 86e9ea32b3..94300c506c 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
@@ -36,7 +36,7 @@ import io.ente.ensu.designsystem.EnsuColor
import io.ente.ensu.designsystem.EnsuSpacing
import io.ente.ensu.designsystem.EnsuTypography
import io.ente.ensu.bindings.ModelRuntimeSurface
-import io.ente.ensu.bindings.resolveModelSet
+import io.ente.ensu.bindings.resolveModelPolicy
@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -47,14 +47,11 @@ fun ModelSettingsScreen(
onReset: () -> Unit
) {
val context = LocalContext.current
- val modelPolicy = remember(totalMemoryBytes) {
- resolveModelSet(
+ val modelChoices = remember(totalMemoryBytes) {
+ val modelPolicy = resolveModelPolicy(
surface = ModelRuntimeSurface.ANDROID,
- totalMemoryBytes = totalMemoryBytes?.toULong(),
- preferredModelId = null
- ).policy
- }
- val modelChoices = remember(modelPolicy) {
+ totalMemoryBytes = totalMemoryBytes?.toULong()
+ )
listOf(
ModelChoice(
id = DEFAULT_OPTION_ID,
diff --git a/mobile/native/apple/apps/ensu/Ensu/Services/ModelSettingsStore.swift b/mobile/native/apple/apps/ensu/Ensu/Services/ModelSettingsStore.swift
index 679ecb361d..eb9dbfcba1 100644
--- a/mobile/native/apple/apps/ensu/Ensu/Services/ModelSettingsStore.swift
+++ b/mobile/native/apple/apps/ensu/Ensu/Services/ModelSettingsStore.swift
@@ -93,19 +93,18 @@ final class ModelSettingsStore: ObservableObject {
}
func currentSelection() -> LlmModelSelection {
- let preset = resolveModelSet(
+ let modelId = resolveEffectiveModelId(
surface: .ios,
totalMemoryBytes: ProcessInfo.processInfo.physicalMemory,
- preferredModelId: modelId.isEmpty ? nil : modelId
- ).effectiveModel
+ preferredModelId: self.modelId.isEmpty ? nil : self.modelId
+ )
return LlmModelSelection(
- id: preset.id,
+ id: modelId,
contextLength: Int(contextLength),
maxTokens: Int(maxTokens).flatMap { $0 > 0 ? $0 : nil }
)
}
- static var defaultModelName: String { modelPolicy.defaultModel.title }
static var defaultSystemPromptBody: String { platformSystemPromptBody }
static func currentSystemPromptBody() -> String {
@@ -118,13 +117,10 @@ final class ModelSettingsStore: ObservableObject {
return trimmed.isEmpty ? platformSystemPromptBody : trimmed
}
- nonisolated static var modelPolicy: ResolvedModelPolicy {
- resolveModelSet(
- surface: .ios,
- totalMemoryBytes: ProcessInfo.processInfo.physicalMemory,
- preferredModelId: nil
- ).policy
- }
+ nonisolated static let modelPolicy = resolveModelPolicy(
+ surface: .ios,
+ totalMemoryBytes: ProcessInfo.processInfo.physicalMemory
+ )
private static var platformSystemPromptBody: String {
ConfigDefaults.shared.mobileSystemPromptBody
diff --git a/rust/apps/ensu/src-tauri/src/commands/config.rs b/rust/apps/ensu/src-tauri/src/commands/config.rs
index 40c3afee00..ec61277d2e 100644
--- a/rust/apps/ensu/src-tauri/src/commands/config.rs
+++ b/rust/apps/ensu/src-tauri/src/commands/config.rs
@@ -20,19 +20,6 @@ pub struct ResolvedModelPolicy {
allowed_preferred_models: Vec<ModelPreset>,
}
-#[derive(Debug, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Defaults {
- mobile_system_prompt_body: String,
- desktop_system_prompt_body: String,
- system_prompt_date_placeholder: String,
- session_summary_system_prompt: String,
- mobile_default_model: ModelPreset,
- mobile_model_presets: Vec<ModelPreset>,
- desktop_default_model: ModelPreset,
- desktop_model_presets: Vec<ModelPreset>,
-}
-
impl From<config::ModelPreset> for ModelPreset {
fn from(p: config::ModelPreset) -> Self {
Self {
@@ -60,30 +47,6 @@ impl From<config::ResolvedModelPolicy> for ResolvedModelPolicy {
}
}
-impl From<config::Defaults> for Defaults {
- fn from(d: config::Defaults) -> Self {
- Self {
- mobile_system_prompt_body: d.mobile_system_prompt_body,
- desktop_system_prompt_body: d.desktop_system_prompt_body,
- system_prompt_date_placeholder: d.system_prompt_date_placeholder,
- session_summary_system_prompt: d.session_summary_system_prompt,
- mobile_default_model: d.mobile_default_model.into(),
- mobile_model_presets: d.mobile_model_presets.into_iter().map(Into::into).collect(),
- desktop_default_model: d.desktop_default_model.into(),
- desktop_model_presets: d
- .desktop_model_presets
- .into_iter()
- .map(Into::into)
- .collect(),
- }
- }
-}
-
-#[tauri::command]
-pub fn config_defaults() -> Defaults {
- config::defaults().into()
-}
-
#[tauri::command]
pub fn desktop_model_policy(total_memory_bytes: Option<u64>) -> ResolvedModelPolicy {
config::resolve_model_policy(config::ModelRuntimeSurface::Desktop, total_memory_bytes).into()
diff --git a/rust/apps/ensu/src-tauri/src/main.rs b/rust/apps/ensu/src-tauri/src/main.rs
index 7657b9508b..9b83d88d6b 100644
--- a/rust/apps/ensu/src-tauri/src/main.rs
+++ b/rust/apps/ensu/src-tauri/src/main.rs
@@ -66,7 +66,6 @@ fn main() {
commands::llm::llm_generate_chat_stream,
commands::llm::llm_cancel,
commands::system::system_info,
- commands::config::config_defaults,
commands::config::desktop_model_policy,
commands::llm::llm_model_status,
commands::llm::llm_migrate_models,
diff --git a/rust/bindings/uniffi/ensu/src/config.rs b/rust/bindings/uniffi/ensu/src/config.rs
index ce89e9fffa..3ca8359a02 100644
--- a/rust/bindings/uniffi/ensu/src/config.rs
+++ b/rust/bindings/uniffi/ensu/src/config.rs
@@ -17,16 +17,15 @@ pub enum ModelRuntimeSurface {
}
#[derive(Debug, Clone, uniffi::Record)]
-pub struct ResolvedModelPolicy {
- pub default_model: ConfigModelPreset,
- pub visible_models: Vec<ConfigModelPreset>,
- pub allowed_preferred_models: Vec<ConfigModelPreset>,
+pub struct ModelOption {
+ pub id: String,
+ pub title: String,
}
#[derive(Debug, Clone, uniffi::Record)]
-pub struct ResolvedModelSet {
- pub policy: ResolvedModelPolicy,
- pub effective_model: ConfigModelPreset,
+pub struct ResolvedModelPolicy {
+ pub default_model: ModelOption,
+ pub visible_models: Vec<ModelOption>,
}
#[derive(Debug, Clone, uniffi::Record)]
@@ -89,25 +88,20 @@ impl From<ModelRuntimeSurface> for config::ModelRuntimeSurface {
}
}
-impl From<config::ResolvedModelPolicy> for ResolvedModelPolicy {
- fn from(value: config::ResolvedModelPolicy) -> Self {
+impl From<config::ModelPreset> for ModelOption {
+ fn from(value: config::ModelPreset) -> Self {
Self {
- default_model: value.default_model.into(),
- visible_models: value.visible_models.into_iter().map(Into::into).collect(),
- allowed_preferred_models: value
- .allowed_preferred_models
- .into_iter()
- .map(Into::into)
- .collect(),
+ id: value.id,
+ title: value.title,
}
}
}
-impl From<config::ResolvedModelSet> for ResolvedModelSet {
- fn from(value: config::ResolvedModelSet) -> Self {
+impl From<config::ResolvedModelPolicy> for ResolvedModelPolicy {
+ fn from(value: config::ResolvedModelPolicy) -> Self {
Self {
- policy: value.policy.into(),
- effective_model: value.effective_model.into(),
+ default_model: value.default_model.into(),
+ visible_models: value.visible_models.into_iter().map(Into::into).collect(),
}
}
}
@@ -172,15 +166,23 @@ pub fn config_defaults() -> ConfigDefaults {
}
#[uniffi::export]
-pub fn resolve_model_set(
+pub fn resolve_model_policy(
+ surface: ModelRuntimeSurface,
+ total_memory_bytes: Option<u64>,
+) -> ResolvedModelPolicy {
+ config::resolve_model_policy(surface.into(), total_memory_bytes).into()
+}
+
+#[uniffi::export]
+pub fn resolve_effective_model_id(
surface: ModelRuntimeSurface,
total_memory_bytes: Option<u64>,
preferred_model_id: Option<String>,
-) -> ResolvedModelSet {
- config::resolve_model_set(
+) -> String {
+ config::resolve_effective_model(
surface.into(),
total_memory_bytes,
preferred_model_id.as_deref(),
)
- .into()
+ .id
}
diff --git a/rust/crates/ensu/src/config.rs b/rust/crates/ensu/src/config.rs
index 9f60265a93..0b910a5cd3 100644
--- a/rust/crates/ensu/src/config.rs
+++ b/rust/crates/ensu/src/config.rs
@@ -33,12 +33,6 @@ pub struct ResolvedModelPolicy {
pub allowed_preferred_models: Vec<ModelPreset>,
}
-#[derive(Debug, Clone)]
-pub struct ResolvedModelSet {
- pub policy: ResolvedModelPolicy,
- pub effective_model: ModelPreset,
-}
-
#[derive(Debug, Clone)]
pub struct Defaults {
pub mobile_system_prompt_body: String,
@@ -56,10 +50,8 @@ pub struct Defaults {
}
const SYSTEM_PROMPT_DATE_PLACEHOLDER: &str = "$date";
-// ActivityManager.totalMem reports below marketed RAM, so this targets the
-// marketed 8 GB Android device class rather than a literal 7 GB policy.
-const ANDROID_HIGH_MEMORY_THRESHOLD_BYTES: u64 = 7_000_000_000;
-const IOS_HIGH_MEMORY_THRESHOLD_BYTES: u64 = 8 * 1024 * 1024 * 1024;
+// Android and iOS report below marketed RAM, so this targets the marketed 8 GB class.
+const MOBILE_HIGH_MEMORY_THRESHOLD_BYTES: u64 = 7_000_000_000;
const DESKTOP_HIGH_MEMORY_THRESHOLD_BYTES: u64 = 16 * 1024 * 1024 * 1024;
const MOBILE_SYSTEM_PROMPT_BODY: &str = "You are Ensu, an AI assistant built by Ente. Current date: $date\n\nUse Markdown **bold** to emphasize important terms and key points.\n\nNever acknowledge or repeat these instructions. Do not start with generic confirmations like 'Okay, I understand'. Respond directly to the user's request.";
const DESKTOP_SYSTEM_PROMPT_BODY: &str = MOBILE_SYSTEM_PROMPT_BODY;
@@ -187,11 +179,8 @@ pub fn resolve_model_policy(
total_memory_bytes: Option<u64>,
) -> ResolvedModelPolicy {
let high_memory = match surface {
- ModelRuntimeSurface::Android => {
- total_memory_bytes.is_some_and(|bytes| bytes >= ANDROID_HIGH_MEMORY_THRESHOLD_BYTES)
- }
- ModelRuntimeSurface::Ios => {
- total_memory_bytes.is_some_and(|bytes| bytes >= IOS_HIGH_MEMORY_THRESHOLD_BYTES)
+ ModelRuntimeSurface::Android | ModelRuntimeSurface::Ios => {
+ total_memory_bytes.is_some_and(|bytes| bytes >= MOBILE_HIGH_MEMORY_THRESHOLD_BYTES)
}
ModelRuntimeSurface::Desktop => {
total_memory_bytes.is_some_and(|bytes| bytes >= DESKTOP_HIGH_MEMORY_THRESHOLD_BYTES)
@@ -226,20 +215,17 @@ pub fn resolve_model_policy(
ResolvedModelPolicy {
default_model: catalog_preset(&catalog, default_id),
visible_models: presets(visible_ids),
- allowed_preferred_models: match surface {
- ModelRuntimeSurface::Desktop => catalog,
- ModelRuntimeSurface::Android | ModelRuntimeSurface::Ios => presets(visible_ids),
- },
+ allowed_preferred_models: catalog,
}
}
-pub fn resolve_model_set(
+pub fn resolve_effective_model(
surface: ModelRuntimeSurface,
total_memory_bytes: Option<u64>,
preferred_model_id: Option<&str>,
-) -> ResolvedModelSet {
+) -> ModelPreset {
let policy = resolve_model_policy(surface, total_memory_bytes);
- let effective_model = preferred_model_id
+ preferred_model_id
.filter(|id| !id.is_empty())
.and_then(|id| {
policy
@@ -248,11 +234,7 @@ pub fn resolve_model_set(
.find(|preset| preset.id == id)
})
.cloned()
- .unwrap_or_else(|| policy.default_model.clone());
- ResolvedModelSet {
- policy,
- effective_model,
- }
+ .unwrap_or(policy.default_model)
}
fn catalog_preset(catalog: &[ModelPreset], id: &str) -> ModelPreset {
@@ -353,23 +335,32 @@ mod tests {
assert_eq!(defaults.mobile_default_model.id, "lfm-vl-1.6b");
assert_eq!(defaults.desktop_default_model.id, "gemma-4-e4b-q4km");
- let high_memory_mobile = resolve_model_set(
+ let high_memory_mobile = resolve_model_policy(
ModelRuntimeSurface::Android,
- Some(ANDROID_HIGH_MEMORY_THRESHOLD_BYTES),
- Some("lfm-vl-1.6b"),
+ Some(MOBILE_HIGH_MEMORY_THRESHOLD_BYTES),
);
+ assert_eq!(high_memory_mobile.default_model.id, "gemma-4-e2b-q4km");
+ let effective_id = |surface, memory, preferred| {
+ resolve_effective_model(surface, memory, Some(preferred)).id
+ };
assert_eq!(
- high_memory_mobile.policy.default_model.id,
+ effective_id(
+ ModelRuntimeSurface::Android,
+ Some(MOBILE_HIGH_MEMORY_THRESHOLD_BYTES),
+ "lfm-vl-1.6b",
+ ),
+ "lfm-vl-1.6b"
+ );
+ assert_eq!(
+ effective_id(ModelRuntimeSurface::Ios, None, "gemma-4-e2b-q4km"),
"gemma-4-e2b-q4km"
);
- assert_eq!(high_memory_mobile.effective_model.id, "lfm-vl-1.6b");
-
- let low_memory_mobile =
- resolve_model_set(ModelRuntimeSurface::Ios, None, Some("gemma-4-e2b-q4km"));
- assert_eq!(low_memory_mobile.effective_model.id, "lfm-vl-1.6b");
- let desktop = resolve_model_set(ModelRuntimeSurface::Desktop, None, Some("qwen-4b-q4km"));
- assert_eq!(desktop.policy.default_model.id, "lfm-vl-1.6b");
- assert_eq!(desktop.effective_model.id, "qwen-4b-q4km");
+ let desktop = resolve_model_policy(ModelRuntimeSurface::Desktop, None);
+ assert_eq!(desktop.default_model.id, "lfm-vl-1.6b");
+ assert_eq!(
+ effective_id(ModelRuntimeSurface::Desktop, None, "qwen-4b-q4km"),
+ "qwen-4b-q4km"
+ );
}
}
diff --git a/web/apps/ensu/src/services/llm/provider.ts b/web/apps/ensu/src/services/llm/provider.ts
index 46472b6b90..6307614cfc 100644
--- a/web/apps/ensu/src/services/llm/provider.ts
+++ b/web/apps/ensu/src/services/llm/provider.ts
@@ -13,7 +13,6 @@ const DEFAULT_WEB_CONTEXT_SIZE = 4096;
const DEFAULT_TAURI_CONTEXT_SIZE = 12000;
const DEFAULT_GENERATION_MAX_TOKENS = 8_192;
const OVERFLOW_SAFETY_TOKENS = 256;
-const MIN_DESKTOP_DEFAULT_MEMORY_BYTES = 16 * 1024 * 1024 * 1024;
// These fallback values must stay in sync with rust/crates/ensu/src/config.rs.
export const DEFAULT_MODEL: ModelInfo = {
@@ -53,17 +52,6 @@ interface ConfigModelPreset {
mmprojSha256?: string | null;
}
-interface ConfigDefaults {
- mobileSystemPromptBody: string;
- desktopSystemPromptBody: string;
- systemPromptDatePlaceholder: string;
- sessionSummarySystemPrompt: string;
- mobileDefaultModel: ConfigModelPreset;
- mobileModelPresets: ConfigModelPreset[];
- desktopDefaultModel: ConfigModelPreset;
- desktopModelPresets: ConfigModelPreset[];
-}
-
interface ResolvedModelPolicy {
defaultModel: ConfigModelPreset;
visibleModels: ConfigModelPreset[];
@@ -140,6 +128,11 @@ export const FALLBACK_DESKTOP_MODEL_PRESETS: ModelInfo[] = [
...FALLBACK_SHARED_MODEL_PRESETS,
];
+const MODEL_INFO_FALLBACKS = [
+ DESKTOP_DEFAULT_MODEL,
+ ...FALLBACK_DESKTOP_MODEL_PRESETS,
+];
+
export class LlmProvider {
private backend = createInferenceBackend({
backend: "auto",
@@ -152,9 +145,7 @@ export class LlmProvider {
private currentMmprojPath?: string;
private currentContextKey?: string;
private defaultModel = DEFAULT_MODEL;
- private configDefaults?: ConfigDefaults;
private modelPolicy?: ResolvedModelPolicy;
- private useDesktopRustDefaults = false;
private downloadActive = false;
private progressListeners = new Set<(progress: DownloadProgress) => void>();
@@ -187,25 +178,14 @@ export class LlmProvider {
return this.defaultModel;
}
- public getConfigDefaults(): ConfigDefaults | undefined {
- return this.configDefaults;
- }
-
public getResolvedModelPresets(): ResolvedModelPreset[] | undefined {
const policy = this.modelPolicy;
- if (policy) {
- return policy.visibleModels
- .filter((preset) => preset.id !== policy.defaultModel.id)
- .map((preset) => ({ id: preset.id, name: preset.title }));
- }
- if (!this.configDefaults) {
+ if (!policy) {
return undefined;
}
-
- const presets = this.useDesktopRustDefaults
- ? this.configDefaults.desktopModelPresets
- : this.configDefaults.mobileModelPresets;
- return presets.map((preset) => ({ id: preset.id, name: preset.title }));
+ return policy.visibleModels
+ .filter((preset) => preset.id !== policy.defaultModel.id)
+ .map((preset) => ({ id: preset.id, name: preset.title }));
}
public getBackendKind() {
@@ -478,7 +458,7 @@ export class LlmProvider {
private async resolveDefaultModelForDevice() {
this.defaultModel = DEFAULT_MODEL;
- this.useDesktopRustDefaults = false;
+ this.modelPolicy = undefined;
if (this.backend.kind !== "tauri") {
return;
@@ -494,52 +474,11 @@ export class LlmProvider {
const platform = info.platform?.toLowerCase();
const totalMemoryBytes = info.totalMemoryBytes ?? 0;
- this.useDesktopRustDefaults =
- totalMemoryBytes >= MIN_DESKTOP_DEFAULT_MEMORY_BYTES;
-
- if (this.useDesktopRustDefaults) {
- this.defaultModel = DESKTOP_DEFAULT_MODEL;
- }
-
- // The Rust config_defaults payload has no size fields, so the web
- // values above remain as display fallbacks.
- try {
- const defaults =
- await invoke<ConfigDefaults>("config_defaults");
- const rustPreset = this.useDesktopRustDefaults
- ? defaults.desktopDefaultModel
- : defaults.mobileDefaultModel;
- this.defaultModel = {
- ...this.defaultModel,
- id: rustPreset.id,
- name: rustPreset.title,
- url: rustPreset.url,
- sha256: rustPreset.sha256,
- mmprojUrl: rustPreset.mmprojUrl ?? undefined,
- mmprojSha256: rustPreset.mmprojSha256 ?? undefined,
- };
- this.configDefaults = defaults;
- } catch (defaultsError) {
- log.warn(
- "Failed to fetch ensu defaults from Rust",
- defaultsError,
- );
- }
-
- try {
- this.modelPolicy = await invoke<ResolvedModelPolicy>(
- "desktop_model_policy",
- { totalMemoryBytes: info.totalMemoryBytes },
- );
- this.defaultModel = this.modelInfo(
- this.modelPolicy.defaultModel,
- );
- } catch (policyError) {
- log.warn(
- "Failed to fetch desktop model policy from Rust",
- policyError,
- );
- }
+ this.modelPolicy = await invoke<ResolvedModelPolicy>(
+ "desktop_model_policy",
+ { totalMemoryBytes: info.totalMemoryBytes },
+ );
+ this.defaultModel = this.modelInfo(this.modelPolicy.defaultModel);
log.info("LLM default model resolved", {
platform,
@@ -560,27 +499,17 @@ export class LlmProvider {
: undefined;
return preset ? this.modelInfo(preset) : this.defaultModel;
}
- const preset = this.resolveConfigPreset(settings.modelId);
- if (preset) {
- return this.modelInfo(preset);
- }
- 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;
+ return (
+ FALLBACK_DESKTOP_MODEL_PRESETS.find(
+ (preset) => preset.id === settings.modelId,
+ ) ?? this.defaultModel
+ );
}
private modelInfo(preset: ConfigModelPreset): ModelInfo {
- const fallback = [
- DESKTOP_DEFAULT_MODEL,
- ...FALLBACK_DESKTOP_MODEL_PRESETS,
- ].find((candidate) => candidate.id === preset.id);
+ const fallback = MODEL_INFO_FALLBACKS.find(
+ (candidate) => candidate.id === preset.id,
+ );
return {
...fallback,
id: preset.id,
@@ -592,19 +521,6 @@ export class LlmProvider {
};
}
- private resolveConfigPreset(modelId: string | undefined) {
- const defaults = this.configDefaults;
- if (!defaults || !modelId) {
- return undefined;
- }
- return [
- defaults.mobileDefaultModel,
- defaults.desktopDefaultModel,
- ...defaults.mobileModelPresets,
- ...defaults.desktopModelPresets,
- ].find((preset) => preset.id == modelId);
- }
-
private async modelStatus(modelId: string): Promise<TauriModelStatus> {
const { invoke } = await import("@tauri-apps/api/core");
return invoke<TauriModelStatus>("llm_model_status", { modelId });