bossiara13/J.A.R.V.I.S-rust
1
1
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Activity Actions
J.A.R.V.I.S-rust/resources/commands/pomodoro/stop.lua

9 lines
340 B
Lua
Raw Normal View History

feat: Ollama LLM backend + 5 utility packs (daily briefing, pomodoro, currency convert, stocks, habits, translate clipboard) Local-LLM support so J.A.R.V.I.S. works offline without GROQ_TOKEN. LLM multi-backend (crates/jarvis-core/src/llm/client.rs) - LlmBackend enum {Groq, Ollama}. Both use OpenAI-compatible /v1/chat/completions (Ollama exposes one natively at :11434/v1). - LlmClient::from_env() now dispatches on JARVIS_LLM=groq|ollama. Auto-detect: Groq if GROQ_TOKEN set, else Ollama. - New helpers: LlmClient::groq() (was: from_env), LlmClient::ollama(). - Reqwest client now has a 60s timeout (was: unbounded — Groq freezes could hang). - api_key skipped when empty (Ollama doesn't need auth). - Defaults: OLLAMA_BASE_URL=http://localhost:11434/v1, OLLAMA_MODEL=qwen2.5:3b. Override via OLLAMA_BASE_URL / OLLAMA_MODEL env. - llm_fallback + llm_router log the active backend on init. - Tests: 32/32 pass. Renamed `from_env_fails` → `groq_fails_when_token_missing`, added `ollama_works_without_token`. Daily briefing pack (resources/commands/daily_briefing/, 3 commands) - setup.lua: "настрой утренний брифинг на 9:00" → adds a daily scheduled task that runs now.lua via the scheduler's Lua-action support. - now.lua: greeting + time + active profile + scheduled task count + memory recap + LLM motivational nudge. Voice-triggered ("утренний брифинг") works the same. - off.lua: removes the scheduled task. Pomodoro pack (resources/commands/pomodoro/, 2 commands) - start.lua / stop.lua + tick.lua (re-scheduled by itself). State stored in jarvis.state — phase alternates work (25 min) / break (5 min) until stop. Currency conversion (resources/commands/currency/convert.lua) - "сколько будет 1000 долларов в рублях" — fetches CBR daily rates from cbr-xml-daily.ru, normalises by Nominal, prints both directions. - Recognises USD/EUR/CNY/GBP/JPY/RUB by substring. Pluralises russian units. Stocks pack (resources/commands/stocks/, 1 command) - "сколько Сбер" → MOEX ISS /iss/engines/stock/markets/shares/securities/<TKR>. - Mapping of 22 popular Russian tickers to common names (Сбер→SBER, Газпром→GAZP, Лукойл→LKOH, Яндекс→YDEX, Т-банк→T, etc). - Picks TQBR (main board) row, reports LAST + LASTTOPREVPRICE%. Habit nudges (resources/commands/habit_nudge/, 4 commands) - "напоминай мне пить воду" → every 2 hours - "напоминай мне размяться" → every 50 minutes - "напоминай отдыхать глазам" → every 20 minutes (20-20-20 rule) - "отключи все привычки" → stops all three by id. Translate clipboard (resources/commands/translate/clipboard.lua) - "переведи буфер на английский" → grabs clipboard, sends to LLM, speaks first sentence, replaces clipboard with full translation, fires notification. Build: cargo build --release -p jarvis-app -p jarvis-gui both green. 32/32 tests. To use Ollama: 1. Install + run Ollama (https://ollama.com). 2. `ollama pull qwen2.5:3b` (or any chat model). 3. Optional: `set JARVIS_LLM=ollama` (auto-picked if GROQ_TOKEN unset).
2026-05-15 15:51:24 +03:00
local removed_w = jarvis.scheduler.remove("pomodoro_work")
local removed_b = jarvis.scheduler.remove("pomodoro_break")
jarvis.state.set("pomodoro_phase", "")
if removed_w or removed_b then
refactor: maintainability pass — dedup, central env config, cmd helpers, tests, ARCHITECTURE.md User asked the code stays easy to fix/extend as the feature surface grows. This commit refactors what was duplicated, centralises what was scattered, adds tests where there were none, and writes the architecture doc that contributors will need. Deduplication - tts::play_wav extracted to tts/mod.rs as pub(crate). Was identical in piper.rs and silero.rs (~25 lines × 2). Both backends now call super::play_wav. Centralised env config - new crates/jarvis-core/src/runtime_config.rs — single doc-file for every JARVIS_* / GROQ_* / OLLAMA_* env var. Includes: - ENV_* constants with doc comments - get(name) / get_bool(name, default) / get_parse(name, default) helpers - feature-flag wrappers: llm_tts_enabled(), llm_router_enabled(), llm_router_threshold() - log_effective_config() prints active values on startup - migrated llm_fallback (JARVIS_LLM_TTS), llm_router (JARVIS_LLM_ROUTER, JARVIS_LLM_ROUTER_THRESHOLD) to use the new helpers. Pattern set for future migrations. Lua boilerplate killer - new crates/jarvis-core/src/lua/api/cmd.rs exposing: jarvis.cmd.ok(msg?) — play_ok + speak + {chain=false} jarvis.cmd.chain_ok(msg?) — same but chain=true jarvis.cmd.error(msg?) — play_error + speak + {chain=false} jarvis.cmd.not_found(msg?) — play_not_found + speak + {chain=false} jarvis.cmd.silent_ok / silent_error - refactored 5 packs (daily_briefing/off, memory_pack/list, pomodoro/stop, habit_nudge/stop_all, scheduler/clear) — each lost 3-4 lines of repetitive play_*/speak/return boilerplate. Pattern for future packs documented in ARCHITECTURE.md. Tests (was 32, now 49) - long_term_memory: 8 new tests for normalize_key, search_in (rank, limit, empty), build_context_from (empty + populated), serde round-trips for MemoryRecord and Store. Extracted pure logic (search_in, build_context_from) into pub(crate) functions to enable testing without global state. - profiles: 6 new tests for Profile::allows_command (empty/whitelist/blacklist/ deny-wins-over-allow), serde round-trip with all fields + minimal-fields tolerance via #[serde(default)]. - runtime_config: 2 tests for get_bool / get_parse defaults. - All 49 tests pass. New mood/energy log pack - resources/commands/mood_log/ with 2 commands: mood.record "запиши настроение 7" / "сегодня мне грустно" → stores timestamped entry via jarvis.memory.remember mood.recap "как прошла неделя" → LLM summarises last 30 entries - Showcase: composes memory + llm + cmd helpers in <30 lines per script. ARCHITECTURE.md (new, 250 lines) - Crate layout, data flow diagram (mic→action 10 steps), per-module responsibility table, configuration layers, TTS pipeline diagram, Lua sandbox details with API quick-ref, background-services overview, "how to add a pack/feature/TTS backend" recipes, test coverage map, build instructions with MSVC env, git workflow with Forgejo NO_PROXY trick. - Aimed at someone who just cloned the repo and needs to fix a bug fast. Build: cargo build --release -p jarvis-app -p jarvis-gui both green. Tests: 49/49 jarvis-core unit tests pass.
2026-05-15 16:06:18 +03:00
return jarvis.cmd.ok("Помодоро остановлен.")
feat: Ollama LLM backend + 5 utility packs (daily briefing, pomodoro, currency convert, stocks, habits, translate clipboard) Local-LLM support so J.A.R.V.I.S. works offline without GROQ_TOKEN. LLM multi-backend (crates/jarvis-core/src/llm/client.rs) - LlmBackend enum {Groq, Ollama}. Both use OpenAI-compatible /v1/chat/completions (Ollama exposes one natively at :11434/v1). - LlmClient::from_env() now dispatches on JARVIS_LLM=groq|ollama. Auto-detect: Groq if GROQ_TOKEN set, else Ollama. - New helpers: LlmClient::groq() (was: from_env), LlmClient::ollama(). - Reqwest client now has a 60s timeout (was: unbounded — Groq freezes could hang). - api_key skipped when empty (Ollama doesn't need auth). - Defaults: OLLAMA_BASE_URL=http://localhost:11434/v1, OLLAMA_MODEL=qwen2.5:3b. Override via OLLAMA_BASE_URL / OLLAMA_MODEL env. - llm_fallback + llm_router log the active backend on init. - Tests: 32/32 pass. Renamed `from_env_fails` → `groq_fails_when_token_missing`, added `ollama_works_without_token`. Daily briefing pack (resources/commands/daily_briefing/, 3 commands) - setup.lua: "настрой утренний брифинг на 9:00" → adds a daily scheduled task that runs now.lua via the scheduler's Lua-action support. - now.lua: greeting + time + active profile + scheduled task count + memory recap + LLM motivational nudge. Voice-triggered ("утренний брифинг") works the same. - off.lua: removes the scheduled task. Pomodoro pack (resources/commands/pomodoro/, 2 commands) - start.lua / stop.lua + tick.lua (re-scheduled by itself). State stored in jarvis.state — phase alternates work (25 min) / break (5 min) until stop. Currency conversion (resources/commands/currency/convert.lua) - "сколько будет 1000 долларов в рублях" — fetches CBR daily rates from cbr-xml-daily.ru, normalises by Nominal, prints both directions. - Recognises USD/EUR/CNY/GBP/JPY/RUB by substring. Pluralises russian units. Stocks pack (resources/commands/stocks/, 1 command) - "сколько Сбер" → MOEX ISS /iss/engines/stock/markets/shares/securities/<TKR>. - Mapping of 22 popular Russian tickers to common names (Сбер→SBER, Газпром→GAZP, Лукойл→LKOH, Яндекс→YDEX, Т-банк→T, etc). - Picks TQBR (main board) row, reports LAST + LASTTOPREVPRICE%. Habit nudges (resources/commands/habit_nudge/, 4 commands) - "напоминай мне пить воду" → every 2 hours - "напоминай мне размяться" → every 50 minutes - "напоминай отдыхать глазам" → every 20 minutes (20-20-20 rule) - "отключи все привычки" → stops all three by id. Translate clipboard (resources/commands/translate/clipboard.lua) - "переведи буфер на английский" → grabs clipboard, sends to LLM, speaks first sentence, replaces clipboard with full translation, fires notification. Build: cargo build --release -p jarvis-app -p jarvis-gui both green. 32/32 tests. To use Ollama: 1. Install + run Ollama (https://ollama.com). 2. `ollama pull qwen2.5:3b` (or any chat model). 3. Optional: `set JARVIS_LLM=ollama` (auto-picked if GROQ_TOKEN unset).
2026-05-15 15:51:24 +03:00
end
refactor: maintainability pass — dedup, central env config, cmd helpers, tests, ARCHITECTURE.md User asked the code stays easy to fix/extend as the feature surface grows. This commit refactors what was duplicated, centralises what was scattered, adds tests where there were none, and writes the architecture doc that contributors will need. Deduplication - tts::play_wav extracted to tts/mod.rs as pub(crate). Was identical in piper.rs and silero.rs (~25 lines × 2). Both backends now call super::play_wav. Centralised env config - new crates/jarvis-core/src/runtime_config.rs — single doc-file for every JARVIS_* / GROQ_* / OLLAMA_* env var. Includes: - ENV_* constants with doc comments - get(name) / get_bool(name, default) / get_parse(name, default) helpers - feature-flag wrappers: llm_tts_enabled(), llm_router_enabled(), llm_router_threshold() - log_effective_config() prints active values on startup - migrated llm_fallback (JARVIS_LLM_TTS), llm_router (JARVIS_LLM_ROUTER, JARVIS_LLM_ROUTER_THRESHOLD) to use the new helpers. Pattern set for future migrations. Lua boilerplate killer - new crates/jarvis-core/src/lua/api/cmd.rs exposing: jarvis.cmd.ok(msg?) — play_ok + speak + {chain=false} jarvis.cmd.chain_ok(msg?) — same but chain=true jarvis.cmd.error(msg?) — play_error + speak + {chain=false} jarvis.cmd.not_found(msg?) — play_not_found + speak + {chain=false} jarvis.cmd.silent_ok / silent_error - refactored 5 packs (daily_briefing/off, memory_pack/list, pomodoro/stop, habit_nudge/stop_all, scheduler/clear) — each lost 3-4 lines of repetitive play_*/speak/return boilerplate. Pattern for future packs documented in ARCHITECTURE.md. Tests (was 32, now 49) - long_term_memory: 8 new tests for normalize_key, search_in (rank, limit, empty), build_context_from (empty + populated), serde round-trips for MemoryRecord and Store. Extracted pure logic (search_in, build_context_from) into pub(crate) functions to enable testing without global state. - profiles: 6 new tests for Profile::allows_command (empty/whitelist/blacklist/ deny-wins-over-allow), serde round-trip with all fields + minimal-fields tolerance via #[serde(default)]. - runtime_config: 2 tests for get_bool / get_parse defaults. - All 49 tests pass. New mood/energy log pack - resources/commands/mood_log/ with 2 commands: mood.record "запиши настроение 7" / "сегодня мне грустно" → stores timestamped entry via jarvis.memory.remember mood.recap "как прошла неделя" → LLM summarises last 30 entries - Showcase: composes memory + llm + cmd helpers in <30 lines per script. ARCHITECTURE.md (new, 250 lines) - Crate layout, data flow diagram (mic→action 10 steps), per-module responsibility table, configuration layers, TTS pipeline diagram, Lua sandbox details with API quick-ref, background-services overview, "how to add a pack/feature/TTS backend" recipes, test coverage map, build instructions with MSVC env, git workflow with Forgejo NO_PROXY trick. - Aimed at someone who just cloned the repo and needs to fix a bug fast. Build: cargo build --release -p jarvis-app -p jarvis-gui both green. Tests: 49/49 jarvis-core unit tests pass.
2026-05-15 16:06:18 +03:00
return jarvis.cmd.not_found("Помодоро и так не запущен.")
Reference in a new issue Copy permalink