AvatarPy: assistente personale con volto 3D, voce, memoria e plugin
Riscrittura in Python dell'assistente Avatar con interfaccia HUD (derivata da Mark LIV, CC BY-NC 4.0, vedi NOTICE.md). Tre motori (Claude API, server locale OpenAI-compatibile, Claude Code), voce Kokoro/macOS, Whisper MLX, avatar 3D con sincronizzazione labiale, memoria per categorie, allegati con OCR, monitor con avvisi, plugin per Calendario, Mail, Promemoria, Note, Musica, app, Mac, timer, meteo, contatti, Messaggi, file, Comandi Rapidi, browser, Telegram, WhatsApp (archivio e tempo reale). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
commit
ff79832c30
76 files changed
+82468
No files matched your search
Whitespace-only changes.
@@ -0,0 +1,384 @@
|
||||
import json
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
def get_base_dir() -> Path:
|
||||
if getattr(sys, "frozen", False):
|
||||
return Path(sys.executable).parent
|
||||
return Path(__file__).resolve().parent.parent
|
||||
|
||||
BASE_DIR = get_base_dir()
|
||||
CONFIG_DIR = BASE_DIR / "config"
|
||||
CONFIG_FILE = CONFIG_DIR / "api_keys.json"
|
||||
|
||||
def ensure_config_dir() -> None:
|
||||
CONFIG_DIR.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
def config_exists() -> bool:
|
||||
return CONFIG_FILE.exists()
|
||||
|
||||
def save_api_keys(gemini_api_key: str) -> None:
|
||||
ensure_config_dir()
|
||||
|
||||
data: dict = {}
|
||||
if CONFIG_FILE.exists():
|
||||
try:
|
||||
data = json.loads(CONFIG_FILE.read_text(encoding="utf-8"))
|
||||
except Exception:
|
||||
data = {}
|
||||
|
||||
data["gemini_api_key"] = gemini_api_key.strip()
|
||||
|
||||
CONFIG_FILE.write_text(
|
||||
json.dumps(data, indent=2),
|
||||
encoding="utf-8"
|
||||
)
|
||||
|
||||
def load_api_keys() -> dict:
|
||||
if not CONFIG_FILE.exists():
|
||||
return {}
|
||||
try:
|
||||
return json.loads(CONFIG_FILE.read_text(encoding="utf-8"))
|
||||
except Exception as e:
|
||||
print(f"❌ Failed to load api_keys.json: {e}")
|
||||
return {}
|
||||
|
||||
def get_gemini_key() -> str | None:
|
||||
return load_api_keys().get("gemini_api_key")
|
||||
|
||||
def is_configured() -> bool:
|
||||
key = get_gemini_key()
|
||||
return bool(key and len(key) > 15)
|
||||
|
||||
|
||||
def get_assistant_name() -> str:
|
||||
"""Return the configured assistant name, or 'JARVIS' if not set."""
|
||||
return load_api_keys().get("assistant_name", "JARVIS") or "JARVIS"
|
||||
|
||||
|
||||
def get_user_name() -> str:
|
||||
"""Return the configured user name for addressing."""
|
||||
return load_api_keys().get("user_name", "")
|
||||
|
||||
|
||||
def save_assistant_config(assistant_name: str, user_name: str) -> None:
|
||||
"""Persist assistant name and user name to config."""
|
||||
ensure_config_dir()
|
||||
data: dict = {}
|
||||
if CONFIG_FILE.exists():
|
||||
try:
|
||||
data = json.loads(CONFIG_FILE.read_text(encoding="utf-8"))
|
||||
except Exception:
|
||||
data = {}
|
||||
data["assistant_name"] = assistant_name.strip() or "JARVIS"
|
||||
data["user_name"] = user_name.strip()
|
||||
CONFIG_FILE.write_text(json.dumps(data, indent=4), encoding="utf-8")
|
||||
|
||||
|
||||
# ── Assistant voice ──────────────────────────────────────────────────────────
|
||||
# Gemini Live prebuilt voices. Names are proper nouns — identical in every
|
||||
# language, so this list is safe to show verbatim in any locale.
|
||||
AVAILABLE_VOICES = ["Sara", "Nicola", "Sistema"] # AvatarPy: Kokoro (Sara, Nicola) o voce di macOS
|
||||
DEFAULT_VOICE = "Sara"
|
||||
|
||||
|
||||
def get_voice() -> str:
|
||||
"""Return the configured Live voice, falling back to the default if unset
|
||||
or if the stored value is not a voice we recognise."""
|
||||
v = load_api_keys().get("voice_name", DEFAULT_VOICE) or DEFAULT_VOICE
|
||||
return v if v in AVAILABLE_VOICES else DEFAULT_VOICE
|
||||
|
||||
|
||||
def save_voice(voice_name: str) -> None:
|
||||
"""Persist the chosen Live voice. Unknown names collapse to the default so a
|
||||
bad value can never reach the API and break the session."""
|
||||
ensure_config_dir()
|
||||
data: dict = {}
|
||||
if CONFIG_FILE.exists():
|
||||
try:
|
||||
data = json.loads(CONFIG_FILE.read_text(encoding="utf-8"))
|
||||
except Exception:
|
||||
data = {}
|
||||
v = (voice_name or "").strip()
|
||||
data["voice_name"] = v if v in AVAILABLE_VOICES else DEFAULT_VOICE
|
||||
CONFIG_FILE.write_text(json.dumps(data, indent=4), encoding="utf-8")
|
||||
|
||||
|
||||
def get_wake_word_enabled() -> bool:
|
||||
"""Whether local wake-word gating is on (assistant sleeps until 'Hey Jarvis')."""
|
||||
return load_api_keys().get("wake_word_enabled", False)
|
||||
|
||||
|
||||
def save_wake_word_enabled(enabled: bool) -> None:
|
||||
ensure_config_dir()
|
||||
data: dict = {}
|
||||
if CONFIG_FILE.exists():
|
||||
try:
|
||||
data = json.loads(CONFIG_FILE.read_text(encoding="utf-8"))
|
||||
except Exception:
|
||||
data = {}
|
||||
data["wake_word_enabled"] = bool(enabled)
|
||||
CONFIG_FILE.write_text(json.dumps(data, indent=4), encoding="utf-8")
|
||||
|
||||
|
||||
def get_push_to_talk_enabled() -> bool:
|
||||
"""Hold-a-key-to-speak. When on, the mic is closed unless the chord is held."""
|
||||
return load_api_keys().get("push_to_talk_enabled", False)
|
||||
|
||||
|
||||
def save_push_to_talk_enabled(enabled: bool) -> None:
|
||||
_save_flag("push_to_talk_enabled", enabled)
|
||||
|
||||
|
||||
HUD_STYLES = ("face", "core", "3d") # AvatarPy: anche l'avatar 3D
|
||||
|
||||
|
||||
def get_hud_style() -> str:
|
||||
"""Which centrepiece the HUD draws: the animated head, or the reactor core.
|
||||
|
||||
Taste, not capability — both render in the same software painter and cost
|
||||
about the same. Defaults to the head because that is what MARK LIV shipped
|
||||
with; anyone who preferred the older look can switch back in ⚙ and the
|
||||
choice survives a restart.
|
||||
"""
|
||||
v = str(load_api_keys().get("hud_style", "face")).strip().lower()
|
||||
return v if v in HUD_STYLES else "face"
|
||||
|
||||
|
||||
def save_hud_style(style: str) -> None:
|
||||
s = str(style or "").strip().lower()
|
||||
_save_flag("hud_style", s if s in HUD_STYLES else "face")
|
||||
|
||||
|
||||
# ── Live-session tuning ──────────────────────────────────────────────────────
|
||||
# Everything here is optional and has a working default, so an untouched
|
||||
# config behaves exactly like a configured one. Each value is also a way out:
|
||||
# if a future model dislikes one of these, set it back and nothing else changes.
|
||||
|
||||
def get_thinking_enabled() -> bool:
|
||||
"""Whether the Live model may spend tokens thinking before it answers.
|
||||
|
||||
Off by default. A voice assistant is judged on how fast it starts talking,
|
||||
and the reasoning that actually needs deliberation in this app is delegated
|
||||
to the planning tools, which run on a separate non-Live model.
|
||||
"""
|
||||
return bool(load_api_keys().get("thinking_enabled", False))
|
||||
|
||||
|
||||
def save_thinking_enabled(enabled: bool) -> None:
|
||||
_save_flag("thinking_enabled", enabled)
|
||||
|
||||
|
||||
def get_turn_tuning() -> dict:
|
||||
"""How eagerly the server decides you have stopped speaking.
|
||||
|
||||
OFF by default, and that default was earned. Cutting turns shorter looks
|
||||
like a free speed win and is not: proactive audio has to judge whether an
|
||||
utterance was even addressed to the assistant, and a turn clipped early
|
||||
gives it less to judge, so it stays quiet — and the reply to your first
|
||||
sentence only arrives once your second one has given it enough context.
|
||||
That reads as the assistant being a turn behind, which is far worse than
|
||||
the fraction of a second the tuning saves.
|
||||
|
||||
Turn it on with "turn_tuning": {"enabled": true} if your own microphone and
|
||||
speaking pace suit it. `silence_ms` is the one that is felt: the pause the
|
||||
server sits through before accepting your turn is over.
|
||||
"""
|
||||
cfg = load_api_keys().get("turn_tuning")
|
||||
cfg = cfg if isinstance(cfg, dict) else {}
|
||||
|
||||
def _int(key, default, lo, hi):
|
||||
try:
|
||||
return max(lo, min(hi, int(cfg.get(key, default))))
|
||||
except (TypeError, ValueError):
|
||||
return default
|
||||
|
||||
return {
|
||||
"enabled": bool(cfg.get("enabled", False)),
|
||||
"silence_ms": _int("silence_ms", 550, 200, 3000),
|
||||
"prefix_ms": _int("prefix_ms", 150, 0, 1000),
|
||||
# "high" = quicker to decide speech has ended.
|
||||
"end_sensitivity": str(cfg.get("end_sensitivity", "high")).lower(),
|
||||
"start_sensitivity": str(cfg.get("start_sensitivity", "default")).lower(),
|
||||
}
|
||||
|
||||
|
||||
def save_turn_tuning(values: dict) -> None:
|
||||
ensure_config_dir()
|
||||
data: dict = {}
|
||||
if CONFIG_FILE.exists():
|
||||
try:
|
||||
data = json.loads(CONFIG_FILE.read_text(encoding="utf-8"))
|
||||
except Exception:
|
||||
data = {}
|
||||
cur = data.get("turn_tuning")
|
||||
cur = dict(cur) if isinstance(cur, dict) else {}
|
||||
cur.update(values or {})
|
||||
data["turn_tuning"] = cur
|
||||
CONFIG_FILE.write_text(json.dumps(data, indent=4), encoding="utf-8")
|
||||
|
||||
|
||||
def get_proactive_audio_enabled() -> bool:
|
||||
"""Whether the model gets to decide an utterance was not aimed at it and
|
||||
stay quiet.
|
||||
|
||||
On by default — it is what stops the assistant answering the room. But it
|
||||
is also the first thing to switch off if replies ever seem to arrive a turn
|
||||
late: what looks like lag is usually the model having judged your previous
|
||||
sentence as not addressed to it, and only changing its mind once the next
|
||||
one arrives.
|
||||
"""
|
||||
return bool(load_api_keys().get("proactive_audio", True))
|
||||
|
||||
|
||||
def save_proactive_audio_enabled(enabled: bool) -> None:
|
||||
_save_flag("proactive_audio", enabled)
|
||||
|
||||
|
||||
MEDIA_RESOLUTIONS = ("default", "low", "medium", "high")
|
||||
|
||||
|
||||
def get_media_resolution() -> str:
|
||||
"""How finely the model tokenises the screenshots and camera frames it is
|
||||
sent. 'medium' keeps on-screen text readable at a fraction of the tokens a
|
||||
full-resolution frame costs; 'low' is cheaper still but starts losing small
|
||||
text, which is most of what screen captures are for."""
|
||||
v = str(load_api_keys().get("media_resolution", "medium")).strip().lower()
|
||||
return v if v in MEDIA_RESOLUTIONS else "medium"
|
||||
|
||||
|
||||
def save_media_resolution(value: str) -> None:
|
||||
v = str(value or "").strip().lower()
|
||||
_save_flag("media_resolution", v if v in MEDIA_RESOLUTIONS else "medium")
|
||||
|
||||
|
||||
def _save_flag(key: str, value) -> None:
|
||||
"""Read-modify-write one key without disturbing the rest of the config."""
|
||||
ensure_config_dir()
|
||||
data: dict = {}
|
||||
if CONFIG_FILE.exists():
|
||||
try:
|
||||
data = json.loads(CONFIG_FILE.read_text(encoding="utf-8"))
|
||||
except Exception:
|
||||
data = {}
|
||||
data[key] = bool(value) if isinstance(value, bool) else value
|
||||
CONFIG_FILE.write_text(json.dumps(data, indent=4), encoding="utf-8")
|
||||
|
||||
|
||||
def get_brief_enabled() -> bool:
|
||||
return load_api_keys().get("morning_brief_enabled", True)
|
||||
|
||||
|
||||
def save_brief_enabled(enabled: bool) -> None:
|
||||
ensure_config_dir()
|
||||
data: dict = {}
|
||||
if CONFIG_FILE.exists():
|
||||
try:
|
||||
data = json.loads(CONFIG_FILE.read_text(encoding="utf-8"))
|
||||
except Exception:
|
||||
data = {}
|
||||
data["morning_brief_enabled"] = enabled
|
||||
CONFIG_FILE.write_text(json.dumps(data, indent=4), encoding="utf-8")
|
||||
|
||||
|
||||
# ── Audio devices ────────────────────────────────────────────────────────────
|
||||
# Stored as device NAMES, not sounddevice indices. Indices shift every time a
|
||||
# USB device is plugged in or removed, so a saved index silently starts pointing
|
||||
# at a different microphone. The empty string means "system default", which is
|
||||
# both the factory setting and what an unresolvable saved device falls back to —
|
||||
# so unplugging a headset degrades to the built-in speakers instead of crashing.
|
||||
|
||||
def _patch_config(**fields) -> None:
|
||||
"""Read-modify-write one or more keys in api_keys.json.
|
||||
|
||||
Every setter in this file open-coded this. Collapsing it here means a new
|
||||
setting is one line, and there is one place where a corrupt config file is
|
||||
handled instead of nine."""
|
||||
ensure_config_dir()
|
||||
data: dict = {}
|
||||
if CONFIG_FILE.exists():
|
||||
try:
|
||||
data = json.loads(CONFIG_FILE.read_text(encoding="utf-8"))
|
||||
except Exception:
|
||||
data = {}
|
||||
data.update(fields)
|
||||
CONFIG_FILE.write_text(json.dumps(data, indent=4), encoding="utf-8")
|
||||
|
||||
|
||||
def get_input_device() -> str:
|
||||
"""Microphone device name, or '' for the system default."""
|
||||
return (load_api_keys().get("input_device", "") or "").strip()
|
||||
|
||||
|
||||
def save_input_device(name: str) -> None:
|
||||
_patch_config(input_device=(name or "").strip())
|
||||
|
||||
|
||||
def get_output_device() -> str:
|
||||
"""Speaker device name, or '' for the system default."""
|
||||
return (load_api_keys().get("output_device", "") or "").strip()
|
||||
|
||||
|
||||
def save_output_device(name: str) -> None:
|
||||
_patch_config(output_device=(name or "").strip())
|
||||
|
||||
|
||||
def get_plugin_enabled(plugin_name: str) -> bool:
|
||||
"""Plugins are enabled by default the moment they're discovered (opt-out model)."""
|
||||
return load_api_keys().get("plugins_enabled", {}).get(plugin_name, True)
|
||||
|
||||
|
||||
# ── Per-plugin settings ("tokens" / connection details) ───────────────────────
|
||||
# Generic store so a plugin can declare its own config fields (PLUGIN_SETTINGS)
|
||||
# and the settings UI renders + persists them WITHOUT any core edit — keeping the
|
||||
# drop-in model intact. Values live under plugin_config[<namespace>][<key>].
|
||||
# A namespace defaults to the plugin name, but a suite of plugins (e.g. the
|
||||
# several printer plugins) can share ONE namespace.
|
||||
def get_plugin_config(namespace: str) -> dict:
|
||||
"""All stored values for a namespace (empty dict if none set yet)."""
|
||||
cfg = load_api_keys().get("plugin_config")
|
||||
val = cfg.get(namespace) if isinstance(cfg, dict) else None
|
||||
return dict(val) if isinstance(val, dict) else {}
|
||||
|
||||
|
||||
def get_plugin_setting(namespace: str, key: str, default=None):
|
||||
"""A single value from a namespace, or `default` if unset."""
|
||||
return get_plugin_config(namespace).get(key, default)
|
||||
|
||||
|
||||
def save_plugin_config(namespace: str, values: dict) -> None:
|
||||
"""Merge `values` into a namespace's stored config (read-modify-write, like
|
||||
every other helper here). Only the provided keys are touched."""
|
||||
ensure_config_dir()
|
||||
data: dict = {}
|
||||
if CONFIG_FILE.exists():
|
||||
try:
|
||||
data = json.loads(CONFIG_FILE.read_text(encoding="utf-8"))
|
||||
except Exception:
|
||||
data = {}
|
||||
pc = data.get("plugin_config")
|
||||
if not isinstance(pc, dict):
|
||||
pc = {}
|
||||
cur = pc.get(namespace)
|
||||
if not isinstance(cur, dict):
|
||||
cur = {}
|
||||
cur.update(values)
|
||||
pc[namespace] = cur
|
||||
data["plugin_config"] = pc
|
||||
CONFIG_FILE.write_text(json.dumps(data, indent=4), encoding="utf-8")
|
||||
|
||||
|
||||
def save_plugin_enabled(plugin_name: str, enabled: bool) -> None:
|
||||
ensure_config_dir()
|
||||
data: dict = {}
|
||||
if CONFIG_FILE.exists():
|
||||
try:
|
||||
data = json.loads(CONFIG_FILE.read_text(encoding="utf-8"))
|
||||
except Exception:
|
||||
data = {}
|
||||
plugins_cfg = data.get("plugins_enabled")
|
||||
if not isinstance(plugins_cfg, dict):
|
||||
plugins_cfg = {}
|
||||
plugins_cfg[plugin_name] = enabled
|
||||
data["plugins_enabled"] = plugins_cfg
|
||||
CONFIG_FILE.write_text(json.dumps(data, indent=4), encoding="utf-8")
|
||||
@@ -0,0 +1,479 @@
|
||||
import json
|
||||
import re
|
||||
from datetime import datetime
|
||||
from threading import Lock
|
||||
from pathlib import Path
|
||||
import sys
|
||||
|
||||
|
||||
def get_base_dir() -> Path:
|
||||
if getattr(sys, "frozen", False):
|
||||
return Path(sys.executable).parent
|
||||
return Path(__file__).resolve().parent.parent
|
||||
|
||||
|
||||
BASE_DIR = get_base_dir()
|
||||
MEMORY_PATH = BASE_DIR / "memory" / "long_term.json"
|
||||
_lock = Lock()
|
||||
MAX_VALUE_LENGTH = 380
|
||||
|
||||
# ── Why there are two very different numbers here ────────────────────────────
|
||||
#
|
||||
# There used to be one: MEMORY_MAX_CHARS = 2200, applied to the whole store. It
|
||||
# was a *storage* limit, and it existed only because the entire memory was
|
||||
# pasted into the system prompt on every connect — so growing the memory grew
|
||||
# every single request. When it filled, _trim_to_limit() deleted the oldest
|
||||
# entries and printed one line to a console nobody reads. A memory described as
|
||||
# "deeply remembers projects, preferences and personal context" was in practice
|
||||
# two pages long, and quietly forgot your sister's name after a few weeks.
|
||||
#
|
||||
# Storage and prompt budget are now separate concerns:
|
||||
#
|
||||
# MEMORY_MAX_CHARS — a runaway guard, not a feature limit. Nothing normal
|
||||
# reaches it; a bug writing in a loop does.
|
||||
# PROMPT_CORE_CHARS — what actually rides in the system prompt every session.
|
||||
# Smaller than the old whole-memory dump, so sessions
|
||||
# start *faster* than before, not slower.
|
||||
#
|
||||
# Everything above the core stays on disk and is fetched on demand by the
|
||||
# recall_memory tool — see search_memory() and format_memory_for_prompt().
|
||||
MEMORY_MAX_CHARS = 200_000
|
||||
PROMPT_CORE_CHARS = 900
|
||||
PROMPT_INDEX_CHARS = 420
|
||||
# Most entries any one category may contribute to the core block, so a person
|
||||
# with forty stored preferences still gets their sister into the prompt.
|
||||
PROMPT_MAX_PER_CATEGORY = 6
|
||||
|
||||
def _empty_memory() -> dict:
|
||||
return {
|
||||
"identity": {},
|
||||
"preferences": {},
|
||||
"projects": {},
|
||||
"relationships": {},
|
||||
"wishes": {},
|
||||
"notes": {},
|
||||
}
|
||||
|
||||
def load_memory() -> dict:
|
||||
if not MEMORY_PATH.exists():
|
||||
return _empty_memory()
|
||||
with _lock:
|
||||
try:
|
||||
data = json.loads(MEMORY_PATH.read_text(encoding="utf-8"))
|
||||
if isinstance(data, dict):
|
||||
base = _empty_memory()
|
||||
for key in base:
|
||||
if key not in data:
|
||||
data[key] = {}
|
||||
return data
|
||||
return _empty_memory()
|
||||
except Exception as e:
|
||||
print(f"[Memory] ⚠️ Load error: {e}")
|
||||
return _empty_memory()
|
||||
|
||||
def _all_entries(memory: dict) -> list[tuple]:
|
||||
entries = []
|
||||
for cat, items in memory.items():
|
||||
if not isinstance(items, dict):
|
||||
continue
|
||||
for key, entry in items.items():
|
||||
if isinstance(entry, dict) and "value" in entry:
|
||||
entries.append((cat, key, entry))
|
||||
return entries
|
||||
|
||||
|
||||
# Set by main.py so a trim can reach the activity log. Deleting something a
|
||||
# person told you and mentioning it only on stdout is how a memory loses trust.
|
||||
_trim_notifier = None
|
||||
|
||||
|
||||
def set_trim_notifier(fn) -> None:
|
||||
"""Register a callable(str) that surfaces trims to the user."""
|
||||
global _trim_notifier
|
||||
_trim_notifier = fn
|
||||
|
||||
|
||||
def _trim_to_limit(memory: dict) -> dict:
|
||||
if len(json.dumps(memory, ensure_ascii=False)) <= MEMORY_MAX_CHARS:
|
||||
return memory
|
||||
entries = _all_entries(memory)
|
||||
entries.sort(key=lambda t: t[2].get("updated", "0000-00-00"))
|
||||
dropped = []
|
||||
for cat, key, _ in entries:
|
||||
if len(json.dumps(memory, ensure_ascii=False)) <= MEMORY_MAX_CHARS:
|
||||
break
|
||||
del memory[cat][key]
|
||||
dropped.append(f"{cat}/{key}")
|
||||
print(f"[Memory] 🗑️ Trimmed {cat}/{key}")
|
||||
if dropped and _trim_notifier:
|
||||
try:
|
||||
_trim_notifier(
|
||||
f"SYS: Memory full — forgot {len(dropped)} oldest entries "
|
||||
f"({', '.join(dropped[:3])}{'…' if len(dropped) > 3 else ''})"
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
return memory
|
||||
|
||||
def save_memory(memory: dict) -> None:
|
||||
if not isinstance(memory, dict):
|
||||
return
|
||||
memory = _trim_to_limit(memory)
|
||||
MEMORY_PATH.parent.mkdir(parents=True, exist_ok=True)
|
||||
with _lock:
|
||||
MEMORY_PATH.write_text(
|
||||
json.dumps(memory, indent=2, ensure_ascii=False),
|
||||
encoding="utf-8",
|
||||
)
|
||||
|
||||
|
||||
def _truncate_value(val: str) -> str:
|
||||
if isinstance(val, str) and len(val) > MAX_VALUE_LENGTH:
|
||||
return val[:MAX_VALUE_LENGTH].rstrip() + "…"
|
||||
return val
|
||||
|
||||
|
||||
def _recursive_update(target: dict, updates: dict) -> bool:
|
||||
changed = False
|
||||
for key, value in updates.items():
|
||||
if value is None:
|
||||
continue
|
||||
if isinstance(value, str) and not value.strip():
|
||||
continue
|
||||
if isinstance(value, dict) and "value" not in value:
|
||||
if key not in target or not isinstance(target[key], dict):
|
||||
target[key] = {}
|
||||
changed = True
|
||||
if _recursive_update(target[key], value):
|
||||
changed = True
|
||||
else:
|
||||
new_val = _truncate_value(str(value["value"] if isinstance(value, dict) else value))
|
||||
entry = {"value": new_val, "updated": datetime.now().strftime("%Y-%m-%d")}
|
||||
existing = target.get(key, {})
|
||||
if not isinstance(existing, dict) or existing.get("value") != new_val:
|
||||
target[key] = entry
|
||||
changed = True
|
||||
return changed
|
||||
|
||||
|
||||
def update_memory(memory_update: dict) -> dict:
|
||||
if not isinstance(memory_update, dict) or not memory_update:
|
||||
return load_memory()
|
||||
memory = load_memory()
|
||||
if _recursive_update(memory, memory_update):
|
||||
save_memory(memory)
|
||||
print(f"[Memory] 💾 Saved: {list(memory_update.keys())}")
|
||||
return memory
|
||||
|
||||
def _entry_value(entry) -> str:
|
||||
"""Accept both the {'value': ..., 'updated': ...} shape and a bare string,
|
||||
because early versions of the store wrote plain strings."""
|
||||
if isinstance(entry, dict):
|
||||
return str(entry.get("value", "") or "").strip()
|
||||
return str(entry or "").strip()
|
||||
|
||||
|
||||
def _pretty(key: str) -> str:
|
||||
return key.replace("_", " ").strip()
|
||||
|
||||
|
||||
# Identity is always in the prompt; these categories compete for the remaining
|
||||
# budget by recency.
|
||||
_CATEGORY_LABELS = {
|
||||
"preferences": "Preferences",
|
||||
"projects": "Active projects / goals",
|
||||
"relationships": "People in their life",
|
||||
"wishes": "Wishes / plans",
|
||||
"notes": "Notes",
|
||||
}
|
||||
|
||||
_IDENTITY_FIELDS = ["name", "age", "birthday", "city", "job",
|
||||
"language", "school", "nationality"]
|
||||
|
||||
|
||||
def format_memory_for_prompt(memory: dict | None) -> str:
|
||||
"""Build the memory block that goes into the system prompt.
|
||||
|
||||
This used to dump everything. It now sends three things:
|
||||
|
||||
1. IDENTITY - always, in full. It is small, and it is wrong for the
|
||||
assistant to have to look up your name.
|
||||
2. RECENT - the most recently updated entries from every other
|
||||
category, up to PROMPT_CORE_CHARS. Recency is the cheapest useful
|
||||
relevance signal available without embeddings.
|
||||
3. AN INDEX - the *keys* of everything else, values omitted.
|
||||
|
||||
Point 3 is what makes recall work at all. A model cannot decide to look
|
||||
something up if it does not know the thing exists: with only points 1 and 2,
|
||||
"who is Ayse?" would get "I don't know" while ayse_sister sat on disk
|
||||
unread. The index costs a few hundred characters and turns recall from a
|
||||
gamble into a lookup.
|
||||
|
||||
Net effect on latency: this block is SMALLER than the old full dump, so
|
||||
every session connects with fewer tokens. Occasionally the model spends one
|
||||
extra round trip on recall_memory - covered by the acknowledgment it
|
||||
already speaks before any slow step."""
|
||||
if not memory:
|
||||
return ""
|
||||
|
||||
core_lines: list[str] = []
|
||||
|
||||
# 1. Identity - always, in full
|
||||
identity = memory.get("identity", {}) or {}
|
||||
for field in _IDENTITY_FIELDS:
|
||||
val = _entry_value(identity.get(field))
|
||||
if not val:
|
||||
continue
|
||||
if field == "language":
|
||||
# Labelled as an observation, not a setting. A bare "Language:
|
||||
# English" line written months ago reads like a standing order and
|
||||
# was one of the reasons a Turkish question came back in English.
|
||||
core_lines.append(
|
||||
f"Has spoken to you in: {val} (an observation about the past — "
|
||||
f"always answer in the language of their CURRENT message)")
|
||||
else:
|
||||
core_lines.append(f"{field.title()}: {val}")
|
||||
for key, entry in identity.items():
|
||||
if key in _IDENTITY_FIELDS:
|
||||
continue
|
||||
val = _entry_value(entry)
|
||||
if val:
|
||||
core_lines.append(f"{_pretty(key).title()}: {val}")
|
||||
|
||||
# 2. Everything else, most recently updated first
|
||||
rest: list[tuple[str, str, str, str]] = [] # (updated, cat, key, value)
|
||||
for cat in _CATEGORY_LABELS:
|
||||
for key, entry in (memory.get(cat, {}) or {}).items():
|
||||
val = _entry_value(entry)
|
||||
if not val:
|
||||
continue
|
||||
updated = (entry.get("updated", "") if isinstance(entry, dict) else "") or "0000-00-00"
|
||||
rest.append((updated, cat, key, val))
|
||||
rest.sort(key=lambda t: t[0], reverse=True)
|
||||
|
||||
used = sum(len(l) + 1 for l in core_lines)
|
||||
shown: dict[str, list[str]] = {}
|
||||
overflow: dict[str, list[str]] = {}
|
||||
|
||||
# Recency decides order, but no single category may take the whole budget.
|
||||
# Without the cap, someone with forty stored preferences gets a prompt that
|
||||
# is forty preferences and not one person's name — the categories that
|
||||
# matter most in conversation are also the ones that change least often, so
|
||||
# pure recency systematically buries them.
|
||||
per_cat_used: dict[str, int] = {}
|
||||
for _updated, cat, key, val in rest:
|
||||
line = f" - {_pretty(key).title()}: {val}"
|
||||
if (per_cat_used.get(cat, 0) < PROMPT_MAX_PER_CATEGORY
|
||||
and used + len(line) + 1 <= PROMPT_CORE_CHARS):
|
||||
shown.setdefault(cat, []).append(line)
|
||||
per_cat_used[cat] = per_cat_used.get(cat, 0) + 1
|
||||
used += len(line) + 1
|
||||
else:
|
||||
overflow.setdefault(cat, []).append(_pretty(key))
|
||||
|
||||
# The index is a table of contents, so it is interleaved across categories
|
||||
# rather than continuing in recency order. Sorted by recency it would list
|
||||
# twenty-four preferences before the first relationship, and the one entry
|
||||
# the index exists for — the old fact the model has no other way to know
|
||||
# about — would fall off the end.
|
||||
indexed: list[str] = []
|
||||
if overflow:
|
||||
cats = [c for c in _CATEGORY_LABELS if overflow.get(c)]
|
||||
cursor = {c: 0 for c in cats}
|
||||
while cats:
|
||||
for cat in list(cats):
|
||||
i = cursor[cat]
|
||||
if i >= len(overflow[cat]):
|
||||
cats.remove(cat)
|
||||
continue
|
||||
indexed.append(overflow[cat][i])
|
||||
cursor[cat] = i + 1
|
||||
|
||||
for cat, label in _CATEGORY_LABELS.items():
|
||||
if shown.get(cat):
|
||||
core_lines.append("")
|
||||
core_lines.append(f"{label}:")
|
||||
core_lines.extend(shown[cat])
|
||||
|
||||
if not core_lines and not indexed:
|
||||
return ""
|
||||
|
||||
out = [
|
||||
"[WHAT YOU KNOW ABOUT THIS PERSON — use naturally, never recite like a list]",
|
||||
*core_lines,
|
||||
]
|
||||
|
||||
# 3. The index of what is on disk but not in this prompt
|
||||
if indexed:
|
||||
budget, names = PROMPT_INDEX_CHARS, []
|
||||
for n in indexed:
|
||||
if budget - len(n) - 2 < 0:
|
||||
break
|
||||
names.append(n)
|
||||
budget -= len(n) + 2
|
||||
if names:
|
||||
out.append("")
|
||||
out.append(
|
||||
"[ALSO REMEMBERED — values not shown here. Call recall_memory "
|
||||
"with a keyword to read any of these before saying you do not know]"
|
||||
)
|
||||
out.append(", ".join(names)
|
||||
+ (f" (+{len(indexed) - len(names)} more)"
|
||||
if len(indexed) > len(names) else ""))
|
||||
|
||||
return "\n".join(out) + "\n"
|
||||
|
||||
|
||||
# ── Recall ────────────────────────────────────────────────────────────────────
|
||||
|
||||
def _score(query_words: list[str], cat: str, key: str, value: str) -> int:
|
||||
"""Cheap lexical relevance. No embeddings, no network, no model call - this
|
||||
runs in well under a millisecond, which is the entire point: recall must
|
||||
cost one model round trip, never two."""
|
||||
hay_key = _pretty(key).lower()
|
||||
hay_val = value.lower()
|
||||
score = 0
|
||||
for w in query_words:
|
||||
if not w:
|
||||
continue
|
||||
if w == hay_key:
|
||||
score += 10
|
||||
elif w in hay_key:
|
||||
score += 6
|
||||
if w in hay_val:
|
||||
score += 3
|
||||
if w in cat:
|
||||
score += 1
|
||||
return score
|
||||
|
||||
|
||||
def search_memory(query: str, limit: int = 8) -> str:
|
||||
"""Find stored facts matching `query`. Backs the recall_memory tool.
|
||||
|
||||
An empty query is treated as "show me everything you know", capped - the
|
||||
model asks that when the user says "what do you remember about me?"."""
|
||||
memory = load_memory()
|
||||
words = [w for w in re.split(r"[^\w]+", (query or "").lower()) if len(w) > 1]
|
||||
|
||||
rows: list[tuple[int, str, str, str]] = []
|
||||
for cat, items in memory.items():
|
||||
if not isinstance(items, dict):
|
||||
continue # skip 'sessions', which is a list
|
||||
for key, entry in items.items():
|
||||
val = _entry_value(entry)
|
||||
if not val:
|
||||
continue
|
||||
s = _score(words, cat, key, val) if words else 1
|
||||
if s > 0:
|
||||
rows.append((s, cat, key, val))
|
||||
|
||||
if not rows:
|
||||
return (f"Nothing stored about '{query}'." if query
|
||||
else "I have not stored anything about this person yet.")
|
||||
|
||||
rows.sort(key=lambda r: (-r[0], r[2]))
|
||||
lines = [f"{cat}/{_pretty(key)}: {val}" for _s, cat, key, val in rows[:max(1, limit)]]
|
||||
head = (f"Stored facts matching '{query}':" if query
|
||||
else "Everything currently stored:")
|
||||
more = (f"\n(+{len(rows) - len(lines)} more — search with a narrower keyword)"
|
||||
if len(rows) > len(lines) else "")
|
||||
return head + "\n" + "\n".join(lines) + more
|
||||
|
||||
|
||||
def all_entries_for_ui() -> list[dict]:
|
||||
"""Flat list for the memory panel: what JARVIS knows, and when it learned it.
|
||||
Sorted newest first so the panel opens on what changed most recently."""
|
||||
memory = load_memory()
|
||||
rows = []
|
||||
for cat, items in memory.items():
|
||||
if not isinstance(items, dict):
|
||||
continue
|
||||
for key, entry in items.items():
|
||||
val = _entry_value(entry)
|
||||
if not val:
|
||||
continue
|
||||
rows.append({
|
||||
"category": cat,
|
||||
"key": key,
|
||||
"value": val,
|
||||
"updated": (entry.get("updated", "") if isinstance(entry, dict) else ""),
|
||||
})
|
||||
rows.sort(key=lambda r: (r["updated"] or "0000-00-00"), reverse=True)
|
||||
return rows
|
||||
|
||||
def remember(key: str, value: str, category: str = "notes") -> str:
|
||||
valid = {"identity", "preferences", "projects", "relationships", "wishes", "notes"}
|
||||
if category not in valid:
|
||||
category = "notes"
|
||||
update_memory({category: {key: {"value": value}}})
|
||||
return f"Remembered: {category}/{key} = {value}"
|
||||
|
||||
|
||||
def forget(key: str, category: str = "notes") -> str:
|
||||
memory = load_memory()
|
||||
cat = memory.get(category, {})
|
||||
if key in cat:
|
||||
del cat[key]
|
||||
memory[category] = cat
|
||||
save_memory(memory)
|
||||
return f"Forgotten: {category}/{key}"
|
||||
return f"Not found: {category}/{key}"
|
||||
|
||||
|
||||
forget_memory = forget
|
||||
|
||||
|
||||
# ── Session memory ─────────────────────────────────────────────────────────────
|
||||
|
||||
_SESSION_MAX = 3 # safety cap — in practice 0-1 entries after pop
|
||||
|
||||
|
||||
def save_session_summary(summary: str, language: str = "") -> None:
|
||||
"""Append a 1-2 sentence session summary to long_term.json['sessions']."""
|
||||
summary = (summary or "").strip()
|
||||
if not summary:
|
||||
return
|
||||
memory = load_memory()
|
||||
sessions = memory.get("sessions", [])
|
||||
if not isinstance(sessions, list):
|
||||
sessions = []
|
||||
entry: dict = {
|
||||
"date": datetime.now().strftime("%Y-%m-%d"),
|
||||
"summary": summary[:280],
|
||||
}
|
||||
if language:
|
||||
entry["language"] = language
|
||||
sessions.append(entry)
|
||||
memory["sessions"] = sessions[-_SESSION_MAX:]
|
||||
with _lock:
|
||||
MEMORY_PATH.parent.mkdir(parents=True, exist_ok=True)
|
||||
MEMORY_PATH.write_text(
|
||||
json.dumps(memory, indent=2, ensure_ascii=False),
|
||||
encoding="utf-8",
|
||||
)
|
||||
print(f"[Memory] 📝 Session saved ({entry['date']}): {summary[:60]}…")
|
||||
|
||||
|
||||
def pop_last_session() -> dict | None:
|
||||
"""
|
||||
Return AND remove the most recent session entry.
|
||||
Calling this consumes the entry so it is never repeated in future briefings.
|
||||
"""
|
||||
with _lock:
|
||||
if not MEMORY_PATH.exists():
|
||||
return None
|
||||
try:
|
||||
memory = json.loads(MEMORY_PATH.read_text(encoding="utf-8"))
|
||||
sessions = memory.get("sessions", [])
|
||||
if not isinstance(sessions, list) or not sessions:
|
||||
return None
|
||||
entry = sessions.pop() # remove the last entry
|
||||
memory["sessions"] = sessions
|
||||
MEMORY_PATH.write_text(
|
||||
json.dumps(memory, indent=2, ensure_ascii=False),
|
||||
encoding="utf-8",
|
||||
)
|
||||
return entry
|
||||
except Exception as e:
|
||||
print(f"[Memory] ⚠️ pop_last_session error: {e}")
|
||||
return None
|
||||
Reference in new issue
Block a user