Skip to content

armgit / uzu

Public Imported from GitHub
0

A high-performance inference engine for AI models

Cli save last model (#689)

Aleksandr Golokoz88dfae7a90ca
diff --git a/crates/cli/src/interactive/components/app_settings.rs b/crates/cli/src/interactive/components/app_settings.rs
new file mode 100644
index 000000000..f1f1ce239
--- /dev/null
+++ b/crates/cli/src/interactive/components/app_settings.rs
@@ -0,0 +1,28 @@
+use serde::{Deserialize, Serialize};
+use uzu::settings::{SettingKind, Settings, SettingsError};
+
+const SETTINGS_APP: &str = "app";
+
+#[derive(Clone, Serialize, Deserialize, Default)]
+pub struct AppSettings {
+ pub selected_model_id: Option<String>,
+}
+
+impl AppSettings {
+ pub fn load(settings: &Settings) -> Result<Self, SettingsError> {
+ let Some(raw) = settings.load(SettingKind::Config, SETTINGS_APP.to_string())? else {
+ return Ok(Self::default());
+ };
+ Ok(serde_json::from_str(&raw).unwrap_or_default())
+ }
+
+ pub fn save(
+ &self,
+ settings: &Settings,
+ ) -> Result<(), SettingsError> {
+ let raw = serde_json::to_string(self).map_err(|error| SettingsError::BackendError {
+ message: error.to_string(),
+ })?;
+ settings.save(SettingKind::Config, SETTINGS_APP.to_string(), Some(raw))
+ }
+}
diff --git a/crates/cli/src/interactive/components/application.rs b/crates/cli/src/interactive/components/application.rs
index 2b9107e6c..f39397123 100644
--- a/crates/cli/src/interactive/components/application.rs
+++ b/crates/cli/src/interactive/components/application.rs
@@ -9,6 +9,7 @@ use uzu::{
use crate::interactive::{
components::{
CommandInput, HistoryCell, HistoryCellType, Logo, ModelCapabilities, Preferences, SelectedModel, Theme,
+ app_settings::AppSettings,
},
flows::{AuthFlow, ExitFlow, Flow, FlowEvent, FlowRegistry, ModelRegistriesFlow, SettingsFlow, ThemeFlow},
helpers::SYMBOL_COMMAND,
@@ -23,6 +24,7 @@ pub struct ApplicationProps {
pub settings: Option<Settings>,
pub theme: Option<Theme>,
pub preferences: Option<Preferences>,
+ pub app_settings: Option<AppSettings>,
pub model: Option<String>,
}
@@ -38,6 +40,7 @@ pub struct ApplicationState {
pub settings: Option<Settings>,
pub theme: Theme,
pub preferences: Preferences,
+ pub app_settings: AppSettings,
pub flow: Option<Box<dyn Flow>>,
pub history: Vec<HistoryCellType>,
pub registry: FlowRegistry,
@@ -62,6 +65,7 @@ pub fn Application(
settings: props.settings.clone(),
theme: props.theme.clone().unwrap_or_default(),
preferences: props.preferences.unwrap_or_default(),
+ app_settings: props.app_settings.clone().unwrap_or_default(),
flow: None,
history: Vec::new(),
registry: FlowRegistry::default()
@@ -80,10 +84,21 @@ pub fn Application(
let mut state = state;
async move {
let Some(identifier) = initial_model else {
+ state.write().flow = Some(Box::new(ModelRegistriesFlow));
return;
};
match engine.model(identifier.clone()).await {
Ok(Some(model)) => {
+ let model_exists = model.is_downloadable()
+ || !model.is_local()
+ || matches!(
+ engine.model_path(&model).await,
+ Some(path) if std::path::Path::new(&path).exists()
+ );
+ if !model_exists {
+ state.write().flow = Some(Box::new(ModelRegistriesFlow));
+ return;
+ }
let summary = format!("Model: {}", model.name());
state.write().model_state = Some(ModelState {
model,
@@ -95,12 +110,18 @@ pub fn Application(
result: summary,
});
},
- Ok(None) => state.write().history.push(HistoryCellType::CommandResult {
- result: format!("Unknown model: {}", identifier),
- }),
- Err(error) => state.write().history.push(HistoryCellType::CommandResult {
- result: format!("Failed to load model {}: {}", identifier, error),
- }),
+ Ok(None) => {
+ state.write().history.push(HistoryCellType::CommandResult {
+ result: format!("Unknown model: {}", identifier),
+ });
+ state.write().flow = Some(Box::new(ModelRegistriesFlow));
+ },
+ Err(error) => {
+ state.write().history.push(HistoryCellType::CommandResult {
+ result: format!("Failed to load model {}: {}", identifier, error),
+ });
+ state.write().flow = Some(Box::new(ModelRegistriesFlow));
+ },
}
}
});
diff --git a/crates/cli/src/interactive/components/mod.rs b/crates/cli/src/interactive/components/mod.rs
index 9efc7f36f..b49b9e178 100644
--- a/crates/cli/src/interactive/components/mod.rs
+++ b/crates/cli/src/interactive/components/mod.rs
@@ -1,3 +1,4 @@
+mod app_settings;
mod application;
mod command_input;
mod gradient;
@@ -13,6 +14,7 @@ mod selector;
mod text_input;
mod theme;
+pub use app_settings::AppSettings;
pub use application::{Application, ApplicationState, ModelState};
pub use command_input::CommandInput;
pub use gradient::Gradient;
diff --git a/crates/cli/src/interactive/flows/models.rs b/crates/cli/src/interactive/flows/models.rs
index a085bd390..7d3a964ea 100644
--- a/crates/cli/src/interactive/flows/models.rs
+++ b/crates/cli/src/interactive/flows/models.rs
@@ -108,14 +108,27 @@ fn Models(
on_submit: move |index: usize| {
let mut state = state;
if let Some(model) = list.get(index) {
- let summary = format!("Model: {}", model.name());
state.write().model_state = Some(ModelState {
model: model.clone(),
download_state: DownloadState::not_downloaded(0),
session_state: None,
capabilities: ModelCapabilities::default(),
});
- on_event(FlowEvent::finish(summary));
+ state.write().app_settings.selected_model_id = Some(model.identifier.clone());
+ let settings_result = {
+ let state = state.read();
+ match state.settings.as_ref() {
+ Some(settings) => state.app_settings.save(settings),
+ None => Ok(()),
+ }
+ };
+ let result = match settings_result {
+ Ok(()) => format!("Model: {}", model.name()),
+ Err(error) => {
+ format!("Model: {}, unable to save preference: {}", model.name(), error)
+ },
+ };
+ on_event(FlowEvent::finish(result));
}
},
)
diff --git a/crates/cli/src/interactive/mod.rs b/crates/cli/src/interactive/mod.rs
index 650c04670..50850089d 100644
--- a/crates/cli/src/interactive/mod.rs
+++ b/crates/cli/src/interactive/mod.rs
@@ -12,6 +12,8 @@ use uzu::{
settings::SettingsError,
};
+use crate::interactive::components::AppSettings;
+
#[derive(Debug, Clone, PartialEq, thiserror::Error)]
#[non_exhaustive]
pub enum CliError {
@@ -56,6 +58,15 @@ impl CliApplication {
Some(settings) => Preferences::load(settings)?,
None => Preferences::default(),
};
+ let app_settings = match &settings {
+ Some(settings) => AppSettings::load(settings)?,
+ None => AppSettings::default(),
+ };
+
+ let mut selected_model = model;
+ if selected_model.is_none() {
+ selected_model = app_settings.selected_model_id.clone();
+ }
element! {
Application(
@@ -63,7 +74,8 @@ impl CliApplication {
settings: settings,
theme: Some(theme),
preferences: Some(preferences),
- model: model,
+ app_settings: Some(app_settings),
+ model: selected_model,
)
}
.render_loop()
@@ -82,3 +94,10 @@ impl CliApplication {
Ok(Self::new(engine))
}
}
+
+pub async fn run_interactive(model: Option<String>) -> anyhow::Result<()> {
+ let engine_config = EngineConfig::default().with_application_identifier("com.trymirai.cli".to_string());
+ let application = CliApplication::create(engine_config).await?;
+ application.run_with_model(model).await?;
+ Ok(())
+}
diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
index 5564d6ab7..6c8ec4d65 100644
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -55,20 +55,8 @@ async fn main() -> Result<()> {
Some(Commands::Storage {
download_manager,
}) => storage::run(download_manager).await?,
- None => run_interactive(cli.model).await?,
+ None => interactive::run_interactive(cli.model).await?,
}
Ok(())
}
-
-async fn run_interactive(model: Option<String>) -> Result<()> {
- use uzu::engine::EngineConfig;
-
- use crate::interactive::CliApplication;
-
- let engine_config = EngineConfig::default().with_application_identifier("com.trymirai.cli".to_string());
- let application = CliApplication::create(engine_config).await?;
- application.run_with_model(model).await?;
-
- Ok(())
-}