a73a986bbe
Krok 4 of the phase-4 plan done ahead of the local-embed-fallback step (Krok 2, deliberately deferred -- embed stays a plain SOLARIA call, per task instruction): one FastAPI process now serves both the /search API and the UI, no separate frontend build (plan §2 decision 4). - GET / renders a Jinja2 shell; app/static/app.js (vanilla, no build) and style.css are the whole client. Query -> /search, results grouped by envelope_id client-side (chunks sorted by dist, <details> fragments). - Colour thresholds per plan §7: dist<0.45 green, 0.45-0.55 yellow (still shown with a warning), >0.55 never rendered as an individual result; if a query ends up with nothing renderable, one "Brak odpowiedzi w KB" message replaces the list, carrying the best observed dist. - Paperless hits link out; gmail hits get a "kopiuj Message-ID" button (there's nothing to link to yet, plan §2 decision 3) plus header metadata. Cascade/flat toggle defaults to cascade. Footer shows sol_status, refreshed from /healthz on load and after each search. - /search gained additive summary/summary_tags fields (document_summary, haiku track) so the UI can show a document summary as each result group's header -- non-breaking, existing response shape untouched. - Tests: app/db.py + app/search.py unit tests (mocked DB/HTTP, no live deps) cover the new summary join; tests/test_frontend.py drives GET / and /static/* via TestClient without running the DB-requiring lifespan; tests/frontend/app.test.js (Node's built-in test runner, no framework) covers query-URL encoding, threshold colouring, and envelope grouping. - Verified live: docker build + container against kb-postgres@PIHA over LAN and Ollama@SOLARIA over Tailscale -- GET / (HTML), /static/app.js, /healthz, and /search (cascade + flat) all round-tripped correctly, including real summary/summary_tags data. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
56 lines
2 KiB
Python
56 lines
2 KiB
Python
"""kb-postgres access for kb-query beyond what `kb_retrieval.retrieval` covers -- the envelope
|
|
join (`source` + `entities` for link/metadata building, app/links.py) is out of scope for the
|
|
shared retrieval package (module 5 phase 4 plan §4: "to jest nowy kod w warstwie
|
|
HTTP-handlera kb-query, nie zmiana w kb_retrieval")."""
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
|
|
import asyncpg
|
|
|
|
|
|
async def create_pool(dsn: str) -> asyncpg.Pool:
|
|
return await asyncpg.create_pool(dsn, min_size=1, max_size=5)
|
|
|
|
|
|
def _decode_jsonb(value: object) -> object:
|
|
"""asyncpg may return jsonb as a str or an already-decoded object."""
|
|
if value is None:
|
|
return None
|
|
if isinstance(value, str):
|
|
return json.loads(value)
|
|
return value
|
|
|
|
|
|
async def fetch_envelopes(conn: asyncpg.Connection, envelope_ids: list[str]) -> dict[str, dict]:
|
|
"""Batch-fetch `source`/`entities` for a set of chunk hits, keyed by envelope id."""
|
|
if not envelope_ids:
|
|
return {}
|
|
rows = await conn.fetch(
|
|
"SELECT id, source, entities FROM envelope WHERE id = ANY($1::text[])",
|
|
envelope_ids,
|
|
)
|
|
return {
|
|
r["id"]: {"source": r["source"], "entities": _decode_jsonb(r["entities"]) or []}
|
|
for r in rows
|
|
}
|
|
|
|
|
|
async def fetch_summaries(
|
|
conn: asyncpg.Connection, envelope_ids: list[str], summary_model: str
|
|
) -> dict[str, dict]:
|
|
"""Batch-fetch `document_summary.summary`/`tags` (the haiku compilation track) for the
|
|
envelopes a search hit, keyed by envelope id -- frontend krok (plan §7): document summary
|
|
as the per-envelope result header, chunks as its expandable fragments."""
|
|
if not envelope_ids:
|
|
return {}
|
|
rows = await conn.fetch(
|
|
"SELECT envelope_id, summary, tags FROM document_summary "
|
|
"WHERE envelope_id = ANY($1::text[]) AND model = $2",
|
|
envelope_ids, summary_model,
|
|
)
|
|
return {
|
|
r["envelope_id"]: {"summary": r["summary"], "tags": _decode_jsonb(r["tags"]) or []}
|
|
for r in rows
|
|
}
|