J.A.R.V.I.S-rust

bossiara13/J.A.R.V.I.S-rust

Fork 0

Commit graph

Author	SHA1	Message	Date
Bossiara13	45243c3e3c	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
Bossiara13	9d8b917149	feat(commands): analog-inspired tier-2 — news, currency, crypto, fun, wiki, power, help (33 packs) Seven more portable Lua packs lifted from common voice-assistant playbooks (Siri/Alexa/Алиса/Cortana). All sandbox=full, jarvis.http + jarvis.system.exec, zero new Rust code. cargo test still 3/3. news/ — pulls Lenta.ru RSS (en switches to BBC), regex-extracts the top 5 <title> entries (skipping the channel header), drops them into the clipboard, then asks Groq for a 2-3 sentence summary at temp 0.4 and speaks it via SAPI. If GROQ_TOKEN is missing it falls back to just reading the first three headlines. currency/ — cbr-xml-daily.ru/daily_json.js. Picks USD/EUR/CNY/GBP/ JPY/KZT by keyword in the phrase, computes value / nominal, diffs against Valute.Previous, says "X стоит N рублей, поднялся/опустился на M" with ▲/▼ in the notify body. crypto/ — CoinGecko simple/price with usd,rub and 24hr_change. Recognises bitcoin / ethereum / solana / dogecoin / the-open-network. Reports price + direction in plain Russian. fun/ — joke / fact / quote / compliment, single ask.lua dispatched by command_id. Per-command system prompt at temp 1.0; seeds with a random integer so consecutive calls don't repeat. wiki/ — ru.wikipedia opensearch → REST summary endpoint. If Groq is available and extract > 350 chars, asks for a 2-3 sentence retell; otherwise speaks the first 400 chars verbatim. Full extract goes to clipboard. power/ — shutdown_pc / restart_pc / sleep_pc / hibernate_pc / logoff_user / cancel_shutdown. Single act.lua keyed by command_id. shutdown/restart use shutdown.exe /s\|/r /t 30 with a /c message — 30-second grace window so "отмени выключение" actually works. sleep uses rundll32 powrprof,SetSuspendState, hibernate uses shutdown.exe /h. help/ — "что ты умеешь". Reads the parent commands/ dir via jarvis.fs.list, sorts subdirs (pack names), pairs each with a hardcoded Russian/English one-liner description, copies the full list to clipboard and speaks a count + "see clipboard for full list". Total command packs is now 33 (was 26).	2026-05-15 12:43:09 +03:00

Author

SHA1

Message

Date

Bossiara13

45243c3e3c

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

Bossiara13

9d8b917149

feat(commands): analog-inspired tier-2 — news, currency, crypto, fun, wiki, power, help (33 packs)

Seven more portable Lua packs lifted from common voice-assistant
playbooks (Siri/Alexa/Алиса/Cortana). All sandbox=full, jarvis.http
+ jarvis.system.exec, zero new Rust code. cargo test still 3/3.

news/ — pulls Lenta.ru RSS (en switches to BBC), regex-extracts the
top 5 <title> entries (skipping the channel header), drops them into
the clipboard, then asks Groq for a 2-3 sentence summary at temp 0.4
and speaks it via SAPI. If GROQ_TOKEN is missing it falls back to
just reading the first three headlines.

currency/ — cbr-xml-daily.ru/daily_json.js. Picks USD/EUR/CNY/GBP/
JPY/KZT by keyword in the phrase, computes value / nominal, diffs
against Valute.Previous, says "X стоит N рублей, поднялся/опустился
на M" with ▲/▼ in the notify body.

crypto/ — CoinGecko simple/price with usd,rub and 24hr_change.
Recognises bitcoin / ethereum / solana / dogecoin / the-open-network.
Reports price + direction in plain Russian.

fun/ — joke / fact / quote / compliment, single ask.lua dispatched by
command_id. Per-command system prompt at temp 1.0; seeds with a
random integer so consecutive calls don't repeat.

wiki/ — ru.wikipedia opensearch → REST summary endpoint. If Groq is
available and extract > 350 chars, asks for a 2-3 sentence retell;
otherwise speaks the first 400 chars verbatim. Full extract goes to
clipboard.

power/ — shutdown_pc / restart_pc / sleep_pc / hibernate_pc /
logoff_user / cancel_shutdown. Single act.lua keyed by command_id.
shutdown/restart use shutdown.exe /s|/r /t 30 with a /c message —
30-second grace window so "отмени выключение" actually works.
sleep uses rundll32 powrprof,SetSuspendState, hibernate uses
shutdown.exe /h.

help/ — "что ты умеешь". Reads the parent commands/ dir via
jarvis.fs.list, sorts subdirs (pack names), pairs each with a
hardcoded Russian/English one-liner description, copies the full
list to clipboard and speaks a count + "see clipboard for full list".

Total command packs is now 33 (was 26).

2026-05-15 12:43:09 +03:00

2 commits