Add: Dynamic problems for fitb questions.

Author: bjones1

controllers/ajax.py

@@ -162,7 +162,7 @@ def hsblog():
         # Grade on the server if needed.
         do_server_feedback, feedback = is_server_feedback(div_id, course)
         if do_server_feedback:
-            correct, res_update = fitb_feedback(answer_json, feedback)
+            correct, seed, res_update = fitb_feedback(div_id, answer_json, feedback)
             res.update(res_update)
 
         # Save this data.
@@ -173,6 +173,7 @@ def hsblog():
             answer=answer_json,
             correct=correct,
             course_name=course,
+            dynamic_seed=seed,
         )
 
     elif event == "dragNdrop" and auth.user:
@@ -1191,13 +1192,13 @@ def getAssessResults():
             )
             .first()
         )
-        if not rows:
+        if not rows or rows.answer is None:
             return ""  # server doesn't have it so we load from local storage instead
         #
         res = {"answer": rows.answer, "timestamp": str(rows.timestamp)}
         do_server_feedback, feedback = is_server_feedback(div_id, course)
         if do_server_feedback:
-            correct, res_update = fitb_feedback(rows.answer, feedback)
+            correct, seed, res_update = fitb_feedback(div_id, rows.answer, feedback)
             res.update(res_update)
         return json.dumps(res)
     elif event == "mChoice":

controllers/books.py

@@ -22,6 +22,9 @@
 import logging
 import datetime
 import importlib
+import random
+
+import pytest
 
 
 logger = logging.getLogger(settings.logger)
@@ -258,6 +261,8 @@ def dummy():
         subchapter_list=_subchaptoc(base_course, chapter),
         questions=questions,
         motd=motd,
+        get_random=_get_random,
+        approx=pytest.approx,
     )
 
 
@@ -289,6 +294,36 @@ def _subchaptoc(course, chap):
     return toclist
 
 
