QuizGenerator 0.1.2__tar.gz → 0.1.4__tar.gz

{quizgenerator-0.1.2 → quizgenerator-0.1.4}/PKG-INFO

@@ -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 → quizgenerator-0.1.4}/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-0.1.2 → quizgenerator-0.1.4}/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-0.1.2 → quizgenerator-0.1.4}/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-0.1.2 → quizgenerator-0.1.4}/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-0.1.2 → quizgenerator-0.1.4}/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-0.1.2 → quizgenerator-0.1.4}/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-0.1.2 → quizgenerator-0.1.4}/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.4/example_files/scratch.yaml

@@ -0,0 +1,15 @@
+name: "(scratch quiz))"
+questions:
+  # Vector Questions - Multipart
+  10:
+    AverageMemoryAccessTime:
+      class: cst334.AverageMemoryAccessTime
+
+#    CachingQuestion:
+#      class: cst334.CachingQuestion
+#
+#    VirtualAddressParts:
+#      class: cst334.VirtualAddressParts
+#
+#    SchedulingQuestion:
+#      class: cst334.SchedulingQuestion

{quizgenerator-0.1.2 → quizgenerator-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "QuizGenerator"
-version = "0.1.2"
+version = "0.1.4"
 description = "Generate randomized quiz questions for Canvas LMS and PDF exams"
 readme = "README.md"
 license = {text = "GPL-3.0-or-later"}

{quizgenerator-0.1.2 → quizgenerator-0.1.4}/scripts/vendor_lms_interface.py

@@ -16,6 +16,7 @@ import argparse
 import re
 import shutil
 import sys
+import os
 from pathlib import Path
 from datetime import datetime
 
@@ -106,15 +107,15 @@ __vendored_date__ = "{datetime.now().strftime('%Y-%m-%d')}"
     return True
 
 
-def update_generate_quiz_imports(repo_root: Path, dry_run: bool = False):
+def update_generate_quiz_imports(target_dir: Path, dry_run: bool = False):
     """Update imports in generate_quiz.py"""
-    generate_quiz = repo_root / "generate_quiz.py"
+    generate_quiz = target_dir / "generate.py"
 
     if not generate_quiz.exists():
         print(f"  ❌ Warning: {generate_quiz} not found")
         return False
 
-    print(f"\n📝 Updating imports in generate_quiz.py")
+    print(f"\n📝 Updating imports in generate.py")
 
     content = generate_quiz.read_text()
 
@@ -236,7 +237,7 @@ def verify_structure(repo_root: Path, dry_run: bool = False):
         "QuizGenerator/canvas/__init__.py",
         "QuizGenerator/canvas/canvas_interface.py",
         "QuizGenerator/canvas/classes.py",
-        "generate_quiz.py",
+        "QuizGenerator/generate.py",
         "pyproject.toml",
     ]
 
@@ -306,7 +307,7 @@ def main():
     success = True
     success &= copy_lms_files(lms_source, target_dir, args.dry_run)
     success &= update_canvas_init(target_dir, version, args.dry_run)
-    success &= update_generate_quiz_imports(repo_root, args.dry_run)
+    success &= update_generate_quiz_imports((repo_root / "QuizGenerator"), args.dry_run)
     success &= update_pyproject_toml(repo_root, lms_path, args.dry_run)
 
     if not args.dry_run:
@@ -320,8 +321,8 @@ def main():
         print("\nNext steps:")
         print("  1. Review changes: git diff")
         print("  2. Check dependencies in pyproject.toml")
-        print("  3. Test: uv sync && python generate_quiz.py --help")
-        print("  4. Commit: git add QuizGenerator/canvas/ generate_quiz.py pyproject.toml")
+        print("  3. Test: uv sync && python QuizGenerator/generate.py --help")
+        print("  4. Commit: git add QuizGenerator/canvas/ QuizGenerator/generate.py pyproject.toml")
     else:
         print("⚠️  Completed with warnings - please review output above")
         return 1

{quizgenerator-0.1.2 → quizgenerator-0.1.4}/uv.lock

@@ -873,7 +873,7 @@ wheels = [
 
 [[package]]
 name = "quizgenerator"
-version = "0.1.0"
+version = "0.1.4"
 source = { editable = "." }
 dependencies = [
     { name = "canvasapi" },

quizgenerator-0.1.2/example_files/scratch.yaml

@@ -1,72 +0,0 @@
-name: "Comprehensive Vector and Matrix Questions"
-questions:
-  # Vector Questions - Multipart
-  10:
-    vector addition 4-part:
-      class: VectorAddition
-      num_subquestions: 4
-      kwargs:
-        spacing: 2
-
-  9:
-    vector scalar multiplication 3-part:
-      class: VectorScalarMultiplication
-      num_subquestions: 3
-      kwargs:
-        spacing: 2
-
-  8:
-    vector dot product 4-part:
-      class: VectorDotProduct
-      num_subquestions: 4
-      kwargs:
-        spacing: 2
-
-  7:
-    vector magnitude 3-part:
-      class: VectorMagnitude
-      num_subquestions: 3
-      kwargs:
-        spacing: 2
-
-  # Matrix Questions - Multipart
-  6:
-    matrix addition 4-part:
-      class: MatrixAddition
-      num_subquestions: 4
-      kwargs:
-        spacing: 2
-
-  5:
-    matrix scalar multiplication 3-part:
-      class: MatrixScalarMultiplication
-      num_subquestions: 3
-      kwargs:
-        spacing: 2
-
-  4:
-    matrix multiplication 2-part:
-      class: MatrixMultiplication
-      num_subquestions: 2
-      kwargs:
-        spacing: 2
-
-  # Vector Questions - Single
-  3:
-    single vector addition:
-      class: VectorAddition
-      kwargs:
-        spacing: 2
-
-  2:
-    single vector dot product:
-      class: VectorDotProduct
-      kwargs:
-        spacing: 2
-
-  # Matrix Questions - Single
-  1:
-    single matrix addition:
-      class: MatrixAddition
-      kwargs:
-        spacing: 2