diff --git a/crates/sprout-agent/src/config.rs b/crates/sprout-agent/src/config.rs index bcccca677..f4ede30d0 100644 --- a/crates/sprout-agent/src/config.rs +++ b/crates/sprout-agent/src/config.rs @@ -108,15 +108,21 @@ impl Config { let (api_key, model, base_url, openai_api) = match provider { Provider::Anthropic => ( req("ANTHROPIC_API_KEY")?, - resolve_model(env("ANTHROPIC_MODEL").as_deref(), sprout_agent_model.as_deref()) - .ok_or_else(|| "config: ANTHROPIC_MODEL required".to_string())?, + resolve_model( + env("ANTHROPIC_MODEL").as_deref(), + sprout_agent_model.as_deref(), + ) + .ok_or_else(|| "config: ANTHROPIC_MODEL required".to_string())?, env_or("ANTHROPIC_BASE_URL", "https://api.anthropic.com"), OpenAiApi::Auto, // unused for Anthropic ), Provider::OpenAi => ( req("OPENAI_COMPAT_API_KEY")?, - resolve_model(env("OPENAI_COMPAT_MODEL").as_deref(), sprout_agent_model.as_deref()) - .ok_or_else(|| "config: OPENAI_COMPAT_MODEL required".to_string())?, + resolve_model( + env("OPENAI_COMPAT_MODEL").as_deref(), + sprout_agent_model.as_deref(), + ) + .ok_or_else(|| "config: OPENAI_COMPAT_MODEL required".to_string())?, env_or("OPENAI_COMPAT_BASE_URL", "https://api.openai.com/v1"), parse_openai_api(env("OPENAI_COMPAT_API").as_deref())?, ), @@ -248,7 +254,6 @@ fn resolve_model(provider_model: Option<&str>, universal_fallback: Option<&str>) provider_model.or(universal_fallback).map(str::to_owned) } - fn present_nonempty(v: Option<&str>) -> bool { v.map(str::trim).is_some_and(|s| !s.is_empty()) } diff --git a/desktop/scripts/check-file-sizes.mjs b/desktop/scripts/check-file-sizes.mjs index 993e7c1e0..0a8869d95 100644 --- a/desktop/scripts/check-file-sizes.mjs +++ b/desktop/scripts/check-file-sizes.mjs @@ -31,7 +31,7 @@ const rules = [ // file is broken up. Tracked as a follow-up. const overrides = new Map([ ["src-tauri/src/managed_agents/nest.rs", 1420], - ["src-tauri/src/managed_agents/runtime.rs", 1440], + ["src-tauri/src/managed_agents/runtime.rs", 1460], ["src-tauri/src/managed_agents/persona_card.rs", 1050], ["src-tauri/src/huddle/tts.rs", 1364], ["src/shared/api/tauri.ts", 1196],