feat(scheduler): IMBA-5 proactive scheduler — reminders, daily briefings, intervals
Background thread that wakes J.A.R.V.I.S. on a schedule to speak reminders.
Nothing else competes here on desktop — Алиса/Сири are reactive-only.
Core (crates/jarvis-core/src/scheduler.rs)
- Schedule::{Daily{h,m}, Interval{secs}, Once{at}} with Schedule::parse for
"daily HH:MM" / "at HH:MM" / "every N minutes|hours" / "in N minutes|hours".
Russian units (час/часа/часов/минут/секунд) also accepted.
- ScheduledTask {id, name, schedule, action, last_fired, enabled, created_at}.
Action::Speak{text} | Action::Lua{script_path}.
- JSON persistence at <APP_CONFIG_DIR>/schedule.json, atomic write-through.
- add/remove/clear/list/find; mark_fired auto-deletes Once tasks.
- start_background() spawns a 30-second tick thread (idempotent). Each tick
calls due_tasks(), fires Action via tts::speak_default (after voices::play_reply
"ahem" cue) or Lua engine.
- 7 unit tests (all passing).
Lua API (crates/jarvis-core/src/lua/api/scheduler.rs)
- jarvis.scheduler.add({name, schedule, action={type, text|script_path}})
- jarvis.scheduler.{list, count, remove(id), clear}.
- Tasks come back as {id, name, schedule_human, action, enabled, last_fired}.
Wire-up (crates/jarvis-app/src/main.rs)
- scheduler::init() + scheduler::start_background() after profiles::init.
- Tasks survive restarts via schedule.json.
Voice commands (resources/commands/scheduler/, 6 ids)
- scheduler.add_reminder "напомни через 5 минут выключить кофеварку"
- scheduler.add_at "напомни в 18:00 забрать ребёнка"
- scheduler.add_recurring "каждые 2 часа напоминай попить воды"
- scheduler.add_daily "каждый день в 9:00 делай briefing"
- scheduler.list "что у меня запланировано"
- scheduler.clear "очисти расписание"
Russian-aware parsers (час/часа/часов, минут/минуту/минуты) live inside the Lua
packs — easy to extend without touching Rust.
Tests: 31/31 jarvis-core unit tests pass (24 prior + 7 scheduler).
Build: cargo build --release -p jarvis-app and -p jarvis-gui both green.
This commit is contained in:
parent
0b1f1d4480
commit
12b1ed4ccb
13 changed files with 1038 additions and 1 deletions
|
|
@ -10,4 +10,5 @@ pub mod llm;
|
|||
pub mod text;
|
||||
pub mod memory;
|
||||
pub mod profile;
|
||||
pub mod vision;
|
||||
pub mod vision;
|
||||
pub mod scheduler;
|
||||
144
crates/jarvis-core/src/lua/api/scheduler.rs
Normal file
144
crates/jarvis-core/src/lua/api/scheduler.rs
Normal file
|
|
@ -0,0 +1,144 @@
|
|||
//! Lua bindings for the proactive scheduler.
|
||||
//!
|
||||
//! Usage:
|
||||
//! jarvis.scheduler.add({
|
||||
//! name = "Daily briefing",
|
||||
//! schedule = "daily 09:00",
|
||||
//! action = { type = "speak", text = "Доброе утро. Готов к работе." }
|
||||
//! })
|
||||
//!
|
||||
//! jarvis.scheduler.add({
|
||||
//! name = "Reminder",
|
||||
//! schedule = "in 5 minutes",
|
||||
//! action = { type = "speak", text = "Выключи кофеварку." }
|
||||
//! })
|
||||
//!
|
||||
//! for _, t in ipairs(jarvis.scheduler.list()) do
|
||||
//! print(t.id, t.name, t.schedule_human)
|
||||
//! end
|
||||
//!
|
||||
//! jarvis.scheduler.remove(id)
|
||||
//! jarvis.scheduler.clear()
|
||||
//!
|
||||
//! Schedule string syntax (see `scheduler::Schedule::parse`):
|
||||
//! "daily HH:MM" | "at HH:MM" | "every N minutes" | "every N hours" | "in N minutes" | "in N hours"
|
||||
|
||||
use mlua::{Lua, Table, Value};
|
||||
|
||||
use crate::scheduler::{self, Action, Schedule, ScheduledTask};
|
||||
|
||||
pub fn register(lua: &Lua, jarvis: &Table) -> mlua::Result<()> {
|
||||
let sched = lua.create_table()?;
|
||||
|
||||
let add_fn = lua.create_function(|_, t: Table| {
|
||||
let name: String = t.get::<Option<String>>("name")?.unwrap_or_else(|| "task".to_string());
|
||||
let schedule_str: String = t.get::<String>("schedule")?;
|
||||
let id: String = t.get::<Option<String>>("id")?.unwrap_or_default();
|
||||
|
||||
let action_tbl: Table = t.get::<Table>("action")?;
|
||||
let action_type: String = action_tbl.get::<String>("type")?;
|
||||
let action = match action_type.as_str() {
|
||||
"speak" => Action::Speak {
|
||||
text: action_tbl.get::<String>("text").unwrap_or_default(),
|
||||
},
|
||||
"lua" => Action::Lua {
|
||||
script_path: action_tbl.get::<String>("script_path").unwrap_or_default(),
|
||||
},
|
||||
other => return Err(mlua::Error::external(format!("unknown action type: {}", other))),
|
||||
};
|
||||
|
||||
let schedule = Schedule::parse(&schedule_str)
|
||||
.map_err(|e| mlua::Error::external(format!("bad schedule '{}': {}", schedule_str, e)))?;
|
||||
|
||||
let task = ScheduledTask {
|
||||
id,
|
||||
name,
|
||||
schedule,
|
||||
action,
|
||||
last_fired: None,
|
||||
enabled: true,
|
||||
created_at: 0,
|
||||
};
|
||||
scheduler::add(task).map_err(mlua::Error::external)
|
||||
})?;
|
||||
sched.set("add", add_fn)?;
|
||||
|
||||
let remove_fn = lua.create_function(|_, id: String| {
|
||||
Ok(scheduler::remove(&id))
|
||||
})?;
|
||||
sched.set("remove", remove_fn)?;
|
||||
|
||||
let clear_fn = lua.create_function(|_, ()| {
|
||||
Ok(scheduler::clear())
|
||||
})?;
|
||||
sched.set("clear", clear_fn)?;
|
||||
|
||||
let list_fn = lua.create_function(|lua, ()| {
|
||||
let arr = lua.create_table()?;
|
||||
for (i, t) in scheduler::list().iter().enumerate() {
|
||||
arr.set(i + 1, task_to_lua(lua, t)?)?;
|
||||
}
|
||||
Ok(arr)
|
||||
})?;
|
||||
sched.set("list", list_fn)?;
|
||||
|
||||
let count_fn = lua.create_function(|_, ()| {
|
||||
Ok(scheduler::list().len())
|
||||
})?;
|
||||
sched.set("count", count_fn)?;
|
||||
|
||||
jarvis.set("scheduler", sched)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn task_to_lua(lua: &Lua, t: &ScheduledTask) -> mlua::Result<Table> {
|
||||
let tbl = lua.create_table()?;
|
||||
tbl.set("id", t.id.clone())?;
|
||||
tbl.set("name", t.name.clone())?;
|
||||
tbl.set("enabled", t.enabled)?;
|
||||
tbl.set("created_at", t.created_at)?;
|
||||
tbl.set("schedule_human", schedule_human(&t.schedule))?;
|
||||
|
||||
let last_fired: Value = match t.last_fired {
|
||||
Some(ts) => Value::Integer(ts),
|
||||
None => Value::Nil,
|
||||
};
|
||||
tbl.set("last_fired", last_fired)?;
|
||||
|
||||
let action_tbl = lua.create_table()?;
|
||||
match &t.action {
|
||||
Action::Speak { text } => {
|
||||
action_tbl.set("type", "speak")?;
|
||||
action_tbl.set("text", text.clone())?;
|
||||
}
|
||||
Action::Lua { script_path } => {
|
||||
action_tbl.set("type", "lua")?;
|
||||
action_tbl.set("script_path", script_path.clone())?;
|
||||
}
|
||||
}
|
||||
tbl.set("action", action_tbl)?;
|
||||
|
||||
Ok(tbl)
|
||||
}
|
||||
|
||||
fn schedule_human(s: &Schedule) -> String {
|
||||
match s {
|
||||
Schedule::Daily { hour, minute } => format!("каждый день в {:02}:{:02}", hour, minute),
|
||||
Schedule::Interval { seconds } => {
|
||||
if *seconds % 3600 == 0 {
|
||||
format!("каждые {} часов", seconds / 3600)
|
||||
} else if *seconds % 60 == 0 {
|
||||
format!("каждые {} минут", seconds / 60)
|
||||
} else {
|
||||
format!("каждые {} секунд", seconds)
|
||||
}
|
||||
}
|
||||
Schedule::Once { at } => {
|
||||
chrono::DateTime::from_timestamp(*at, 0)
|
||||
.map(|dt: chrono::DateTime<chrono::Utc>| {
|
||||
dt.with_timezone(&chrono::Local).format("один раз в %H:%M %d.%m").to_string()
|
||||
})
|
||||
.unwrap_or_else(|| format!("один раз в {}", at))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -80,6 +80,7 @@ impl LuaEngine {
|
|||
api::text::register(&self.lua, &jarvis)?;
|
||||
api::memory::register(&self.lua, &jarvis)?;
|
||||
api::profile::register(&self.lua, &jarvis)?;
|
||||
api::scheduler::register(&self.lua, &jarvis)?;
|
||||
|
||||
// sandbox-controlled APIs
|
||||
if self.sandbox.allows_http() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue