Personal AI, On Personal Devices
Python
fix(channels): serialize concurrent session appends (#931)
Haotian Zhengdff192c3962c
diff --git a/src/openjarvis/server/session_store.py b/src/openjarvis/server/session_store.pyindex 7dd829cd..f0b3d2a8 100644--- a/src/openjarvis/server/session_store.py+++ b/src/openjarvis/server/session_store.py@@ -5,6 +5,8 @@ from __future__ import annotationsimport jsonimport loggingimport sqlite3+import threading+from functools import wrapsfrom pathlib import Pathfrom typing import Any, Dict, List, Optional@@ -15,6 +17,17 @@ logger = logging.getLogger(__name__)_MAX_HISTORY_TURNS = 20+def _db_locked(func):+ """Serialize access to a session-store connection shared by worker threads."""++ @wraps(func)+ def wrapped(self, *args, **kwargs):+ with self._db_lock:+ return func(self, *args, **kwargs)++ return wrapped++class SessionStore:"""Manages per-sender, per-channel conversation sessions.@@ -30,6 +43,7 @@ class SessionStore:from openjarvis.security.file_utils import secure_createsecure_create(Path(db_path))+ self._db_lock = threading.RLock()self._db = sqlite3.connect(db_path, check_same_thread=False)self._db.row_factory = sqlite3.Rowself._create_tables()@@ -38,6 +52,7 @@ class SessionStore:# Schema# ------------------------------------------------------------------+ @_db_lockeddef _create_tables(self) -> None:self._db.executescript("""\@@ -61,6 +76,7 @@ class SessionStore:# Public API# ------------------------------------------------------------------+ @_db_lockeddef get_or_create(self, sender_id: str, channel_type: str) -> Dict[str, Any]:row = self._db.execute("SELECT * FROM channel_sessions WHERE sender_id = ? AND channel_type = ?",@@ -87,6 +103,7 @@ class SessionStore:"pending_response": row["pending_response"],}+ @_db_lockeddef append_message(self,sender_id: str,@@ -94,26 +111,33 @@ class SessionStore:role: str,content: str,) -> None:- row = self._db.execute(- "SELECT conversation_history FROM channel_sessions "- "WHERE sender_id = ? AND channel_type = ?",- (sender_id, channel_type),- ).fetchone()- if row is None:- return- history: List[Dict[str, str]] = json.loads(row["conversation_history"])- history.append({"role": role, "content": content})- if len(history) > _MAX_HISTORY_TURNS:- history = history[-_MAX_HISTORY_TURNS:]- self._db.execute(- "UPDATE channel_sessions "- "SET conversation_history = ?, "- "updated_at = datetime('now') "- "WHERE sender_id = ? AND channel_type = ?",- (json.dumps(history), sender_id, channel_type),- )- self._db.commit()+ self._db.execute("BEGIN IMMEDIATE")+ try:+ row = self._db.execute(+ "SELECT conversation_history FROM channel_sessions "+ "WHERE sender_id = ? AND channel_type = ?",+ (sender_id, channel_type),+ ).fetchone()+ if row is None:+ self._db.rollback()+ return+ history: List[Dict[str, str]] = json.loads(row["conversation_history"])+ history.append({"role": role, "content": content})+ if len(history) > _MAX_HISTORY_TURNS:+ history = history[-_MAX_HISTORY_TURNS:]+ self._db.execute(+ "UPDATE channel_sessions "+ "SET conversation_history = ?, "+ "updated_at = datetime('now') "+ "WHERE sender_id = ? AND channel_type = ?",+ (json.dumps(history), sender_id, channel_type),+ )+ self._db.commit()+ except Exception:+ self._db.rollback()+ raise+ @_db_lockeddef set_notification_preference(self,sender_id: str,@@ -129,6 +153,7 @@ class SessionStore:)self._db.commit()+ @_db_lockeddef set_pending_response(self,sender_id: str,@@ -144,9 +169,11 @@ class SessionStore:)self._db.commit()+ @_db_lockeddef clear_pending_response(self, sender_id: str, channel_type: str) -> None:self.set_pending_response(sender_id, channel_type, None)+ @_db_lockeddef expire_sessions(self, max_age_hours: int = 24) -> int:cur = self._db.execute("UPDATE channel_sessions "@@ -158,6 +185,7 @@ class SessionStore:self._db.commit()return cur.rowcount+ @_db_lockeddef get_last_active_channel(self, sender_id: str) -> Optional[str]:row = self._db.execute("SELECT channel_type FROM channel_sessions "@@ -167,6 +195,7 @@ class SessionStore:).fetchone()return row["channel_type"] if row else None+ @_db_lockeddef get_notification_targets(self) -> List[Dict[str, str]]:"""Return all senders with a notification channel."""rows = self._db.execute(@@ -177,5 +206,6 @@ class SessionStore:).fetchall()return [dict(r) for r in rows]+ @_db_lockeddef close(self) -> None:self._db.close()diff --git a/tests/server/test_session_store.py b/tests/server/test_session_store.pyindex 6f637035..4da5cc34 100644--- a/tests/server/test_session_store.py+++ b/tests/server/test_session_store.py@@ -59,6 +59,62 @@ class TestAppendMessage:"content": "hello!",}+ def test_concurrent_appends_from_separate_stores_keep_both_messages(+ self, tmp_path, monkeypatch+ ):+ """Concurrent read-modify-write appends must not overwrite each other."""+ import sqlite3+ import threading++ db_path = str(tmp_path / "sessions.db")+ seed = SessionStore(db_path=db_path)+ seed.get_or_create("user1", "slack")+ seed.close()++ first_read = threading.Event()+ release_first_read = threading.Event()+ original_connect = sqlite3.connect++ class ControlledConnection(sqlite3.Connection):+ def execute(self, sql, parameters=(), /):+ if "SELECT conversation_history" in sql and not first_read.is_set():+ first_read.set()+ assert release_first_read.wait(timeout=5)+ return super().execute(sql, parameters)++ def connect(*args, **kwargs):+ kwargs["factory"] = ControlledConnection+ return original_connect(*args, **kwargs)++ monkeypatch.setattr(sqlite3, "connect", connect)+ stores = [SessionStore(db_path=db_path), SessionStore(db_path=db_path)]+ errors = []++ def append(store, content):+ try:+ store.append_message("user1", "slack", "user", content)+ except Exception as exc: # noqa: BLE001 - capture race symptoms+ errors.append(exc)++ first = threading.Thread(target=append, args=(stores[0], "first"))+ second = threading.Thread(target=append, args=(stores[1], "second"))+ first.start()+ assert first_read.wait(timeout=5)+ second.start()+ release_first_read.set()+ first.join(timeout=5)+ second.join(timeout=5)++ assert errors == []+ assert not first.is_alive()+ assert not second.is_alive()+ for store in stores:+ store.close()+ check = SessionStore(db_path=db_path)+ history = check.get_or_create("user1", "slack")["conversation_history"]+ check.close()+ assert {message["content"] for message in history} == {"first", "second"}+def test_caps_history_at_max_turns(self, store):store.get_or_create("user1", "slack")for i in range(25):