feat: real-Jarvis Wave 4 — personality, idle banter, persistent history, offline math, DDG search
Personality pack (`resources/commands/personality/`):
- 5 voice commands × ~7-29 phrases each across RU and EN.
- personality.greet: 4 time-of-day buckets (morning/midday/evening/night),
pulls one of ~7 lines per bucket per language.
- personality.thanks / .compliment / .how_are_you / .tony_quote.
- how_are_you embeds live memory size + active profile via jarvis.health()
and jarvis.memory.all() for a "feels alive" effect.
- All use jarvis.cmd.ok helpers, no inline PowerShell SAPI.
- Built by sub-agent. Verified: 6 rust command tests + 60 python tests.
Idle banter (`crates/jarvis-core/src/idle_banter.rs`):
- Background thread chimes in periodically without being asked. Gated by
JARVIS_IDLE_BANTER env (default OFF — intrusion is opt-in).
- Quiet hours 23:00–07:00, skipped under "sleep" profile, paused during
active interactions via `pause()`.
- 30+ static offline lines split into RU/EN × morning/evening/generic
buckets — no network required.
- Lua API jarvis.banter.{fire, pause, resume, enabled}.
- New voice pack `banter/` exposes "скажи что-нибудь интересное",
"помолчи", "можешь говорить".
- 6 unit tests covering pool selection, quiet hours, interval clamp,
pause/resume, opt-in default.
Conversation continuity (`crates/jarvis-core/src/llm/history.rs`):
- New `ConversationHistory::with_persistence(path)` builder. Every
push/clear/pop atomically writes to `<APP_CONFIG_DIR>/llm_history.json`
so daemon restart picks up the thread.
- System prompt is intentionally NOT persisted — comes from current init
call so prompt edits take effect immediately on restart.
- `llm::init_history` wires the path in automatically.
- 4 new tests: round-trip, clear wipes file, corrupt file tolerated,
len/is_empty helpers.
Offline-first math (`resources/commands/math/math.lua`):
- Was: always-LLM, hard fail without GROQ_TOKEN, inline PowerShell SAPI.
- Now: shunting-yard parser handles 95% of voice queries in <50ms — no
network, no token. Russian operator words ("плюс", "умножить на",
"в степени", "квадрат", ...) normalised to symbols first. Patterns
for "корень из X" and "X процентов от Y". Falls back to LLM only on
parse failure (word problems / equations / unit conversions).
- Drops inline PowerShell — speaks via jarvis.cmd.ok.
- 10-case shunting-yard kernel test added (basic ops, precedence,
parens, unary minus, div-by-zero, garbage rejected).
DuckDuckGo Instant Answer (`resources/commands/ddg_answer/`):
- New pack — short factual Q&A without API key. Trigger phrases
"что такое", "кто такой", "расскажи про", "what is", etc.
- Reads AbstractText → Answer → Definition → RelatedTopics[0] in order
from DDG's free JSON API. Opens the search page only if nothing
useful comes back.
- Sandbox full (needs http + system.open).
Tests: 128 → 139 (+11). Release build green.
This commit is contained in:
Bossiara13
parent
3f8300dc6f
commit
919d565879
23 changed files with 1450 additions and 54 deletions
|
|
@ -1,40 +1,246 @@
|
|||
-- Quick math — offline-first arithmetic evaluator.
|
||||
--
|
||||
-- Strategy:
|
||||
-- 1. Strip the trigger phrase from the user's utterance.
|
||||
-- 2. Normalise Russian/English operator words (плюс/minus/в степени/...) into
|
||||
-- symbols so the remainder looks like a regular numeric expression.
|
||||
-- 3. Try a small shunting-yard parser on the result. If it succeeds and the
|
||||
-- output is finite, speak it INSTANTLY — no LLM round-trip.
|
||||
-- 4. Only fall back to the LLM if the local parse failed or returned NaN.
|
||||
-- That covers word problems, multi-step equations, unit conversions.
|
||||
--
|
||||
-- This makes 95% of "сколько будет X плюс Y" complete in under 50ms regardless
|
||||
-- of network or GROQ_TOKEN.
|
||||
|
||||
local lang = jarvis.context.language
|
||||
local phrase = (jarvis.context.phrase or ""):lower()
|
||||
local raw = (jarvis.context.phrase or ""):lower()
|
||||
|
||||
local triggers = {
|
||||
"сколько будет", "сколько это", "посчитай", "вычисли", "реши",
|
||||
"how much is", "calculate", "compute", "solve", "what is",
|
||||
"скільки буде", "порахуй", "обчисли",
|
||||
}
|
||||
|
||||
local query = phrase
|
||||
for _, t in ipairs(triggers) do
|
||||
local s, e = string.find(query, t, 1, true)
|
||||
if s == 1 then
|
||||
query = query:sub(e + 1)
|
||||
break
|
||||
end
|
||||
end
|
||||
local query = jarvis.text.strip_trigger(raw, triggers)
|
||||
if not query or query == "" then query = raw end
|
||||
query = query:gsub("^%s+", ""):gsub("%s+$", "")
|
||||
|
||||
if query == "" then
|
||||
jarvis.system.notify("Math", lang == "ru" and "Что посчитать?" or "What to compute?")
|
||||
jarvis.audio.play_error()
|
||||
return { chain = false }
|
||||
return jarvis.cmd.not_found(lang == "ru" and "Что посчитать?" or "What to compute?")
|
||||
end
|
||||
|
||||
-- ── 1. Russian/English operator → symbol normalisation ────────────────────
|
||||
|
||||
local function normalise(s)
|
||||
local mapping = {
|
||||
{ "плюс", "+" },
|
||||
{ "прибавить к?", "+" },
|
||||
{ "минус", "-" },
|
||||
{ "отнять", "-" },
|
||||
{ "вычесть", "-" },
|
||||
{ "умножить на", "*" },
|
||||
{ "умножь на", "*" },
|
||||
{ "помножить на", "*" },
|
||||
{ "разделить на", "/" },
|
||||
{ "поделить на", "/" },
|
||||
{ "делить на", "/" },
|
||||
{ "в степени", "^" },
|
||||
{ "возвести в степень", "^" },
|
||||
{ "остаток от деления на", "%%" },
|
||||
{ "по модулю", "%%" },
|
||||
{ "квадрат", "^2" },
|
||||
{ "куб", "^3" },
|
||||
{ "plus", "+" },
|
||||
{ "minus", "-" },
|
||||
{ "times", "*" },
|
||||
{ "multiplied by", "*" },
|
||||
{ "divided by", "/" },
|
||||
{ "to the power of", "^" },
|
||||
{ "squared", "^2" },
|
||||
{ "cubed", "^3" },
|
||||
{ "modulo", "%%" },
|
||||
{ "mod", "%%" },
|
||||
}
|
||||
for _, pair in ipairs(mapping) do
|
||||
s = s:gsub(pair[1], pair[2])
|
||||
end
|
||||
-- comma as decimal separator (русская запись)
|
||||
s = s:gsub("(%d),(%d)", "%1.%2")
|
||||
return s
|
||||
end
|
||||
|
||||
-- Pattern: "корень из X" / "квадратный корень из X" → math.sqrt
|
||||
local function handle_sqrt(s)
|
||||
local n = s:match("^%s*к?орен?ь?%s*и?з?%s+(%-?[%d%.]+)%s*$")
|
||||
if not n then n = s:match("^%s*sqrt%s*%(?%s*(%-?[%d%.]+)%s*%)?%s*$") end
|
||||
if n then
|
||||
local v = tonumber(n)
|
||||
if v and v >= 0 then return math.sqrt(v) end
|
||||
end
|
||||
return nil
|
||||
end
|
||||
|
||||
-- Pattern: "X процентов от Y" / "X percent of Y" → X * Y / 100
|
||||
local function handle_percent(s)
|
||||
local x, y = s:match("^%s*(%-?[%d%.]+)%s*процент[%a]*%s*от%s+(%-?[%d%.]+)%s*$")
|
||||
if not x then
|
||||
x, y = s:match("^%s*(%-?[%d%.]+)%s*percent%s*of%s+(%-?[%d%.]+)%s*$")
|
||||
end
|
||||
if x and y then
|
||||
local fx, fy = tonumber(x), tonumber(y)
|
||||
if fx and fy then return fx * fy / 100 end
|
||||
end
|
||||
return nil
|
||||
end
|
||||
|
||||
-- ── 2. Tiny shunting-yard for "<num> <op> <num> <op> <num> ..." with parens
|
||||
local function tokenize(s)
|
||||
local tokens = {}
|
||||
local i = 1
|
||||
while i <= #s do
|
||||
local c = s:sub(i, i)
|
||||
if c:match("[%s]") then
|
||||
i = i + 1
|
||||
elseif c:match("[%d%.]") then
|
||||
local j = i
|
||||
while j <= #s and s:sub(j, j):match("[%d%.]") do j = j + 1 end
|
||||
table.insert(tokens, { kind = "num", val = tonumber(s:sub(i, j - 1)) })
|
||||
i = j
|
||||
elseif c == "+" or c == "-" or c == "*" or c == "/" or c == "^" or c == "%" then
|
||||
-- handle unary minus / plus at expression start or after operator/paren
|
||||
if (c == "-" or c == "+") and (#tokens == 0 or tokens[#tokens].kind == "op" or tokens[#tokens].kind == "lparen") then
|
||||
local j = i + 1
|
||||
while j <= #s and s:sub(j, j):match("[%s]") do j = j + 1 end
|
||||
if j <= #s and s:sub(j, j):match("[%d%.]") then
|
||||
local k = j
|
||||
while k <= #s and s:sub(k, k):match("[%d%.]") do k = k + 1 end
|
||||
local v = tonumber(s:sub(j, k - 1))
|
||||
if v then
|
||||
table.insert(tokens, { kind = "num", val = (c == "-" and -v or v) })
|
||||
i = k
|
||||
else
|
||||
return nil
|
||||
end
|
||||
else
|
||||
return nil
|
||||
end
|
||||
else
|
||||
table.insert(tokens, { kind = "op", val = c })
|
||||
i = i + 1
|
||||
end
|
||||
elseif c == "(" then
|
||||
table.insert(tokens, { kind = "lparen" }); i = i + 1
|
||||
elseif c == ")" then
|
||||
table.insert(tokens, { kind = "rparen" }); i = i + 1
|
||||
else
|
||||
return nil -- unknown char
|
||||
end
|
||||
end
|
||||
return tokens
|
||||
end
|
||||
|
||||
local function precedence(op)
|
||||
if op == "+" or op == "-" then return 1 end
|
||||
if op == "*" or op == "/" or op == "%" then return 2 end
|
||||
if op == "^" then return 3 end
|
||||
return 0
|
||||
end
|
||||
|
||||
local function eval_op(a, b, op)
|
||||
if op == "+" then return a + b end
|
||||
if op == "-" then return a - b end
|
||||
if op == "*" then return a * b end
|
||||
if op == "/" then if b == 0 then return nil end; return a / b end
|
||||
if op == "%" then if b == 0 then return nil end; return a % b end
|
||||
if op == "^" then return a ^ b end
|
||||
return nil
|
||||
end
|
||||
|
||||
local function shunting_yard_eval(tokens)
|
||||
if not tokens or #tokens == 0 then return nil end
|
||||
local values, ops = {}, {}
|
||||
|
||||
local function apply()
|
||||
local op = table.remove(ops)
|
||||
local b = table.remove(values)
|
||||
local a = table.remove(values)
|
||||
if a == nil or b == nil then return false end
|
||||
local r = eval_op(a, b, op)
|
||||
if r == nil then return false end
|
||||
table.insert(values, r)
|
||||
return true
|
||||
end
|
||||
|
||||
for _, t in ipairs(tokens) do
|
||||
if t.kind == "num" then
|
||||
table.insert(values, t.val)
|
||||
elseif t.kind == "op" then
|
||||
while #ops > 0 and ops[#ops] ~= "(" and precedence(ops[#ops]) >= precedence(t.val) do
|
||||
if not apply() then return nil end
|
||||
end
|
||||
table.insert(ops, t.val)
|
||||
elseif t.kind == "lparen" then
|
||||
table.insert(ops, "(")
|
||||
elseif t.kind == "rparen" then
|
||||
while #ops > 0 and ops[#ops] ~= "(" do
|
||||
if not apply() then return nil end
|
||||
end
|
||||
if ops[#ops] ~= "(" then return nil end
|
||||
table.remove(ops)
|
||||
end
|
||||
end
|
||||
while #ops > 0 do
|
||||
if ops[#ops] == "(" then return nil end
|
||||
if not apply() then return nil end
|
||||
end
|
||||
if #values ~= 1 then return nil end
|
||||
return values[1]
|
||||
end
|
||||
|
||||
-- ── 3. Format result for speech (no scientific notation, trim trailing zeros)
|
||||
local function format_result(n)
|
||||
if n ~= n then return nil end -- NaN
|
||||
if n == math.huge or n == -math.huge then return nil end
|
||||
if math.abs(n - math.floor(n)) < 1e-9 then
|
||||
return tostring(math.floor(n + (n < 0 and -0.5 or 0.5)))
|
||||
end
|
||||
local s = string.format("%.4f", n)
|
||||
s = s:gsub("0+$", ""):gsub("%.$", "")
|
||||
return s
|
||||
end
|
||||
|
||||
-- ── 4. Try offline first ──────────────────────────────────────────────────
|
||||
|
||||
local normalised = normalise(query)
|
||||
jarvis.log("info", "math normalised: " .. normalised)
|
||||
|
||||
local result_num =
|
||||
handle_sqrt(normalised)
|
||||
or handle_percent(normalised)
|
||||
or shunting_yard_eval(tokenize(normalised))
|
||||
|
||||
if result_num ~= nil then
|
||||
local pretty = format_result(result_num)
|
||||
if pretty then
|
||||
local prefix = (lang == "ru" and "Получилось " or "Result: ")
|
||||
return jarvis.cmd.ok(prefix .. pretty)
|
||||
end
|
||||
end
|
||||
|
||||
-- ── 5. LLM fallback for word-problems / equations / conversions ───────────
|
||||
|
||||
local token = jarvis.system.env("GROQ_TOKEN")
|
||||
if not token or token == "" then
|
||||
jarvis.system.notify("Math", "GROQ_TOKEN не задан")
|
||||
jarvis.audio.play_error()
|
||||
return { chain = false }
|
||||
return jarvis.cmd.error(lang == "ru"
|
||||
and "Не понял выражение, и GROQ_TOKEN не задан."
|
||||
or "Couldn't parse, and GROQ_TOKEN unset.")
|
||||
end
|
||||
|
||||
local base = jarvis.system.env("GROQ_BASE_URL"); if not base or base == "" then base = "https://api.groq.com/openai/v1" end
|
||||
local model = jarvis.system.env("GROQ_MODEL"); if not model or model == "" then model = "llama-3.3-70b-versatile" end
|
||||
local base = jarvis.system.env("GROQ_BASE_URL")
|
||||
if not base or base == "" then base = "https://api.groq.com/openai/v1" end
|
||||
local model = jarvis.system.env("GROQ_MODEL")
|
||||
if not model or model == "" then model = "llama-3.3-70b-versatile" end
|
||||
|
||||
local sys = "Ты калькулятор. Решай арифметику, простые уравнения, конверсии единиц, проценты. "
|
||||
.. "Отвечай ТОЛЬКО результатом числом или короткой строкой (для уравнений — значения корней). "
|
||||
.. "Отвечай ТОЛЬКО результатом числом или короткой строкой. "
|
||||
.. "Если запрос — не математика, ответь одним словом «нет»."
|
||||
|
||||
local payload = {
|
||||
|
|
@ -47,41 +253,20 @@ local payload = {
|
|||
temperature = 0.0,
|
||||
}
|
||||
|
||||
jarvis.log("info", "math query: " .. query)
|
||||
jarvis.log("info", "math fallback to LLM: " .. query)
|
||||
local res = jarvis.http.post_json(base .. "/chat/completions", payload, { Authorization = "Bearer " .. token })
|
||||
|
||||
if not res.ok then
|
||||
jarvis.log("error", "math api failed: " .. tostring(res.status))
|
||||
jarvis.system.notify("Math", "Ошибка API")
|
||||
jarvis.audio.play_error()
|
||||
return { chain = false }
|
||||
return jarvis.cmd.error("Ошибка API: " .. tostring(res.status))
|
||||
end
|
||||
|
||||
local body = res.body or ""
|
||||
local content = body:match('"content"%s*:%s*"(.-[^\\])"')
|
||||
local content = (res.body or ""):match('"content"%s*:%s*"(.-[^\\])"')
|
||||
if not content then
|
||||
jarvis.system.notify("Math", "Не смог распарсить ответ")
|
||||
jarvis.audio.play_error()
|
||||
return { chain = false }
|
||||
return jarvis.cmd.error(lang == "ru" and "Не смог распарсить ответ" or "Couldn't parse response")
|
||||
end
|
||||
content = content:gsub('\\n', '\n'):gsub('\\"', '"'):gsub('\\\\', '\\'):gsub('\\t', '\t')
|
||||
content = content:gsub("^%s+", ""):gsub("%s+$", "")
|
||||
|
||||
if content:lower() == "нет" or content == "" then
|
||||
jarvis.system.notify("Math", lang == "ru" and "Это не математика" or "Not math")
|
||||
jarvis.audio.play_not_found()
|
||||
return { chain = false }
|
||||
return jarvis.cmd.not_found(lang == "ru" and "Это не математика" or "Not math")
|
||||
end
|
||||
|
||||
jarvis.system.notify(query, content)
|
||||
jarvis.log("info", "math result: " .. content)
|
||||
|
||||
local sapi_text = ((lang == "ru" and "Получилось " or "Result: ") .. content):gsub("'", "''"):gsub("\r?\n", " ")
|
||||
local ps = string.format(
|
||||
[[Add-Type -AssemblyName System.Speech; $s = New-Object System.Speech.Synthesis.SpeechSynthesizer; foreach ($v in $s.GetInstalledVoices()) { if ($v.VoiceInfo.Culture.TwoLetterISOLanguageName -eq 'ru') { try { $s.SelectVoice($v.VoiceInfo.Name); break } catch {} } } $s.Speak('%s')]],
|
||||
sapi_text
|
||||
)
|
||||
jarvis.system.exec(string.format('powershell -NoProfile -ExecutionPolicy Bypass -Command "%s"', ps:gsub('"', '\\"')))
|
||||
|
||||
jarvis.audio.play_ok()
|
||||
return { chain = false }
|
||||
local prefix = (lang == "ru" and "Получилось " or "Result: ")
|
||||
return jarvis.cmd.ok(prefix .. content)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue