QuizGenerator 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

QuizGenerator/canvas/__init__.py

@@ -1,7 +1,7 @@
 """
 Canvas LMS integration for QuizGenerator.
 
-Vendored from LMSInterface v0.1.0 (2025-11-18)
+Vendored from LMSInterface v0.1.0 (2025-11-24)
 
 This module provides Canvas API integration for uploading quizzes
 and managing course content.
@@ -9,5 +9,5 @@ and managing course content.
 
 __version__ = "0.1.0"
 __vendored_from__ = "LMSInterface"
-__vendored_date__ = "2025-11-18"
+__vendored_date__ = "2025-11-24"
 

QuizGenerator/canvas/canvas_interface.py

@@ -159,7 +159,12 @@ class CanvasCourse(LMSWrapper):
 
         question_fingerprint = question_for_canvas["question_text"]
         try:
-          question_fingerprint += ''.join([str(a["answer_text"]) for a in question_for_canvas["answers"]])
+          question_fingerprint += ''.join([
+            '|'.join([
+              f"{k}:{a[k]}" for k in sorted(a.keys())
+            ])
+            for a in question_for_canvas["answers"]
+          ])
         except TypeError as e:
           log.error(e)
           log.warning("Continuing anyway")

QuizGenerator/contentast.py

@@ -75,7 +75,10 @@ class ContentAST:
         html_output = section.render("html")
     """
     def __init__(self, elements=None, add_spacing_before=False):
-      self.elements : List[ContentAST.Element] = elements or []
+      self.elements : List[ContentAST.Element] = [
+        e if isinstance(e, ContentAST.Element) else ContentAST.Text(e)
+        for e in (elements if elements else [])
+      ]
       self.add_spacing_before = add_spacing_before
     
     def __str__(self):
@@ -436,7 +439,8 @@ class ContentAST:
         interest=1.0,
         spacing=0,
         topic=None,
-        question_number=None
+        question_number=None,
+        **kwargs
     ):
       super().__init__()
       self.name = name
@@ -447,14 +451,21 @@ class ContentAST:
       self.spacing = spacing
       self.topic = topic  # todo: remove this bs.
       self.question_number = question_number  # For QR code generation
+      
+      self.default_kwargs = kwargs
     
     def render(self, output_format, **kwargs):
+      updated_kwargs = self.default_kwargs
+      updated_kwargs.update(kwargs)
+      
+      log.debug(f"updated_kwargs: {updated_kwargs}")
+      
       # Special handling for latex and typst - use dedicated render methods
       if output_format == "typst":
         return self.render_typst(**kwargs)
       
       # Generate content from all elements
-      content = self.body.render(output_format, **kwargs)
+      content = self.body.render(output_format, **updated_kwargs)
       
       # If output format is latex, add in minipage and question environments
       if output_format == "latex":
@@ -1420,7 +1431,11 @@ class ContentAST:
         key_to_display = self.answer[0].key
       return f"{self.label + (':' if len(self.label) > 0 else '')} [{key_to_display}] {self.unit}".strip()
     
-    def render_html(self, show_answers=False, **kwargs):
+    def render_html(self, show_answers=False, can_be_numerical=False, **kwargs):
+      log.debug(f"can_be_numerical: {can_be_numerical}")
+      log.debug(f"kwargs: {kwargs}")
+      if can_be_numerical:
+        return f"Calculate {self.label}"
       if show_answers and self.answer:
         # Show actual answer value using formatted display string
         if not isinstance(self.answer, list):

QuizGenerator/generate.py

@@ -25,6 +25,8 @@ def parse_args():
     default=os.path.join(Path.home(), '.env'),
     help="Path to .env file specifying canvas details"
   )