+# Get a RNG for a problem.
+def _get_random(div_id):
+    # See if this user has a stored seed; always get the most recent one. If no user is logged in, generate a new seed.
+    row = (
+        db(
+            (db.fitb_answers.div_id == div_id)
+            & (db.fitb_answers.sid == auth.user.username)
+            & (db.fitb_answers.course_name == auth.user.course_name)
+        )
+        .select(db.fitb_answers.dynamic_seed, orderby=~db.fitb_answers.id)
+        .first()
+    ) if auth.user else None
+    # If so, return it. Allow a random seed of 0, hence the ``is not None`` test.
+    if row and row.dynamic_seed is not None:
+        seed = row.dynamic_seed
+    else:
+        # Otherwise, generate one and store it (if a user is logged in).
+        seed = random.randint(-(2 ** 31), 2 ** 31 - 1)
+        if auth.user:
+            db.fitb_answers.insert(
+                sid=auth.user.username,
+                div_id=div_id,
+                course_name=auth.user.course_name,
+                dynamic_seed=seed,
+            )
+
+    # Return a RNG using this seed.
+    return random.Random(seed)
+
+
 def _exercises(basecourse, chapter):
     """
     Given a base course and a chapter return the instructor generated questions

models/db_ebook.py

@@ -113,6 +113,8 @@
     Field("course_name", "string"),
     Field("answer", "string"),
     Field("correct", "boolean"),
+    # The seed used to generate this dynamic problem.
+    Field("dynamic_seed", "integer"),
     migrate=table_migrate_prefix + "fitb_answers.table",
 )
 db.define_table(

modules/feedback.py

@@ -15,10 +15,12 @@
 import tempfile
 from io import open
 import json
+import random
 
 # Third-party imports
 # -------------------
 from gluon import current
+from pytest import approx
 from runestone.lp.lp_common_lib import (
     STUDENT_SOURCE_PATH,
     code_here_comment,
@@ -61,7 +63,7 @@ def is_server_feedback(div_id, course):
 
 # Provide feedback for a fill-in-the-blank problem. This should produce
 # identical results to the code in ``evaluateAnswers`` in ``fitb.js``.
-def fitb_feedback(answer_json, feedback):
+def fitb_feedback(div_id, answer_json, feedback):
     # Grade based on this feedback. The new format is JSON; the old is
     # comma-separated.
     try:
@@ -73,6 +75,11 @@ def fitb_feedback(answer_json, feedback):
         answer = answer_json.split(",")
     displayFeed = []
     isCorrectArray = []
+    db = current.db
+    # For dynamic problems.
+    seed = None
+    locals_ = {}
+    globals_ = {"approx": approx}
     # The overall correctness of the entire problem.
     correct = True
     for blank, feedback_for_blank in zip(answer, feedback):
@@ -85,18 +92,55 @@ def fitb_feedback(answer_json, feedback):
             is_first_item = True
             # Check everything but the last answer, which always matches.
             for fb in feedback_for_blank[:-1]:
-                if "regex" in fb:
-                    if re.search(
-                        fb["regex"], blank, re.I if fb["regexFlags"] == "i" else 0
-                    ):
+                solution_code = fb.get("solution_code")
+                regex = fb.get("regex")
+                number = fb.get("number")
+                if solution_code:
+                    # Run the dynamic code to compute solution prereqs.
+                    dynamic_code = fb.get("dynamic_code")
+                    if dynamic_code:
+                        # Get the seed.
+                        seed = (
+                            db(
+                                (db.fitb_answers.div_id == div_id)
+                                & (db.fitb_answers.sid == current.auth.user.username)
+                                & (
+                                    db.fitb_answers.course_name
+                                    == current.auth.user.course_name
+                                )
+                            )
+                            .select(
+                                db.fitb_answers.dynamic_seed,
+                                orderby=~db.fitb_answers.id,
+                            )
+                            .first()
+                            .dynamic_seed
+                        )
+                        # Set it up.
+                        globals_["random"] = random.Random(seed)
+                        exec(dynamic_code, locals_, globals_)
+
+                    # Compare this solution.
+                    globals_["ans"] = blank
+                    try:
+                        is_correct = eval(solution_code, locals_, globals_)
+                    except:
+                        is_correct = False
+                    if is_correct:
+                        isCorrectArray.append(is_first_item)
+                        if not is_first_item:
+                            correct = False
+                        displayFeed.append(fb["feedback"])
+                        break
+                elif regex:
+                    if re.search(regex, blank, re.I if fb["regexFlags"] == "i" else 0):
                         isCorrectArray.append(is_first_item)
                         if not is_first_item:
                             correct = False
                         displayFeed.append(fb["feedback"])
                         break
                 else:
-                    assert "number" in fb
-                    min_, max_ = fb["number"]
+                    min_, max_ = number
                     try:
                         val = ast.literal_eval(blank)
                         in_range = val >= min_ and val <= max_
@@ -118,7 +162,7 @@ def fitb_feedback(answer_json, feedback):
 
     # Return grading results to the client for a non-test scenario.
     res = dict(correct=correct, displayFeed=displayFeed, isCorrectArray=isCorrectArray)
-    return "T" if correct else "F", res
+    return "T" if correct else "F", seed, res
 
 
 # lp feedback

tests/test_course_1/_sources/index.rst

@@ -101,6 +101,20 @@ Fill in the Blank
        :x: Nope.
 
 
+.. fillintheblank:: fitb_dynamic
+    :dynamic:
+        a = random.randrange(0, 10)
+        b = random.randrange(0, 10)
+
+    What is {{=a}} + {{=b}}?
+
+    -   :int(ans) == a + b: Correct!
+        :int(ans) == a - b: That's subtraction.
+        :int(ans) == a * b: That's multiplication.
+        :float(ans) == approx(a / b): That's division.
+        :x: I don't know what you're doing.
+
+
 Short answers
 -------------
 .. shortanswer:: test_short_answer_1

tests/test_server.py

@@ -986,7 +986,7 @@ def __eq__(self, other):
             "Given name",
             "e-mail",
             "avg grade (%)",
-            "Q-5",
+            "Q-6",
             "Q-2",
             "Q-1",
             "Q-1",