Add Compose, Gitea deploy, and Postgres dual-backend on develop.
Use host ports 3006/8005 and 3096/8096 so Kansho does not collide with Bookstack on 3005 or the sister products. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
32acdc220b
commit
07479f6a9f
37 files changed
+1613
-102
No files matched your search
+132
-34
@@ -1,4 +1,8 @@
|
||||
"""SQLite persistence for the local frame. PostgreSQL remains the later target."""
|
||||
"""Persistence for the local frame.
|
||||
|
||||
SQLite is the Windows/test engine. PostgreSQL 16 is the Docker/server engine.
|
||||
Switch at connect time via KANSHO_DB_BACKEND / DB_HOST; stores keep SQLite-shaped SQL.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
@@ -6,14 +10,49 @@ import os
|
||||
import sqlite3
|
||||
from contextlib import contextmanager
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
DATA_DIR = Path(__file__).resolve().parent / "data"
|
||||
from sql_compat import (
|
||||
adapt_sql,
|
||||
postgres_connect_kwargs,
|
||||
rewrite_catalog_sql,
|
||||
split_sql,
|
||||
sqlite_schema_to_postgres,
|
||||
use_postgres,
|
||||
)
|
||||
|
||||
_env_data = (os.environ.get("KANSHO_DATA_DIR") or "").strip()
|
||||
DATA_DIR = Path(_env_data) if _env_data else Path(__file__).resolve().parent / "data"
|
||||
SCHEMA_PATH = Path(__file__).resolve().parent / "schema.sql"
|
||||
SEED_PATH = Path(__file__).resolve().parent / "config" / "platform_seed.json"
|
||||
PROMPTS_SEED_PATH = Path(__file__).resolve().parent / "config" / "prompts.seed.json"
|
||||
_env_db = os.environ.get("KANSHO_DB_PATH")
|
||||
DB_PATH = Path(_env_db) if _env_db else DATA_DIR / "kansho.sqlite"
|
||||
|
||||
SQLITE_HISTORY_MIGRATIONS = (
|
||||
"001_frame",
|
||||
"002_platform",
|
||||
"003_dialogue_memory",
|
||||
"004_mvp_journal",
|
||||
"005_provider_settings",
|
||||
"006_writing_profile_dialogue_style",
|
||||
"007_journal_day_scratch",
|
||||
"008_journal_source_refs",
|
||||
"009_conversation_signals",
|
||||
"010_profile_governance",
|
||||
"011_profile_review",
|
||||
"012_profile_shell",
|
||||
"013_journal_generate_narration",
|
||||
"014_identity_registry",
|
||||
"015_journal_generation_settings",
|
||||
"016_generation_instruction_fragments",
|
||||
"017_generation_guidelines",
|
||||
"018_debug_runs",
|
||||
"019_debug_run_placement",
|
||||
"020_voice_style_context",
|
||||
"021_voice_legacy_immutable",
|
||||
)
|
||||
|
||||
_PROFILE_COLUMNS = {
|
||||
"status": "TEXT NOT NULL DEFAULT 'active'",
|
||||
"tier_id": "TEXT NOT NULL DEFAULT 'local'",
|
||||
@@ -88,7 +127,61 @@ _IDENTITY_MAPPING_COLUMNS = {
|
||||
}
|
||||
|
||||
|
||||
def _connect() -> sqlite3.Connection:
|
||||
class PostgresCompat:
|
||||
"""sqlite3-like execute/commit surface over psycopg, with SQL translation."""
|
||||
|
||||
def __init__(self, raw: Any):
|
||||
self._raw = raw
|
||||
|
||||
def execute(self, sql: str, params: Any = None):
|
||||
special = rewrite_catalog_sql(sql)
|
||||
if special:
|
||||
adapted, extra = special
|
||||
args = extra if extra is not None else params
|
||||
else:
|
||||
adapted = adapt_sql(sql)
|
||||
args = params
|
||||
if args is None:
|
||||
return self._raw.execute(adapted)
|
||||
return self._raw.execute(adapted, args)
|
||||
|
||||
def executemany(self, sql: str, seq_of_params: Any):
|
||||
adapted = adapt_sql(sql)
|
||||
cursor = None
|
||||
for params in seq_of_params:
|
||||
cursor = self._raw.execute(adapted, params)
|
||||
return cursor
|
||||
|
||||
def executescript(self, script: str):
|
||||
for statement in split_sql(sqlite_schema_to_postgres(script)):
|
||||
self._raw.execute(statement)
|
||||
return self
|
||||
|
||||
def commit(self):
|
||||
self._raw.commit()
|
||||
|
||||
def rollback(self):
|
||||
self._raw.rollback()
|
||||
|
||||
def close(self):
|
||||
self._raw.close()
|
||||
|
||||
|
||||
def _connect_postgres() -> PostgresCompat:
|
||||
import psycopg
|
||||
from psycopg.rows import dict_row
|
||||
|
||||
kwargs = postgres_connect_kwargs()
|
||||
if "conninfo" in kwargs:
|
||||
raw = psycopg.connect(kwargs["conninfo"], row_factory=dict_row)
|
||||
else:
|
||||
raw = psycopg.connect(row_factory=dict_row, **kwargs)
|
||||
return PostgresCompat(raw)
|
||||
|
||||
|
||||
def _connect():
|
||||
if use_postgres():
|
||||
return _connect_postgres()
|
||||
DB_PATH.parent.mkdir(parents=True, exist_ok=True)
|
||||
conn = sqlite3.connect(DB_PATH, timeout=30)
|
||||
conn.row_factory = sqlite3.Row
|
||||
@@ -109,32 +202,32 @@ def get_db():
|
||||
conn.close()
|
||||
|
||||
|
||||
def row_to_dict(row: sqlite3.Row | None) -> dict | None:
|
||||
def row_to_dict(row: Any) -> dict | None:
|
||||
if row is None:
|
||||
return None
|
||||
return dict(row)
|
||||
|
||||
|
||||
def _column_names(conn: sqlite3.Connection, table: str) -> set[str]:
|
||||
def _column_names(conn: Any, table: str) -> set[str]:
|
||||
rows = conn.execute(f"PRAGMA table_info({table})").fetchall()
|
||||
return {row["name"] for row in rows}
|
||||
|
||||
|
||||
def _ensure_columns(conn: sqlite3.Connection, table: str, columns: dict[str, str]) -> None:
|
||||
def _ensure_columns(conn: Any, table: str, columns: dict[str, str]) -> None:
|
||||
existing = _column_names(conn, table)
|
||||
for name, ddl in columns.items():
|
||||
if name not in existing:
|
||||
conn.execute(f"ALTER TABLE {table} ADD COLUMN {name} {ddl}")
|
||||
|
||||
|
||||
def _mark(conn: sqlite3.Connection, migration_id: str) -> None:
|
||||
def _mark(conn: Any, migration_id: str) -> None:
|
||||
conn.execute(
|
||||
"INSERT OR IGNORE INTO schema_migrations (id) VALUES (?)",
|
||||
(migration_id,),
|
||||
)
|
||||
|
||||
|
||||
def _seed_platform(conn: sqlite3.Connection) -> None:
|
||||
def _seed_platform(conn: Any) -> None:
|
||||
seed = json.loads(SEED_PATH.read_text(encoding="utf-8"))
|
||||
for tier in seed.get("tiers", []):
|
||||
conn.execute(
|
||||
@@ -171,7 +264,7 @@ def _seed_platform(conn: sqlite3.Connection) -> None:
|
||||
)
|
||||
|
||||
|
||||
def _seed_prompts(conn: sqlite3.Connection) -> None:
|
||||
def _seed_prompts(conn: Any) -> None:
|
||||
"""Prompts come from JSON/DB, never from Python string literals.
|
||||
|
||||
Untouched system prompts (template == default_template) receive the seed.
|
||||
@@ -246,7 +339,7 @@ def _parse_legacy_ids(raw: str | None) -> list[str]:
|
||||
|
||||
|
||||
def _insert_source_refs(
|
||||
conn: sqlite3.Connection,
|
||||
conn: Any,
|
||||
table: str,
|
||||
owner_col: str,
|
||||
owner_id: str,
|
||||
@@ -275,7 +368,7 @@ def _insert_source_refs(
|
||||
)
|
||||
|
||||
|
||||
def migrate_journal_source_refs(conn: sqlite3.Connection) -> None:
|
||||
def migrate_journal_source_refs(conn: Any) -> None:
|
||||
"""Copy JSON id lists into relational source-ref tables without touching Source."""
|
||||
existing = {
|
||||
row["name"]
|
||||
@@ -323,7 +416,7 @@ def migrate_journal_source_refs(conn: sqlite3.Connection) -> None:
|
||||
)
|
||||
|
||||
|
||||
def _migrate_writing_profile_dialogue_style(conn: sqlite3.Connection) -> None:
|
||||
def _migrate_writing_profile_dialogue_style(conn: Any) -> None:
|
||||
"""Existing DBs keep the old CHECK; recreate so dialogue_style is a valid source kind."""
|
||||
row = row_to_dict(
|
||||
conn.execute(
|
||||
@@ -354,7 +447,7 @@ def _migrate_writing_profile_dialogue_style(conn: sqlite3.Connection) -> None:
|
||||
)
|
||||
|
||||
|
||||
def _migrate_writing_profile_shell(conn: sqlite3.Connection) -> None:
|
||||
def _migrate_writing_profile_shell(conn: Any) -> None:
|
||||
"""Layers stay; inferred count-facets are not the profile. Manual style keys become traits."""
|
||||
from writing_profile_schema import LEGACY_STYLE_KEYS, coerce_slug, facet_layer, normalize_facet_key
|
||||
|
||||
@@ -449,7 +542,31 @@ def _migrate_writing_profile_shell(conn: sqlite3.Connection) -> None:
|
||||
)
|
||||
|
||||
|
||||
def _seed_runtime(conn: Any) -> None:
|
||||
_seed_platform(conn)
|
||||
_seed_prompts(conn)
|
||||
from provider_settings import seed_provider_settings
|
||||
from journal_generation_policy import backfill_missing_settings, seed_generation_instructions
|
||||
|
||||
seed_provider_settings(conn)
|
||||
seed_generation_instructions(conn)
|
||||
backfill_missing_settings(conn)
|
||||
seed_generation_instructions(conn)
|
||||
seed_generation_instructions(conn)
|
||||
|
||||
|
||||
def init_db() -> None:
|
||||
if use_postgres():
|
||||
from db_init import ensure_postgres_ready
|
||||
|
||||
ensure_postgres_ready()
|
||||
with get_db() as conn:
|
||||
_seed_runtime(conn)
|
||||
from writing_profile_store import bootstrap_from_existing
|
||||
|
||||
bootstrap_from_existing()
|
||||
return
|
||||
|
||||
schema = SCHEMA_PATH.read_text(encoding="utf-8")
|
||||
with get_db() as conn:
|
||||
conn.executescript(schema)
|
||||
@@ -474,35 +591,16 @@ def init_db() -> None:
|
||||
from identity_store import migrate_legacy_identity_rows
|
||||
|
||||
migrate_legacy_identity_rows(conn)
|
||||
_mark(conn, "001_frame")
|
||||
_mark(conn, "002_platform")
|
||||
_mark(conn, "003_dialogue_memory")
|
||||
_mark(conn, "004_mvp_journal")
|
||||
_mark(conn, "005_provider_settings")
|
||||
_mark(conn, "006_writing_profile_dialogue_style")
|
||||
_mark(conn, "007_journal_day_scratch")
|
||||
_mark(conn, "008_journal_source_refs")
|
||||
_mark(conn, "009_conversation_signals")
|
||||
_mark(conn, "010_profile_governance")
|
||||
_mark(conn, "011_profile_review")
|
||||
_mark(conn, "012_profile_shell")
|
||||
_mark(conn, "013_journal_generate_narration")
|
||||
_mark(conn, "014_identity_registry")
|
||||
for migration_id in SQLITE_HISTORY_MIGRATIONS:
|
||||
_mark(conn, migration_id)
|
||||
from journal_generation_policy import backfill_missing_settings, seed_generation_instructions
|
||||
|
||||
_ensure_columns(conn, "generation_guidelines", _GUIDELINE_COLUMNS)
|
||||
seed_generation_instructions(conn)
|
||||
backfill_missing_settings(conn)
|
||||
_mark(conn, "015_journal_generation_settings")
|
||||
_mark(conn, "016_generation_instruction_fragments")
|
||||
_mark(conn, "017_generation_guidelines")
|
||||
_mark(conn, "018_debug_runs")
|
||||
_ensure_columns(conn, "debug_runs", _DEBUG_RUN_COLUMNS)
|
||||
_mark(conn, "019_debug_run_placement")
|
||||
seed_generation_instructions(conn)
|
||||
_mark(conn, "020_voice_style_context")
|
||||
seed_generation_instructions(conn)
|
||||
_mark(conn, "021_voice_legacy_immutable")
|
||||
from writing_profile_store import bootstrap_from_existing
|
||||
|
||||
bootstrap_from_existing()
|
||||
Reference in new issue
Block a user