From 780cd4b8b67e7014a0508f09f93388c86f5f1f4a Mon Sep 17 00:00:00 2001 From: Seth Bernstein Date: Wed, 6 May 2026 09:10:12 -0400 Subject: [PATCH 1/4] Add toggle_async endpoint and wire it to the instructor dashboard --- .../assignment_server_api/routers/peer.py | 27 ++++++++++ .../assignment/instructor/peer_dashboard.html | 50 ++++++++++++++++++- 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/bases/rsptx/assignment_server_api/routers/peer.py b/bases/rsptx/assignment_server_api/routers/peer.py index df6c29e2c..5b1a1b6e4 100644 --- a/bases/rsptx/assignment_server_api/routers/peer.py +++ b/bases/rsptx/assignment_server_api/routers/peer.py @@ -229,6 +229,7 @@ async def get_peer_dashboard( "num_questions": num_questions, "is_instructor": True, "is_last": is_last, + "peer_async_visible": bool(assignment.peer_async_visible), "lti": is_lti, "latex_macros": latex_macros, "enable_ab": enable_ab, @@ -1044,6 +1045,32 @@ async def log_peer_rating( return JSONResponse(content={"message": retmess}) +@router.post("/api/toggle_async") +@instructor_role_required() +@with_course() +async def toggle_async( + request: Request, + assignment_id: int = Body(..., embed=True), + user=Depends(auth_manager), + course=None, +): + """ + Toggle peer_async_visible on an assignment. Instructors use this to open/close + the after-class async interface for students. + """ + assignment = await fetch_one_assignment(assignment_id) + if not assignment: + return JSONResponse(status_code=404, content={"ok": False, "error": "assignment not found"}) + if assignment.course != course.id: + return JSONResponse(status_code=403, content={"ok": False, "error": "assignment does not belong to your course"}) + + assignment.peer_async_visible = not bool(assignment.peer_async_visible) + await update_assignment(assignment, pi_update=True) + + rslogger.info(f"Toggled peer_async_visible for assignment {assignment_id} to {assignment.peer_async_visible}") + return JSONResponse(content={"peer_async_visible": assignment.peer_async_visible}) + + @router.post("/api/get_async_explainer") @with_course() async def get_async_explainer( diff --git a/components/rsptx/templates/assignment/instructor/peer_dashboard.html b/components/rsptx/templates/assignment/instructor/peer_dashboard.html index c8aa40dbb..f84de406c 100644 --- a/components/rsptx/templates/assignment/instructor/peer_dashboard.html +++ b/components/rsptx/templates/assignment/instructor/peer_dashboard.html @@ -47,9 +47,23 @@

Question {{ current_qnum }} of {{ num_questions }}

+ {% if not is_last %} + {% else %} +
+ +
+ {% endif %} @@ -279,7 +293,41 @@

Question {{ current_qnum }} of {{ num_questions }}

var answerCount = 0; var done = {{ 'true' if is_last else 'false' }}; if (done) { - document.getElementById("nextq").disabled = true; + document.getElementById("nextq") && (document.getElementById("nextq").disabled = true); + } + + var asyncReleased = {{ 'true' if peer_async_visible else 'false' }}; + + function showAsyncConfirm() { + var area = document.getElementById("asyncBtnArea"); + var msg = asyncReleased + ? "Undo the after-class PI release?" + : "Release after-class PI questions to students?"; + area.innerHTML = ` + ${msg} + + + `; + } + + function cancelAsyncConfirm() { + var area = document.getElementById("asyncBtnArea"); + var label = asyncReleased ? "Undo After-Class Release" : "Release After-Class PI"; + var extraStyle = asyncReleased + ? 'style="background-color:#a3d4ec; border-color:#a3d4ec; color:#fff; margin-right:4px;"' + : 'style="margin-right:4px;"'; + area.innerHTML = ``; + } + + async function confirmToggleAsync() { + var resp = await fetch("/assignment/peer/api/toggle_async", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ assignment_id: {{ assignment_id }} }), + }); + var data = await resp.json(); + asyncReleased = data.peer_async_visible; + cancelAsyncConfirm(); } {% endblock %} From 2bfe9a0573bfce5ac5f3c0ac4458fc1fbbbed254 Mon Sep 17 00:00:00 2001 From: Seth Bernstein Date: Wed, 6 May 2026 09:36:19 -0400 Subject: [PATCH 2/4] Add peer instructor extra page with live percent-correct polling --- .../assignment_server_api/routers/peer.py | 38 +++++++++++------- .../assignment/instructor/peer_extra.html | 39 +++++++++++++++++++ 2 files changed, 62 insertions(+), 15 deletions(-) create mode 100644 components/rsptx/templates/assignment/instructor/peer_extra.html diff --git a/bases/rsptx/assignment_server_api/routers/peer.py b/bases/rsptx/assignment_server_api/routers/peer.py index 5b1a1b6e4..ee662a519 100644 --- a/bases/rsptx/assignment_server_api/routers/peer.py +++ b/bases/rsptx/assignment_server_api/routers/peer.py @@ -254,26 +254,34 @@ async def get_peer_extra( course=None, ): """ - Display extra information for peer instruction that instructors - might not want to share with students (e.g., correct answers, insights). + Instructor-only view showing live percent-correct for the current question. + Meant to be opened on a separate device so students can't see it. """ rslogger.info(f"Peer extra info for assignment {assignment_id}") - - # TODO: Implement extra info display - # This will show: - # - Correct answers - # - Instructor notes - # - Common misconceptions + templates = Jinja2Templates(directory=template_folder) assignment = await fetch_one_assignment(assignment_id) + questions_result = await fetch_assignment_questions(assignment_id) + questions = [q for q, _aq in questions_result] - return JSONResponse( - content={ - "message": "Extra info functionality to be implemented", - "assignment_id": assignment_id, - "assignment_name": assignment.name, - } - ) + current_idx = assignment.current_index if assignment.current_index is not None else 0 + if current_idx >= len(questions): + current_idx = len(questions) - 1 if questions else 0 + current_question = questions[current_idx] if questions else None + + if not current_question: + return JSONResponse(status_code=404, content={"detail": "No questions found for this assignment"}) + + context = { + "request": request, + "course": course, + "user": user, + "assignment_id": assignment_id, + "current_question": current_question, + "is_instructor": True, + } + + return templates.TemplateResponse("assignment/instructor/peer_extra.html", context) @router.get("/instructor/review", response_class=HTMLResponse) diff --git a/components/rsptx/templates/assignment/instructor/peer_extra.html b/components/rsptx/templates/assignment/instructor/peer_extra.html new file mode 100644 index 000000000..62ae56186 --- /dev/null +++ b/components/rsptx/templates/assignment/instructor/peer_extra.html @@ -0,0 +1,39 @@ +{% extends "_base.html" %} + +{% block title %}Peer Instruction - Extra Info{% endblock %} + +{% block content %} +
+

