mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-11-06 05:17:15 +00:00
Teknium
8dcf72feb5
- Desktop input-requests: main's new `else clearParkedCard(ctx, id)` merged cleanly into this branch's extracted cancelParkedCredentialRequest, which had no ctx (tsc TS2304). The helper takes the event context. - Composer: with a card waiting, Send answers it, so the primary button reads Send whatever the busy action (main's controls.test "answers a waiting card with Send"). The queue-button gate moves to a helper to stay inside the component's complexity cap. - tests/e2e/test_relay_native_openai_stream.py: main fixed the same finalizer deadlock its own way (6e84ce66fb: wait only off the stream's loop); the merge kept main's wait but this branch's removal of its Event (F821). Take main's file. - hermes_state_sessions.py went to 2005 lines (cap 2000) with main's two conversation model_config helpers on top of this branch's growth: their bodies move to hermes_state_sessions_model_config.py, the methods stay as thin delegates. - overlay-gaps.json: drop the known gap for connectors.directory.receiptSaid, which the English catalog no longer has (overlay-completeness test). Checks: desktop typecheck 0 errors; vitest 1736 + 16 passed; pytest 1243 + 124 + 10 passed; scripts/check health 0 blocking vs0e427d788d.
43 lines
2.0 KiB
Python
43 lines
2.0 KiB
Python
"""Conversation-wide ``sessions.model_config`` keys: read-modify-write at the compression tip and the
|
|
key scan. Bodies of :class:`hermes_state_sessions.SessionSessionsMixin`'s two methods of the same names."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from typing import Any, Callable, Optional
|
|
|
|
from hermes_state_common import _sql_json_extract
|
|
|
|
|
|
def update_conversation_model_config_value(db, session_id: str, key: str,
|
|
update: Callable[[Any], Any]) -> Optional[str]:
|
|
"""Read a conversation-wide ``key`` at *session_id*'s compression tip and write ``update(value)``
|
|
back, in one write transaction: a concurrent writer of the key cannot be overwritten with a stale
|
|
copy, and a rotation cannot publish between finding the tip and writing it (the child would keep
|
|
the old copy). ``update`` may run more than once (lock retry) and must be pure; returning None
|
|
removes the key. Returns the id written, None when the row does not exist."""
|
|
from hermes_state_sessions import _parse_model_config
|
|
|
|
def _do(conn) -> Optional[str]:
|
|
tip = db._compression_tip_on(conn, session_id)
|
|
row = conn.execute("SELECT model_config FROM sessions WHERE id = ?", (tip,)).fetchone()
|
|
if row is None:
|
|
return None
|
|
config = _parse_model_config(row[0])
|
|
if (value := update(config.get(key))) is None:
|
|
config.pop(key, None)
|
|
else:
|
|
config[key] = value
|
|
conn.execute("UPDATE sessions SET model_config = ? WHERE id = ?", (json.dumps(config), tip))
|
|
return tip
|
|
return db._execute_write(_do)
|
|
|
|
|
|
def session_ids_with_model_config_key(db, key: str) -> list[str]:
|
|
"""Ids of the sessions whose model_config carries ``key``, newest first."""
|
|
with db._read_ctx() as conn:
|
|
rows = conn.execute(
|
|
f"SELECT id FROM sessions WHERE {_sql_json_extract('model_config', '$.' + key)} IS NOT NULL "
|
|
"ORDER BY started_at DESC").fetchall()
|
|
return [row["id"] for row in rows]
|