mirror of
https://github.com/hansjone/oclaw.git
synced 2026-10-17 15:43:19 +08:00
feat(persistence): PostgreSQL assistant store, chat persist fixes, gateway scripts
- Add SQLAlchemy Core repos, pg adapter/compat, assistant_store factory, Alembic bootstrap and migration/cutover scripts. - Harden chat_message writes (NUL scrub for PG), turn_uuid on attempt failure, WS turn_runner fallbacks and gateway executed_turn_uuid init. - start_gateway: log paths, PS7 stderr handling via cmd, background stdout/stderr redirect; runtime assistant_runtime_log_dir export. - Ops: clear_all_chat_sessions with PG-only --postgresql and env-gated wipe; clear_postgres_chat_sessions.ps1. - Tests: SA repos, pg compat, persist fallback, smoke env isolation; CI and docs touch-ups. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
parent
2b32d11f43
commit
d14e9d3596
103 changed files with 7574 additions and 1641 deletions
57
svc/persistence/assistant_store.py
Normal file
57
svc/persistence/assistant_store.py
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
"""Single entry point for the assistant persistence layer (SQLite or PostgreSQL)."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from pathlib import Path
|
||||
|
||||
from svc.config.database import assistant_db_backend, assistant_postgres_dsn
|
||||
from svc.persistence.assistant_store_protocol import AssistantStoreProtocol
|
||||
|
||||
_singleton: AssistantStoreProtocol | None = None
|
||||
_singleton_key: str | None = None
|
||||
|
||||
|
||||
def reset_assistant_store_singleton() -> None:
|
||||
"""Drop the cached :func:`get_assistant_store` instance (tests / engine URL changes)."""
|
||||
global _singleton, _singleton_key
|
||||
_singleton = None
|
||||
_singleton_key = None
|
||||
|
||||
|
||||
def get_assistant_store() -> AssistantStoreProtocol:
|
||||
"""Return the process-wide assistant store implementation.
|
||||
|
||||
- Default: SQLite at :func:`svc.config.paths.db_path`.
|
||||
- ``AIA_ASSISTANT_DB_BACKEND=postgresql`` + DSN: same :class:`~svc.persistence.sqlite_store.SqliteStore`
|
||||
API over PostgreSQL (schema via Alembic / ``postgresql_bootstrap.sql``).
|
||||
|
||||
The store is **cached per process** for a stable (backend, connection key) so ``SqliteStore.__init__``
|
||||
does not re-run PostgreSQL bootstrap / orphan pruning on every HTTP or WS call (which could race
|
||||
with in-flight writes and make messages disappear after tool rounds).
|
||||
|
||||
Tests should keep constructing ``SqliteStore(path)`` with an explicit file path; production code
|
||||
should prefer this factory for ``db_path()``-backed instances.
|
||||
|
||||
Return type is :class:`~svc.persistence.assistant_store_protocol.AssistantStoreProtocol`; the
|
||||
concrete class is :class:`~svc.persistence.sqlite_store.SqliteStore` for both backends.
|
||||
"""
|
||||
global _singleton, _singleton_key
|
||||
from svc.config.paths import db_path
|
||||
from svc.persistence.sqlite_store import SqliteStore
|
||||
|
||||
if assistant_db_backend() == "postgresql":
|
||||
key = f"postgresql::{assistant_postgres_dsn()}"
|
||||
else:
|
||||
key = f"sqlite::{Path(db_path()).resolve()}"
|
||||
|
||||
if _singleton is not None and _singleton_key == key:
|
||||
return _singleton
|
||||
if assistant_db_backend() == "postgresql":
|
||||
_singleton = SqliteStore(None, postgres_url=assistant_postgres_dsn())
|
||||
else:
|
||||
_singleton = SqliteStore(db_path())
|
||||
_singleton_key = key
|
||||
return _singleton
|
||||
|
||||
|
||||
__all__ = ["get_assistant_store", "reset_assistant_store_singleton"]
|
||||
Loading…
Add table
Add a link
Reference in a new issue