Percent Correct for {{ current_question.name }}

+

%

+
+{% endblock %} + +{% block js %} + +{% endblock %} From 0c680d295fdb5015628c3dd1670542afb097314e Mon Sep 17 00:00:00 2001 From: Seth Bernstein Date: Thu, 7 May 2026 09:27:30 -0400 Subject: [PATCH 3/4] Migrate sync PI routes to FastAPI, fix nav links, and add missing endpoints --- .../assignment_server_api/routers/peer.py | 88 +++++++++++++++---- .../sphinx_bootstrap/layout.html | 4 +- .../applications/runestone/views/layout.html | 4 +- components/rsptx/templates/_base.html | 4 +- .../templates/admin/instructor/menu.html | 2 +- .../rsptx/templates/staticAssets/js/peer.js | 2 +- 6 files changed, 78 insertions(+), 26 deletions(-) diff --git a/bases/rsptx/assignment_server_api/routers/peer.py b/bases/rsptx/assignment_server_api/routers/peer.py index ee662a519..a76ff829c 100644 --- a/bases/rsptx/assignment_server_api/routers/peer.py +++ b/bases/rsptx/assignment_server_api/routers/peer.py @@ -35,6 +35,8 @@ count_distinct_student_answers, count_peer_messages, fetch_last_useinfo_peergroup, + fetch_course_students, + fetch_all_grades_for_assignment, ) from rsptx.db.models import UseinfoValidation from rsptx.auth.session import auth_manager @@ -296,24 +298,9 @@ async def get_peer_review( """ Review peer instruction results and student interactions. """ - rslogger.info(f"Peer review for assignment {assignment_id}") - - # TODO: Implement review functionality - # This will show: - # - Overall statistics - # - Student participation - # - Answer distribution - # - Chat transcripts - - assignment = await fetch_one_assignment(assignment_id) - - return JSONResponse( - content={ - "message": "Review functionality to be implemented", - "assignment_id": assignment_id, - "assignment_name": assignment.name, - } - ) + rslogger.info(f"Peer review for assignment {assignment_id} - not yet implemented, redirecting") + from fastapi.responses import RedirectResponse + return RedirectResponse(url=f"/assignment/instructor/reviewPeerAssignment?assignment_id={assignment_id}") # Student Routes @@ -1053,6 +1040,71 @@ async def log_peer_rating( return JSONResponse(content={"message": retmess}) +@router.post("/clear_pairs") +@instructor_role_required() +@with_course() +async def clear_pairs( + request: Request, + user=Depends(auth_manager), + course=None, +): + """ + Clear the partner assignments for the current course from Redis. + Called when the instructor switches to face-chat mode. + """ + import os + import redis as redis_lib + + r = redis_lib.from_url(os.environ.get("REDIS_URI", "redis://redis:6379/0")) + r.delete(f"partnerdb_{course.course_name}") + rslogger.info(f"Cleared pairs for course {course.course_name}") + return JSONResponse(content="success") + + +@router.get("/course_students") +@instructor_role_required() +@with_course() +async def get_course_students( + request: Request, + user=Depends(auth_manager), + course=None, +): + """ + Return a dict of {username: full_name} for all students in the course. + Used by peer.js to populate the group selection panel. + """ + students = await fetch_course_students(course.id) + result = { + s.username: f"{s.first_name} {s.last_name}".strip() + for s in students + } + return JSONResponse(content=result) + + +@router.post("/send_lti_scores") +@instructor_role_required() +@with_course() +async def send_lti_scores( + request: Request, + assignment_id: int = Body(..., embed=True), + user=Depends(auth_manager), + course=None, +): + """ + Send LTI scores for all students in the assignment. + Mirrors web2py peer.send_lti_scores. + """ + from rsptx.lti1p3.core import attempt_lti1p3_score_updates + + rslogger.info(f"Sending LTI scores for assignment {assignment_id}") + try: + await attempt_lti1p3_score_updates(assignment_id, force=True) + except Exception as e: + rslogger.error(f"Error sending LTI scores: {e}") + return JSONResponse(status_code=500, content={"ok": False, "error": str(e)}) + return JSONResponse(content="success") + + @router.post("/api/toggle_async") @instructor_role_required() @with_course() diff --git a/bases/rsptx/interactives/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html b/bases/rsptx/interactives/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html index b66e58559..153b952e5 100644 --- a/bases/rsptx/interactives/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html +++ b/bases/rsptx/interactives/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html @@ -197,8 +197,8 @@
  • Course Home
  • Assignments
  • Practice
    • - -
  • Peer Instruction (Student)
    • + +
  • Peer Instruction (Student)
  • {% if minimal_outside_links != 'True' %}
  • Change Course
    • diff --git a/bases/rsptx/web2py_server/applications/runestone/views/layout.html b/bases/rsptx/web2py_server/applications/runestone/views/layout.html index d1ae92b64..f0954a5fa 100644 --- a/bases/rsptx/web2py_server/applications/runestone/views/layout.html +++ b/bases/rsptx/web2py_server/applications/runestone/views/layout.html @@ -109,8 +109,8 @@
  • Assignments
  • Practice
    • - -
  • Peer Instruction (Student)
    • + +
  • Peer Instruction (Student)
  • Request Invoice
  • {{ if settings.academy_mode: }} diff --git a/components/rsptx/templates/_base.html b/components/rsptx/templates/_base.html index 8aa86d972..4aaded5f2 100644 --- a/components/rsptx/templates/_base.html +++ b/components/rsptx/templates/_base.html @@ -96,14 +96,14 @@ Course Home Assignments Practice - Peer Instruction (Student) + Peer Instruction (Student) Progress Page
    Change Course
    {% if is_instructor %} Instructor Dashboard - Peer Instruction (Instructor) + Peer Instruction (Instructor) Author Tools Editorial Page Request Invoice diff --git a/components/rsptx/templates/admin/instructor/menu.html b/components/rsptx/templates/admin/instructor/menu.html index 9c0a5a783..2cc2c7843 100644 --- a/components/rsptx/templates/admin/instructor/menu.html +++ b/components/rsptx/templates/admin/instructor/menu.html @@ -221,7 +221,7 @@

    Configure Practice

    Reset Student Exam

    Reset timed exams for individual students

    - +

    Peer Instruction Dashboard

    Manage peer assignment reviews

     diff --git a/components/rsptx/templates/staticAssets/js/peer.js b/components/rsptx/templates/staticAssets/js/peer.js index f7b6a998a..1a7e4e28d 100644 --- a/components/rsptx/templates/staticAssets/js/peer.js +++ b/components/rsptx/templates/staticAssets/js/peer.js @@ -763,7 +763,7 @@ async function setupPeerGroup() { Accept: "application/json", }); - let request = new Request("/runestone/admin/course_students", { + let request = new Request("/assignment/peer/course_students", { method: "GET", headers: jsonHeaders, }); From eff7a183e23b0ec346064e322badba21d16e7190 Mon Sep 17 00:00:00 2001 From: Seth Bernstein Date: Sun, 10 May 2026 18:26:16 -0400 Subject: [PATCH 4/4] Add async PI student page --- .../assignment_server_api/routers/peer.py | 395 ++++++++- .../runestone/static/css/peer.css | 19 + components/rsptx/db/models.py | 2 +- .../assignment/student/peer_async.html | 811 ++++++++++++++++++ components/rsptx/templates/footer.html | 21 +- 5 files changed, 1195 insertions(+), 53 deletions(-) create mode 100644 components/rsptx/templates/assignment/student/peer_async.html diff --git a/bases/rsptx/assignment_server_api/routers/peer.py b/bases/rsptx/assignment_server_api/routers/peer.py index a76ff829c..5eb79eb03 100644 --- a/bases/rsptx/assignment_server_api/routers/peer.py +++ b/bases/rsptx/assignment_server_api/routers/peer.py @@ -37,8 +37,11 @@ fetch_last_useinfo_peergroup, fetch_course_students, fetch_all_grades_for_assignment, + fetch_api_token, + fetch_question, ) -from rsptx.db.models import UseinfoValidation +from rsptx.db.models import UseinfoValidation, Useinfo +from rsptx.db.async_session import async_session from rsptx.auth.session import auth_manager import pandas as pd import random @@ -422,49 +425,152 @@ async def get_peer_question( return templates.TemplateResponse("assignment/student/peer_question.html", context) +async def _has_vote1_async(div_id: str, sid: str) -> bool: + from sqlalchemy import select + async with async_session() as session: + query = ( + select(Useinfo) + .where( + (Useinfo.event == "mChoice") + & (Useinfo.sid == sid) + & (Useinfo.div_id == div_id) + & Useinfo.act.like("%vote1") + ) + .order_by(Useinfo.id.desc()) + .limit(1) + ) + result = await session.execute(query) + return result.scalar() is not None + + +async def _has_reflection_async(div_id: str, sid: str) -> bool: + from sqlalchemy import select + async with async_session() as session: + query = ( + select(Useinfo) + .where( + (Useinfo.event == "reflection") + & (Useinfo.sid == sid) + & (Useinfo.div_id == div_id) + ) + .order_by(Useinfo.id.desc()) + .limit(1) + ) + result = await session.execute(query) + return result.scalar() is not None + + +async def _llm_enabled_async(course_id: int) -> bool: + token = await fetch_api_token(course_id, "openai") + return token is not None and bool(token.token) + @router.get("/student/async", response_class=HTMLResponse) @with_course() async def get_peer_async( request: Request, assignment_id: int, + question_num: int = 1, user=Depends(auth_manager), course=None, ): - """ - Display the asynchronous (after-class) peer instruction interface. - Students can review questions and see recorded chat transcripts. - """ - rslogger.info(f"Peer async for assignment {assignment_id}, user {user.username}") - # TODO: Implement async peer instruction interface - # This will include: - # - Question review - # - Two voting rounds - # - Access to recorded chat transcripts - # - Explanations from peers + import os, random + + rslogger.info(f"Peer async for assignment {assignment_id}, question {question_num}, user {user.username}") + templates = Jinja2Templates(directory=template_folder) assignment = await fetch_one_assignment(assignment_id) + if not assignment: + return JSONResponse(status_code=404, content={"detail": "Assignment not found"}) - # Check if async is enabled for this assignment if not assignment.peer_async_visible: return JSONResponse( status_code=403, - content={ - "message": "After-class peer instruction is not available for this assignment" - }, + content={"message": "After-class peer instruction is not available for this assignment"}, ) - # TODO: Use assignment_questions when implementing async interface - # assignment_questions = await fetch_assignment_questions(assignment_id) + qa_pairs = list(await fetch_assignment_questions(assignment_id)) + questions = [q for q, _aq in qa_pairs] + total_questions = len(questions) + + idx = question_num - 1 + if not questions or idx >= total_questions: + all_done = True + current_question = None + aq = None + else: + all_done = False + current_question = questions[idx] + aq = qa_pairs[idx][1] + + has_vote1 = False + has_reflection = False + if current_question: + has_vote1 = await _has_vote1_async(current_question.name, user.username) + has_reflection = await _has_reflection_async(current_question.name, user.username) - return JSONResponse( - content={ - "message": "Async peer instruction functionality to be implemented", - "assignment_id": assignment_id, - "assignment_name": assignment.name, - } + course_attrs = await fetch_all_course_attributes(course.id) + latex_macros = course_attrs.get("latex_macros", "") + + async_llm_modes_enabled = course_attrs.get("enable_async_llm_modes", "false") == "true" + has_api_token = await _llm_enabled_async(course.id) + question_async_mode = (getattr(aq, "async_mode", None) or "standard") if aq else "standard" + if async_llm_modes_enabled: + question_use_llm = question_async_mode in ("llm", "analogies") + llm_enabled = question_use_llm and has_api_token + else: + llm_enabled = has_api_token + + try: + await create_useinfo_entry(UseinfoValidation( + course_id=course.course_name, + sid=user.username, + div_id=current_question.name if current_question else "", + event="pi_mode", + act=json.dumps({"mode": "llm" if llm_enabled else "legacy"}), + timestamp=datetime.datetime.utcnow(), + )) + except Exception: + rslogger.exception("Failed to log pi_mode for peer_async") + + site_packages_path = sys.path[0] + peer_js_path = os.path.join( + site_packages_path, "rsptx/templates/staticAssets", "js", "peer.js" ) + try: + peer_mtime = str(int(os.path.getmtime(peer_js_path))) + except (FileNotFoundError, AttributeError): + peer_mtime = str(random.randrange(10000)) + + wp_assets = get_webpack_static_imports(course) + + context = { + "request": request, + "course": course, + "user": user, + "course_id": course.course_name, + "assignment_id": assignment_id, + "assignment_name": assignment.name, + "current_question": current_question, + "nextQnum": question_num + 1, + "total_questions": total_questions, + "is_last_question": question_num >= total_questions, + "all_done": all_done, + "has_vote1": has_vote1, + "has_reflection": has_reflection, + "llm_enabled": llm_enabled, + "async_mode": question_async_mode, + "llm_reply": None, + "latex_macros": latex_macros, + "peer_mtime": peer_mtime, + "is_instructor": False, + "student_page": True, + "settings": settings, + "wp_imports": wp_assets, + } + + return templates.TemplateResponse("assignment/student/peer_async.html", context) # API Endpoints @@ -1132,38 +1238,239 @@ async def toggle_async( @router.post("/api/get_async_explainer") -@with_course() async def get_async_explainer( request: Request, div_id: str = Body(...), course: str = Body(...), user=Depends(auth_manager), - course_obj=None, ): - """ - Get a peer's explanation for async peer instruction mode. - Returns a recorded explanation and the peer's answer. - """ + + from sqlalchemy import select, or_ rslogger.info(f"Getting async explainer for {div_id} in course {course}") try: - # TODO: Implement the logic to fetch a recorded peer explanation - # This should: - # 1. Query the database for peer messages from this question - # 2. Find a good explanation to show (not from this student) - # 3. Return the explanation and the peer's answer + async with async_session() as session: + msg_query = ( + select(Useinfo) + .where( + Useinfo.event.in_(["sendmessage", "reflection"]), + Useinfo.div_id == div_id, + Useinfo.course_id == course, + ) + .order_by(Useinfo.id) + ) + msg_result = await session.execute(msg_query) + messages = msg_result.scalars().all() + + all_msgs = [] + last_per_sid = {} + for row in messages: + if row.event == "reflection": + msg = row.act + else: + try: + msg = row.act.split(":", 2)[2] + except Exception: + msg = row.act + if last_per_sid.get(row.sid) != msg: + all_msgs.append((row.sid, msg)) + last_per_sid[row.sid] = msg + + parts = [] + for sid, msg in all_msgs: + parts.append(f"
  • {sid} said: {msg}
    • ") + + if not parts: + mess = "Sorry there are no explanations yet." + else: + mess = "
      " + "".join(parts) + "
    " + + return JSONResponse(content={"mess": mess, "user": "", "answer": "", "responses": {}}) - # Placeholder response - return JSONResponse( - content={ - "user": "peer_student", - "answer": "A", - "mess": "This is a placeholder explanation. The actual implementation will fetch recorded peer explanations from the database.", - "responses": {"peer1": "A", "peer2": "B"}, - } - ) except Exception as e: rslogger.error(f"Error getting async explainer: {e}") return JSONResponse( status_code=500, content={"detail": f"Failed to get explainer: {str(e)}"} ) + + +async def _get_mcq_context_async(div_id: str): + try: + q = await fetch_question(div_id) + if not q: + rslogger.error(f"_get_mcq_context_async: no question row for {div_id}") + return "", "", [] + + question = (q.question or "").strip() + code = (q.code or "").strip() if hasattr(q, "code") else "" + choices = [] + try: + if q.answers: + opts = json.loads(q.answers) + for i, opt in enumerate(opts): + choices.append(f"{chr(65+i)}. {opt.strip()}") + except Exception as e: + rslogger.warning(f"Could not parse choices for {div_id}: {e}") + return question, code, choices + except Exception: + rslogger.exception(f"_get_mcq_context_async failed for {div_id}") + return "", "", [] + + +async def _call_openai_async(messages: list, course_id: int) -> str: + import os, aiohttp + token_row = await fetch_api_token(course_id, "openai") + if not token_row or not token_row.token: + raise Exception("missing api key") + + api_key = token_row.token + model = os.environ.get("PI_OPENAI_MODEL", "gpt-4o-mini").strip() or "gpt-4o-mini" + url = "https://api.openai.com/v1/chat/completions" + headers = { + "Authorization": f"Bearer {api_key}", + "Content-Type": "application/json", + } + payload = { + "model": model, + "messages": messages, + "temperature": 0.4, + "max_tokens": 300, + } + async with aiohttp.ClientSession() as session: + async with session.post(url, headers=headers, json=payload, timeout=aiohttp.ClientTimeout(total=30)) as resp: + resp.raise_for_status() + data = await resp.json() + rslogger.warning(f"PEER LLM CALL | provider=openai-course-token | model={model}") + return data["choices"][0]["message"]["content"].strip() + + +@router.post("/api/get_async_llm_reflection") +async def get_async_llm_reflection( + request: Request, + user=Depends(auth_manager), +): + try: + data = await request.json() + except Exception: + return JSONResponse(content={"ok": False, "error": "invalid json"}) + + div_id = (data.get("div_id") or "").strip() + selected = (data.get("selected_answer") or "").strip() + messages = data.get("messages") + + if not div_id: + return JSONResponse(content={"ok": False, "error": "missing div_id"}) + + try: + user_msgs = [m for m in (messages or []) if m.get("role") == "user"] + for idx, m in enumerate(user_msgs): + content = (m.get("content") or "").strip() + if not content: + continue + if idx == 0: + await create_useinfo_entry(UseinfoValidation( + course_id=user.course_name, + sid=user.username, + div_id=div_id, + event="reflection", + act=content, + timestamp=datetime.datetime.utcnow(), + )) + else: + await create_useinfo_entry(UseinfoValidation( + course_id=user.course_name, + sid=user.username, + div_id=div_id, + event="sendmessage", + act=f"to:llm:{content}", + timestamp=datetime.datetime.utcnow(), + )) + except Exception: + rslogger.exception("Failed to log LLM user message") + + question, code, choices = await _get_mcq_context_async(div_id) + + sys_content = ( + "only speak in lower case.\n" + "you are a student talking to another student during peer instruction.\n" + "you are both looking at the same multiple choice question with code and answers.\n" + "you remember the question and choices.\n" + "most messages should be short (1 to 3 sentences often very short).\n" + "use casual informal language and common typos.\n" + "never use commas.\n" + "never use gendered language.\n" + "do not use new lines.\n" + "do not sound like a teacher.\n" + "do not explain step by step.\n" + "never say something is right or wrong.\n" + "do not pretend to have picked an answer yourself.\n" + "never mention a choice letter as the correct answer.\n" + "if the question includes code never clearly describe the final result or fully state what it prints.\n" + "if the question does not include code do not make up or reference code that is not there.\n" + "only refer to what is actually in the question.\n" + "be aware of common misconceptions but do not introduce them yourself.\n" + "if there is code refer to it loosely like 'that line' or 'the loop' or 'the print'.\n" + "often hedge with uncertainty.\n" + "ask the other student to explain why they picked their answer and how they reasoned through it.\n" + "ask follow up questions about their reasoning like 'what makes you think that' or 'how did you trace through it'.\n" + "do not push them toward a different answer or imply their answer is wrong.\n" + "never reveal or hint at which answer is correct or incorrect.\n" + "never say things like 'the feedback says' or 'according to the answer' or reference any grading or correctness information.\n" + "do not make up information that is not in the question.\n" + "if you are unsure about something say so honestly instead of guessing.\n" + "if the other student clearly sounds confident or repeats the same answer twice tell them to vote again or submit it.\n" + "do not continue reasoning after telling them to vote again.\n" + "focus on getting them to think through the problem not on changing their mind.\n\n" + ) + + if question: + sys_content += f"question:\n{question}\n\n" + if code: + sys_content += f"code:\n{code}\n\n" + if choices: + sys_content += "answer choices:\n" + "\n".join(choices) + "\n\n" + if selected: + sys_content += f"the other student chose: {selected}\n\n" + + system_msg = {"role": "system", "content": sys_content} + + if not messages: + reflection = (data.get("reflection") or "").strip() + if not reflection: + return JSONResponse(content={"ok": False, "error": "missing reflection"}) + messages = [ + system_msg, + {"role": "user", "content": f"i chose answer {selected}. my explanation was:\n\n{reflection}"}, + ] + else: + if not isinstance(messages, list): + return JSONResponse(content={"ok": False, "error": "messages must be a list"}) + if len(messages) == 0 or messages[0].get("role") != "system": + messages = [system_msg] + messages + else: + messages[0] = system_msg + + try: + from rsptx.db.crud import fetch_course + course = await fetch_course(user.course_name) + reply = await _call_openai_async(messages, course.id) + except Exception as e: + rslogger.exception("LLM reflection failed") + return JSONResponse(content={"ok": False, "error": str(e)}) + + try: + await create_useinfo_entry(UseinfoValidation( + course_id=user.course_name, + sid=user.username, + div_id=div_id, + event="llm_peer_sendmessage", + act=f"to: student:{reply}", + timestamp=datetime.datetime.utcnow(), + )) + except Exception: + rslogger.exception("Failed to log LLM reply") + + if not reply: + return JSONResponse(content={"ok": False, "error": "llm returned empty reply (missing api key?)"}) + + return JSONResponse(content={"ok": True, "reply": reply}) diff --git a/bases/rsptx/web2py_server/applications/runestone/static/css/peer.css b/bases/rsptx/web2py_server/applications/runestone/static/css/peer.css index e67543374..951242a6a 100644 --- a/bases/rsptx/web2py_server/applications/runestone/static/css/peer.css +++ b/bases/rsptx/web2py_server/applications/runestone/static/css/peer.css @@ -166,6 +166,25 @@ display: none; } +.oneq label.mchoice-option, +#pi-student-interface label.mchoice-option { + display: block !important; + margin-bottom: 4px; +} + +.oneq button[name="compare"], +#pi-student-interface button[name="compare"] { + display: none !important; +} + +.oneq button[aria-label="Close"], +.oneq .close, +.oneq .knowl-close, +#pi-student-interface button[aria-label="Close"], +#pi-student-interface .close { + display: none !important; +} + /* ------------------- */ /* Student's interface */ /* ------------------- */ diff --git a/components/rsptx/db/models.py b/components/rsptx/db/models.py index 42b366cf6..3d2d5e120 100644 --- a/components/rsptx/db/models.py +++ b/components/rsptx/db/models.py @@ -688,7 +688,7 @@ class AssignmentQuestion(Base, IdMixin): activities_required = Column( Integer ) # only reading assignments will have this populated - use_llm = Column(Web2PyBoolean, server_default="F") + async_mode = Column(String(20), server_default="standard") AssignmentQuestionValidator: TypeAlias = sqlalchemy_to_pydantic(AssignmentQuestion) # type: ignore diff --git a/components/rsptx/templates/assignment/student/peer_async.html b/components/rsptx/templates/assignment/student/peer_async.html new file mode 100644 index 000000000..10ae337f4 --- /dev/null +++ b/components/rsptx/templates/assignment/student/peer_async.html @@ -0,0 +1,811 @@ +{% extends "_base.html" %} + +{% block title %}Peer Instruction (After Class){% endblock %} + +{% block css %} + + +{% endblock %} + +{% block navitems %} +
  • + Back to {{ course.course_name }} +
    • +{% endblock %} + +{% block content %} +
    +{% include 'common/static_assets.html' %} +{% include 'common/ebook_config.html' %} + + + +
    +
    + + + +

    Peer Instruction Question (After Class)

    + +{% if not all_done %} +
    + ● ● ●   Step 1 of 3: Answer the question +
    +{% endif %} + +
    +

    This page is meant for you to use after the inclass peer instruction is over. +

      +
    1. Answer the question as best you can.
      2. +
    2. Then, in the space provided write a justification for your answer.
      3. + {% if llm_enabled %} +
    3. Discuss the question with an LLM peer — explain your reasoning and respond to their questions.
      4. + {% else %} +
    4. Read the justification or discussion.
      5. + {% endif %} +
    5. Answer the question again. Even if you are not changing your answer from the first time.
      6. +
    +

    +
    + +
    + {% if not all_done %} +
    + {{ current_question.htmlsrc|safe }} +
    + {% else %} +
    +

    Congratulations, you have completed this assignment!

    +
    + {% endif %} + + {% if not all_done %} +
    +

    + Please provide an explanation for why you answered + __ +

    + + + +

    + You must submit your first vote before starting the discussion. +

    + + +
    + {% endif %} + + {% if not all_done %} +
    +
    + + + +
    +
    + {% endif %} +
    + +{% if has_vote1 and has_reflection and llm_reply %} +
    +
    + An LLM peer said: +

    {{ llm_reply }}

    +
    +{% endif %} + +
    {# end max-width wrapper #} +{% endblock %} + +{% block js %} + + + + + + + + + + + +{% endblock %} diff --git a/components/rsptx/templates/footer.html b/components/rsptx/templates/footer.html index ce788138b..3c2a029ae 100644 --- a/components/rsptx/templates/footer.html +++ b/components/rsptx/templates/footer.html @@ -1,10 +1,15 @@ -