QuizGenerator 0.8.0__py3-none-any.whl → 0.8.1__py3-none-any.whl

QuizGenerator/contentast.py

@@ -2263,6 +2263,10 @@ class Answer(Leaf):
     unit_part = f" {self.unit}" if self.unit else ""
 
     return f"{label_part} {blank}{unit_part}".strip()
+
+  @classmethod
+  def get_entry_warning(cls) -> List[str] | None:
+    return None
   
   # Factory methods for common answer types
   @classmethod
@@ -2330,17 +2334,19 @@ class Answer(Leaf):
       0.123444... → ["0.1234"]
     """
     rounding_digits = Answer.DEFAULT_ROUNDING_DIGITS
-    decimal.getcontext().prec = max(34, rounding_digits + 10)
-
     outs = set()
 
     # Round to our standard precision first
+    decimal.getcontext().prec = max(34, rounding_digits + 10)
     q = decimal.Decimal(1).scaleb(-rounding_digits)
-    rounded_decimal = decimal.Decimal(str(value)).quantize(q, rounding=decimal.ROUND_HALF_UP)
-
-    # Normalize negative zero to positive zero
-    if rounded_decimal == 0:
-      rounded_decimal = abs(rounded_decimal)
+    if isinstance(value, str) and '/' in value:
+      f = Answer._to_fraction(value)
+      decimal_value = decimal.Decimal(f.numerator) / decimal.Decimal(f.denominator)
+    elif isinstance(value, fractions.Fraction):
+      decimal_value = decimal.Decimal(value.numerator) / decimal.Decimal(value.denominator)
+    else:
+      decimal_value = decimal.Decimal(str(value))
+    rounded_decimal = decimal_value.quantize(q, rounding=decimal.ROUND_HALF_UP)
 
     # Fixed decimal form (e.g., "1.2500")
     fixed_str = format(rounded_decimal, 'f')
@@ -2431,6 +2437,15 @@ class AnswerTypes:
 
   # Concrete type answers
   class Float(Answer):
+    @classmethod
+    def get_entry_warning(cls) -> List[str] | None:
+      digits = Answer.DEFAULT_ROUNDING_DIGITS
+      return [
+        f"Round floats to {digits} decimal places (fewer if exact, e.g., `1.25`). "
+        "No mixed numbers (e.g. use `5/4`, not `1 1/4`). "
+        "Integers as integers (e.g., `2`, not `2/1`)."
+      ]
+
     def get_for_canvas(self, single_answer=False) -> List[dict]:
       if single_answer:
         canvas_answers = [
@@ -2460,8 +2475,8 @@ class AnswerTypes:
       return canvas_answers
 
     def get_display_string(self) -> str:
-      rounded = round(self.value, Answer.DEFAULT_ROUNDING_DIGITS)
-      return f"{self.fix_negative_zero(rounded)}"
+      answer_strings = Answer.accepted_strings(self.value)
+      return answer_strings[0] if len(answer_strings) > 0 else f"{self.value}"
 
   class Int(Answer):
 
@@ -2486,6 +2501,10 @@ class AnswerTypes:
     pass
 
   class List(Answer):
+    @classmethod
+    def get_entry_warning(cls) -> List[str] | None:
+      return ["Enter lists as comma-separated values with a space after the comma (e.g., `1, 2, 3`)."]
+
     def __init__(self, order_matters=True, *args, **kwargs):
       super().__init__(*args, **kwargs)
       self.order_matters = order_matters
@@ -2523,6 +2542,13 @@ class AnswerTypes:
     """
     These are self-contained vectors that will go in a single answer block
     """
+
+    @classmethod
+    def get_entry_warning(cls) -> List[str] | None:
+      return [
+        "Enter vectors as comma-separated values with a space after the comma, "
+        "with optional parentheses (e.g., `1, 2` or `(1, 2)`)."
+      ]
   
   # Canvas export methods (from misc.Answer)
     def get_for_canvas(self, single_answer=False) -> List[dict]:
@@ -2565,6 +2591,13 @@ class AnswerTypes:
     """
     Matrix answers generate multiple blank_ids (e.g., M_0_0, M_0_1, M_1_0, M_1_1).
     """
+
+    @classmethod
+    def get_entry_warning(cls) -> List[str] | None:
+      return [
+        "For result matrices, enter `-` in any cell that does not exist.",
+        *AnswerTypes.Float.get_entry_warning()
+      ]
   
     def __init__(self, value, *args, **kwargs):
       super().__init__(value=value, *args, **kwargs)

QuizGenerator/premade_questions/cst334/process.py

@@ -433,13 +433,7 @@ class SchedulingQuestion(ProcessQuestion, RegenerableChoiceMixin, TableQuestionM
       f"Break any ties using the job number."
     )
 
-    instructions = ca.OnlyHtml([ca.Paragraph([
-      f"Please format answer as fractions, mixed numbers, or numbers rounded to a maximum of {ca.Answer.DEFAULT_ROUNDING_DIGITS} digits after the decimal. "
-      "Examples of appropriately formatted answers would be `0`, `3/2`, `1 1/3`, `1.6667`, and `1.25`. "
-      "Note that answers that can be rounded to whole numbers should be, rather than being left in fractional form."
-    ])])
-
-    body = cls.create_fill_in_table_body(intro_text, instructions, scheduling_table)
+    body = cls.create_fill_in_table_body(intro_text, None, scheduling_table)
     body.add_element(average_block)
     return body
   

QuizGenerator/premade_questions/cst463/math_and_data/matrix_questions.py

@@ -352,7 +352,6 @@ class MatrixMultiplication(MatrixMathQuestion):
         answers.extend(table_answers)
         body.add_element(
             ca.OnlyHtml([
-                ca.Paragraph(["Result matrix (use '-' if cell doesn't exist):"]),
                 table
             ])
         )

QuizGenerator/question.py

@@ -382,6 +382,7 @@ class RegenerableChoiceMixin:
         del choice_info['_temp_fixed_value']
 
 class Question(abc.ABC):
+  AUTO_ENTRY_WARNINGS = True
   """
   Base class for all quiz questions with cross-format rendering support.
 
