* feat(web): Curated Memory restructure + per-user Dismiss + filter-state utility
Squashed from cvrysanek/zsrotyr's 4-commit PR branch + rebased onto
current main + CHANGELOG bullets spliced into [Unreleased] (preserves
existing #316/#320/#322 entries that landed on main since the branch
was authored).
Routes + access:
- /corporate-memory now user-facing (get_current_user), in primary
nav next to "Data Packages" — same gate as /api/memory/*.
- /admin/corporate-memory is the new admin review queue location
(was /corporate-memory/admin); reached via Admin dropdown. Template
renamed: corporate_memory_admin.html → admin_corporate_memory.html.
Visual chrome:
- Both pages migrate to shared _page_hero.html blue hero band.
Per-user Dismiss (new feature, schema v46):
- knowledge_item_user_dismissed(user_id, item_id, dismissed_at) + index.
- POST /api/memory/{id}/dismiss + DELETE (idempotent).
- Mandatory items can never be dismissed — enforced at 2 layers.
- GET /api/memory: hide_dismissed=false default + dismissed_by_me flag.
- GET /api/memory/bundle: always excludes dismissed for the caller.
- UI: Dismiss/Undismiss button per item (hidden for mandatory),
gray-out + line-through for dismissed rows, Hide-dismissed toggle.
Admin edit modal:
- Category as <select> + "Add new category…" reveal.
- Audience as <select> with (unset)/all/group:<name> from RBAC.
- Tags: full tag-input widget (pills, ×-remove, Backspace pop,
Enter/comma to add, ↑/↓ typeahead from EXISTING_TAGS).
Bulk-edit modal pickers (closes #128):
- Move-to-category / Add-tag: <select> + add-new.
- Set-audience: <select> (no more typo-able 'gourp:eng').
- Remove-tag: closed-set picker.
FilterState utility:
- app/web/static/js/filter-state.js — save/load/clear/bindInputs
for per-page localStorage filter state. Adopted on /corporate-memory.
E2E verified live on a real VM through the API + browser flow.
* release: 0.54.18 — Curated Memory restructure + 4 adversarial-review fixes
Bundles together:
- #316 fix(store): surface review failures + harden publish gate
(BREAKING fail-CLOSED guardrail, override v2+ promote, restore guard,
retry/rescan staged-bundle, banner widening, LLM truncation retry)
- #320 fix(store): C2 bundle export RBAC + H2 per-entity write lock +
H3 update_status compare-and-swap with bg_verdict_skipped audit
- #322 fix(store): M1 prompt sentinel filename escape + M2 atomic
promote_to_version helper + L1 admin forensic download per-version
- #324 Curated Memory restructure + per-user Dismiss + FilterState utility
Bump from 0.54.17 → 0.54.18 (patch — pre-1.0 policy: every cycle is patch).
128 lines
4.6 KiB
Python
128 lines
4.6 KiB
Python
"""v41 → v42 migration: 7 new usage_* tables for telemetry."""
|
|
|
|
import duckdb
|
|
import pytest
|
|
from src.db import _ensure_schema as init_database, SCHEMA_VERSION
|
|
|
|
|
|
def test_schema_version_is_42():
|
|
# Test name preserved for git-blame continuity; the version-pinned
|
|
# tests in test_db_schema_version.py, test_home_stats.py and
|
|
# test_schema_v46_migration.py carry the current commentary.
|
|
assert SCHEMA_VERSION == 46
|
|
|
|
|
|
def test_v42_tables_exist_after_init(tmp_path):
|
|
db_path = tmp_path / "test.duckdb"
|
|
conn = duckdb.connect(str(db_path))
|
|
init_database(conn)
|
|
tables = {
|
|
row[0]
|
|
for row in conn.execute("SELECT table_name FROM information_schema.tables WHERE table_schema='main'").fetchall()
|
|
}
|
|
for tbl in [
|
|
"usage_events",
|
|
"usage_session_summary",
|
|
"usage_tool_daily",
|
|
"usage_plugin_daily",
|
|
"usage_attribution_skills",
|
|
"usage_attribution_agents",
|
|
"usage_attribution_commands",
|
|
]:
|
|
assert tbl in tables, f"missing table {tbl}"
|
|
conn.close()
|
|
|
|
|
|
def test_v42_indices_exist(tmp_path):
|
|
db_path = tmp_path / "test.duckdb"
|
|
conn = duckdb.connect(str(db_path))
|
|
init_database(conn)
|
|
idx_names = {
|
|
row[0]
|
|
for row in conn.execute("SELECT index_name FROM duckdb_indexes WHERE table_name LIKE 'usage_%'").fetchall()
|
|
}
|
|
for idx in [
|
|
"idx_usage_events_session",
|
|
"idx_usage_events_user_time",
|
|
"idx_usage_events_tool",
|
|
"idx_usage_events_skill",
|
|
"idx_usage_events_ref",
|
|
"idx_usage_session_user",
|
|
"idx_usage_session_started",
|
|
"idx_usage_attr_skill_lookup",
|
|
"idx_usage_attr_agent_lookup",
|
|
"idx_usage_attr_command_lookup",
|
|
]:
|
|
assert idx in idx_names, f"missing index {idx}"
|
|
conn.close()
|
|
|
|
|
|
def test_v41_to_v42_is_idempotent(tmp_path):
|
|
"""Running init twice on same DB must not error and version stays 41."""
|
|
db_path = tmp_path / "twice.duckdb"
|
|
conn = duckdb.connect(str(db_path))
|
|
init_database(conn)
|
|
conn.close()
|
|
conn = duckdb.connect(str(db_path))
|
|
init_database(conn)
|
|
v = conn.execute("SELECT MAX(version) FROM schema_version").fetchone()[0]
|
|
assert v == 46
|
|
conn.close()
|
|
|
|
|
|
def test_v41_db_upgrades_cleanly(tmp_path):
|
|
"""A v40-state DB (post-Activity-Center) must climb to v41 without error."""
|
|
db_path = tmp_path / "v41.duckdb"
|
|
conn = duckdb.connect(str(db_path))
|
|
# Minimal v40 baseline shape — schema_version + audit_log with v40 columns.
|
|
conn.execute("CREATE TABLE schema_version (version INTEGER, applied_at TIMESTAMP DEFAULT current_timestamp)")
|
|
conn.execute("INSERT INTO schema_version (version) VALUES (41)")
|
|
conn.execute("""CREATE TABLE audit_log (
|
|
id VARCHAR PRIMARY KEY, timestamp TIMESTAMP DEFAULT current_timestamp,
|
|
user_id VARCHAR, action VARCHAR, resource VARCHAR, params JSON,
|
|
result VARCHAR, duration_ms INTEGER,
|
|
params_before JSON, client_ip VARCHAR, client_kind VARCHAR, correlation_id VARCHAR
|
|
)""")
|
|
conn.close()
|
|
conn = duckdb.connect(str(db_path))
|
|
init_database(conn)
|
|
v = conn.execute("SELECT MAX(version) FROM schema_version").fetchone()[0]
|
|
assert v == 46
|
|
# All 7 new v41 tables exist after the v40→v41 upgrade
|
|
tables = {
|
|
row[0]
|
|
for row in conn.execute("SELECT table_name FROM information_schema.tables WHERE table_schema='main'").fetchall()
|
|
}
|
|
for tbl in [
|
|
"usage_events",
|
|
"usage_session_summary",
|
|
"usage_tool_daily",
|
|
"usage_plugin_daily",
|
|
"usage_attribution_skills",
|
|
"usage_attribution_agents",
|
|
"usage_attribution_commands",
|
|
]:
|
|
assert tbl in tables, f"missing table {tbl} after v40→v41 upgrade"
|
|
conn.close()
|
|
|
|
|
|
def test_v30_db_ladders_all_the_way_up(tmp_path):
|
|
"""Old v30-state DB must climb all the way to v41 without losing data."""
|
|
db_path = tmp_path / "v30.duckdb"
|
|
conn = duckdb.connect(str(db_path))
|
|
conn.execute("CREATE TABLE schema_version (version INTEGER, applied_at TIMESTAMP DEFAULT current_timestamp)")
|
|
conn.execute("INSERT INTO schema_version (version) VALUES (30)")
|
|
conn.execute("CREATE TABLE audit_log (id VARCHAR PRIMARY KEY)")
|
|
conn.execute("INSERT INTO audit_log (id) VALUES ('vintage')")
|
|
conn.close()
|
|
|
|
conn = duckdb.connect(str(db_path))
|
|
init_database(conn)
|
|
v = conn.execute("SELECT MAX(version) FROM schema_version").fetchone()[0]
|
|
assert v == 46
|
|
cnt = conn.execute("SELECT COUNT(*) FROM audit_log WHERE id='vintage'").fetchone()[0]
|
|
assert cnt == 1
|
|
# New v41 table exists
|
|
cnt2 = conn.execute("SELECT COUNT(*) FROM usage_events").fetchone()[0]
|
|
assert cnt2 == 0
|
|
conn.close()
|