Merge branch 'main' into issue-829-3

Author: morozov-av

.pre-commit-config.yaml

@@ -0,0 +1,14 @@
+repos:
+  - repo: https://github.com/psf/black
+    rev: 24.4.2
+    hooks:
+      - id: black
+        types: [python]
+        files: ^(bases|components)/
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.4.4
+    hooks:
+      - id: ruff
+        types: [python]
+        files: ^(bases|components)/

CHANGELOG.md

@@ -0,0 +1,155 @@
+# ChangeLog
+
+## Updates since last changelog entry (2026-02-21 → 2026-02-27)
+
+Coverage: commits from **2026-02-21** through **2026-02-27** (i.e., changes after the prior cutoff on 2026-02-20).
+
+### Highlights
+
+- **Learning clues (prototype) + student context improvements:** initial prototype of “learning clues” integration landed, plus follow-on work to add context and automate lookup of book ids (primarily in `assignment_server_api/routers/student.py` and `bookfuncs.js`).
+- **Peer/LLM chat robustness:** improvements to async peer messaging (prompt + behavior), fixes for message ordering, and a key fix so the correct API token field is used and LLM peer lookup can retrieve keys at call time.
+- **LTI1p3 UX:** better messaging when an LMS rejects access to an **expired course**.
+- **UI theming iteration:** dark-mode dropdown styling changes were introduced and then reverted (net effect: continued iteration/experimentation in this area).
+- **Code quality + dependencies:** a broad pass fixing **Black/Ruff** issues and updating lock files / dependencies.
+
+### Commit notes (for reference)
+
+- 1a181c81 Initial prototype of learning clues integration
+- 3f42fae0 log todos
+- 5964439a Add context and automate lookup of book ids
+- c523c054 Fix API token field selection + make LLM peer lookup retrieve keys at call time
+- 8e375a9c Fix message ordering in async peer chat display
+- c34931a8 update prompt and async peer messaging
+- bde25ecd LTI1p3: better message when LMS rejects accessing an expired course
+- eca2ee17 fix dark mode for dropdown menu…
+- cacd4e49 Revert "fix dark mode for dropdown menu…"
+- 968f1cd9 Fix all black errors
+- 0b40954b Fix all black and ruff issues
+
+---
+
+## Updates since last changelog entry (2026-02-12 → 2026-02-20)
+
+Coverage: commits from **2026-02-12** through **2026-02-20** (i.e., changes after the prior cutoff on 2026-02-11).
+
+### Highlights
+
+- **Peer chat cleanup + reliability:** merged fixes to clean up the peer A/B chat experience and to ensure students can still send messages during synchronous chat.
+- **Interactive evaluation UX:** added a new `showEval` capability for interactives.
+- **Assessment data correctness:** fixed a shortanswer issue by correcting the underlying answers table name.
+- **Verbal discussion improvements:** updated the verbal discussion UI to show who a student is grouped with.
+- **Scratch ActiveCode layout polish:** adjusted Scratch ActiveCode positioning / CSS.
+- **Ops/config + dependency updates:** multiple internal updates (logging, course OpenAI key plumbing, fernet secret handling) plus package/version bumps.
+
+### Commit notes (for reference)
+
+- 6d5383df Merge PR #1153 (peer A/B chat cleanup)
+- 3efce80b new showEval for use with interactives
+- 8d56fcaa Fix: correct the table name for shortanswer answers
+- b2dfc2f1 Updated the verbal discussion to show who students are in a group with
+- 6a40b256 Merge PR #1147 (Scratch AC CSS update)
+- 36c319a3 Update packages
+- 0ccdc6e5 Merge PR #10 (fastapi-peer-llm)
+- dea3f13d ensure students can send message during sync chat
+- 90b2636f update logging
+- de3fa2a7 update get course openai key
+- 21f64240 update fernet secret
+- b6134724 new version
+
+---
+
+## Updates since last changelog entry (2026-02-07 → 2026-02-11)
+
+Coverage: commits from **2026-02-07** through **2026-02-11** (since the prior cutoff of 2026-02-06).
+
+### Highlights
+
+- **Java/ActiveCode execution (JOBE) + unit test results:** wired in JOBE-based submission flow for Java ActiveCode with unit tests, and surfaced results end-to-end. This work primarily touched the personalized-parsons endpoints and ActiveCode client JS.
+- **Personalized Parsons cleanup:** removed unused variables and tidied related evaluation code.
+- **Question counting fixes:** corrected “number of questions” accounting in both backend CRUD (`question.py`) and frontend book utilities (`bookfuncs.js`).
+- **Build output enhancements:** added a new preprocessor to inject **GitHub source links** into generated HTML output (`add_github_links.py`).
+- **Repo hygiene:** removed empty placeholder files (`content`, `docker-compose.override.yml`, `pi_attempt_id`).
+- **Release/version bump:** bumped interactives version (`projects/interactives/pyproject.toml`).
+
+### Commit notes (for reference)
+
+- 682e940d Applied JOBE for submitting Javacode with unit tests and get results
+- bf3b9553 removed unused variables
+- 06b5b8da Remove empty placeholder files
+- 2ebf9adb preprocessor to add github links to html output
+- 30773448 Fix: get number of questions correct
+- 6c6d1fa9 Count questions correctly
+- 4bfc6ed4 new version
+
+---
+
+## 2026 (Year to Date)
+
+Coverage: commits from **2026-01-01** through **2026-02-06**.
+
+### Themes
+
+- **Assignment experience + navigation:** continued refinement of assignment navigation (including “readings” integration) and UI polish.
+- **Authoring/build stability:** better build hygiene in `rsptx` tooling (clean logs, cleaned output folders) and dependency work to reduce PreTeXt friction.
+- **Instructor/admin capabilities:** expanded tooling for course administration (token cleanup, CSV enrollment) and billing/invoice-related fixes.
+- **Assignment Builder options:** improved exercise configuration—especially for ActiveCode (CodeLens) and the new/expanded IFrame exercise type.
+
+### Notable changes (grouped)
+
+#### Releases / version bumps
+- Multiple **release/version** bumps (primarily in `projects/interactives/pyproject.toml`).
+
+#### Assignment navigation + readings UX
+- Implemented and iterated on **two-way assignment navigation** (top/bottom navigation, readings integration, styling fixes).
+- Added `readingNames` support and related UI/markup adjustments.
+- Improved assignment navigation behavior and added material icons to assignment pages.
+
+#### Assignment Builder: new capabilities and settings fixes
+- **IFrame exercise type:** added IFrame exercise type/components and later removed an iframe height restriction in preview/input.
+- **ActiveCode improvements:**
+  - Added support for enabling/disabling **CodeLens**.
+  - Tightened up settings/preview plumbing and types.
+- **CodeTailor options:** updated handling to correctly modify `parsonspersonalize` values.
+- Misc. robustness fixes around label toggles (avoid replace/split when `toggleLabels` is null).
+
+#### Peer / Parsons + assessment behavior
+- Parsons improvements including fallback to the problem source when restoring a student answer fails.
+- Multiple changes in the peer/PI area (dashboard + templates + JS), along with ongoing refinements in the peer router.
+- Fixes for MathJax processing and a regression involving counting questions for async.
+
+#### Instructor/Admin operations
+- **API token cleanup:** added ability to delete API token(s) for a course, including a “delete all tokens” capability and supporting UI.
+- **CSV enrollment:** allow a user to be enrolled in a new course by CSV.
+
+#### Billing / invoicing
+- Fixes related to course creation billing flows (invoice checkbox handling) and an additional invoice request fix.
+
+#### Build tooling + dependencies (PreTeXt/author server)
+- Build improvements in `components/rsptx/build_tools/core.py`:
+  - Start builds with a clean log
+  - Clean output folders more reliably
+  - Remove leftover debugging (`set_trace`)
+- `rsmanage build` gained a `--target` option.
+- Dependency work to address **PreTeXt** issues (notably updates in `projects/author_server/poetry.lock` / `pyproject.toml`).
+
+### Month-by-month timeline
+
+#### January 2026
+- Merged/landed the two-way assignment navigation work and related readings UI improvements.
+- Added/expanded Assignment Builder capabilities (CodeTailor options; IFrame exercise type).
+- Improved assignment sorting and decoration of assigned problems.
+- Multiple dependency updates (lxml/pretext/runestone) and several small bug-fix releases.
+- Addressed billing/invoicing edge cases.
+
+#### February 2026 (so far)
+- Instructor tooling: token deletion support (including bulk delete).
+- Authoring/build stability: PreTeXt dependency fixes; cleaner build logs; output folder cleanup; `rsmanage build --target`.
+- Minor version bumps and cleanup.
+
+---
+
+### How to read this repo’s recent work
+Most of the work since Jan 1 clusters into three areas:
+1) **Learner/instructor experience** (assignment nav + builder settings)
+2) **Operational/admin tooling** (billing, enrollment, token hygiene)
+3) **Platform stability** (dependencies + build predictability)