+  
+  parser.add_argument("--debug", action="store_true", help="Set logging level to debug")
 
   parser.add_argument("--quiz_yaml", default=os.path.join(os.path.dirname(os.path.abspath(__file__)), "example_files/exam_generation.yaml"))
   parser.add_argument("--seed", type=int, default=None,
@@ -211,6 +213,21 @@ def main():
   
   # Load environment variables
   load_dotenv(args.env)
+  
+  if args.debug:
+    # Set root logger to DEBUG
+    logging.getLogger().setLevel(logging.DEBUG)
+
+    # Set all handlers to DEBUG level
+    for handler in logging.getLogger().handlers:
+      handler.setLevel(logging.DEBUG)
+
+    # Set named loggers to DEBUG
+    for logger_name in ['QuizGenerator', 'lms_interface', '__main__']:
+      logger = logging.getLogger(logger_name)
+      logger.setLevel(logging.DEBUG)
+      for handler in logger.handlers:
+        handler.setLevel(logging.DEBUG)
 
   if args.command == "TEST":
     test()
@@ -233,4 +250,4 @@ def main():
 
 
 if __name__ == "__main__":
-  main()
+  main()

QuizGenerator/misc.py

@@ -6,7 +6,7 @@ import enum
 import itertools
 import logging
 import math
-from typing import List, Dict, Tuple
+from typing import List, Dict, Tuple, Any
 
 import fractions
 
@@ -23,11 +23,12 @@ class Answer:
   
   class AnswerKind(enum.Enum):
     BLANK = "fill_in_multiple_blanks_question"
-    MULTIPLE_ANSWER = "multiple_answers_question"  # todo: have baffles?
+    MULTIPLE_ANSWER = "multiple_answers_question"
     ESSAY = "essay_question"
     MULTIPLE_DROPDOWN = "multiple_dropdowns_question"
+    NUMERICAL_QUESTION = "numerical_question" # note: these can only be single answers as far as I can tell
     
-  class VariableKind(enum.Enum): # todo: use these for generate variations?
+  class VariableKind(enum.Enum):
     STR = enum.auto()
     INT = enum.auto()
     FLOAT = enum.auto()
@@ -66,7 +67,7 @@ class Answer:
     self.baffles = baffles
     self.pdf_only = pdf_only
   
-  def get_for_canvas(self) -> List[Dict]:
+  def get_for_canvas(self, single_answer=False) -> List[Dict]:
     # If this answer is marked as PDF-only, don't send it to Canvas
     if self.pdf_only:
       return []
@@ -131,18 +132,29 @@ class Answer:
       Answer.VariableKind.FLOAT,
       Answer.VariableKind.INT
     ]:
-      # Use the accepted_strings helper with settings that match the original AUTOFLOAT behavior
-      answer_strings = self.__class__.accepted_strings(
-        self.value,
-        allow_integer=True,
-        allow_simple_fraction=True,
-        max_denominator=3*4*5,  # For process questions, these are the numbers of jobs we'd have
-        allow_mixed=True,
-        include_spaces=False,
-        include_fixed_even_if_integer=True
-      )
-
-      canvas_answers = [
+      if single_answer:
+        canvas_answers = [
+          {
+            "numerical_answer_type": "exact_answer",
+            "answer_text": round(self.value, self.DEFAULT_ROUNDING_DIGITS),
+            "answer_exact": round(self.value, self.DEFAULT_ROUNDING_DIGITS),
+            "answer_error_margin": 0.1,
+            "answer_weight": 100 if self.correct else 0,
+          }
+        ]
+      else:
+        # Use the accepted_strings helper with settings that match the original AUTOFLOAT behavior
+        answer_strings = self.__class__.accepted_strings(
+          self.value,
+          allow_integer=True,
+          allow_simple_fraction=True,
+          max_denominator=3*4*5,  # For process questions, these are the numbers of jobs we'd have
+          allow_mixed=True,
+          include_spaces=False,
+          include_fixed_even_if_integer=True
+        )
+  
+        canvas_answers = [
         {
           "blank_id": self.key,
           "answer_text": answer_string,
@@ -476,5 +488,4 @@ class Answer:
           whole, rem = divmod(A, b)
           outs.add(f"{sign}{whole} {rem}/{b}")
     
-    return sorted(outs, key=lambda s: (len(s), s))
-
+    return sorted(outs, key=lambda s: (len(s), s))

QuizGenerator/premade_questions/cst334/memory_questions.py

@@ -190,6 +190,8 @@ class CachingQuestion(MemoryQuestion, RegenerableChoiceMixin, TableQuestionMixin
     self.num_elements = self.config_params.get("num_elements", 5)
     self.cache_size = self.config_params.get("cache_size", 3)
     self.num_requests = self.config_params.get("num_requests", 10)
+    
+    self.hit_rate = 0. # placeholder
 
   def refresh(self, previous: Optional[CachingQuestion] = None, *args, hard_refresh: bool = False, **kwargs):
     # Call parent refresh which seeds RNG and calls is_interesting()
@@ -200,7 +202,7 @@ class CachingQuestion(MemoryQuestion, RegenerableChoiceMixin, TableQuestionMixin
     self.cache_policy = self.get_choice('policy', self.Kind)
 
     self.requests = (
-        list(range(self.cache_size))  # Prime the cache with the compulsory misses
+        list(range(self.cache_size))  # Prime the cache with the capacity misses
         + self.rng.choices(
       population=list(range(self.cache_size - 1)), k=1
     )  # Add in one request to an earlier  that will differentiate clearly between FIFO and LRU
@@ -274,7 +276,7 @@ class CachingQuestion(MemoryQuestion, RegenerableChoiceMixin, TableQuestionMixin
     hit_rate_block = ContentAST.AnswerBlock(
       ContentAST.Answer(
         answer=self.answers["answer__hit_rate"],
-        label=f"Hit rate, excluding compulsory misses.  If appropriate, round to {Answer.DEFAULT_ROUNDING_DIGITS} decimal digits.",
+        label=f"Hit rate, excluding capacity misses.  If appropriate, round to {Answer.DEFAULT_ROUNDING_DIGITS} decimal digits.",
         unit="%"
       )
     )
@@ -324,7 +326,7 @@ class CachingQuestion(MemoryQuestion, RegenerableChoiceMixin, TableQuestionMixin
           "To calculate the hit rate we calculate the percentage of requests "
           "that were cache hits out of the total number of requests. "
           f"In this case we are counting only all but {self.cache_size} requests, "
-          f"since we are excluding compulsory misses."
+          f"since we are excluding capacity misses."
         ]
       )
     )

QuizGenerator/question.py

@@ -11,6 +11,7 @@ import itertools
 import os
 import pathlib
 import pkgutil
+import pprint
 import random
 import re
 import uuid
@@ -522,7 +523,9 @@ class Question(abc.ABC):
       explanation=explanation,
       value=self.points_value,
       spacing=self.spacing,
-      topic=self.topic
+      topic=self.topic,
+      
+      can_be_numerical=self.can_be_numerical()
     )
 
     # Attach regeneration metadata to the question AST
@@ -534,7 +537,7 @@ class Question(abc.ABC):
     question_ast.config_params = dict(self.config_params)
 
     return question_ast
-  
+   
   @abc.abstractmethod
   def get_body(self, **kwargs) -> ContentAST.Section:
     """
@@ -555,11 +558,20 @@ class Question(abc.ABC):
     )
   
   def get_answers(self, *args, **kwargs) -> Tuple[Answer.AnswerKind, List[Dict[str,Any]]]:
+    if self.can_be_numerical():
+      return (
+        Answer.AnswerKind.NUMERICAL_QUESTION,
+        list(itertools.chain(*[a.get_for_canvas(single_answer=True) for a in self.answers.values()]))
+      )
+    elif len(self.answers.values()) > 0:
+      return (
+        self.answer_kind,
+        list(itertools.chain(*[a.get_for_canvas() for a in self.answers.values()]))
+      )
     return (
-      self.answer_kind,
-      list(itertools.chain(*[a.get_for_canvas() for a in self.answers.values()]))
+      Answer.AnswerKind.ESSAY, []
     )
-
+    
   def refresh(self, rng_seed=None, *args, **kwargs):
     """If it is necessary to regenerate aspects between usages, this is the time to do it.
     This base implementation simply resets everything.
@@ -621,7 +633,13 @@ class Question(abc.ABC):
       "answers": answers,
       "neutral_comments_html": explanation_html
     }
-
+  
+  def can_be_numerical(self):
+    if (len(self.answers.values()) == 1
+          and list(self.answers.values())[0].variable_kind in [Answer.VariableKind.FLOAT, Answer.VariableKind.AUTOFLOAT]
+    ):
+      return True
+    return False
 
 class QuestionGroup():
   

{quizgenerator-0.1.2.dist-info → quizgenerator-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QuizGenerator
-Version: 0.1.2
+Version: 0.1.4
 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.1.2.dist-info → quizgenerator-0.1.4.dist-info}/RECORD

@@ -2,25 +2,25 @@ QuizGenerator/README.md,sha256=4n16gKyhIAKRBX4VKlpfcK0pyUYJ6Ht08MUsnwgxrZo,145
 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=bHC1D_OBrDCnTuXcTiI37Muk20mBxD1gjDArUBrGv9c,63657
-QuizGenerator/generate.py,sha256=HK8TtfQwkj59n0_BVSrej_CuQUnDwoIGlqDikI4YwK4,6613
+QuizGenerator/contentast.py,sha256=3yvgtpw4ZSN9Cxfiq7QncT0JMoLoX4XuQ57GeIkfRj8,64171
+QuizGenerator/generate.py,sha256=o2XezoSE0u-qjxYu1_Ofm9Lpkza7M2Tg47C-ClMcPsE,7197
 QuizGenerator/logging.yaml,sha256=VJCdh26D8e_PNUs4McvvP1ojz9EVjQNifJzfhEk1Mbo,1114
-QuizGenerator/misc.py,sha256=uIc1revyGZK8LL-1sJfhsoJ_MlYn75LPap6FRAiJWRQ,15635
+QuizGenerator/misc.py,sha256=HE6B49IQ4E2EdAIO2yprlluVRS5dtWtFsiIkk68zY2E,16125
 QuizGenerator/mixins.py,sha256=RjV76C1tkTLSvhSoMys67W7UmR6y6wAAcBM2Msxdpd0,18186
 QuizGenerator/performance.py,sha256=CM3zLarJXN5Hfrl4-6JRBqD03j4BU1B2QW699HAr1Ds,7002
 QuizGenerator/qrcode_generator.py,sha256=S3mzZDk2UiHiw6ipSCpWPMhbKvSRR1P5ordZJUTo6ug,10776
-QuizGenerator/question.py,sha256=ZA-Yl28mtBXV3GgUipqogL9pKEBiLYzHq_io9wLXcKo,25390
+QuizGenerator/question.py,sha256=c72zJMoUGH-Io7XVaR1kLBzlW_s-0W0_XeMy9gbIuIg,26004
 QuizGenerator/quiz.py,sha256=wOuj_mDfdnUNHlAEAcLUZoH-JX57RovLoYW4mA0GgPc,18762
 QuizGenerator/typst_utils.py,sha256=XtMEO1e4_Tg0G1zR9D1fmrYKlUfHenBPdGoCKR0DhZg,3154
-QuizGenerator/canvas/__init__.py,sha256=qsgHE4cz_WBXYZ3DZ_fEqLXUKbm-fH6oLkNUAnX96HY,286
-QuizGenerator/canvas/canvas_interface.py,sha256=vbfLX9BBKIOwkVyiXzrwIsjdRbl6jYTnxznt-ymARrM,24407
+QuizGenerator/canvas/__init__.py,sha256=TwFP_zgxPIlWtkvIqQ6mcvBNTL9swIH_rJl7DGKcvkQ,286
+QuizGenerator/canvas/canvas_interface.py,sha256=wsEWh2lonUMgmbtXF-Zj59CAM_0NInoaERqsujlYMfc,24501
 QuizGenerator/canvas/classes.py,sha256=v_tQ8t_JJplU9sv2p4YctX45Fwed1nQ2HC1oC9BnDNw,7594
 QuizGenerator/premade_questions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 QuizGenerator/premade_questions/basic.py,sha256=wAvVZED6a7VToIvSCdAx6SrExmR0xVRo5dL40kycdXI,3402
 QuizGenerator/premade_questions/cst334/__init__.py,sha256=BTz-Os1XbwIRKqAilf2UIva2NlY0DbA_XbSIggO2Tdk,36
 QuizGenerator/premade_questions/cst334/languages.py,sha256=N5vcmZi-AFM_BZypnvNogHD7s--28-j-8tykYg6CBzs,14388
 QuizGenerator/premade_questions/cst334/math_questions.py,sha256=za8lNqhM0RB8qefmPP-Ww0WB_SQn0iRcBKOrZgyHCQQ,9290
-QuizGenerator/premade_questions/cst334/memory_questions.py,sha256=s887hyUyOBcUa53zhPxwdOV2YbJChSywZNpTtAqeljs,51561
+QuizGenerator/premade_questions/cst334/memory_questions.py,sha256=QhCALX7nzq_moLnkok4JVNO4crtmJnosg7_xOZL_5-c,51597
 QuizGenerator/premade_questions/cst334/ostep13_vsfs.py,sha256=d9jjrynEw44vupAH_wKl57UoHooCNEJXaC5DoNYualk,16163
 QuizGenerator/premade_questions/cst334/persistence_questions.py,sha256=em-HzFRnaroDmHl5uA771HyFMI7dMvG-gxTgsB3ecaY,14458
 QuizGenerator/premade_questions/cst334/process.py,sha256=C7-FzOGW7EzQHXZNKden7eHo1NoG0UQbci0ZrUtybzs,23732
@@ -37,8 +37,8 @@ QuizGenerator/premade_questions/cst463/neural-network-basics/__init__.py,sha256=
 QuizGenerator/premade_questions/cst463/neural-network-basics/neural_network_questions.py,sha256=7ZtCQ2fXhIPSd99TstQfOKCN13GJE_56UfBQKdmzmMI,42398
 QuizGenerator/premade_questions/cst463/tensorflow-intro/__init__.py,sha256=G1gEHtG4KakYgi8ZXSYYhX6bQRtnm2tZVGx36d63Nmo,173
 QuizGenerator/premade_questions/cst463/tensorflow-intro/tensorflow_questions.py,sha256=dPn8Sj0yk4m02np62esMKZ7CvcljhYq3Tq51nY9aJnA,29781
-quizgenerator-0.1.2.dist-info/METADATA,sha256=GpIkM0qosTZY2p0NFI7K1Zg3g33mUOTuHtlz82awGvI,7149
-quizgenerator-0.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-quizgenerator-0.1.2.dist-info/entry_points.txt,sha256=iViWMzswXGe88WKoue_Ib-ODUSiT_j_6f1us28w9pkc,56
-quizgenerator-0.1.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-quizgenerator-0.1.2.dist-info/RECORD,,
+quizgenerator-0.1.4.dist-info/METADATA,sha256=ebekoIHR35xPw-W6sVVHxD1xQulJioslbCYtT8uCfiE,7149
+quizgenerator-0.1.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+quizgenerator-0.1.4.dist-info/entry_points.txt,sha256=iViWMzswXGe88WKoue_Ib-ODUSiT_j_6f1us28w9pkc,56
+quizgenerator-0.1.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+quizgenerator-0.1.4.dist-info/RECORD,,