QuizGenerator 0.4.2__py3-none-any.whl → 0.6.0__py3-none-any.whl

QuizGenerator/premade_questions/cst334/persistence_questions.py

@@ -5,8 +5,8 @@ import abc
 import difflib
 import logging
 
-from QuizGenerator.question import Question, Answer, QuestionRegistry
-from QuizGenerator.contentast import ContentAST
+from QuizGenerator.question import Question, QuestionRegistry
+from QuizGenerator.contentast import ContentAST, AnswerTypes
 from QuizGenerator.mixins import TableQuestionMixin, BodyTemplatesMixin
 
 log = logging.getLogger(__name__)
@@ -36,25 +36,21 @@ class HardDriveAccessTime(IOQuestion, TableQuestionMixin, BodyTemplatesMixin):
     self.disk_access_delay = self.access_delay * self.number_of_reads + self.transfer_delay
     
     self.answers.update({
-      "answer__rotational_delay": Answer.float_value(
-        "answer__rotational_delay",
-        self.rotational_delay
-      ),
-      "answer__access_delay": Answer.float_value(
-        "answer__access_delay",
-        self.access_delay
-      ),
-      "answer__transfer_delay": Answer.float_value(
-        "answer__transfer_delay",
-        self.transfer_delay
-      ),
-      "answer__disk_access_delay": Answer.float_value(
-        "answer__disk_access_delay",
-        self.disk_access_delay
-      ),
+      "answer__rotational_delay"  : AnswerTypes.Float(self.rotational_delay),
+      "answer__access_delay"      : AnswerTypes.Float(self.access_delay),
+      "answer__transfer_delay"    : AnswerTypes.Float(self.transfer_delay),
+      "answer__disk_access_delay" : AnswerTypes.Float(self.disk_access_delay),
     })
   
-  def get_body(self, *args, **kwargs) -> ContentAST.Section:
+  def _get_body(self, *args, **kwargs):
+    """Build question body and collect answers."""
+    answers = [
+      self.answers["answer__rotational_delay"],
+      self.answers["answer__access_delay"],
+      self.answers["answer__transfer_delay"],
+      self.answers["answer__disk_access_delay"],
+    ]
+
     # Create parameter info table using mixin
     parameter_info = {
       "Hard Drive Rotation Speed": f"{self.hard_drive_rotation_speed}RPM",
@@ -84,8 +80,8 @@ class HardDriveAccessTime(IOQuestion, TableQuestionMixin, BodyTemplatesMixin):
     intro_text = "Given the information below, please calculate the following values."
 
     instructions = (
-      f"Make sure your answers are rounded to {Answer.DEFAULT_ROUNDING_DIGITS} decimal points "
-      f"(even if they are whole numbers), and do so after you finish all your calculations! "
+      f"Make sure that if you round your answers you use the unrounded values for your final calculations, "
+      f"otherwise you may introduce error into your calculations."
       f"(i.e. don't use your rounded answers to calculate your overall answer)"
     )
 
@@ -96,9 +92,14 @@ class HardDriveAccessTime(IOQuestion, TableQuestionMixin, BodyTemplatesMixin):
       additional_instructions=instructions
     )
 
+    return body, answers
+
+  def get_body(self, *args, **kwargs) -> ContentAST.Section:
+    """Build question body (backward compatible interface)."""
+    body, _ = self._get_body(*args, **kwargs)
     return body
-  
-  def get_explanation(self) -> ContentAST.Section:
+
+  def _get_explanation(self):
     explanation = ContentAST.Section()
     
     explanation.add_element(
@@ -150,6 +151,11 @@ class HardDriveAccessTime(IOQuestion, TableQuestionMixin, BodyTemplatesMixin):
         f"= {self.number_of_reads} \\cdot {self.access_delay:0.2f} + {self.transfer_delay:0.2f} "
         f"= {self.disk_access_delay:0.2f}ms")
     ])
+    return explanation, []
+
+  def get_explanation(self) -> ContentAST.Section:
+    """Build question explanation (backward compatible interface)."""
+    explanation, _ = self._get_explanation()
     return explanation
 
 
@@ -172,13 +178,21 @@ class INodeAccesses(IOQuestion, TableQuestionMixin, BodyTemplatesMixin):
     self.inode_index_in_block = int(self.inode_address_in_block / self.inode_size)
     
     self.answers.update({
-      "answer__inode_address": Answer.integer("answer__inode_address", self.inode_address),
-      "answer__inode_block": Answer.integer("answer__inode_block", self.inode_block),
-      "answer__inode_address_in_block": Answer.integer("answer__inode_address_in_block", self.inode_address_in_block),
-      "answer__inode_index_in_block": Answer.integer("answer__inode_index_in_block", self.inode_index_in_block),
+      "answer__inode_address": AnswerTypes.Int(self.inode_address),
+      "answer__inode_block": AnswerTypes.Int(self.inode_block),
+      "answer__inode_address_in_block": AnswerTypes.Int(self.inode_address_in_block),
+      "answer__inode_index_in_block": AnswerTypes.Int(self.inode_index_in_block),
     })
   
-  def get_body(self) -> ContentAST.Section:
+  def _get_body(self):
+    """Build question body and collect answers."""
+    answers = [
+      self.answers["answer__inode_address"],
+      self.answers["answer__inode_block"],
+      self.answers["answer__inode_address_in_block"],
+      self.answers["answer__inode_index_in_block"],
+    ]
+
     # Create parameter info table using mixin
     parameter_info = {
       "Block Size": f"{self.block_size} Bytes",
@@ -206,21 +220,21 @@ class INodeAccesses(IOQuestion, TableQuestionMixin, BodyTemplatesMixin):
     # Use mixin to create complete body with both tables
     intro_text = "Given the information below, please calculate the following values."
 
-    instructions = (
-      "(hint: they should all be round numbers). "
-      "Remember, demonstrating you know the equations and what goes into them is generally sufficient."
-    )
-
     body = self.create_parameter_calculation_body(
       intro_text=intro_text,
       parameter_table=parameter_table,
       answer_table=answer_table,
-      additional_instructions=instructions
+      # additional_instructions=instructions
     )
 
+    return body, answers
+
+  def get_body(self) -> ContentAST.Section:
+    """Build question body (backward compatible interface)."""
+    body, _ = self._get_body()
     return body
-  
-  def get_explanation(self) -> ContentAST.Section:
+
+  def _get_explanation(self):
     explanation = ContentAST.Section()
     
     explanation.add_element(
@@ -292,7 +306,12 @@ class INodeAccesses(IOQuestion, TableQuestionMixin, BodyTemplatesMixin):
         f"{self.inode_index_in_block}"
       ]
     ))
-    
+
+    return explanation, []
+
+  def get_explanation(self) -> ContentAST.Section:
+    """Build question explanation (backward compatible interface)."""
+    explanation, _ = self._get_explanation()
     return explanation
 
 
@@ -303,7 +322,7 @@ class VSFS_states(IOQuestion):
   
   def __init__(self, *args, **kwargs):
     super().__init__(*args, **kwargs)
-    self.answer_kind = Answer.AnswerKind.MULTIPLE_DROPDOWN
+    self.answer_kind = ContentAST.Answer.CanvasAnswerKind.MULTIPLE_DROPDOWN
     
     self.num_steps = kwargs.get("num_steps", 10)
   
@@ -325,45 +344,44 @@ class VSFS_states(IOQuestion):
     ))
     self.rng.shuffle(wrong_answers)
     
-    self.answers["answer__cmd"] = Answer(
-      "answer__cmd",
+    self.answers["answer__cmd"] = ContentAST.Answer.dropdown(
       f"{operations[-1]['cmd']}",
-      kind=Answer.AnswerKind.MULTIPLE_DROPDOWN,
-      correct=True,
-      baffles=list(set([op['cmd'] for op in operations[:-1] if op != operations[-1]['cmd']]))
+      baffles=list(set([op['cmd'] for op in operations[:-1] if op != operations[-1]['cmd']])),
+      label="Command"
     )
   
-  def get_body(self) -> ContentAST.Section:
+  def _get_body(self):
+    """Build question body and collect answers."""
+    answers = [self.answers["answer__cmd"]]
+
     body = ContentAST.Section()
-    
+
     body.add_element(ContentAST.Paragraph(["What operation happens between these two states?"]))
-    
+
     body.add_element(
       ContentAST.Code(
         self.start_state,
         make_small=True
       )
     )
-    
-    body.add_element(
-      ContentAST.AnswerBlock(
-        ContentAST.Answer(
-          self.answers["answer__cmd"],
-          label="Command"
-        )
-      )
-    )
-    
+
+    body.add_element(ContentAST.AnswerBlock(self.answers["answer__cmd"]))
+
     body.add_element(
       ContentAST.Code(
         self.end_state,
         make_small=True
       )
     )
-    
+
+    return body, answers
+
+  def get_body(self) -> ContentAST.Section:
+    """Build question body (backward compatible interface)."""
+    body, _ = self._get_body()
     return body
-  
-  def get_explanation(self) -> ContentAST.Section:
+
+  def _get_explanation(self):
     explanation = ContentAST.Section()
     
     log.debug(f"self.start_state: {self.start_state}")
@@ -446,6 +464,11 @@ class VSFS_states(IOQuestion):
         highlight_changes(self.start_state, self.end_state)
       )
     )
-    
+
+    return explanation, []
+
+  def get_explanation(self) -> ContentAST.Section:
+    """Build question explanation (backward compatible interface)."""
+    explanation, _ = self._get_explanation()
     return explanation