bases/rsptx/admin_server_api/routers/instructor.py

@@ -40,6 +40,7 @@
     fetch_base_course,
     fetch_course_by_id,
     fetch_course,
+    fetch_courses_for_user,
     fetch_group,
     fetch_instructor_courses,
     fetch_library_books,
@@ -862,16 +863,44 @@ async def enroll_students(
                 accept_tcp=False,
             )
             # Check if user exists
-            if await fetch_user(user_data.username):
-                results.append(
-                    {
-                        "username": user_data.username,
-                        "status": "already exists",
-                        "category": "duplicate",
-                    }
-                )
-                failed += 1
-                continue
+            temp_user = await fetch_user(user_data.username)
+            if temp_user:
+                if temp_user.username == row[0] and temp_user.email == row[1]:
+                    # User exists, enroll in course if not already enrolled
+                    user_courses = await fetch_courses_for_user(temp_user.id)
+                    if any(mc.id == course.id for mc in user_courses):
+                        results.append(
+                            {
+                                "username": user_data.username,
+                                "status": "already enrolled",
+                                "category": "duplicate",
+                            }
+                        )
+                        failed += 1
+                        continue
+                    else:
+                        await create_user_course_entry(
+                            temp_user.id, course.id
+                        )  # Enroll the user in the course
+                    results.append(
+                        {
+                            "username": user_data.username,
+                            "status": "enrolled existing user",
+                            "category": "success",
+                        }
+                    )
+                    enrolled += 1
+                    continue
+                else:
+                    results.append(
+                        {
+                            "username": user_data.username,
+                            "status": "already exists with a different email",
+                            "category": "duplicate",
+                        }
+                    )
+                    failed += 1
+                    continue
             new_user = await create_user(user_data)
             await create_user_course_entry(
                 new_user.id, course.id
@@ -1052,6 +1081,7 @@ async def _copy_one_assignment(
             course=target_course.id,
             name=old_assignment.name,
             duedate=due_date,
+            updated_date=datetime.datetime.now(),
             description=old_assignment.description,
             points=old_assignment.points,
             threshold_pct=old_assignment.threshold_pct,
@@ -1226,9 +1256,7 @@ async def post_create_course_page(
 
         # if invoice is true then we need to create an invoice for the course
         if invoice == "true":
-            res = await create_invoice_request(
-                user.username, projectname, 0.0,  user.email
-            )
+            await create_invoice_request(user.username, projectname, 0.0, user.email)
         # Copy attributes from base course
         bc = await fetch_course(coursetype)
         attrs = await fetch_all_course_attributes(bc.id)

bases/rsptx/admin_server_api/routers/lti1p3.py

@@ -77,6 +77,7 @@
     fetch_instructor_courses,
     validate_user_credentials,
 )
+from rsptx.db.crud.assignment import is_assignment_visible_to_students
 
 from rsptx.configuration import settings
 from rsptx.logging import rslogger
@@ -445,7 +446,10 @@ async def launch(request: Request):
                 status_code=400, detail=f"Assignment {lineitem_assign_id} not found"
             )
 
-        if not rs_assign.visible and not message_launch.check_teacher_access():
+        if (
+            not is_assignment_visible_to_students(rs_assign)
+            and not message_launch.check_teacher_access()
+        ):
             raise HTTPException(
                 status_code=400,
                 detail=f"Assignment {rs_assign.name} is not open for students",
@@ -874,10 +878,19 @@ async def dynamic_link_entry(request: Request):
     assignments.sort(key=lambda a: a.name)
     assignments.sort(key=lambda a: a.duedate)
 
-    # all lineitems in the LMS
-    ags = message_launch.get_ags()
-    l_items = await ags.get_lineitems()
+    try:
+        # all lineitems in the LMS - may be rejected if course is closed in LMS
+        ags = message_launch.get_ags()
+        l_items = await ags.get_lineitems()
+    except LtiServiceException as e:
+        rslogger.error(f"LTI1p3 - Error accessing course line items: {e}")
+        raise HTTPException(
+            status_code=422,
+            detail="This course appears to be closed in your Learning Management System.",
+        )
+
     l_items.sort(key=lambda li: li.get("label"))
+
     # build lookup dicts for line items
     l_items_resourceId_dict = {li.get("resourceId"): li for li in l_items}
     l_items_label_dict = {li.get("label"): li for li in l_items}