uusi projekti
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
use futures_util::{SinkExt, StreamExt};
|
||||
use serde_json::json;
|
||||
use std::io::IsTerminal;
|
||||
use sysinfo::System;
|
||||
use tokio_tungstenite::connect_async;
|
||||
use tokio_tungstenite::tungstenite::Message;
|
||||
@@ -362,13 +363,17 @@ async fn main() {
|
||||
st.push_log("System", format!("Malli valmis: {}", active_model), None);
|
||||
}
|
||||
|
||||
// Käynnistetään graafinen TUI vasta kun TUI:n Prompt (LlmEngine::load) on ohitettu!
|
||||
// Käynnistetään graafinen TUI vain jos stdin on terminaali (ei taustaprosessina)
|
||||
let ui_state = tui_state.clone();
|
||||
tokio::spawn(async move {
|
||||
if let Err(e) = tui_dashboard::run_dashboard(ui_state, cmd_tx).await {
|
||||
tracing::error!("Pääluupin TUI kaatui: {}", e);
|
||||
}
|
||||
});
|
||||
if std::io::stdin().is_terminal() {
|
||||
tokio::spawn(async move {
|
||||
if let Err(e) = tui_dashboard::run_dashboard(ui_state, cmd_tx).await {
|
||||
tracing::error!("Pääluupin TUI kaatui: {}", e);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
tracing::info!("Ei terminaalia — TUI ohitettu, lokitetaan stdoutiin");
|
||||
};
|
||||
|
||||
// Haetaan paikalliset mallit hubille lähetettäväksi
|
||||
let mut available_models = None;
|
||||
@@ -418,6 +423,48 @@ async fn main() {
|
||||
st.status = "ACTIVE".to_string();
|
||||
st.push_log("System", "Suoritus jatkuu...".to_string(), None);
|
||||
}
|
||||
} else if cmd_str == "fetch_models" {
|
||||
// Haetaan mallit Ollamasta ja avataan valikkö
|
||||
if let Some(ref engine) = llm {
|
||||
match engine.fetch_models().await {
|
||||
Ok(tags) => {
|
||||
let models: Vec<String> = tags.get("models")
|
||||
.and_then(|v| v.as_array())
|
||||
.map(|arr| arr.iter()
|
||||
.filter_map(|m| m.get("name").and_then(|n| n.as_str()).map(|s| s.to_string()))
|
||||
.collect())
|
||||
.unwrap_or_default();
|
||||
let mut st = tui_state.write().await;
|
||||
st.model_picker_items = models;
|
||||
st.model_picker_idx = 0;
|
||||
st.model_picker_open = true;
|
||||
}
|
||||
Err(e) => {
|
||||
let mut st = tui_state.write().await;
|
||||
st.push_log("System", format!("Mallilistan haku epäonnistui: {}", e), None);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if let Some(model) = cmd_str.strip_prefix("change_model:") {
|
||||
// TUI:sta valittu malli — vaihdetaan
|
||||
if let Some(ref engine) = llm {
|
||||
engine.set_model(model.to_string());
|
||||
match engine.ensure_model().await {
|
||||
Ok(()) => {
|
||||
tracing::info!("Malli vaihdettu: {}", model);
|
||||
let mut st = tui_state.write().await;
|
||||
st.model_name = model.to_string();
|
||||
st.push_log("System", format!("Malli vaihdettu: {}", model), None);
|
||||
// Ilmoitetaan hubille
|
||||
let auth = build_auth_message(allocated_gb, model, available_models.clone());
|
||||
let _ = write.send(Message::Text(auth)).await;
|
||||
}
|
||||
Err(e) => {
|
||||
let mut st = tui_state.write().await;
|
||||
st.push_log("System", format!("Mallin vaihto epäonnistui: {}", e), None);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user