Spaces:
Running
Running
File size: 14,583 Bytes
67acd34 c52f47a 67acd34 96e3e70 67acd34 c52f47a 67acd34 c52f47a 4d7b4ed 67acd34 96e3e70 67acd34 96e3e70 67acd34 c52f47a 67acd34 c52f47a 67acd34 c52f47a 67acd34 4d7b4ed 67acd34 c52f47a 4d7b4ed c52f47a 67acd34 f227b96 67acd34 96e3e70 67acd34 c52f47a 67acd34 | 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 | from __future__ import annotations
import os
import random
from pathlib import Path
from typing import Any
from fastapi import Depends, FastAPI, Header, HTTPException, Query
from fastapi.responses import FileResponse
from fastapi.staticfiles import StaticFiles
from .board_utils import normalize_board_for_display, normalize_board_for_submission
from .config import Settings
from .dataset import DatasetStore
from .db import SessionStore
from .llm_results import LLMResultsStore
from .models import engine_for_puzzle, normalize_player_name
from .schemas import (
CreateSessionRequest,
LeaderboardEntry,
LeaderboardResponse,
LLMResultsResponse,
PuzzleOptionResponse,
SessionPayload,
SessionResponse,
SubmitResponse,
SubmitSessionRequest,
)
from .verification import VerificationService
def _session_to_response(
session: dict[str, Any],
*,
problem_ascii: str,
image_base64: str | None,
) -> SessionResponse:
current_board_ascii = normalize_board_for_display(
puzzle_type=str(session["puzzle_type"]),
problem_ascii=problem_ascii,
board_ascii=str(session["submitted_artifact"] or problem_ascii),
)
return SessionResponse(
session_id=str(session["id"]),
engine=str(session["engine"]),
puzzle_type=str(session["puzzle_type"]),
difficulty=str(session["difficulty"]),
puzzle_id=str(session["puzzle_filename"]),
args=str(session["args"]),
status=str(session["status"]),
started_at=session["started_at"],
payload=SessionPayload(
problem_ascii=problem_ascii,
current_board_ascii=current_board_ascii,
image_base64=image_base64,
),
)
def create_app(
*,
settings: Settings | None = None,
dataset_store: DatasetStore | None = None,
session_store: SessionStore | None = None,
verifier: VerificationService | None = None,
llm_results_store: LLMResultsStore | None = None,
) -> FastAPI:
resolved_settings = settings or Settings.from_env()
resolved_settings.prepare()
app = FastAPI(title="TopoBench Space")
app.state.settings = resolved_settings
app.state.dataset_store = dataset_store or DatasetStore.load_huggingface()
app.state.session_store = session_store or SessionStore(resolved_settings.database_path)
app.state.verifier = verifier or VerificationService()
app.state.llm_results_store = llm_results_store or LLMResultsStore.from_file(
Path(__file__).parent / "llm_results.json"
)
def get_settings() -> Settings:
return app.state.settings
def get_dataset_store() -> DatasetStore:
return app.state.dataset_store
def get_session_store() -> SessionStore:
return app.state.session_store
def get_verifier() -> VerificationService:
return app.state.verifier
def get_llm_results_store() -> LLMResultsStore:
return app.state.llm_results_store
def require_admin(
authorization: str | None = Header(default=None),
current_settings: Settings = Depends(get_settings),
) -> None:
token = f"Bearer {current_settings.admin_api_token}"
if authorization != token:
raise HTTPException(status_code=401, detail="Unauthorized")
@app.get("/api/health")
def health() -> dict[str, str]:
return {"status": "ok"}
@app.get("/api/puzzles", response_model=list[PuzzleOptionResponse])
def list_puzzles(
puzzle_type: str = Query(...),
difficulty: str = Query(...),
current_dataset_store: DatasetStore = Depends(get_dataset_store),
) -> list[PuzzleOptionResponse]:
try:
rows = current_dataset_store.list_rows(
puzzle_type=puzzle_type,
difficulty=difficulty,
limit=50,
)
except ValueError as exc:
raise HTTPException(status_code=404, detail=str(exc)) from exc
return [
PuzzleOptionResponse(
puzzle_id=row.filename,
title=row.filename,
sequence=index,
puzzle_type=row.puzzlename,
difficulty=row.difficulty,
args=row.args,
)
for index, row in enumerate(rows, start=1)
]
@app.post("/api/sessions", response_model=SessionResponse)
def create_session(
request: CreateSessionRequest,
current_dataset_store: DatasetStore = Depends(get_dataset_store),
current_session_store: SessionStore = Depends(get_session_store),
) -> SessionResponse:
player_name_raw = request.player_name.strip()
player_name_norm = normalize_player_name(player_name_raw)
if not player_name_norm:
raise HTTPException(status_code=400, detail="Player name is required.")
if request.puzzle_id is None:
try:
pool = current_dataset_store.list_rows(
puzzle_type=request.puzzle_type,
difficulty=request.difficulty,
limit=50,
)
except ValueError as exc:
raise HTTPException(status_code=404, detail=str(exc)) from exc
already_solved = current_session_store.get_solved_filenames(
player_name_norm=player_name_norm,
puzzle_type=request.puzzle_type,
difficulty=request.difficulty,
)
unseen = [item for item in pool if item.filename not in already_solved]
row = random.choice(unseen) if unseen else random.choice(pool)
else:
try:
row = current_dataset_store.get_row(request.puzzle_id)
except KeyError:
raise HTTPException(status_code=404, detail="Puzzle not found.") from None
if row.puzzlename != request.puzzle_type or row.difficulty != request.difficulty:
raise HTTPException(
status_code=400,
detail="Selected puzzle does not match the chosen family and difficulty.",
)
session = current_session_store.create_session(
player_name_raw=player_name_raw,
player_name_norm=player_name_norm,
puzzle_type=request.puzzle_type,
difficulty=request.difficulty,
dataset_variant="plain",
puzzle_filename=row.filename,
args=row.args,
engine=engine_for_puzzle(request.puzzle_type),
)
return _session_to_response(
session,
problem_ascii=row.problem,
image_base64=row.image_base64,
)
@app.get("/api/sessions/{session_id}", response_model=SessionResponse)
def get_session(
session_id: str,
current_dataset_store: DatasetStore = Depends(get_dataset_store),
current_session_store: SessionStore = Depends(get_session_store),
) -> SessionResponse:
session = current_session_store.get_session(session_id)
if session is None:
raise HTTPException(status_code=404, detail="Session not found.")
row = current_dataset_store.get_row(str(session["puzzle_filename"]))
return _session_to_response(
session,
problem_ascii=row.problem,
image_base64=row.image_base64,
)
@app.post("/api/sessions/{session_id}/ready")
def ready_session(
session_id: str,
current_session_store: SessionStore = Depends(get_session_store),
) -> dict[str, str | None]:
try:
session = current_session_store.mark_ready(session_id)
except KeyError:
raise HTTPException(status_code=404, detail="Session not found.") from None
return {"status": str(session["status"]), "started_at": session["started_at"]}
@app.post("/api/sessions/{session_id}/submit", response_model=SubmitResponse)
def submit_session(
session_id: str,
request: SubmitSessionRequest,
current_dataset_store: DatasetStore = Depends(get_dataset_store),
current_session_store: SessionStore = Depends(get_session_store),
current_verifier: VerificationService = Depends(get_verifier),
) -> SubmitResponse:
session = current_session_store.get_session(session_id)
if session is None:
raise HTTPException(status_code=404, detail="Session not found.")
if not session["started_at"]:
raise HTTPException(status_code=409, detail="Session is not ready yet.")
row = current_dataset_store.get_row(str(session["puzzle_filename"]))
# Normalization and verification must never crash the request: a failure
# here (e.g. a native verifier segfault/hang, or a malformed board) is
# recorded as a failed attempt rather than surfacing as an opaque 500.
try:
normalized_board_ascii = normalize_board_for_submission(
puzzle_type=str(session["puzzle_type"]),
problem_ascii=row.problem,
board_ascii=request.board_ascii,
)
except Exception:
normalized_board_ascii = request.board_ascii
try:
verification = current_verifier.verify(
puzzle_type=str(session["puzzle_type"]),
problem_ascii=row.problem,
board_ascii=normalized_board_ascii,
args=str(session["args"]),
)
except Exception as exc: # pragma: no cover - defensive guard
verification = {
"board_exists": bool(normalized_board_ascii),
"board_valid": False,
"board_modified": False,
"correct": False,
"error": f"Verification failed: {exc}"[:500],
}
updated = current_session_store.record_submission(
session_id=session_id,
solved=bool(verification.get("correct")),
submitted_artifact=normalized_board_ascii,
verification_payload=verification,
)
return SubmitResponse(
solved=bool(updated["solved"]),
elapsed_ms=updated["elapsed_ms"],
status=str(updated["status"]),
verification=verification,
)
@app.get("/api/llm-results/{puzzle_id}", response_model=LLMResultsResponse)
def llm_results(
puzzle_id: str,
current_llm_results_store: LLMResultsStore = Depends(get_llm_results_store),
) -> LLMResultsResponse:
verdicts = current_llm_results_store.get_for_puzzle(puzzle_id)
if verdicts is None:
raise HTTPException(
status_code=404,
detail="No LLM results recorded for this puzzle.",
)
return LLMResultsResponse(
puzzle_id=puzzle_id,
models_solved=verdicts["models_solved"],
models_failed=verdicts["models_failed"],
)
@app.get("/api/admin/check", dependencies=[Depends(require_admin)])
def admin_check() -> dict[str, bool]:
return {"ok": True}
@app.get("/api/admin/leaderboard/{puzzle_id}", response_model=LeaderboardResponse, dependencies=[Depends(require_admin)])
def admin_leaderboard(
puzzle_id: str,
include_test: bool = Query(default=False),
current_session_store: SessionStore = Depends(get_session_store),
) -> LeaderboardResponse:
rows = current_session_store.list_leaderboard(
puzzle_id=puzzle_id,
include_test=include_test,
)
entries = [
LeaderboardEntry(
player_name=str(row["player_name_raw"]),
elapsed_ms=row["elapsed_ms"],
submission_count=int(row["submission_count"]),
solved=bool(row["solved"]),
started_at=row["started_at"],
submitted_at=row["submitted_at"],
)
for row in rows
]
return LeaderboardResponse(puzzle_id=puzzle_id, entries=entries)
@app.get("/api/admin/solves", dependencies=[Depends(require_admin)])
def admin_solves(
player_name_norm: str | None = Query(default=None),
puzzle_type: str | None = Query(default=None),
difficulty: str | None = Query(default=None),
status: str | None = Query(default=None),
date_from: str | None = Query(default=None),
date_to: str | None = Query(default=None),
current_session_store: SessionStore = Depends(get_session_store),
) -> list[dict[str, Any]]:
return current_session_store.list_solves(
{
"player_name_norm": player_name_norm,
"puzzle_type": puzzle_type,
"difficulty": difficulty,
"status": status,
"date_from": date_from,
"date_to": date_to,
}
)
@app.get("/api/admin/aggregates", dependencies=[Depends(require_admin)])
def admin_aggregates(
player_name_norm: str | None = Query(default=None),
puzzle_type: str | None = Query(default=None),
difficulty: str | None = Query(default=None),
date_from: str | None = Query(default=None),
date_to: str | None = Query(default=None),
current_session_store: SessionStore = Depends(get_session_store),
) -> list[dict[str, Any]]:
aggregates = current_session_store.aggregate_solves(
{
"player_name_norm": player_name_norm,
"puzzle_type": puzzle_type,
"difficulty": difficulty,
"date_from": date_from,
"date_to": date_to,
}
)
return [item.__dict__ for item in aggregates]
frontend_dist_dir = resolved_settings.frontend_dist_dir
assets_dir = frontend_dist_dir / "assets"
if assets_dir.exists():
app.mount("/assets", StaticFiles(directory=assets_dir), name="assets")
@app.get("/{path:path}")
def spa(path: str) -> FileResponse:
if path.startswith("api/"):
raise HTTPException(status_code=404, detail="Not found.")
index_path = frontend_dist_dir / "index.html"
if index_path.exists():
return FileResponse(index_path)
raise HTTPException(
status_code=503,
detail="Frontend has not been built yet. Run `npm run build` in frontend/.",
)
return app
app = create_app() if os.getenv("TOPOBENCH_SKIP_AUTOAPP") != "1" else FastAPI()
|