feat: persist LLM/TTS backend choice + reset/repeat context + quick-search + diagnostics
Closes the UX hole I created in 5c72450: voice-swap to Ollama used to vanish
after restart. Plus P0.3 (long-standing roadmap item) and two new packs.
Persistent backend choice (crates/jarvis-core/src/db/structs.rs)
- Settings struct gains llm_backend + tts_backend fields (both String,
"" / "auto" = follow env/auto-detect).
- set("llm_backend", "groq"|"ollama"|"auto") validates input.
- llm::init_global() reads DB first, then JARVIS_LLM env, then auto-detect.
- llm::swap_to() now persists the choice via db::save_settings.
- Voice swap "переключись на локальный" now survives restart.
Shared conversation history (P0.3, crates/jarvis-core/src/llm/mod.rs)
- HISTORY: Lazy<RwLock<Option<ConversationHistory>>> singleton.
- Helpers: init_history, history_push_user, history_push_assistant,
history_snapshot, history_clear, history_pop_last_user, history_last_assistant.
- llm_fallback migrated off its own Mutex<History> — now reads/writes shared.
- ConversationHistory gains last_assistant() method.
New Lua APIs
- jarvis.llm_reset() → clear conversation turns (keeps system prompt).
- jarvis.llm_last_reply() → string or nil (last assistant message text).
- jarvis.health() → debug table {tts_backend, llm_backend, llm_model,
active_profile, memory_facts, scheduled_tasks,
language, voice, microphone, vosk_model,
noise_suppression}. No secrets included.
New voice packs
- resources/commands/llm_context/ (P0.3)
* "сбрось контекст" / "забудь разговор" → llm.reset
* "повтори последнее" / "повтори ответ" → llm.repeat (uses last_assistant)
- resources/commands/quick_search/ (imba P1 item)
* "найди в гугле <X>" / "загугли <X>"
* Uses DuckDuckGo Instant Answer API (api.duckduckgo.com, no key required).
Pulls AbstractText or RelatedTopics into LLM prompt; falls back to pure
LLM knowledge if DDG returns nothing useful. Speaks 2-4 sentence answer.
- resources/commands/diagnostics/
* "диагностика" / "доложи о себе" / "статус"
* Reads jarvis.health() and speaks a one-line summary. Useful when
debugging — user can read out their current state for a bug report.
Build: cargo build --release -p jarvis-app -p jarvis-gui green.
Tests: 52/52 jarvis-core unit tests pass.
This commit is contained in:
parent
5c7245012e
commit
385bd5c8ce
15 changed files with 413 additions and 37 deletions
|
|
@ -1,20 +1,19 @@
|
||||||
use once_cell::sync::OnceCell;
|
use once_cell::sync::OnceCell;
|
||||||
use parking_lot::Mutex;
|
|
||||||
|
|
||||||
use jarvis_core::config;
|
use jarvis_core::config;
|
||||||
use jarvis_core::i18n;
|
use jarvis_core::i18n;
|
||||||
use jarvis_core::ipc::{self, IpcEvent};
|
use jarvis_core::ipc::{self, IpcEvent};
|
||||||
use jarvis_core::llm::{self, ChatMessage, ConversationHistory};
|
use jarvis_core::llm::{self, ChatMessage};
|
||||||
use jarvis_core::long_term_memory;
|
use jarvis_core::long_term_memory;
|
||||||
use jarvis_core::profiles;
|
use jarvis_core::profiles;
|
||||||
use jarvis_core::tts::{self, SpeakOpts};
|
use jarvis_core::tts::{self, SpeakOpts};
|
||||||
use jarvis_core::voices;
|
use jarvis_core::voices;
|
||||||
|
|
||||||
// State now only holds conversation history — the actual LLM client lives in
|
// State now only holds the max_tokens config — both the LLM client AND the
|
||||||
// `jarvis_core::llm::GLOBAL` so that voice/Lua commands can hot-swap backends
|
// conversation history live in `jarvis_core::llm::*` globals. This lets voice
|
||||||
// (Ollama ↔ Groq) without rebuilding this module's state.
|
// commands ("сбрось контекст", "повтори последнее") and Lua scripts share the
|
||||||
|
// same buffer instead of each module owning its own.
|
||||||
struct State {
|
struct State {
|
||||||
history: Mutex<ConversationHistory>,
|
|
||||||
max_tokens: u32,
|
max_tokens: u32,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -38,11 +37,10 @@ fn build_state() -> Option<State> {
|
||||||
|
|
||||||
let lang = i18n::get_language();
|
let lang = i18n::get_language();
|
||||||
let prompt = config::get_llm_system_prompt(&lang);
|
let prompt = config::get_llm_system_prompt(&lang);
|
||||||
let history = Mutex::new(ConversationHistory::new(prompt, config::LLM_DEFAULT_MAX_HISTORY));
|
llm::init_history(prompt, config::LLM_DEFAULT_MAX_HISTORY);
|
||||||
|
|
||||||
info!("LLM fallback enabled (backend: {}).", llm::current_backend_name());
|
info!("LLM fallback enabled (backend: {}).", llm::current_backend_name());
|
||||||
Some(State {
|
Some(State {
|
||||||
history,
|
|
||||||
max_tokens: config::LLM_DEFAULT_MAX_TOKENS,
|
max_tokens: config::LLM_DEFAULT_MAX_TOKENS,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
@ -89,31 +87,26 @@ pub fn handle(prompt: &str) {
|
||||||
|
|
||||||
info!("LLM prompt: {}", prompt);
|
info!("LLM prompt: {}", prompt);
|
||||||
|
|
||||||
let snapshot: Vec<ChatMessage> = {
|
llm::history_push_user(prompt);
|
||||||
let mut h = state.history.lock();
|
let mut snapshot: Vec<ChatMessage> = llm::history_snapshot();
|
||||||
h.push_user(prompt);
|
|
||||||
let mut snap = h.snapshot();
|
|
||||||
|
|
||||||
// Inject (a) profile personality (b) relevant long-term memory as a fresh
|
// Inject (a) profile personality (b) relevant long-term memory as a fresh
|
||||||
// system message right after the base prompt. Both are optional.
|
// system message right after the base prompt. Both are optional.
|
||||||
let profile = profiles::active();
|
let profile = profiles::active();
|
||||||
let mut overlay = String::new();
|
let mut overlay = String::new();
|
||||||
if !profile.llm_personality.is_empty() {
|
if !profile.llm_personality.is_empty() {
|
||||||
overlay.push_str(&format!("Активный профиль: {} {}\nХарактер для ответа: {}\n",
|
overlay.push_str(&format!("Активный профиль: {} {}\nХарактер для ответа: {}\n",
|
||||||
profile.icon, profile.name, profile.llm_personality));
|
profile.icon, profile.name, profile.llm_personality));
|
||||||
}
|
}
|
||||||
let mem_ctx = long_term_memory::build_context(prompt, 5);
|
let mem_ctx = long_term_memory::build_context(prompt, 5);
|
||||||
if !mem_ctx.is_empty() {
|
if !mem_ctx.is_empty() {
|
||||||
overlay.push_str(&mem_ctx);
|
overlay.push_str(&mem_ctx);
|
||||||
}
|
}
|
||||||
if !overlay.is_empty() {
|
if !overlay.is_empty() {
|
||||||
// Insert after the base system prompt (index 0 typically), before user msgs.
|
// Insert after the base system prompt (index 0 typically), before user msgs.
|
||||||
let insert_at = if !snap.is_empty() && snap[0].role == "system" { 1 } else { 0 };
|
let insert_at = if !snapshot.is_empty() && snapshot[0].role == "system" { 1 } else { 0 };
|
||||||
snap.insert(insert_at, ChatMessage::system(overlay));
|
snapshot.insert(insert_at, ChatMessage::system(overlay));
|
||||||
}
|
}
|
||||||
|
|
||||||
snap
|
|
||||||
};
|
|
||||||
|
|
||||||
let client = match llm::current() {
|
let client = match llm::current() {
|
||||||
Some(c) => c,
|
Some(c) => c,
|
||||||
|
|
@ -127,14 +120,14 @@ pub fn handle(prompt: &str) {
|
||||||
Ok(reply) => {
|
Ok(reply) => {
|
||||||
let reply = reply.trim().to_string();
|
let reply = reply.trim().to_string();
|
||||||
info!("LLM reply: {}", reply);
|
info!("LLM reply: {}", reply);
|
||||||
state.history.lock().push_assistant(reply.clone());
|
llm::history_push_assistant(reply.clone());
|
||||||
ipc::send(IpcEvent::LlmReply { text: reply.clone() });
|
ipc::send(IpcEvent::LlmReply { text: reply.clone() });
|
||||||
voices::play_ok();
|
voices::play_ok();
|
||||||
speak_reply(&reply);
|
speak_reply(&reply);
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
error!("LLM request failed: {}", e);
|
error!("LLM request failed: {}", e);
|
||||||
state.history.lock().pop_last_user();
|
llm::history_pop_last_user();
|
||||||
let err_text = config::LLM_FALLBACK_ERROR_RU.to_string();
|
let err_text = config::LLM_FALLBACK_ERROR_RU.to_string();
|
||||||
ipc::send(IpcEvent::LlmReply { text: err_text.clone() });
|
ipc::send(IpcEvent::LlmReply { text: err_text.clone() });
|
||||||
voices::play_error();
|
voices::play_error();
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,19 @@ pub struct Settings {
|
||||||
pub language: String,
|
pub language: String,
|
||||||
|
|
||||||
pub api_keys: ApiKeys,
|
pub api_keys: ApiKeys,
|
||||||
|
|
||||||
|
/// Preferred LLM backend ("groq" | "ollama" | empty=auto). Empty/auto means
|
||||||
|
/// the JARVIS_LLM env var or auto-detect (Groq if GROQ_TOKEN set else Ollama)
|
||||||
|
/// decides. When the user runs `jarvis.llm_switch(...)` the result is
|
||||||
|
/// persisted here so it survives restart.
|
||||||
|
#[serde(default)]
|
||||||
|
pub llm_backend: String,
|
||||||
|
|
||||||
|
/// Preferred TTS backend ("sapi" | "piper" | "silero" | empty=auto). Same
|
||||||
|
/// rules as `llm_backend`. Empty falls back to JARVIS_TTS env var, then
|
||||||
|
/// auto-detect.
|
||||||
|
#[serde(default)]
|
||||||
|
pub tts_backend: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn default_intent_backend() -> String { config::DEFAULT_INTENT_BACKEND.to_string() }
|
fn default_intent_backend() -> String { config::DEFAULT_INTENT_BACKEND.to_string() }
|
||||||
|
|
@ -60,6 +73,8 @@ impl Settings {
|
||||||
"language" => Some(self.language.clone()),
|
"language" => Some(self.language.clone()),
|
||||||
"api_key__picovoice" => Some(self.api_keys.picovoice.clone()),
|
"api_key__picovoice" => Some(self.api_keys.picovoice.clone()),
|
||||||
"api_key__openai" => Some(self.api_keys.openai.clone()),
|
"api_key__openai" => Some(self.api_keys.openai.clone()),
|
||||||
|
"llm_backend" => Some(self.llm_backend.clone()),
|
||||||
|
"tts_backend" => Some(self.tts_backend.clone()),
|
||||||
_ => None,
|
_ => None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -120,6 +135,22 @@ impl Settings {
|
||||||
"api_key__openai" => {
|
"api_key__openai" => {
|
||||||
self.api_keys.openai = val.to_string();
|
self.api_keys.openai = val.to_string();
|
||||||
}
|
}
|
||||||
|
"llm_backend" => {
|
||||||
|
// empty / "auto" / "groq" / "ollama" — anything else rejected
|
||||||
|
match val.trim().to_lowercase().as_str() {
|
||||||
|
"" | "auto" => self.llm_backend = String::new(),
|
||||||
|
"groq" => self.llm_backend = "groq".into(),
|
||||||
|
"ollama" => self.llm_backend = "ollama".into(),
|
||||||
|
other => return Err(format!("unknown llm_backend: '{}'", other)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"tts_backend" => {
|
||||||
|
match val.trim().to_lowercase().as_str() {
|
||||||
|
"" | "auto" => self.tts_backend = String::new(),
|
||||||
|
"sapi" | "piper" | "silero" => self.tts_backend = val.to_lowercase(),
|
||||||
|
other => return Err(format!("unknown tts_backend: '{}'", other)),
|
||||||
|
}
|
||||||
|
}
|
||||||
_ => return Err(format!("unknown setting: '{}'", key)),
|
_ => return Err(format!("unknown setting: '{}'", key)),
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|
@ -142,6 +173,8 @@ impl Settings {
|
||||||
"language",
|
"language",
|
||||||
"api_key__picovoice",
|
"api_key__picovoice",
|
||||||
"api_key__openai",
|
"api_key__openai",
|
||||||
|
"llm_backend",
|
||||||
|
"tts_backend",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -173,6 +206,9 @@ impl Default for Settings {
|
||||||
picovoice: String::from(""),
|
picovoice: String::from(""),
|
||||||
openai: String::from(""),
|
openai: String::from(""),
|
||||||
},
|
},
|
||||||
|
|
||||||
|
llm_backend: String::new(),
|
||||||
|
tts_backend: String::new(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -58,6 +58,11 @@ impl ConversationHistory {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Return the most recent assistant message, or None if none yet.
|
||||||
|
pub fn last_assistant(&self) -> Option<&ChatMessage> {
|
||||||
|
self.turns.iter().rev().find(|m| m.role == "assistant")
|
||||||
|
}
|
||||||
|
|
||||||
fn truncate(&mut self) {
|
fn truncate(&mut self) {
|
||||||
if self.turns.len() > self.max_turns {
|
if self.turns.len() > self.max_turns {
|
||||||
let drop = self.turns.len() - self.max_turns;
|
let drop = self.turns.len() - self.max_turns;
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,52 @@ use once_cell::sync::Lazy;
|
||||||
use parking_lot::RwLock;
|
use parking_lot::RwLock;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
// ─── Shared conversation history ───────────────────────────────────────────
|
||||||
|
//
|
||||||
|
// Single global history so the LLM fallback chat, the Lua reset/repeat helpers,
|
||||||
|
// and any future IPC handler all operate on the same buffer. Initialised on
|
||||||
|
// boot via `init_history(system_prompt, max_turns)`.
|
||||||
|
|
||||||
|
static HISTORY: Lazy<RwLock<Option<ConversationHistory>>> = Lazy::new(|| RwLock::new(None));
|
||||||
|
|
||||||
|
pub fn init_history(system_prompt: impl Into<String>, max_turns: usize) {
|
||||||
|
*HISTORY.write() = Some(ConversationHistory::new(system_prompt, max_turns));
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn history_push_user(content: impl Into<String>) {
|
||||||
|
if let Some(h) = HISTORY.write().as_mut() {
|
||||||
|
h.push_user(content);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn history_push_assistant(content: impl Into<String>) {
|
||||||
|
if let Some(h) = HISTORY.write().as_mut() {
|
||||||
|
h.push_assistant(content);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn history_snapshot() -> Vec<ChatMessage> {
|
||||||
|
HISTORY.read().as_ref().map(|h| h.snapshot()).unwrap_or_default()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn history_clear() {
|
||||||
|
if let Some(h) = HISTORY.write().as_mut() {
|
||||||
|
h.clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn history_pop_last_user() {
|
||||||
|
if let Some(h) = HISTORY.write().as_mut() {
|
||||||
|
h.pop_last_user();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Return the most recent assistant message text, or None.
|
||||||
|
pub fn history_last_assistant() -> Option<String> {
|
||||||
|
HISTORY.read().as_ref()
|
||||||
|
.and_then(|h| h.last_assistant().map(|m| m.content.clone()))
|
||||||
|
}
|
||||||
|
|
||||||
/// Shared mutable LLM client. Modules read via `current()`; the user can
|
/// Shared mutable LLM client. Modules read via `current()`; the user can
|
||||||
/// hot-swap backends at runtime via `swap_to(LlmBackend::Ollama)` etc.
|
/// hot-swap backends at runtime via `swap_to(LlmBackend::Ollama)` etc.
|
||||||
///
|
///
|
||||||
|
|
@ -19,12 +65,28 @@ use std::sync::Arc;
|
||||||
/// `init_global()` was never called).
|
/// `init_global()` was never called).
|
||||||
static GLOBAL: Lazy<RwLock<Option<Arc<LlmClient>>>> = Lazy::new(|| RwLock::new(None));
|
static GLOBAL: Lazy<RwLock<Option<Arc<LlmClient>>>> = Lazy::new(|| RwLock::new(None));
|
||||||
|
|
||||||
/// Initialise the global client from env vars (`JARVIS_LLM`, `GROQ_TOKEN`, ...).
|
/// Initialise the global client. Precedence:
|
||||||
|
/// 1. Settings DB `llm_backend` field (if non-empty)
|
||||||
|
/// 2. `JARVIS_LLM` env var
|
||||||
|
/// 3. Auto-detect (Groq if `GROQ_TOKEN`, else Ollama)
|
||||||
|
///
|
||||||
/// Idempotent — replaces any previous global. Returns Ok even when the chosen
|
/// Idempotent — replaces any previous global. Returns Ok even when the chosen
|
||||||
/// backend can't be probed: an Ollama server may not be running yet but we
|
/// backend can't be probed: an Ollama server may not be running yet but we
|
||||||
/// stash the client anyway and let calls fail on first request.
|
/// stash the client anyway and let calls fail on first request.
|
||||||
pub fn init_global() -> Result<(), ConfigError> {
|
pub fn init_global() -> Result<(), ConfigError> {
|
||||||
let c = LlmClient::from_env()?;
|
// Try DB-persisted choice first.
|
||||||
|
let persisted = crate::DB.get().and_then(|db| {
|
||||||
|
let s = db.read();
|
||||||
|
let backend = s.llm_backend.trim().to_string();
|
||||||
|
if backend.is_empty() { None } else { parse_backend(&backend) }
|
||||||
|
});
|
||||||
|
|
||||||
|
let c = match persisted {
|
||||||
|
Some(LlmBackend::Groq) => LlmClient::groq()?,
|
||||||
|
Some(LlmBackend::Ollama) => LlmClient::ollama(),
|
||||||
|
None => LlmClient::from_env()?,
|
||||||
|
};
|
||||||
|
|
||||||
log::info!("LLM global initialised: backend={}, model={}", c.backend().name(), c.model());
|
log::info!("LLM global initialised: backend={}, model={}", c.backend().name(), c.model());
|
||||||
*GLOBAL.write() = Some(Arc::new(c));
|
*GLOBAL.write() = Some(Arc::new(c));
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|
@ -45,6 +107,7 @@ pub fn current_backend_name() -> &'static str {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Hot-swap to a different backend. Returns the new backend's name on success.
|
/// Hot-swap to a different backend. Returns the new backend's name on success.
|
||||||
|
/// Persists the choice to the settings DB so it survives restart.
|
||||||
pub fn swap_to(backend: LlmBackend) -> Result<&'static str, ConfigError> {
|
pub fn swap_to(backend: LlmBackend) -> Result<&'static str, ConfigError> {
|
||||||
let c = match backend {
|
let c = match backend {
|
||||||
LlmBackend::Groq => LlmClient::groq()?,
|
LlmBackend::Groq => LlmClient::groq()?,
|
||||||
|
|
@ -53,6 +116,21 @@ pub fn swap_to(backend: LlmBackend) -> Result<&'static str, ConfigError> {
|
||||||
let name = c.backend().name();
|
let name = c.backend().name();
|
||||||
log::info!("LLM swapped → backend={}, model={}", name, c.model());
|
log::info!("LLM swapped → backend={}, model={}", name, c.model());
|
||||||
*GLOBAL.write() = Some(Arc::new(c));
|
*GLOBAL.write() = Some(Arc::new(c));
|
||||||
|
|
||||||
|
// Persist to settings DB (best-effort — log on failure, don't propagate).
|
||||||
|
if let Some(db) = crate::DB.get() {
|
||||||
|
let snapshot = {
|
||||||
|
let mut s = db.write();
|
||||||
|
s.llm_backend = name.to_string();
|
||||||
|
s.clone()
|
||||||
|
};
|
||||||
|
if let Err(e) = crate::db::save_settings(&snapshot) {
|
||||||
|
log::warn!("LLM swap: failed to persist to settings DB: {}", e);
|
||||||
|
} else {
|
||||||
|
log::info!("LLM choice persisted: {}", name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Ok(name)
|
Ok(name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,4 +12,5 @@ pub mod memory;
|
||||||
pub mod profile;
|
pub mod profile;
|
||||||
pub mod vision;
|
pub mod vision;
|
||||||
pub mod scheduler;
|
pub mod scheduler;
|
||||||
pub mod cmd;
|
pub mod cmd;
|
||||||
|
pub mod health;
|
||||||
50
crates/jarvis-core/src/lua/api/health.rs
Normal file
50
crates/jarvis-core/src/lua/api/health.rs
Normal file
|
|
@ -0,0 +1,50 @@
|
||||||
|
//! `jarvis.health()` — debug snapshot of active runtime state.
|
||||||
|
//!
|
||||||
|
//! Returns a table that can be JSON-encoded for bug reports. Doesn't include
|
||||||
|
//! secrets (no API keys, no LLM history content).
|
||||||
|
//!
|
||||||
|
//! Example use from Lua:
|
||||||
|
//! local h = jarvis.health()
|
||||||
|
//! for k, v in pairs(h) do print(k, v) end
|
||||||
|
|
||||||
|
use mlua::{Lua, Table};
|
||||||
|
|
||||||
|
pub fn register(lua: &Lua, jarvis: &Table) -> mlua::Result<()> {
|
||||||
|
let health_fn = lua.create_function(|lua, ()| {
|
||||||
|
let t = lua.create_table()?;
|
||||||
|
|
||||||
|
// TTS
|
||||||
|
t.set("tts_backend", crate::tts::backend().name())?;
|
||||||
|
|
||||||
|
// LLM
|
||||||
|
t.set("llm_backend", crate::llm::current_backend_name())?;
|
||||||
|
if let Some(c) = crate::llm::current() {
|
||||||
|
t.set("llm_model", c.model().to_string())?;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Profile
|
||||||
|
t.set("active_profile", crate::profiles::active_name())?;
|
||||||
|
|
||||||
|
// Memory size
|
||||||
|
t.set("memory_facts", crate::long_term_memory::all().len())?;
|
||||||
|
|
||||||
|
// Scheduler size
|
||||||
|
t.set("scheduled_tasks", crate::scheduler::list().len())?;
|
||||||
|
|
||||||
|
// Language
|
||||||
|
t.set("language", crate::i18n::get_language())?;
|
||||||
|
|
||||||
|
// Voice from settings
|
||||||
|
if let Some(db) = crate::DB.get() {
|
||||||
|
let s = db.read();
|
||||||
|
t.set("voice", s.voice.clone())?;
|
||||||
|
t.set("microphone", s.microphone)?;
|
||||||
|
t.set("vosk_model", s.vosk_model.clone())?;
|
||||||
|
t.set("noise_suppression", format!("{:?}", s.noise_suppression))?;
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(t)
|
||||||
|
})?;
|
||||||
|
jarvis.set("health", health_fn)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
@ -98,5 +98,25 @@ pub fn register(lua: &Lua, jarvis: &Table) -> mlua::Result<()> {
|
||||||
})?;
|
})?;
|
||||||
jarvis.set("llm_switch", switch_fn)?;
|
jarvis.set("llm_switch", switch_fn)?;
|
||||||
|
|
||||||
|
// Clear conversation turns (keeps system prompt). Returns true if history was
|
||||||
|
// initialised, false if LLM is not configured.
|
||||||
|
let reset_fn = lua.create_function(|_, ()| {
|
||||||
|
llm::history_clear();
|
||||||
|
Ok(true)
|
||||||
|
})?;
|
||||||
|
jarvis.set("llm_reset", reset_fn)?;
|
||||||
|
|
||||||
|
// Return the most recent assistant message text, or nil.
|
||||||
|
let last_fn = lua.create_function(|lua, ()| {
|
||||||
|
match llm::history_last_assistant() {
|
||||||
|
Some(text) => {
|
||||||
|
let s = lua.create_string(text)?;
|
||||||
|
Ok(Value::String(s))
|
||||||
|
}
|
||||||
|
None => Ok(Value::Nil),
|
||||||
|
}
|
||||||
|
})?;
|
||||||
|
jarvis.set("llm_last_reply", last_fn)?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -82,6 +82,7 @@ impl LuaEngine {
|
||||||
api::profile::register(&self.lua, &jarvis)?;
|
api::profile::register(&self.lua, &jarvis)?;
|
||||||
api::scheduler::register(&self.lua, &jarvis)?;
|
api::scheduler::register(&self.lua, &jarvis)?;
|
||||||
api::cmd::register(&self.lua, &jarvis)?;
|
api::cmd::register(&self.lua, &jarvis)?;
|
||||||
|
api::health::register(&self.lua, &jarvis)?;
|
||||||
|
|
||||||
// sandbox-controlled APIs
|
// sandbox-controlled APIs
|
||||||
if self.sandbox.allows_http() {
|
if self.sandbox.allows_http() {
|
||||||
|
|
|
||||||
21
resources/commands/diagnostics/command.toml
Normal file
21
resources/commands/diagnostics/command.toml
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
# Diagnostics — speak a summary of the active runtime state. Useful when
|
||||||
|
# something is misbehaving and you want to know which backends are active.
|
||||||
|
|
||||||
|
[[commands]]
|
||||||
|
id = "diagnostics.health"
|
||||||
|
type = "lua"
|
||||||
|
script = "health.lua"
|
||||||
|
sandbox = "standard"
|
||||||
|
timeout = 3000
|
||||||
|
|
||||||
|
[commands.phrases]
|
||||||
|
ru = [
|
||||||
|
"диагностика",
|
||||||
|
"состояние системы",
|
||||||
|
"статус",
|
||||||
|
"что у тебя сейчас",
|
||||||
|
"проверка системы",
|
||||||
|
"доложи о себе",
|
||||||
|
]
|
||||||
|
en = ["diagnostics", "status report", "health check"]
|
||||||
|
ua = ["діагностика", "стан системи"]
|
||||||
11
resources/commands/diagnostics/health.lua
Normal file
11
resources/commands/diagnostics/health.lua
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
local h = jarvis.health()
|
||||||
|
local line = string.format(
|
||||||
|
"TTS: %s. LLM: %s. Профиль: %s. Памяти фактов: %d. Запланировано: %d. Язык: %s.",
|
||||||
|
h.tts_backend or "—",
|
||||||
|
h.llm_backend or "—",
|
||||||
|
h.active_profile or "—",
|
||||||
|
h.memory_facts or 0,
|
||||||
|
h.scheduled_tasks or 0,
|
||||||
|
h.language or "—"
|
||||||
|
)
|
||||||
|
return jarvis.cmd.ok(line)
|
||||||
39
resources/commands/llm_context/command.toml
Normal file
39
resources/commands/llm_context/command.toml
Normal file
|
|
@ -0,0 +1,39 @@
|
||||||
|
# P0.3: Conversation context controls — reset / repeat last reply.
|
||||||
|
|
||||||
|
[[commands]]
|
||||||
|
id = "llm.reset"
|
||||||
|
type = "lua"
|
||||||
|
script = "reset.lua"
|
||||||
|
sandbox = "standard"
|
||||||
|
timeout = 2000
|
||||||
|
|
||||||
|
[commands.phrases]
|
||||||
|
ru = [
|
||||||
|
"сбрось контекст",
|
||||||
|
"сбрось разговор",
|
||||||
|
"забудь о чём мы говорили",
|
||||||
|
"забудь разговор",
|
||||||
|
"начни разговор заново",
|
||||||
|
"очисти контекст",
|
||||||
|
]
|
||||||
|
en = ["reset context", "forget conversation", "start fresh"]
|
||||||
|
ua = ["скинь контекст", "забудь розмову"]
|
||||||
|
|
||||||
|
|
||||||
|
[[commands]]
|
||||||
|
id = "llm.repeat"
|
||||||
|
type = "lua"
|
||||||
|
script = "repeat.lua"
|
||||||
|
sandbox = "standard"
|
||||||
|
timeout = 5000
|
||||||
|
|
||||||
|
[commands.phrases]
|
||||||
|
ru = [
|
||||||
|
"повтори последнее",
|
||||||
|
"повтори что сказал",
|
||||||
|
"повтори ответ",
|
||||||
|
"что ты сказал",
|
||||||
|
"повтори",
|
||||||
|
]
|
||||||
|
en = ["repeat", "say it again", "repeat the last answer"]
|
||||||
|
ua = ["повтори", "повтори що сказав"]
|
||||||
5
resources/commands/llm_context/repeat.lua
Normal file
5
resources/commands/llm_context/repeat.lua
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
local last = jarvis.llm_last_reply()
|
||||||
|
if not last or last == "" then
|
||||||
|
return jarvis.cmd.not_found("Мне нечего повторить.")
|
||||||
|
end
|
||||||
|
return jarvis.cmd.ok(last)
|
||||||
2
resources/commands/llm_context/reset.lua
Normal file
2
resources/commands/llm_context/reset.lua
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
jarvis.llm_reset()
|
||||||
|
return jarvis.cmd.ok("Контекст сброшен.")
|
||||||
31
resources/commands/quick_search/command.toml
Normal file
31
resources/commands/quick_search/command.toml
Normal file
|
|
@ -0,0 +1,31 @@
|
||||||
|
# Quick-search-read — answer questions using DuckDuckGo Instant Answer API + LLM.
|
||||||
|
# No API key required. Falls back to pure LLM if web search returns nothing.
|
||||||
|
|
||||||
|
[[commands]]
|
||||||
|
id = "quick_search"
|
||||||
|
type = "lua"
|
||||||
|
script = "search.lua"
|
||||||
|
sandbox = "full"
|
||||||
|
timeout = 30000
|
||||||
|
|
||||||
|
[commands.phrases]
|
||||||
|
ru = [
|
||||||
|
"найди в гугле",
|
||||||
|
"найди в интернете",
|
||||||
|
"поищи в гугле",
|
||||||
|
"найди и расскажи",
|
||||||
|
"загугли",
|
||||||
|
"посмотри в гугле",
|
||||||
|
"поищи информацию",
|
||||||
|
"найди информацию о",
|
||||||
|
]
|
||||||
|
en = [
|
||||||
|
"google for",
|
||||||
|
"search for",
|
||||||
|
"find online",
|
||||||
|
"look up",
|
||||||
|
]
|
||||||
|
ua = [
|
||||||
|
"знайди в гуглі",
|
||||||
|
"погугли",
|
||||||
|
]
|
||||||
83
resources/commands/quick_search/search.lua
Normal file
83
resources/commands/quick_search/search.lua
Normal file
|
|
@ -0,0 +1,83 @@
|
||||||
|
-- "Найди в гугле что такое квантовая запутанность"
|
||||||
|
-- Uses DuckDuckGo's free Instant Answer API (api.duckduckgo.com). No key.
|
||||||
|
-- The IA response often has a "Abstract" / "AbstractText" / "AbstractURL" set
|
||||||
|
-- for well-known topics. We feed Abstract + RelatedTopics to the LLM for a
|
||||||
|
-- spoken summary. Falls back to pure LLM knowledge if DDG returns nothing useful.
|
||||||
|
|
||||||
|
local phrase = (jarvis.context.phrase or "")
|
||||||
|
|
||||||
|
local query = jarvis.text.strip_trigger(phrase:lower(), {
|
||||||
|
"найди и расскажи",
|
||||||
|
"найди в гугле",
|
||||||
|
"найди в интернете",
|
||||||
|
"поищи в гугле",
|
||||||
|
"посмотри в гугле",
|
||||||
|
"загугли",
|
||||||
|
"поищи информацию о",
|
||||||
|
"поищи информацию",
|
||||||
|
"найди информацию о",
|
||||||
|
"google for",
|
||||||
|
"search for",
|
||||||
|
"find online",
|
||||||
|
"look up",
|
||||||
|
"знайди в гуглі",
|
||||||
|
"погугли",
|
||||||
|
})
|
||||||
|
query = query:gsub("^[%s,:%.]+", ""):gsub("%s+$", "")
|
||||||
|
|
||||||
|
if query == "" then
|
||||||
|
return jarvis.cmd.error("Что искать?")
|
||||||
|
end
|
||||||
|
|
||||||
|
local function urlencode(s)
|
||||||
|
return (s:gsub("[^A-Za-z0-9%-_%.~]", function(c)
|
||||||
|
return string.format("%%%02X", string.byte(c))
|
||||||
|
end))
|
||||||
|
end
|
||||||
|
|
||||||
|
local url = "https://api.duckduckgo.com/?q=" .. urlencode(query)
|
||||||
|
.. "&format=json&no_html=1&skip_disambig=1"
|
||||||
|
|
||||||
|
local data = jarvis.http.json(url)
|
||||||
|
|
||||||
|
local context = ""
|
||||||
|
if data then
|
||||||
|
if data.AbstractText and data.AbstractText ~= "" then
|
||||||
|
context = data.AbstractText
|
||||||
|
if data.AbstractURL and data.AbstractURL ~= "" then
|
||||||
|
context = context .. "\nИсточник: " .. data.AbstractURL
|
||||||
|
end
|
||||||
|
elseif data.RelatedTopics and #data.RelatedTopics > 0 then
|
||||||
|
local lines = {}
|
||||||
|
for i = 1, math.min(4, #data.RelatedTopics) do
|
||||||
|
local t = data.RelatedTopics[i]
|
||||||
|
if t.Text then table.insert(lines, t.Text) end
|
||||||
|
end
|
||||||
|
context = table.concat(lines, "\n")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local user_prompt
|
||||||
|
if context ~= "" then
|
||||||
|
user_prompt = string.format(
|
||||||
|
"Вопрос пользователя: %s\n\nДанные из веб-поиска:\n%s\n\nОтветь на вопрос по-русски, кратко (2-4 предложения), используя данные. Если данных мало — добавь из своих знаний.",
|
||||||
|
query, context
|
||||||
|
)
|
||||||
|
else
|
||||||
|
user_prompt = string.format(
|
||||||
|
"Вопрос пользователя: %s\n\nВеб-поиск ничего полезного не дал. Ответь по-русски кратко (2-4 предложения), используя свои знания. Если не уверен — скажи об этом.",
|
||||||
|
query
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
local answer = jarvis.llm({
|
||||||
|
{ role = "system", content = "Ты — справочный помощник. Отвечай кратко и по делу, без вводных фраз." },
|
||||||
|
{ role = "user", content = user_prompt }
|
||||||
|
}, { max_tokens = 350, temperature = 0.3 })
|
||||||
|
|
||||||
|
if not answer or answer == "" then
|
||||||
|
return jarvis.cmd.error("Не получилось получить ответ.")
|
||||||
|
end
|
||||||
|
|
||||||
|
jarvis.system.notify("Поиск: " .. query, answer:sub(1, 200))
|
||||||
|
return jarvis.cmd.ok(answer)
|
||||||
Loading…
Add table
Add a link
Reference in a new issue