mirror of
https://github.com/hansjone/oclaw.git
synced 2026-10-12 14:03:18 +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
|
|
@ -8,6 +8,7 @@ from typing import Any
|
|||
from runtime.application.gateway import process_inbound_payload_usecase
|
||||
from svc.config.paths import db_path
|
||||
from svc.persistence.sqlite_store import SqliteStore
|
||||
from svc.persistence.assistant_store import get_assistant_store
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
|
|
@ -59,7 +60,7 @@ def _extract_reply_text(resp: dict[str, Any]) -> str:
|
|||
|
||||
|
||||
def run_gateway_eval(dataset_path: str) -> dict[str, Any]:
|
||||
store = SqliteStore(db_path())
|
||||
store = get_assistant_store()
|
||||
# Seed a tenant + bind code for tests
|
||||
tenants = store.list_tenants(limit=1)
|
||||
if tenants:
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ from typing import Any
|
|||
|
||||
from runtime.agents.factory import build_gateway_executor
|
||||
from svc.persistence.sqlite_store import SqliteStore
|
||||
from svc.persistence.assistant_store import get_assistant_store
|
||||
from runtime.orchestration.evaluation import eval_summary
|
||||
from svc.config.paths import db_path
|
||||
from runtime.gateway import OclawGateway
|
||||
|
|
@ -71,7 +72,7 @@ def run_eval(
|
|||
Dataset format: JSONL, each line:
|
||||
{"id": "...", "input": "...", "assert_contains": ["..."], "assert_not_contains": ["..."]}
|
||||
"""
|
||||
store = SqliteStore(db_path())
|
||||
store = get_assistant_store()
|
||||
agent = build_gateway_executor(store)
|
||||
session = store.create_session("offline-eval")
|
||||
gw = OclawGateway(store=store)
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ from typing import Any
|
|||
from svc.config.paths import db_path
|
||||
from svc.embeddings.embedding_client import build_default_embedding_client
|
||||
from svc.persistence.sqlite_store import SqliteStore
|
||||
from svc.persistence.assistant_store import get_assistant_store
|
||||
from runtime.tools.base import ToolSpec
|
||||
|
||||
|
||||
|
|
@ -27,7 +28,7 @@ def kb_add_tool() -> ToolSpec:
|
|||
if title:
|
||||
source = f"{source}:{title[:48]}"
|
||||
cid = _chunk_id(source, text)
|
||||
store = SqliteStore(db_path())
|
||||
store = get_assistant_store()
|
||||
store.upsert_knowledge_chunk(
|
||||
chunk_id=cid,
|
||||
source=source,
|
||||
|
|
@ -63,7 +64,7 @@ def kb_search_tool() -> ToolSpec:
|
|||
limit = int(args.get("limit") or 3)
|
||||
if not tenant_id or not query:
|
||||
return {"ok": False, "error": "tenant_id and query are required"}
|
||||
store = SqliteStore(db_path())
|
||||
store = get_assistant_store()
|
||||
from runtime.orchestration.memory import retrieve_context
|
||||
|
||||
rows = retrieve_context(store, query, limit=max(1, min(limit, 6)))
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ from typing import Any
|
|||
|
||||
from svc.config.paths import db_path
|
||||
from svc.persistence.sqlite_store import SqliteStore
|
||||
from svc.persistence.assistant_store import get_assistant_store
|
||||
from runtime.tools.base import ToolSpec
|
||||
|
||||
|
||||
|
|
@ -22,7 +23,7 @@ def todo_create_tool() -> ToolSpec:
|
|||
title = _require(str(args.get("title") or ""), "title")
|
||||
due_at = str(args.get("due_at") or "").strip() or None
|
||||
assignee_user_id = str(args.get("assignee_user_id") or "").strip() or None
|
||||
store = SqliteStore(db_path())
|
||||
store = get_assistant_store()
|
||||
row = store.todo_create(
|
||||
tenant_id=tenant_id,
|
||||
owner_user_id=owner_user_id,
|
||||
|
|
@ -61,7 +62,7 @@ def todo_list_tool() -> ToolSpec:
|
|||
assignee_user_id = str(args.get("assignee_user_id") or "").strip() or None
|
||||
status = str(args.get("status") or "open").strip() or None
|
||||
limit = int(args.get("limit") or 50)
|
||||
store = SqliteStore(db_path())
|
||||
store = get_assistant_store()
|
||||
rows = store.todo_list(
|
||||
tenant_id=tenant_id,
|
||||
assignee_user_id=assignee_user_id,
|
||||
|
|
@ -96,7 +97,7 @@ def todo_done_tool() -> ToolSpec:
|
|||
try:
|
||||
tenant_id = _require(str(args.get("tenant_id") or ""), "tenant_id")
|
||||
todo_id = _require(str(args.get("todo_id") or ""), "todo_id")
|
||||
store = SqliteStore(db_path())
|
||||
store = get_assistant_store()
|
||||
ok = store.todo_set_status(tenant_id=tenant_id, todo_id=todo_id, status="done")
|
||||
return {"ok": bool(ok), "todo_id": todo_id}
|
||||
except Exception as e:
|
||||
|
|
@ -122,7 +123,7 @@ def todo_assign_tool() -> ToolSpec:
|
|||
tenant_id = _require(str(args.get("tenant_id") or ""), "tenant_id")
|
||||
todo_id = _require(str(args.get("todo_id") or ""), "todo_id")
|
||||
assignee_user_id = _require(str(args.get("assignee_user_id") or ""), "assignee_user_id")
|
||||
store = SqliteStore(db_path())
|
||||
store = get_assistant_store()
|
||||
ok = store.todo_assign(tenant_id=tenant_id, todo_id=todo_id, assignee_user_id=assignee_user_id)
|
||||
return {"ok": bool(ok), "todo_id": todo_id, "assignee_user_id": assignee_user_id}
|
||||
except Exception as e:
|
||||
|
|
|
|||
|
|
@ -3,17 +3,16 @@ from __future__ import annotations
|
|||
from typing import Any
|
||||
|
||||
from runtime.tools.base import ToolSpec
|
||||
from svc.persistence.assistant_store import get_assistant_store
|
||||
|
||||
|
||||
def index_workspace_tool() -> ToolSpec:
|
||||
def handler(args: dict[str, Any]) -> dict[str, Any]:
|
||||
max_files = int(args.get("max_files") or 120)
|
||||
try:
|
||||
from svc.persistence.sqlite_store import SqliteStore
|
||||
from svc.config.paths import db_path
|
||||
from runtime.tools.workspace_indexer import index_workspace
|
||||
|
||||
store = SqliteStore(db_path())
|
||||
store = get_assistant_store()
|
||||
st = index_workspace(store, max_files=max(1, min(max_files, 800)))
|
||||
return {"ok": True, "files_seen": st.files_seen, "chunks_upserted": st.chunks_upserted, "embeddings_upserted": st.embeddings_upserted}
|
||||
except Exception as e:
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ from typing import Any
|
|||
|
||||
from svc.config.paths import db_path
|
||||
from svc.persistence.sqlite_store import SqliteStore
|
||||
from svc.persistence.assistant_store import get_assistant_store
|
||||
from runtime.chat.tool_invocation_context import (
|
||||
current_tool_lane_sessions,
|
||||
current_tool_workspace_lane_role,
|
||||
|
|
@ -16,7 +17,7 @@ from runtime.tools.base import ToolSpec
|
|||
|
||||
|
||||
def _store() -> SqliteStore:
|
||||
return SqliteStore(db_path())
|
||||
return get_assistant_store()
|
||||
|
||||
|
||||
def _coerce_public_flag(raw: Any) -> bool:
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ from typing import Any
|
|||
|
||||
from svc.config.paths import db_path
|
||||
from svc.persistence.sqlite_store import SqliteStore
|
||||
from svc.persistence.assistant_store import get_assistant_store
|
||||
from runtime.skill_installer import install_skill_from_registry_archive
|
||||
from runtime.skills import default_skills_root
|
||||
from runtime.skills_market import get_market_adapter, normalize_skill_market_provider_setting
|
||||
|
|
@ -12,7 +13,7 @@ from runtime.tools.base import ToolSpec
|
|||
|
||||
|
||||
def _store() -> SqliteStore:
|
||||
return SqliteStore(db_path())
|
||||
return get_assistant_store()
|
||||
|
||||
|
||||
def _agent_workspace_skills_root() -> Path:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue