Spaces:
Runtime error
Runtime error
File size: 22,423 Bytes
4c4a722 054d73a 4c4a722 054d73a 4c4a722 bc45e54 4c4a722 054d73a 4c4a722 054d73a 4c4a722 054d73a 4c4a722 054d73a bc45e54 4c4a722 bc45e54 4c4a722 054d73a 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 054d73a 4c4a722 054d73a bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 054d73a bc45e54 4c4a722 054d73a 4c4a722 054d73a 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 054d73a 4c4a722 054d73a bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 ad5d4b6 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 d2075b0 4c4a722 d2075b0 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 bc45e54 4c4a722 d2075b0 4c4a722 d2075b0 4c4a722 d2075b0 4c4a722 d2075b0 4c4a722 d2075b0 4c4a722 108b5b1 d2075b0 108b5b1 d2075b0 108b5b1 4c4a722 d2075b0 4c4a722 d2075b0 4c4a722 d2075b0 4c4a722 | 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 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 | """Data-access layer for ClassLens, backed by SQLAlchemy async (Supabase Postgres).
Public function names/signatures are kept stable for existing callers:
- "session" in the API == a row in the ``quizzes`` table (a quiz/exam session)
- "user" == a row in the ``teachers`` table
New capabilities (students as first-class entities, per-student results, and
analytics) are added alongside the legacy CRUD helpers.
"""
from __future__ import annotations
import re
import unicodedata
from datetime import datetime, timezone
from typing import Optional
from sqlalchemy import delete, func, select, update
from .config import get_settings
from .db import get_engine, get_sessionmaker
from .models import (
Base,
ParsedData,
Prompt,
Quiz,
RawFile,
Report,
Student,
StudentResult,
Teacher,
)
ANSWER_GRID_DATA_TYPE = "answer_grid"
def _now() -> datetime:
return datetime.now(timezone.utc)
def _row(obj) -> dict:
"""Serialize an ORM object to a plain dict of its columns."""
return {c.key: getattr(obj, c.key) for c in obj.__table__.columns}
def normalize_name(name: str) -> str:
"""Canonical key for matching the same student across quizzes."""
s = unicodedata.normalize("NFKC", (name or "").strip()).casefold()
return re.sub(r"\s+", " ", s)
# =============================================================================
# Schema bootstrap
# =============================================================================
async def init_database():
"""Ensure schema exists and bootstrap admins.
On Supabase, tables are managed by Alembic migrations; here we only create
tables for the SQLite dev/test fallback. Admin bootstrap runs for both.
"""
settings = get_settings()
if settings.database_provider != "supabase":
async with get_engine().begin() as conn:
await conn.run_sync(Base.metadata.create_all)
await _bootstrap_admins()
async def _bootstrap_admins():
settings = get_settings()
emails = [e.strip().lower() for e in (settings.admin_emails or "").split(",") if e.strip()]
if not emails:
return
async with get_sessionmaker()() as db:
await db.execute(
update(Teacher).where(func.lower(Teacher.email).in_(emails)).values(is_admin=True)
)
await db.commit()
# =============================================================================
# Teachers (users)
# =============================================================================
async def create_user(
email: str,
password_hash: str,
display_name: str = "",
full_name: str = "",
school: str = "",
) -> int:
async with get_sessionmaker()() as db:
teacher = Teacher(
email=email,
password_hash=password_hash,
display_name=display_name or email.split("@")[0],
full_name=full_name,
school=school,
)
db.add(teacher)
await db.commit()
await db.refresh(teacher)
return teacher.id
async def get_user_by_email(email: str) -> Optional[dict]:
async with get_sessionmaker()() as db:
res = await db.execute(select(Teacher).where(Teacher.email == email))
teacher = res.scalar_one_or_none()
return _row(teacher) if teacher else None
async def get_user_by_id(user_id: int) -> Optional[dict]:
async with get_sessionmaker()() as db:
teacher = await db.get(Teacher, user_id)
return _row(teacher) if teacher else None
async def update_last_login(user_id: int):
async with get_sessionmaker()() as db:
await db.execute(
update(Teacher).where(Teacher.id == user_id).values(last_login=_now())
)
await db.commit()
async def set_user_admin(user_id: int, is_admin: bool):
async with get_sessionmaker()() as db:
await db.execute(
update(Teacher).where(Teacher.id == user_id).values(is_admin=is_admin)
)
await db.commit()
async def list_all_users() -> list[dict]:
"""Admin: all teachers (without password hashes), with per-teacher counts."""
async with get_sessionmaker()() as db:
res = await db.execute(select(Teacher).order_by(Teacher.created_at.desc()))
teachers = res.scalars().all()
out = []
for t in teachers:
d = _row(t)
d.pop("password_hash", None)
d["quiz_count"] = (
await db.execute(select(func.count(Quiz.id)).where(Quiz.teacher_id == t.id))
).scalar_one()
d["student_count"] = (
await db.execute(select(func.count(Student.id)).where(Student.teacher_id == t.id))
).scalar_one()
out.append(d)
return out
async def delete_user(user_id: int):
async with get_sessionmaker()() as db:
await db.execute(delete(Teacher).where(Teacher.id == user_id))
await db.commit()
# =============================================================================
# Quizzes (sessions)
# =============================================================================
async def create_session(user_id: int, title: str = "Untitled Session") -> int:
async with get_sessionmaker()() as db:
quiz = Quiz(teacher_id=user_id, title=title, status="draft")
db.add(quiz)
await db.commit()
await db.refresh(quiz)
return quiz.id
async def get_sessions(user_id: int) -> list[dict]:
async with get_sessionmaker()() as db:
res = await db.execute(
select(Quiz).where(Quiz.teacher_id == user_id).order_by(Quiz.created_at.desc())
)
return [_row(q) for q in res.scalars().all()]
async def get_session(session_id: int) -> Optional[dict]:
async with get_sessionmaker()() as db:
quiz = await db.get(Quiz, session_id)
if not quiz:
return None
d = _row(quiz)
d["user_id"] = quiz.teacher_id # back-compat key for existing callers
return d
async def update_session_status(session_id: int, status: str):
async with get_sessionmaker()() as db:
await db.execute(
update(Quiz).where(Quiz.id == session_id).values(status=status, updated_at=_now())
)
await db.commit()
async def update_session_meta(session_id: int, title: Optional[str] = None, subject: Optional[str] = None):
values: dict = {"updated_at": _now()}
if title is not None:
values["title"] = title
if subject is not None:
values["subject"] = subject
async with get_sessionmaker()() as db:
await db.execute(update(Quiz).where(Quiz.id == session_id).values(**values))
await db.commit()
async def delete_session(session_id: int):
async with get_sessionmaker()() as db:
await db.execute(delete(Quiz).where(Quiz.id == session_id))
await db.commit()
# =============================================================================
# Parsed data
# =============================================================================
async def save_parsed_data(
session_id: int, data_type: str, file_name: str, raw_text: str, structured_data: dict
) -> int:
async with get_sessionmaker()() as db:
row = ParsedData(
quiz_id=session_id,
data_type=data_type,
file_name=file_name or "",
raw_text=raw_text or "",
structured_data=structured_data,
)
db.add(row)
await db.commit()
await db.refresh(row)
return row.id
async def get_parsed_data(session_id: int) -> list[dict]:
async with get_sessionmaker()() as db:
res = await db.execute(
select(ParsedData)
.where(ParsedData.quiz_id == session_id)
.order_by(ParsedData.data_type, ParsedData.created_at)
)
return [_row(p) for p in res.scalars().all()]
async def delete_parsed_data(session_id: int, data_type: Optional[str] = None):
async with get_sessionmaker()() as db:
stmt = delete(ParsedData).where(ParsedData.quiz_id == session_id)
if data_type:
stmt = stmt.where(ParsedData.data_type == data_type)
await db.execute(stmt)
await db.commit()
# ---- Answer grid (stored as a parsed_data row) ----
async def save_answer_grid(session_id: int, grid_dict: dict) -> int:
await delete_parsed_data(session_id, ANSWER_GRID_DATA_TYPE)
return await save_parsed_data(
session_id=session_id,
data_type=ANSWER_GRID_DATA_TYPE,
file_name="",
raw_text="",
structured_data=grid_dict,
)
async def get_answer_grid(session_id: int) -> Optional[dict]:
async with get_sessionmaker()() as db:
res = await db.execute(
select(ParsedData.structured_data)
.where(ParsedData.quiz_id == session_id)
.where(ParsedData.data_type == ANSWER_GRID_DATA_TYPE)
.order_by(ParsedData.created_at.desc())
.limit(1)
)
row = res.scalar_one_or_none()
return row if row else None
# =============================================================================
# Raw files (metadata; bytes live in Supabase Storage)
# =============================================================================
async def save_raw_file(
session_id: int,
data_type: str,
file_name: str,
content_type: str,
size_bytes: int,
storage_path: str,
) -> int:
async with get_sessionmaker()() as db:
row = RawFile(
quiz_id=session_id,
data_type=data_type,
file_name=file_name,
content_type=content_type,
size_bytes=size_bytes,
storage_path=storage_path,
)
db.add(row)
await db.commit()
await db.refresh(row)
return row.id
async def get_raw_files(session_id: int) -> list[dict]:
async with get_sessionmaker()() as db:
res = await db.execute(
select(RawFile).where(RawFile.quiz_id == session_id).order_by(RawFile.created_at)
)
return [_row(f) for f in res.scalars().all()]
# =============================================================================
# Students (first-class, matched across quizzes by normalized name)
# =============================================================================
async def match_or_create_student(
teacher_id: int, name: str, external_id: Optional[str] = None
) -> int:
"""Return the student id for this teacher, creating the row if new."""
norm = normalize_name(name)
async with get_sessionmaker()() as db:
res = await db.execute(
select(Student)
.where(Student.teacher_id == teacher_id)
.where(Student.normalized_name == norm)
)
student = res.scalar_one_or_none()
if student:
if external_id and not student.external_id:
student.external_id = external_id
await db.commit()
return student.id
student = Student(
teacher_id=teacher_id, name=name, normalized_name=norm, external_id=external_id
)
db.add(student)
await db.commit()
await db.refresh(student)
return student.id
async def get_students(teacher_id: int) -> list[dict]:
async with get_sessionmaker()() as db:
res = await db.execute(
select(Student).where(Student.teacher_id == teacher_id).order_by(Student.name)
)
return [_row(s) for s in res.scalars().all()]
async def get_student(student_id: int) -> Optional[dict]:
async with get_sessionmaker()() as db:
student = await db.get(Student, student_id)
return _row(student) if student else None
async def save_student_result(
quiz_id: int,
student_id: int,
answers: dict,
total_questions: int,
correct_count: int,
score: float,
) -> int:
"""Upsert one student's result for a quiz (unique per quiz+student)."""
async with get_sessionmaker()() as db:
res = await db.execute(
select(StudentResult)
.where(StudentResult.quiz_id == quiz_id)
.where(StudentResult.student_id == student_id)
)
existing = res.scalar_one_or_none()
if existing:
existing.answers = answers
existing.total_questions = total_questions
existing.correct_count = correct_count
existing.score = score
await db.commit()
return existing.id
row = StudentResult(
quiz_id=quiz_id,
student_id=student_id,
answers=answers,
total_questions=total_questions,
correct_count=correct_count,
score=score,
)
db.add(row)
await db.commit()
await db.refresh(row)
return row.id
async def get_student_timeline(student_id: int) -> list[dict]:
"""One student's results across all quizzes, oldest first — the trajectory."""
async with get_sessionmaker()() as db:
res = await db.execute(
select(StudentResult, Quiz.title, Quiz.subject, Quiz.created_at)
.join(Quiz, StudentResult.quiz_id == Quiz.id)
.join(Student, StudentResult.student_id == Student.id)
.where(StudentResult.student_id == student_id)
# defense-in-depth: only the student's own teacher's quizzes
.where(Quiz.teacher_id == Student.teacher_id)
.order_by(Quiz.created_at)
)
out = []
for sr, title, subject, created in res.all():
d = _row(sr)
d["quiz_title"] = title
d["quiz_subject"] = subject
d["quiz_created_at"] = created
out.append(d)
return out
# =============================================================================
# Prompts
# =============================================================================
async def save_prompt(user_id: int, name: str, content: str, is_default: bool = False) -> int:
async with get_sessionmaker()() as db:
row = Prompt(teacher_id=user_id, name=name, content=content, is_default=is_default)
db.add(row)
await db.commit()
await db.refresh(row)
return row.id
async def get_prompts(user_id: int) -> list[dict]:
async with get_sessionmaker()() as db:
res = await db.execute(
select(Prompt)
.where((Prompt.teacher_id == user_id) | (Prompt.is_default.is_(True)))
.order_by(Prompt.is_default.desc(), Prompt.updated_at.desc())
)
return [_row(p) for p in res.scalars().all()]
async def get_all_prompts() -> list[dict]:
async with get_sessionmaker()() as db:
res = await db.execute(
select(Prompt, Teacher.email)
.join(Teacher, Prompt.teacher_id == Teacher.id)
.order_by(Prompt.updated_at.desc())
)
out = []
for p, email in res.all():
d = _row(p)
d["author_email"] = email
out.append(d)
return out
async def get_prompt(prompt_id: int) -> Optional[dict]:
async with get_sessionmaker()() as db:
p = await db.get(Prompt, prompt_id)
if not p:
return None
d = _row(p)
d["user_id"] = p.teacher_id # back-compat key
return d
async def update_prompt(prompt_id: int, name: str, content: str):
async with get_sessionmaker()() as db:
await db.execute(
update(Prompt)
.where(Prompt.id == prompt_id)
.values(name=name, content=content, updated_at=_now())
)
await db.commit()
async def delete_prompt(prompt_id: int):
async with get_sessionmaker()() as db:
await db.execute(delete(Prompt).where(Prompt.id == prompt_id))
await db.commit()
# =============================================================================
# Reports
# =============================================================================
async def save_report(
session_id: int,
prompt_id: Optional[int],
html_content: str,
student_id: Optional[int] = None,
model: str = "",
) -> int:
async with get_sessionmaker()() as db:
row = Report(
quiz_id=session_id,
prompt_id=prompt_id,
student_id=student_id,
html_content=html_content,
model=model,
)
db.add(row)
await db.commit()
await db.refresh(row)
return row.id
async def get_reports(session_id: int) -> list[dict]:
async with get_sessionmaker()() as db:
res = await db.execute(
select(Report).where(Report.quiz_id == session_id).order_by(Report.created_at.desc())
)
return [_row(r) for r in res.scalars().all()]
async def get_report(report_id: int) -> Optional[dict]:
async with get_sessionmaker()() as db:
r = await db.get(Report, report_id)
return _row(r) if r else None
# =============================================================================
# Analytics (admin dashboard)
# =============================================================================
async def get_stats(teacher_id: Optional[int] = None) -> dict:
"""Global stats (admin) or stats scoped to one teacher's own data."""
async with get_sessionmaker()() as db:
async def count(stmt):
return (await db.execute(stmt)).scalar_one()
if teacher_id is None:
return {
"teachers": await count(select(func.count(Teacher.id))),
"students": await count(select(func.count(Student.id))),
"quizzes": await count(select(func.count(Quiz.id))),
"reports": await count(select(func.count(Report.id))),
"student_results": await count(select(func.count(StudentResult.id))),
"prompts": await count(select(func.count(Prompt.id))),
}
# Scoped to one teacher: own students/quizzes/prompts directly; reports and
# results are owned transitively through the teacher's own quizzes.
own_quiz = select(Quiz.id).where(Quiz.teacher_id == teacher_id).scalar_subquery()
return {
"teachers": 1,
"students": await count(
select(func.count(Student.id)).where(Student.teacher_id == teacher_id)
),
"quizzes": await count(
select(func.count(Quiz.id)).where(Quiz.teacher_id == teacher_id)
),
"reports": await count(
select(func.count(Report.id)).where(Report.quiz_id.in_(own_quiz))
),
"student_results": await count(
select(func.count(StudentResult.id)).where(StudentResult.quiz_id.in_(own_quiz))
),
"prompts": await count(
select(func.count(Prompt.id)).where(Prompt.teacher_id == teacher_id)
),
}
async def admin_list_students(teacher_id: Optional[int] = None, limit: int = 500) -> list[dict]:
"""Students with quiz count + avg score; all teachers (admin) or one teacher's own."""
async with get_sessionmaker()() as db:
stmt = (
select(Student, Teacher.email)
.join(Teacher, Student.teacher_id == Teacher.id)
.order_by(Student.name)
.limit(limit)
)
if teacher_id is not None:
stmt = stmt.where(Student.teacher_id == teacher_id)
res = await db.execute(stmt)
out = []
for s, email in res.all():
d = _row(s)
d["teacher_email"] = email
agg = (
await db.execute(
select(func.count(StudentResult.id), func.avg(StudentResult.score)).where(
StudentResult.student_id == s.id
)
)
).one()
d["result_count"] = agg[0]
d["avg_score"] = round(float(agg[1]), 1) if agg[1] is not None else None
out.append(d)
return out
async def get_quiz_results(quiz_id: int) -> list[dict]:
"""All student results for a quiz, joined with student name (admin detail)."""
async with get_sessionmaker()() as db:
res = await db.execute(
select(StudentResult, Student.name, Student.id)
.join(Student, StudentResult.student_id == Student.id)
.join(Quiz, StudentResult.quiz_id == Quiz.id)
.where(StudentResult.quiz_id == quiz_id)
# defense-in-depth: only students belonging to this quiz's teacher
.where(Student.teacher_id == Quiz.teacher_id)
.order_by(Student.name)
)
out = []
for sr, name, sid in res.all():
d = _row(sr)
d["student_name"] = name
d["student_id"] = sid
out.append(d)
return out
async def get_schema_version() -> Optional[str]:
"""Current Alembic migration revision applied to the DB."""
from sqlalchemy import text
from .db import active_schema
schema = active_schema()
table = f'"{schema}".alembic_version' if schema else "alembic_version"
async with get_sessionmaker()() as db:
try:
res = await db.execute(text(f"SELECT version_num FROM {table} LIMIT 1"))
row = res.first()
return row[0] if row else None
except Exception:
return None
async def admin_list_sessions(teacher_id: Optional[int] = None, limit: int = 200) -> list[dict]:
"""Quizzes with author email + counts; all teachers (admin) or one teacher's own."""
async with get_sessionmaker()() as db:
stmt = (
select(Quiz, Teacher.email)
.join(Teacher, Quiz.teacher_id == Teacher.id)
.order_by(Quiz.created_at.desc())
.limit(limit)
)
if teacher_id is not None:
stmt = stmt.where(Quiz.teacher_id == teacher_id)
res = await db.execute(stmt)
out = []
for q, email in res.all():
d = _row(q)
d["teacher_email"] = email
d["report_count"] = (
await db.execute(select(func.count(Report.id)).where(Report.quiz_id == q.id))
).scalar_one()
out.append(d)
return out
|