@@ -584,6 +585,10 @@ class Question(abc.ABC):
 
       can_be_numerical = self._can_be_numerical_from_answers(answers)
 
+      if self.AUTO_ENTRY_WARNINGS:
+        warnings = self._entry_warnings_from_answers(answers)
+        components.body = self._append_entry_warnings(components.body, warnings)
+
       config_params = dict(self.config_params)
       if isinstance(ctx, dict) and ctx.get("_config_params"):
         config_params.update(ctx.get("_config_params"))
@@ -723,6 +728,38 @@ class Question(abc.ABC):
         merged.append(ans)
     return merged
 
+  @classmethod
+  def _entry_warnings_from_answers(cls, answers: List[ca.Answer]) -> List[str]:
+    warnings: List[str] = []
+    seen: set[str] = set()
+    for answer in answers:
+      warning = None
+      if hasattr(answer.__class__, "get_entry_warning"):
+        warning = answer.__class__.get_entry_warning()
+      if not warning:
+        continue
+      if isinstance(warning, str):
+        warning_list = [warning]
+      else:
+        warning_list = list(warning)
+      for item in warning_list:
+        if item and item not in seen:
+          warnings.append(item)
+          seen.add(item)
+    return warnings
+
+  @classmethod
+  def _append_entry_warnings(cls, body: ca.Element, warnings: List[str]) -> ca.Element:
+    if not warnings:
+      return body
+    notes_lines = ["**Notes for answer entry**", ""]
+    notes_lines.extend(f"- {warning}" for warning in warnings)
+    warning_elements = ca.OnlyHtml([ca.Text("\n".join(notes_lines))])
+    if isinstance(body, ca.Container):
+      body.add_element(warning_elements)
+      return body
+    return ca.Section([body, warning_elements])
+
   @classmethod
   def _can_be_numerical_from_answers(cls, answers: List[ca.Answer]) -> bool:
     return (

{quizgenerator-0.8.0.dist-info → quizgenerator-0.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QuizGenerator
-Version: 0.8.0
+Version: 0.8.1
 Summary: Generate randomized quiz questions for Canvas LMS and PDF exams
 Project-URL: Homepage, https://github.com/OtterDen-Lab/QuizGenerator
 Project-URL: Documentation, https://github.com/OtterDen-Lab/QuizGenerator/tree/main/documentation

{quizgenerator-0.8.0.dist-info → quizgenerator-0.8.1.dist-info}/RECORD

@@ -1,13 +1,13 @@
 QuizGenerator/__init__.py,sha256=8EV-k90A3PNC8Cm2-ZquwNyVyvnwW1gs6u-nGictyhs,840
 QuizGenerator/__main__.py,sha256=Dd9w4R0Unm3RiXztvR4Y_g9-lkWp6FHg-4VN50JbKxU,151
 QuizGenerator/constants.py,sha256=AO-UWwsWPLb1k2JW6KP8rl9fxTcdT0rW-6XC6zfnDOs,4386
-QuizGenerator/contentast.py,sha256=6eqhgjAGrkFQUoEOnnEuGIyllGnNC4354aP8IvnGCx4,86316
+QuizGenerator/contentast.py,sha256=uTql3nvNg8DZnPxOg7S31vXbifSNfb3rFK5c_ihLsbg,87615
 QuizGenerator/generate.py,sha256=dqF-WWmWxyJmPHl0gTYr3gNNxyF877fvXYaMvYA3uA8,15790
 QuizGenerator/misc.py,sha256=MXrguUhhdrWSV4Hqdl4G21ktowODu1AcKy6-5mvy3aI,454
 QuizGenerator/mixins.py,sha256=B9Ee52wUCeclmBTgonasHNo0WHvVOcnILsz0iecrf78,15705
 QuizGenerator/performance.py,sha256=CM3zLarJXN5Hfrl4-6JRBqD03j4BU1B2QW699HAr1Ds,7002
 QuizGenerator/qrcode_generator.py,sha256=S3mzZDk2UiHiw6ipSCpWPMhbKvSRR1P5ordZJUTo6ug,10776
-QuizGenerator/question.py,sha256=cfhCViOSI4p7rcQHE2igv1-aWZgyEKU6rUqJ25VHkfU,32304
+QuizGenerator/question.py,sha256=QsLKFEM8LzLkH1_5MOwMFRuqtTkEd7-a_eoaTKcttpU,33602
 QuizGenerator/quiz.py,sha256=CEWy7FB7BZiK33s_wYs6MqGKDetc6htUaqvP3--2HzI,21621
 QuizGenerator/regenerate.py,sha256=ZAs1mtERmO8JXza2tBqJpd-uJs9V7gS1jJ9A9gSb8jo,19764
 QuizGenerator/typst_utils.py,sha256=JGQn_u5bEHd8HAtjAHuZoVJwLkx-Rd4ZCBWffwFZa3o,3136
@@ -22,7 +22,7 @@ QuizGenerator/premade_questions/cst334/math_questions.py,sha256=aUYbQxneL5MXE7Xo
 QuizGenerator/premade_questions/cst334/memory_questions.py,sha256=g0EFJ2HUogYnOYMWYyn-z4lEv15Pfv5IdSvj0xGoKbI,51050
 QuizGenerator/premade_questions/cst334/ostep13_vsfs.py,sha256=d9jjrynEw44vupAH_wKl57UoHooCNEJXaC5DoNYualk,16163
 QuizGenerator/premade_questions/cst334/persistence_questions.py,sha256=9mgsX-3oWDQgm_n2YwmFSil0QPyzsruHzuqB-hfGMuA,16220
-QuizGenerator/premade_questions/cst334/process.py,sha256=J9sk-tXeuCDFk2hHm_h9XJE40avacQWPNGf92yp4EjA,37682
+QuizGenerator/premade_questions/cst334/process.py,sha256=0SqXkvdxaEJZXJA8fBqheh7F0PL8I6xgO5a8u2s2po4,37238
 QuizGenerator/premade_questions/cst463/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 QuizGenerator/premade_questions/cst463/gradient_descent/__init__.py,sha256=sH2CUV6zK9FT3jWTn453ys6_JTrUKRtZnU8hK6RmImU,240
 QuizGenerator/premade_questions/cst463/gradient_descent/gradient_calculation.py,sha256=laBeC0tMc2EaLzCotGHQNzePPPOKS1EGgQirigNyi9M,13479
@@ -30,7 +30,7 @@ QuizGenerator/premade_questions/cst463/gradient_descent/gradient_descent_questio
 QuizGenerator/premade_questions/cst463/gradient_descent/loss_calculations.py,sha256=8GtJX1DNNox-AgMvABFkRgmHB-lvrxMZKzv-3Ils_Jg,22380
 QuizGenerator/premade_questions/cst463/gradient_descent/misc.py,sha256=0R-nFeD3zsqJyde5CXWrF6Npjmpx6_HbzfCbThLi3os,2657
 QuizGenerator/premade_questions/cst463/math_and_data/__init__.py,sha256=EbIaUrx7_aK9j3Gd8Mk08h9GocTq_0OoNu2trfNwaU8,202
-QuizGenerator/premade_questions/cst463/math_and_data/matrix_questions.py,sha256=4HsMflR1Fm-yjD0J3iW057_q3UHDRiW-swzOd5D73Ys,15647
+QuizGenerator/premade_questions/cst463/math_and_data/matrix_questions.py,sha256=4DLdo_8XDS_xtPA8R-wH4K0cKnMn4r5727Vszz8keTc,15565
 QuizGenerator/premade_questions/cst463/math_and_data/vector_questions.py,sha256=VXQCLQEeNKxRDPn_fGW5nAPX-0betrZ8mURh0ElbNz0,12668
 QuizGenerator/premade_questions/cst463/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 QuizGenerator/premade_questions/cst463/models/attention.py,sha256=iECxOoR0LEJAH_d7ZE3MoLOkdYVbGOKo4Dwf8Pww0tM,5443
@@ -43,8 +43,8 @@ QuizGenerator/premade_questions/cst463/neural-network-basics/__init__.py,sha256=
 QuizGenerator/premade_questions/cst463/neural-network-basics/neural_network_questions.py,sha256=bit_HfAG4K6yh9SZZw_HAPhFUVFkOBdZ2odwt-Cdvmo,42868
 QuizGenerator/premade_questions/cst463/tensorflow-intro/__init__.py,sha256=G1gEHtG4KakYgi8ZXSYYhX6bQRtnm2tZVGx36d63Nmo,173
 QuizGenerator/premade_questions/cst463/tensorflow-intro/tensorflow_questions.py,sha256=jZRbEqb65BAtliv_V9VR4kvpwOt-o10ApN7RmOIg3XI,30464
-quizgenerator-0.8.0.dist-info/METADATA,sha256=W3Cb-jkrgfxtWGBJ7zynREY_q-_3q53rKpQ0eFC9OCw,8113
-quizgenerator-0.8.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-quizgenerator-0.8.0.dist-info/entry_points.txt,sha256=aOIdRdw26xY8HkxOoKHBnUPe2mwGv5Ti3U1zojb6zxQ,98
-quizgenerator-0.8.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-quizgenerator-0.8.0.dist-info/RECORD,,
+quizgenerator-0.8.1.dist-info/METADATA,sha256=Ef_TPUm2UKYIXnBMiaip6SaAyRjMD4G1MNdVejagfRw,8113
+quizgenerator-0.8.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+quizgenerator-0.8.1.dist-info/entry_points.txt,sha256=aOIdRdw26xY8HkxOoKHBnUPe2mwGv5Ti3U1zojb6zxQ,98
+quizgenerator-0.8.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+quizgenerator-0.8.1.dist-info/RECORD,,