File size: 18,285 Bytes
aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 8cbec20 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 aafbcb7 17640d9 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 | import re
import json
import shutil
import asyncio
from pathlib import Path
from typing import Optional, List
import httpx
from bs4 import BeautifulSoup
from fastapi import FastAPI, BackgroundTasks, Form, UploadFile, File, Request, HTTPException
from pydantic import BaseModel
from fastapi.staticfiles import StaticFiles
from fastapi.responses import JSONResponse, FileResponse
from config import UPLOADS_DIR, DB_PATH
CONTENT_DIR = UPLOADS_DIR / "content"
from db import (
init_db, save_capture, update_capture, get_captures, get_surfaceable,
mark_surfaced, mark_done, get_all_embeddings, get_captures_by_ids,
delete_capture, patch_capture, get_review_queue, record_review,
search_captures, get_brief, get_brief_dates, get_brief_week, get_captures_by_intent,
get_review_history, get_review_streak,
)
from lm import (
process_text, process_link, process_image, embed, find_related,
generate_recall_question, synthesize_answer, generate_extend,
generate_feynman_questions, grade_feynman_answers, generate_learning_arc,
generate_brief_synthesis, generate_weekly_synthesis,
)
from surface import pick
app = FastAPI()
@app.api_route("/api/watch", methods=["GET", "POST", "OPTIONS"])
async def api_watch():
return {"status": "ok"}
@app.on_event("startup")
async def startup():
UPLOADS_DIR.mkdir(parents=True, exist_ok=True)
CONTENT_DIR.mkdir(exist_ok=True)
init_db()
from db import get_captures as _gc
if len(_gc(limit=1)) == 0:
try:
import seed
seed.run()
except Exception as e:
print(f"[seed] {e}")
else:
try:
from db import get_all_embeddings, get_captures as _gc2, update_capture
from lm import find_related
all_embs = get_all_embeddings()
for c in _gc2(limit=2000):
emb_row = next((e for cid, e in all_embs if cid == c["id"]), None)
if not emb_row:
continue
related = find_related(emb_row, all_embs, exclude_id=c["id"])
update_capture(c["id"], c["summary"], c.get("tags", []), c.get("intent"), emb_row, related)
print(f"[startup] related_ids backfill complete ({len(all_embs)} captures)")
except Exception as e:
print(f"[startup backfill] {e}")
# ββ capture endpoints ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
@app.post("/capture/text")
async def capture_text(background_tasks: BackgroundTasks, content: str = Form(...), your_take: str = Form("")):
cid = save_capture("text", raw=content, your_take=your_take)
background_tasks.add_task(_process, cid, "text", content=content, your_take=your_take)
return {"id": cid, "status": "captured"}
@app.post("/capture/link")
async def capture_link(background_tasks: BackgroundTasks, url: str = Form(...), your_take: str = Form("")):
cid = save_capture("link", raw=url, source_url=url, your_take=your_take)
background_tasks.add_task(_process, cid, "link", url=url, your_take=your_take)
return {"id": cid, "status": "captured"}
@app.post("/capture/image")
async def capture_image(
background_tasks: BackgroundTasks,
file: UploadFile = File(...),
description: str = Form(""),
your_take: str = Form(""),
):
dest = UPLOADS_DIR / file.filename
with open(dest, "wb") as f:
shutil.copyfileobj(file.file, f)
cid = save_capture("image", raw=description or None, file_path=str(dest), your_take=description or None)
background_tasks.add_task(_process, cid, "image", file_path=str(dest), description=description, your_take=description)
return {"id": cid, "status": "captured"}
# ββ uploads βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
@app.get("/uploads/content/{capture_id}.txt")
async def serve_source_content(capture_id: int):
path = CONTENT_DIR / f"{capture_id}.txt"
if not path.exists():
raise HTTPException(status_code=404)
return FileResponse(path, media_type="text/plain; charset=utf-8")
@app.get("/uploads/{filename:path}")
async def serve_upload(filename: str):
path = UPLOADS_DIR / filename
if not path.exists():
raise HTTPException(status_code=404)
return FileResponse(path)
# ββ read endpoints βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
@app.get("/captures")
async def list_captures(limit: int = 50, intent: Optional[str] = None):
if intent:
return get_captures_by_intent(intent, limit)
return get_captures(limit)
@app.get("/captures/{capture_id}/related")
async def related_captures(capture_id: int):
from db import get_all_embeddings
import json, sqlite3
from config import DB_PATH
with sqlite3.connect(DB_PATH) as conn:
conn.row_factory = sqlite3.Row
row = conn.execute("SELECT related_ids FROM captures WHERE id=?", (capture_id,)).fetchone()
if not row:
return []
ids = json.loads(row["related_ids"] or "[]")
if not ids:
return []
placeholders = ",".join("?" * len(ids))
rows = conn.execute(f"SELECT * FROM captures WHERE id IN ({placeholders})", ids).fetchall()
result = []
for r in rows:
d = dict(r)
d["tags"] = json.loads(d["tags"] or "[]")
d.pop("embedding", None)
result.append(d)
return result
@app.delete("/captures/{capture_id}")
async def delete_capture_endpoint(capture_id: int):
delete_capture(capture_id)
return {"status": "deleted"}
# ββ surface endpoints ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
VALID_MOODS = {"focused", "curious", "restless", "tired", "inspired"}
@app.get("/surface")
async def surface(mode: str = None, n: int = 3, mood: str = None):
mood = mood if mood in VALID_MOODS else None
include_ephemeral = mood == "bored"
candidates = get_surfaceable(include_ephemeral=include_ephemeral)
items = pick(candidates, n=n, mode=mode, mood=mood)
for item in items:
related_ids = json.loads(item.get("related_ids") or "[]")
item["related"] = get_captures_by_ids(related_ids)
item.pop("embedding", None)
return items
@app.post("/events")
async def log_event(request: Request):
data = await request.json()
with __import__('sqlite3').connect(DB_PATH) as conn:
conn.execute(
"INSERT INTO events (capture_id, event, value, created_at) VALUES (?, ?, ?, datetime('now','localtime'))",
(data.get("capture_id"), data.get("event"), str(data.get("value", "")))
)
return {"status": "ok"}
@app.post("/surface/{capture_id}/done")
async def surface_done(capture_id: int):
mark_done(capture_id)
return {"status": "done"}
@app.post("/surface/{capture_id}/skip")
async def surface_skip(capture_id: int):
mark_surfaced(capture_id)
return {"status": "skipped"}
# ββ patch ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
class PatchBody(BaseModel):
intent: Optional[str] = None
tags: Optional[List[str]] = None
@app.patch("/captures/{capture_id}")
async def patch_capture_endpoint(capture_id: int, body: PatchBody):
patch_capture(capture_id, intent=body.intent, tags=body.tags)
return {"status": "updated"}
# ββ review (spaced repetition) βββββββββββββββββββββββββββββββββββββββββββββββββ
@app.get("/review")
async def review_queue(limit: int = 10):
return get_review_queue(limit)
@app.get("/review/history")
async def review_history(days: int = 7):
return {"reviewed_dates": get_review_history(days), "streak": get_review_streak()}
class ReviewBody(BaseModel):
rating: str # "got_it" | "again"
@app.post("/captures/{capture_id}/review")
async def post_review(capture_id: int, body: ReviewBody):
if body.rating not in ("got_it", "again"):
raise HTTPException(status_code=400, detail="rating must be 'got_it' or 'again'")
record_review(capture_id, body.rating)
return {"status": "recorded"}
# ββ search βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
@app.get("/search")
async def search(q: str, limit: int = 20):
if not q.strip():
return []
loop = asyncio.get_event_loop()
query_emb = await loop.run_in_executor(None, embed, q.strip())
if query_emb:
all_embs = get_all_embeddings()
from lm import _cosine
scored = sorted(
[(cid, _cosine(query_emb, emb)) for cid, emb in all_embs],
key=lambda x: x[1], reverse=True
)
top = [(cid, score) for cid, score in scored[:limit] if score > 0.3]
if top:
score_map = {cid: score for cid, score in top}
captures = get_captures_by_ids([cid for cid, _ in top])
for c in captures:
c["score"] = round(score_map.get(c["id"], 0), 3)
captures.sort(key=lambda c: c["score"], reverse=True)
return captures
# fallback: keyword search (no scores)
return search_captures(q.strip(), limit)
# ββ ask: synthesize + extend βββββββββββββββββββββββββββββββββββββββββββββββββββ
class AskBody(BaseModel):
query: str
capture_ids: List[int]
class ExtendBody(BaseModel):
query: str
synthesis: str
@app.post("/ask/synthesize")
async def ask_synthesize(body: AskBody):
if not body.query.strip() or not body.capture_ids:
return {"synthesis": "", "tension": None}
captures = get_captures_by_ids(body.capture_ids[:8])
loop = asyncio.get_event_loop()
result = await loop.run_in_executor(None, synthesize_answer, body.query.strip(), captures)
# split off [TENSION: ...] if present
tension = None
text = result
tension_match = re.search(r'\[TENSION:\s*(.*?)\]', result, re.IGNORECASE | re.DOTALL)
if tension_match:
tension = tension_match.group(1).strip()
text = result[:tension_match.start()].strip()
return {"synthesis": text, "tension": tension}
@app.post("/ask/extend")
async def ask_extend(body: ExtendBody):
if not body.query.strip() or not body.synthesis.strip():
return {"gap": "", "questions": []}
loop = asyncio.get_event_loop()
result = await loop.run_in_executor(None, generate_extend, body.query.strip(), body.synthesis.strip())
return result
class FeynmanBody(BaseModel):
query: str
capture_ids: List[int]
class FeynmanGradeBody(BaseModel):
qa_pairs: List[dict]
capture_ids: List[int]
class ArcBody(BaseModel):
query: str
capture_ids: List[int]
@app.post("/ask/feynman")
async def ask_feynman(body: FeynmanBody):
if not body.query.strip() or not body.capture_ids:
return {"questions": []}
captures = get_captures_by_ids(body.capture_ids[:8])
loop = asyncio.get_event_loop()
questions = await loop.run_in_executor(None, generate_feynman_questions, body.query.strip(), captures)
return {"questions": questions}
@app.post("/ask/feynman/grade")
async def ask_feynman_grade(body: FeynmanGradeBody):
if not body.qa_pairs or not body.capture_ids:
return {"grades": []}
captures = get_captures_by_ids(body.capture_ids[:8])
loop = asyncio.get_event_loop()
grades = await loop.run_in_executor(None, grade_feynman_answers, body.qa_pairs, captures)
return {"grades": grades}
@app.post("/ask/arc")
async def ask_arc(body: ArcBody):
if not body.query.strip() or not body.capture_ids:
return {"periods": []}
captures = get_captures_by_ids(body.capture_ids[:15])
loop = asyncio.get_event_loop()
periods = await loop.run_in_executor(None, generate_learning_arc, body.query.strip(), captures)
return {"periods": periods}
# ββ brief ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
@app.get("/brief/dates")
async def brief_dates():
return get_brief_dates()
@app.get("/brief/week")
async def brief_week():
return get_brief_week()
class WeeklySynthesisBody(BaseModel):
daily_entries: List[dict] # [{date, synthesis, count}]
@app.post("/brief/week/synthesize")
async def brief_week_synthesize(body: WeeklySynthesisBody):
if not body.daily_entries:
return {"synthesis": ""}
loop = asyncio.get_event_loop()
synthesis = await loop.run_in_executor(None, generate_weekly_synthesis, body.daily_entries)
return {"synthesis": synthesis}
@app.get("/brief")
async def brief(limit: int = 50, date: Optional[str] = None):
items = get_brief(limit, date=date)
grouped: dict[str, list] = {}
for item in items:
key = item.get("intent") or "other"
grouped.setdefault(key, []).append(item)
return grouped
class BriefSynthesisBody(BaseModel):
capture_ids: List[int]
date_label: Optional[str] = None
@app.post("/brief/synthesize")
async def brief_synthesize(body: BriefSynthesisBody):
if not body.capture_ids:
return {"synthesis": ""}
captures = get_captures_by_ids(body.capture_ids[:20])
loop = asyncio.get_event_loop()
synthesis = await loop.run_in_executor(
None, generate_brief_synthesis, captures, body.date_label or ""
)
return {"synthesis": synthesis}
# ββ admin / maintenance ββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
@app.post("/admin/regenerate-questions")
async def regenerate_questions(background_tasks: BackgroundTasks):
background_tasks.add_task(_regenerate_questions_bg)
return {"status": "started"}
async def _regenerate_questions_bg():
import sqlite3
loop = asyncio.get_event_loop()
with sqlite3.connect(DB_PATH) as conn:
conn.row_factory = sqlite3.Row
rows = conn.execute(
"SELECT id, summary, intent, claims FROM captures WHERE summary IS NOT NULL"
).fetchall()
updated = 0
for row in rows:
try:
claims = json.loads(row["claims"] or "[]")
q = await loop.run_in_executor(
None, generate_recall_question, row["summary"], row["intent"] or "", claims
)
with sqlite3.connect(DB_PATH) as conn:
conn.execute("UPDATE captures SET recall_question=? WHERE id=?", (q, row["id"]))
updated += 1
except Exception as e:
print(f"[regen-questions] id={row['id']} error: {e}")
print(f"[regen-questions] done β updated {updated} captures")
# ββ background processing ββββββββββββββββββββββββββββββββββββββββββββββββββββββ
async def _process(cid: int, type: str, **kwargs):
loop = asyncio.get_event_loop()
your_take = kwargs.get("your_take", "")
source_content_path = None
try:
if type == "text":
content = kwargs["content"]
path = CONTENT_DIR / f"{cid}.txt"
path.write_text(content, encoding="utf-8")
source_content_path = str(path)
result = await loop.run_in_executor(None, process_text, content, your_take)
elif type == "link":
page_text, page_title = await _fetch_page(kwargs["url"])
if page_text:
path = CONTENT_DIR / f"{cid}.txt"
path.write_text(page_text, encoding="utf-8")
source_content_path = str(path)
result = await loop.run_in_executor(None, process_link, kwargs["url"], page_text, your_take, page_title)
elif type == "image":
result = await loop.run_in_executor(None, process_image, kwargs["file_path"], kwargs.get("description", ""), your_take)
else:
return
summary = result.get("summary") or ""
claims = result.get("claims") or []
title = result.get("title") or ""
intent = result.get("intent")
embed_text = summary + (" " + claims[0] if claims else "")
emb = await loop.run_in_executor(None, embed, embed_text)
all_embs = get_all_embeddings()
related = find_related(emb, all_embs, exclude_id=cid)
recall_q = await loop.run_in_executor(None, generate_recall_question, summary, intent or "", claims)
update_capture(cid, summary, result.get("tags", []), intent, emb, related, recall_q, claims, source_content_path, title)
except Exception as e:
print(f"[process error] {e}")
async def _fetch_page(url: str) -> tuple[str, str]:
"""Returns (page_text, page_title)."""
try:
async with httpx.AsyncClient(follow_redirects=True, timeout=10) as client:
resp = await client.get(url, headers={"User-Agent": "Mozilla/5.0"})
soup = BeautifulSoup(resp.text, "html.parser")
page_title = (soup.title.string or "").strip() if soup.title else ""
for tag in soup(["script", "style", "nav", "footer"]):
tag.decompose()
return soup.get_text(separator=" ", strip=True), page_title
except Exception:
return "", ""
app.mount("/", StaticFiles(directory="static", html=True), name="static")
|