mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-06-15 17:25:26 -04:00
Joshua Valderrama
35b4dd2824
* docs: add implementation plan for fixing chat context drifting (#135) * fix: make Session.history immutable + fix {}.history crash - Session.history now exposes a COPY of the internal _history list - add_message() replaces history with a fresh copy each time - get_context_messages() derives from _history directly - replace_messages() updates both _history and history - truncate_messages() updates both _history and history - _persist_message() line 207: fixed {}.history fallback crash - Added 11 tests for session isolation and edge cases Addresses #135 root cause #1: shared mutable references * fix: task scheduler uses SessionManager methods instead of overwriting sessions - Added ensure_task_session() to SessionManager (checks cache first) - Task scheduler now uses ensure_task_session() instead of direct dict assignment - Task scheduler now uses SessionManager.add_message() for message persistence - Removed direct sess_obj.history.append() that was silently losing data Addresses #135 root causes #2 and #3 * fix: add age guard to cleanup_empty_sessions — don't delete sessions <1h old Prevents the cleanup task from deleting sessions that were just created and haven't received any messages yet (message_count == 0). Addresses #135 root cause #5 * test: comprehensive session isolation tests (10/10 passing) * refactor: consolidate _session_manager into singleton pattern - Added set_session_manager_instance / get_session_manager_instance to core/models - kept backward-compat aliases (set_session_manager, get_session_manager) - session_manager.py re-exports the singleton functions - ai_interaction.set_session_manager now syncs with the core singleton - context_compactor uses get_session_manager_instance() instead of getattr hack - app.py initializes the singleton once Addresses #135 root cause #4: fragile global wiring * test: add concurrent session isolation integration tests Verifies: - Concurrent add_message to different sessions doesn't cross-contaminate - Rapid parallel writes maintain isolation - Read-write concurrent access is safe All 3 async tests pass, proving the immutable history fix works under concurrency * fix: pre-import core.models in conftest to prevent test pollution test_agent_loop.py stubs sys.modules['core.models'] = MagicMock() at module level during collection. Any test collected after it imports Session as a MagicMock. Pre-importing core.models in conftest.py before test_agent_loop.py's module-level code runs prevents this. * fix: make .history authoritative mutable list, address PR review Per review feedback: keep .history as the authoritative mutable list so existing code doing .history.pop(), .history = [...], etc. still works. Fix the cross-contamination bug by ensuring __post_init__() gives each Session its OWN unique history list (never shared). Changes: - core/models.py: .history IS the authoritative list. _history aliases it. Each Session gets its own list in __post_init__. - core/session_manager.py: add_message() delegates to Session.add_message() instead of appending directly — no double-append, single source of truth. - tests/test_session_manager.py: updated test to reflect that .history references see new messages (same list, not a snapshot). - docs/plans/2026-06-01-fix-chat-context-drifting.md: removed (not for shipping — useful design context but too much process/doc to ship). All 272 tests pass (3 pre-existing failures unrelated). * Fix session manager message persistence * Fix session history alias regressions * Fix session history aliasing and task delivery
79 lines
2.9 KiB
Python
79 lines
2.9 KiB
Python
"""Regression: truncate_messages must not set message_count above the real
|
|
number of messages when keep_count exceeds the message total.
|
|
|
|
The AI tool layer (src/ai_interaction.py manage_session action='truncate')
|
|
defaults keep_count=10, so a short session (say 3 messages) gets truncated
|
|
with keep_count=10. The DB has only 3 rows left, but truncate_messages used to
|
|
write db_session.message_count = keep_count (=10), leaving the persisted count
|
|
inconsistent with the actual rows. get_session relies on message_count>0 to
|
|
decide whether to lazily hydrate from the DB, so an inflated count is a latent
|
|
correctness hazard.
|
|
"""
|
|
import os
|
|
import tempfile
|
|
|
|
|
|
def _make_manager():
|
|
db_fd, db_path = tempfile.mkstemp(suffix=".db")
|
|
os.close(db_fd)
|
|
os.environ["DATABASE_URL"] = f"sqlite:///{db_path}"
|
|
|
|
# Import after DATABASE_URL is set so the engine binds to the temp DB.
|
|
import importlib
|
|
import core.database as database
|
|
importlib.reload(database)
|
|
database.Base.metadata.create_all(bind=database.engine)
|
|
|
|
import core.session_manager as sm_mod
|
|
importlib.reload(sm_mod)
|
|
return sm_mod.SessionManager(), database, sm_mod
|
|
|
|
|
|
def test_truncate_keep_count_exceeds_total_does_not_inflate_count():
|
|
from core.models import ChatMessage
|
|
|
|
sm, database, sm_mod = _make_manager()
|
|
sid = "short-session"
|
|
sm.create_session(session_id=sid, name="t", endpoint_url="x",
|
|
model="m", rag=False, owner="u")
|
|
for i in range(3):
|
|
sm.add_message(sid, ChatMessage("user", f"msg{i}"))
|
|
|
|
# AI default keep_count is 10 — larger than the 3 real messages.
|
|
assert sm.truncate_messages(sid, 10) is True
|
|
|
|
db = database.SessionLocal()
|
|
try:
|
|
DbSession = database.Session
|
|
DbChatMessage = database.ChatMessage
|
|
rows = db.query(DbChatMessage).filter(
|
|
DbChatMessage.session_id == sid).count()
|
|
db_session = db.query(DbSession).filter(DbSession.id == sid).first()
|
|
# Nothing should have been deleted (only 3 messages exist).
|
|
assert rows == 3
|
|
# message_count must reflect the real number of rows, not keep_count.
|
|
assert db_session.message_count == 3, (
|
|
f"message_count={db_session.message_count} but only {rows} rows exist"
|
|
)
|
|
finally:
|
|
db.close()
|
|
|
|
|
|
def test_truncate_keeps_history_alias_for_context_messages():
|
|
from core.models import ChatMessage
|
|
|
|
sm, database, sm_mod = _make_manager()
|
|
sid = "alias-after-truncate"
|
|
sm.create_session(session_id=sid, name="t", endpoint_url="x",
|
|
model="m", rag=False, owner="u")
|
|
for i in range(3):
|
|
sm.add_message(sid, ChatMessage("user", f"msg{i}"))
|
|
|
|
assert sm.truncate_messages(sid, 2) is True
|
|
|
|
session = sm.sessions[sid]
|
|
assert session.history is session._history
|
|
|
|
session.history.append(ChatMessage("user", "after direct mutation"))
|
|
assert session.get_context_messages()[-1]["content"] == "after direct mutation"
|