Add document_json and chunks_json persistence layer
Schema migration for new columns, repository read/write support, and dedicated update_chunks method for re-chunking operations.
This commit is contained in:
parent
78c27b087d
commit
f5b31f809f
2 changed files with 51 additions and 13 deletions
|
|
@ -16,6 +16,7 @@ def _parse_dt(value: str | None) -> datetime | None:
|
||||||
|
|
||||||
|
|
||||||
def _row_to_job(row) -> AnalysisJob:
|
def _row_to_job(row) -> AnalysisJob:
|
||||||
|
keys = row.keys()
|
||||||
return AnalysisJob(
|
return AnalysisJob(
|
||||||
id=row["id"],
|
id=row["id"],
|
||||||
document_id=row["document_id"],
|
document_id=row["document_id"],
|
||||||
|
|
@ -23,11 +24,13 @@ def _row_to_job(row) -> AnalysisJob:
|
||||||
content_markdown=row["content_markdown"],
|
content_markdown=row["content_markdown"],
|
||||||
content_html=row["content_html"],
|
content_html=row["content_html"],
|
||||||
pages_json=row["pages_json"],
|
pages_json=row["pages_json"],
|
||||||
|
document_json=row["document_json"] if "document_json" in keys else None,
|
||||||
|
chunks_json=row["chunks_json"] if "chunks_json" in keys else None,
|
||||||
error_message=row["error_message"],
|
error_message=row["error_message"],
|
||||||
started_at=_parse_dt(row["started_at"]),
|
started_at=_parse_dt(row["started_at"]),
|
||||||
completed_at=_parse_dt(row["completed_at"]),
|
completed_at=_parse_dt(row["completed_at"]),
|
||||||
created_at=_parse_dt(row["created_at"]) or datetime.now(),
|
created_at=_parse_dt(row["created_at"]) or datetime.now(),
|
||||||
document_filename=row["filename"] if "filename" in row.keys() else None, # noqa: SIM118
|
document_filename=row["filename"] if "filename" in keys else None,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -60,9 +63,7 @@ async def find_all(*, limit: int = 200, offset: int = 0) -> list[AnalysisJob]:
|
||||||
|
|
||||||
async def find_by_id(job_id: str) -> AnalysisJob | None:
|
async def find_by_id(job_id: str) -> AnalysisJob | None:
|
||||||
async with get_connection() as db:
|
async with get_connection() as db:
|
||||||
cursor = await db.execute(
|
cursor = await db.execute(f"{_SELECT_WITH_DOC} WHERE aj.id = ?", (job_id,))
|
||||||
f"{_SELECT_WITH_DOC} WHERE aj.id = ?", (job_id,)
|
|
||||||
)
|
|
||||||
row = await cursor.fetchone()
|
row = await cursor.fetchone()
|
||||||
return _row_to_job(row) if row else None
|
return _row_to_job(row) if row else None
|
||||||
|
|
||||||
|
|
@ -72,17 +73,36 @@ async def update_status(job: AnalysisJob) -> None:
|
||||||
await db.execute(
|
await db.execute(
|
||||||
"""UPDATE analysis_jobs
|
"""UPDATE analysis_jobs
|
||||||
SET status = ?, content_markdown = ?, content_html = ?,
|
SET status = ?, content_markdown = ?, content_html = ?,
|
||||||
pages_json = ?, error_message = ?, started_at = ?, completed_at = ?
|
pages_json = ?, document_json = ?, chunks_json = ?,
|
||||||
|
error_message = ?, started_at = ?, completed_at = ?
|
||||||
WHERE id = ?""",
|
WHERE id = ?""",
|
||||||
(job.status.value, job.content_markdown, job.content_html,
|
(
|
||||||
job.pages_json, job.error_message,
|
job.status.value,
|
||||||
str(job.started_at) if job.started_at else None,
|
job.content_markdown,
|
||||||
str(job.completed_at) if job.completed_at else None,
|
job.content_html,
|
||||||
job.id),
|
job.pages_json,
|
||||||
|
job.document_json,
|
||||||
|
job.chunks_json,
|
||||||
|
job.error_message,
|
||||||
|
str(job.started_at) if job.started_at else None,
|
||||||
|
str(job.completed_at) if job.completed_at else None,
|
||||||
|
job.id,
|
||||||
|
),
|
||||||
)
|
)
|
||||||
await db.commit()
|
await db.commit()
|
||||||
|
|
||||||
|
|
||||||
|
async def update_chunks(job_id: str, chunks_json: str) -> bool:
|
||||||
|
"""Update only the chunks_json column for a completed analysis."""
|
||||||
|
async with get_connection() as db:
|
||||||
|
cursor = await db.execute(
|
||||||
|
"UPDATE analysis_jobs SET chunks_json = ? WHERE id = ?",
|
||||||
|
(chunks_json, job_id),
|
||||||
|
)
|
||||||
|
await db.commit()
|
||||||
|
return cursor.rowcount > 0
|
||||||
|
|
||||||
|
|
||||||
async def delete(job_id: str) -> bool:
|
async def delete(job_id: str) -> bool:
|
||||||
async with get_connection() as db:
|
async with get_connection() as db:
|
||||||
cursor = await db.execute("DELETE FROM analysis_jobs WHERE id = ?", (job_id,))
|
cursor = await db.execute("DELETE FROM analysis_jobs WHERE id = ?", (job_id,))
|
||||||
|
|
@ -93,8 +113,6 @@ async def delete(job_id: str) -> bool:
|
||||||
async def delete_by_document(document_id: str) -> int:
|
async def delete_by_document(document_id: str) -> int:
|
||||||
"""Delete all analysis jobs for a given document. Returns count deleted."""
|
"""Delete all analysis jobs for a given document. Returns count deleted."""
|
||||||
async with get_connection() as db:
|
async with get_connection() as db:
|
||||||
cursor = await db.execute(
|
cursor = await db.execute("DELETE FROM analysis_jobs WHERE document_id = ?", (document_id,))
|
||||||
"DELETE FROM analysis_jobs WHERE document_id = ?", (document_id,)
|
|
||||||
)
|
|
||||||
await db.commit()
|
await db.commit()
|
||||||
return cursor.rowcount
|
return cursor.rowcount
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,8 @@ CREATE TABLE IF NOT EXISTS analysis_jobs (
|
||||||
content_markdown TEXT,
|
content_markdown TEXT,
|
||||||
content_html TEXT,
|
content_html TEXT,
|
||||||
pages_json TEXT,
|
pages_json TEXT,
|
||||||
|
document_json TEXT,
|
||||||
|
chunks_json TEXT,
|
||||||
error_message TEXT,
|
error_message TEXT,
|
||||||
started_at TEXT,
|
started_at TEXT,
|
||||||
completed_at TEXT,
|
completed_at TEXT,
|
||||||
|
|
@ -42,11 +44,29 @@ CREATE INDEX IF NOT EXISTS idx_documents_created_at ON documents(created_at);
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
_MIGRATIONS = [
|
||||||
|
("document_json", "ALTER TABLE analysis_jobs ADD COLUMN document_json TEXT"),
|
||||||
|
("chunks_json", "ALTER TABLE analysis_jobs ADD COLUMN chunks_json TEXT"),
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
async def _run_migrations(db: aiosqlite.Connection) -> None:
|
||||||
|
"""Add columns that may be missing in older databases."""
|
||||||
|
cursor = await db.execute("PRAGMA table_info(analysis_jobs)")
|
||||||
|
existing = {row[1] for row in await cursor.fetchall()}
|
||||||
|
for col_name, ddl in _MIGRATIONS:
|
||||||
|
if col_name not in existing:
|
||||||
|
await db.execute(ddl)
|
||||||
|
logger.info("Migration: added column %s to analysis_jobs", col_name)
|
||||||
|
await db.commit()
|
||||||
|
|
||||||
|
|
||||||
async def init_db() -> None:
|
async def init_db() -> None:
|
||||||
"""Create database file and tables if they don't exist."""
|
"""Create database file and tables if they don't exist."""
|
||||||
os.makedirs(os.path.dirname(DB_PATH) or ".", exist_ok=True)
|
os.makedirs(os.path.dirname(DB_PATH) or ".", exist_ok=True)
|
||||||
async with aiosqlite.connect(DB_PATH) as db:
|
async with aiosqlite.connect(DB_PATH) as db:
|
||||||
await db.executescript(_SCHEMA)
|
await db.executescript(_SCHEMA)
|
||||||
|
await _run_migrations(db)
|
||||||
await db.commit()
|
await db.commit()
|
||||||
logger.info("Database initialized at %s", DB_PATH)
|
logger.info("Database initialized at %s", DB_PATH)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue