QuizGenerator 0.5.1__py3-none-any.whl → 0.6.1__py3-none-any.whl

QuizGenerator/premade_questions/cst463/models/attention.py

@@ -5,9 +5,8 @@ import keras
 import numpy as np
 from typing import List, Tuple
 
-from QuizGenerator.misc import MatrixAnswer
-from QuizGenerator.question import Question, QuestionRegistry, Answer
-from QuizGenerator.contentast import ContentAST
+from QuizGenerator.question import Question, QuestionRegistry
+from QuizGenerator.contentast import ContentAST, AnswerTypes
 from QuizGenerator.constants import MathRanges
 from QuizGenerator.mixins import TableQuestionMixin
 
@@ -62,12 +61,12 @@ class AttentionForwardPass(MatrixQuestion, TableQuestionMixin):
     ## Answers:
     # Q, K, V, output, weights
 
-    self.answers["weights"] = MatrixAnswer("weights", self.weights, label="Weights")
-    self.answers["output"] = MatrixAnswer("output", self.output, label="Output")
+    self.answers["weights"] = AnswerTypes.Matrix(self.weights, label="Weights")
+    self.answers["output"] = AnswerTypes.Matrix(self.output, label="Output")
     
     return True
   
-  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question body and collect answers."""
     body = ContentAST.Section()
     answers = []
@@ -101,10 +100,10 @@ class AttentionForwardPass(MatrixQuestion, TableQuestionMixin):
     body, _ = self._get_body(**kwargs)
     return body
   
-  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question explanation."""
     explanation = ContentAST.Section()
-    digits = Answer.DEFAULT_ROUNDING_DIGITS
+    digits = ContentAST.Answer.DEFAULT_ROUNDING_DIGITS
 
     explanation.add_element(
       ContentAST.Paragraph([

QuizGenerator/premade_questions/cst463/models/cnns.py

@@ -5,9 +5,8 @@ import keras
 import numpy as np
 from typing import List, Tuple
 
-from QuizGenerator.question import Question, QuestionRegistry, Answer
-from QuizGenerator.misc import MatrixAnswer
-from QuizGenerator.contentast import ContentAST
+from QuizGenerator.question import Question, QuestionRegistry
+from QuizGenerator.contentast import ContentAST, AnswerTypes
 from QuizGenerator.constants import MathRanges
 from .matrices import MatrixQuestion
 
@@ -66,13 +65,13 @@ class ConvolutionCalculation(MatrixQuestion):
     self.result = self.conv2d_multi_channel(self.image, self.kernel, stride=self.stride, padding=self.padding)
     
     self.answers = {
-      f"result_{i}" : MatrixAnswer(f"result_{i}", self.result[:,:,i], label=f"Result of filter {i}")
+      f"result_{i}" : AnswerTypes.Matrix(self.result[:,:,i], label=f"Result of filter {i}")
       for i in range(self.result.shape[-1])
     }
     
     return True
   
-  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question body and collect answers."""
     body = ContentAST.Section()
     answers = []
@@ -119,10 +118,10 @@ class ConvolutionCalculation(MatrixQuestion):
     body, _ = self._get_body(**kwargs)
     return body
   
-  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question explanation."""
     explanation = ContentAST.Section()
-    digits = Answer.DEFAULT_ROUNDING_DIGITS
+    digits = ContentAST.Answer.DEFAULT_ROUNDING_DIGITS
 
     explanation.add_element(
       ContentAST.Paragraph([

QuizGenerator/premade_questions/cst463/models/rnns.py

@@ -6,8 +6,8 @@ import numpy as np
 from typing import List, Tuple
 
 from .matrices import MatrixQuestion
-from QuizGenerator.question import Question, QuestionRegistry, Answer
-from QuizGenerator.contentast import ContentAST
+from QuizGenerator.question import Question, QuestionRegistry
+from QuizGenerator.contentast import ContentAST, AnswerTypes
 from QuizGenerator.constants import MathRanges
 from QuizGenerator.mixins import TableQuestionMixin
 
@@ -64,11 +64,11 @@ class RNNForwardPass(MatrixQuestion, TableQuestionMixin):
     ## Answers:
     # x_seq, W_xh, W_hh, b_h, h_0, h_states
     
-    self.answers["output_sequence"] = Answer.matrix(key="output_sequence", value=self.h_states, label="Hidden states")
+    self.answers["output_sequence"] = AnswerTypes.Matrix(value=self.h_states, label="Hidden states")
     
     return True
   
-  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question body and collect answers."""
     body = ContentAST.Section()
     answers = []
@@ -103,10 +103,10 @@ class RNNForwardPass(MatrixQuestion, TableQuestionMixin):
     body, _ = self._get_body(**kwargs)
     return body
   
-  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question explanation."""
     explanation = ContentAST.Section()
-    digits = Answer.DEFAULT_ROUNDING_DIGITS
+    digits = ContentAST.Answer.DEFAULT_ROUNDING_DIGITS
 
     explanation.add_element(
       ContentAST.Paragraph([

QuizGenerator/premade_questions/cst463/models/text.py

@@ -5,10 +5,9 @@ import keras
 import numpy as np
 from typing import List, Tuple
 
-from QuizGenerator.misc import MatrixAnswer
 from QuizGenerator.premade_questions.cst463.models.matrices import MatrixQuestion
-from QuizGenerator.question import Question, QuestionRegistry, Answer
-from QuizGenerator.contentast import ContentAST
+from QuizGenerator.question import Question, QuestionRegistry
+from QuizGenerator.contentast import ContentAST, AnswerTypes
 from QuizGenerator.constants import MathRanges
 from QuizGenerator.mixins import TableQuestionMixin
 
@@ -60,15 +59,15 @@ class word2vec__skipgram(MatrixQuestion, TableQuestionMixin):
 
     ## Answers:
     # center_word, center_emb, context_words, context_embs, logits, probs
-    self.answers["logits"] = Answer.vector_value(key="logits", value=self.logits, label="Logits")
+    self.answers["logits"] = AnswerTypes.Vector(self.logits, label="Logits")
     most_likely_idx = np.argmax(self.probs)
     most_likely_word = self.context_words[most_likely_idx]
-    self.answers["center_word"] = Answer.string(key="center_word", value=most_likely_word, label="Most likely context word")
+    self.answers["center_word"] = AnswerTypes.String(most_likely_word, label="Most likely context word")
     
     
     return True
   
-  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question body and collect answers."""
     body = ContentAST.Section()
     answers = []
@@ -101,10 +100,10 @@ class word2vec__skipgram(MatrixQuestion, TableQuestionMixin):
     body, _ = self._get_body(**kwargs)
     return body
   
-  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question explanation."""
     explanation = ContentAST.Section()
-    digits = Answer.DEFAULT_ROUNDING_DIGITS
+    digits = ContentAST.Answer.DEFAULT_ROUNDING_DIGITS
 
     explanation.add_element(
       ContentAST.Paragraph([

QuizGenerator/premade_questions/cst463/models/weight_counting.py

@@ -5,8 +5,8 @@ import keras
 import numpy as np
 from typing import List, Tuple
 
-from QuizGenerator.question import Question, QuestionRegistry, Answer
-from QuizGenerator.contentast import ContentAST
+from QuizGenerator.question import Question, QuestionRegistry
+from QuizGenerator.contentast import ContentAST, AnswerTypes
 from QuizGenerator.constants import MathRanges
 
 log = logging.getLogger(__name__)
@@ -85,15 +85,11 @@ class WeightCounting(Question, abc.ABC):
         continue
     
     self.num_parameters = self.model.count_params()
-    self.answers["num_parameters"] = Answer.integer(
-      "num_parameters",
-      self.num_parameters,
-      label="Number of Parameters"
-    )
+    self.answers["num_parameters"] = AnswerTypes.Int(self.num_parameters, label="Number of Parameters")
     
     return True
   
-  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question body and collect answers."""
     body = ContentAST.Section()
     answers = []
@@ -127,7 +123,7 @@ class WeightCounting(Question, abc.ABC):
     body, _ = self._get_body(**kwargs)
     return body
   
-  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question explanation."""
     explanation = ContentAST.Section()
 

QuizGenerator/premade_questions/cst463/neural-network-basics/neural_network_questions.py

@@ -12,8 +12,8 @@ from typing import List, Tuple, Dict, Any
 import matplotlib.pyplot as plt
 import matplotlib.patches as mpatches
 
-from QuizGenerator.contentast import ContentAST
-from QuizGenerator.question import Question, Answer, QuestionRegistry
+from QuizGenerator.contentast import ContentAST, AnswerTypes
+from QuizGenerator.question import Question, QuestionRegistry
 from QuizGenerator.mixins import TableQuestionMixin, BodyTemplatesMixin
 from ..models.matrices import MatrixQuestion
 
@@ -566,12 +566,12 @@ class ForwardPassQuestion(SimpleNeuralNetworkBase):
     # Hidden layer activations
     for i in range(self.num_hidden):
       key = f"h{i+1}"
-      self.answers[key] = Answer.float_value(key, float(self.a1[i]), label=f"h_{i+1}")
+      self.answers[key] = AnswerTypes.Float(float(self.a1[i]), label=f"h_{i + 1}")
 
     # Output
-    self.answers["y_pred"] = Answer.float_value("y_pred", float(self.a2[0]), label="ŷ")
+    self.answers["y_pred"] = AnswerTypes.Float(float(self.a2[0]), label="ŷ")
 
-  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question body and collect answers."""
     body = ContentAST.Section()
     answers = []
@@ -614,7 +614,7 @@ class ForwardPassQuestion(SimpleNeuralNetworkBase):
     body, _ = self._get_body(**kwargs)
     return body
 
-  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question explanation."""
     explanation = ContentAST.Section()
 
@@ -743,14 +743,14 @@ class BackpropGradientQuestion(SimpleNeuralNetworkBase):
     # Gradient for W2 (hidden to output)
     for i in range(self.num_hidden):
       key = f"dL_dw2_{i}"
-      self.answers[key] = Answer.auto_float(key, self._compute_gradient_W2(i), label=f"∂L/∂w_{i+3}")
+      self.answers[key] = AnswerTypes.Float(self._compute_gradient_W2(i), label=f"∂L/∂w_{i + 3}")
 
     # Gradient for W1 (input to hidden) - pick first hidden neuron
     for j in range(self.num_inputs):
       key = f"dL_dw1_0{j}"
-      self.answers[key] = Answer.auto_float(key, self._compute_gradient_W1(0, j), label=f"∂L/∂w_1{j+1}")
+      self.answers[key] = AnswerTypes.Float(self._compute_gradient_W1(0, j), label=f"∂L/∂w_1{j + 1}")
 
-  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question body and collect answers."""
     body = ContentAST.Section()
     answers = []
@@ -800,7 +800,7 @@ class BackpropGradientQuestion(SimpleNeuralNetworkBase):
     body, _ = self._get_body(**kwargs)
     return body
 
-  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question explanation."""
     explanation = ContentAST.Section()
 
@@ -920,13 +920,13 @@ class EnsembleAveragingQuestion(Question):
 
     # Mean prediction
     mean_pred = np.mean(self.predictions)
-    self.answers["mean"] = Answer.float_value("mean", float(mean_pred), label="Mean (average)")
+    self.answers["mean"] = AnswerTypes.Float(float(mean_pred), label="Mean (average)")
 
     # Median (optional, but useful)
     median_pred = np.median(self.predictions)
-    self.answers["median"] = Answer.float_value("median", float(median_pred), label="Median")
+    self.answers["median"] = AnswerTypes.Float(float(median_pred), label="Median")
 
-  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question body and collect answers."""
     body = ContentAST.Section()
     answers = []
@@ -961,7 +961,7 @@ class EnsembleAveragingQuestion(Question):
     body, _ = self._get_body(**kwargs)
     return body
 
-  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question explanation."""
     explanation = ContentAST.Section()
 
@@ -1083,20 +1083,20 @@ class EndToEndTrainingQuestion(SimpleNeuralNetworkBase):
     self.answers = {}
 
     # Forward pass answers
-    self.answers["y_pred"] = Answer.float_value("y_pred", float(self.a2[0]), label="1. Forward Pass - Network output ŷ")
+    self.answers["y_pred"] = AnswerTypes.Float(float(self.a2[0]), label="1. Forward Pass - Network output ŷ")
 
     # Loss answer
-    self.answers["loss"] = Answer.float_value("loss", float(self.loss), label="2. Loss")
+    self.answers["loss"] = AnswerTypes.Float(float(self.loss), label="2. Loss")
 
     # Gradient answers (for key weights)
-    self.answers["grad_w3"] = Answer.auto_float("grad_w3", self._compute_gradient_W2(0), label="3. Gradient ∂L/∂w₃")
-    self.answers["grad_w11"] = Answer.auto_float("grad_w11", self._compute_gradient_W1(0, 0), label="4. Gradient ∂L/∂w₁₁")
+    self.answers["grad_w3"] = AnswerTypes.Float(self._compute_gradient_W2(0), label="3. Gradient ∂L/∂w₃")
+    self.answers["grad_w11"] = AnswerTypes.Float(self._compute_gradient_W1(0, 0), label="4. Gradient ∂L/∂w₁₁")
 
     # Updated weight answers
-    self.answers["new_w3"] = Answer.float_value("new_w3", float(self.new_W2[0, 0]), label="5. Updated w₃:")
-    self.answers["new_w11"] = Answer.float_value("new_w11", float(self.new_W1[0, 0]), label="6. Updated w₁₁:")
+    self.answers["new_w3"] = AnswerTypes.Float(float(self.new_W2[0, 0]), label="5. Updated w₃:")
+    self.answers["new_w11"] = AnswerTypes.Float(float(self.new_W1[0, 0]), label="6. Updated w₁₁:")
 
-  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question body and collect answers."""
     body = ContentAST.Section()
     answers = []
@@ -1162,7 +1162,7 @@ class EndToEndTrainingQuestion(SimpleNeuralNetworkBase):
     body, _ = self._get_body(**kwargs)
     return body
 
-  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question explanation."""
     explanation = ContentAST.Section()
 

QuizGenerator/premade_questions/cst463/tensorflow-intro/tensorflow_questions.py

@@ -8,8 +8,8 @@ import numpy as np
 import sympy as sp
 from typing import List, Tuple, Dict, Any
 
-from QuizGenerator.contentast import ContentAST
-from QuizGenerator.question import Question, Answer, QuestionRegistry
+from QuizGenerator.contentast import ContentAST, AnswerTypes
+from QuizGenerator.question import Question, QuestionRegistry
 from QuizGenerator.mixins import TableQuestionMixin, BodyTemplatesMixin
 
 # Import gradient descent utilities
@@ -85,15 +85,15 @@ class ParameterCountingQuestion(Question):
     """Create answer fields."""
     self.answers = {}
 
-    self.answers["total_weights"] = Answer.integer("total_weights", self.total_weights, label="Total weights")
+    self.answers["total_weights"] = AnswerTypes.Int(self.total_weights, label="Total weights")
 
     if self.include_biases:
-      self.answers["total_biases"] = Answer.integer("total_biases", self.total_biases, label="Total biases")
-      self.answers["total_params"] = Answer.integer("total_params", self.total_params, label="Total trainable parameters")
+      self.answers["total_biases"] = AnswerTypes.Int(self.total_biases, label="Total biases")
+      self.answers["total_params"] = AnswerTypes.Int(self.total_params, label="Total trainable parameters")
     else:
-      self.answers["total_params"] = Answer.integer("total_params", self.total_params, label="Total trainable parameters")
+      self.answers["total_params"] = AnswerTypes.Int(self.total_params, label="Total trainable parameters")
 
-  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question body and collect answers."""
     body = ContentAST.Section()
     answers = []
@@ -152,7 +152,7 @@ class ParameterCountingQuestion(Question):
     body, _ = self._get_body(**kwargs)
     return body
 
-  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question explanation."""
     explanation = ContentAST.Section()
 
@@ -331,14 +331,14 @@ class ActivationFunctionComputationQuestion(Question):
 
     if self.activation == self.ACTIVATION_SOFTMAX:
       # Softmax: single vector answer
-      self.answers["output"] = Answer.vector_value("output", self.output_vector, label="Output vector")
+      self.answers["output"] = AnswerTypes.Vector(self.output_vector, label="Output vector")
     else:
       # Element-wise: individual answers
       for i, output in enumerate(self.output_vector):
         key = f"output_{i}"
-        self.answers[key] = Answer.float_value(key, float(output), label=f"Output for input {self.input_vector[i]:.1f}")
+        self.answers[key] = AnswerTypes.Float(float(output), label=f"Output for input {self.input_vector[i]:.1f}")
 
-  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question body and collect answers."""
     body = ContentAST.Section()
     answers = []
@@ -399,7 +399,7 @@ class ActivationFunctionComputationQuestion(Question):
     body, _ = self._get_body(**kwargs)
     return body
 
-  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question explanation."""
     explanation = ContentAST.Section()
 
@@ -545,13 +545,13 @@ class RegularizationCalculationQuestion(Question):
     """Create answer fields."""
     self.answers = {}
 
-    self.answers["prediction"] = Answer.float_value("prediction", float(self.prediction), label="Prediction ŷ")
-    self.answers["base_loss"] = Answer.float_value("base_loss", float(self.base_loss), label="Base MSE loss")
-    self.answers["l2_penalty"] = Answer.float_value("l2_penalty", float(self.l2_penalty), label="L2 penalty")
-    self.answers["total_loss"] = Answer.float_value("total_loss", float(self.total_loss), label="Total loss")
-    self.answers["grad_total_w0"] = Answer.auto_float("grad_total_w0", float(self.grad_total_w0), label="Gradient ∂L/∂w₀")
+    self.answers["prediction"] = AnswerTypes.Float(float(self.prediction), label="Prediction ŷ")
+    self.answers["base_loss"] = AnswerTypes.Float(float(self.base_loss), label="Base MSE loss")
+    self.answers["l2_penalty"] = AnswerTypes.Float(float(self.l2_penalty), label="L2 penalty")
+    self.answers["total_loss"] = AnswerTypes.Float(float(self.total_loss), label="Total loss")
+    self.answers["grad_total_w0"] = AnswerTypes.Float(float(self.grad_total_w0), label="Gradient ∂L/∂w₀")
 
-  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question body and collect answers."""
     body = ContentAST.Section()
     answers = []
@@ -643,7 +643,7 @@ class RegularizationCalculationQuestion(Question):
     body, _ = self._get_body(**kwargs)
     return body
 
-  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question explanation."""
     explanation = ContentAST.Section()
 
@@ -817,16 +817,16 @@ class MomentumOptimizerQuestion(Question, TableQuestionMixin, BodyTemplatesMixin
     self.answers = {}
 
     # New velocity
-    self.answers["velocity"] = Answer.vector_value("velocity", self.new_velocity, label="New velocity")
+    self.answers["velocity"] = AnswerTypes.Vector(self.new_velocity, label="New velocity")
 
     # New weights with momentum
-    self.answers["weights_momentum"] = Answer.vector_value("weights_momentum", self.new_weights, label="Weights (momentum)")
+    self.answers["weights_momentum"] = AnswerTypes.Vector(self.new_weights, label="Weights (momentum)")
 
     # Vanilla SGD weights for comparison
     if self.show_vanilla_sgd:
-      self.answers["weights_sgd"] = Answer.vector_value("weights_sgd", self.sgd_weights, label="Weights (vanilla SGD)")
+      self.answers["weights_sgd"] = AnswerTypes.Vector(self.sgd_weights, label="Weights (vanilla SGD)")
 
-  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question body and collect answers."""
     body = ContentAST.Section()
     answers = []
@@ -920,7 +920,7 @@ class MomentumOptimizerQuestion(Question, TableQuestionMixin, BodyTemplatesMixin
     body, _ = self._get_body(**kwargs)
     return body
 
-  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[Answer]]:
+  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
     """Build question explanation."""
     explanation = ContentAST.Section()
 
@@ -944,7 +944,7 @@ class MomentumOptimizerQuestion(Question, TableQuestionMixin, BodyTemplatesMixin
     ))
 
     # Show calculation for each component
-    digits = Answer.DEFAULT_ROUNDING_DIGITS
+    digits = ContentAST.Answer.DEFAULT_ROUNDING_DIGITS
     for i in range(self.num_variables):
       var_name = f"x_{i}"
       # Round all intermediate values to avoid floating point precision issues

QuizGenerator/question.py

@@ -21,8 +21,7 @@ import yaml
 from typing import List, Dict, Any, Tuple, Optional
 import canvasapi.course, canvasapi.quiz
 
-from QuizGenerator.misc import Answer
-from QuizGenerator.contentast import ContentAST
+from QuizGenerator.contentast import ContentAST, AnswerTypes
 from QuizGenerator.performance import timer, PerformanceTracker
 
 import logging
@@ -33,7 +32,7 @@ log = logging.getLogger(__name__)
 class QuestionComponents:
     """Bundle of question parts generated during construction."""
     body: ContentAST.Element
-    answers: List[Answer]
+    answers: List[ContentAST.Answer]
     explanation: ContentAST.Element
 
 
@@ -352,8 +351,8 @@ class Question(abc.ABC):
   ensures consistent rendering across PDF/LaTeX and Canvas/HTML formats.
 
   Required Methods:
-    - _get_body(): Return Tuple[ContentAST.Section, List[Answer]] with body and answers
-    - _get_explanation(): Return Tuple[ContentAST.Section, List[Answer]] with explanation
+    - _get_body(): Return Tuple[ContentAST.Section, List[ContentAST.Answer]] with body and answers
+    - _get_explanation(): Return Tuple[ContentAST.Section, List[ContentAST.Answer]] with explanation
 
   Note: get_body() and get_explanation() are provided for backward compatibility
   and call the _get_* methods, returning just the first element of the tuple.
@@ -373,7 +372,7 @@ class Question(abc.ABC):
         body.add_element(ContentAST.Matrix(data=matrix_data, bracket_type="b"))
 
         # Answer extends ContentAST.Leaf - add directly to body
-        ans = Answer.integer("result", 42, label="Result")
+        ans = ContentAST.Answer.integer("result", 42, label="Result")
         answers.append(ans)
         body.add_element(ans)
         return body, answers
@@ -474,7 +473,7 @@ class Question(abc.ABC):
     self.points_value = points_value
     self.topic = topic
     self.spacing = parse_spacing(kwargs.get("spacing", 0))
-    self.answer_kind = Answer.AnswerKind.BLANK
+    self.answer_kind = ContentAST.Answer.CanvasAnswerKind.BLANK
 
     # Support for multi-part questions (defaults to 1 for normal questions)
     self.num_subquestions = kwargs.get("num_subquestions", 1)
@@ -600,7 +599,7 @@ class Question(abc.ABC):
       [ContentAST.Text("[Please reach out to your professor for clarification]")]
     )
 
-  def _get_body(self) -> Tuple[ContentAST.Element, List[Answer]]:
+  def _get_body(self) -> Tuple[ContentAST.Element, List[ContentAST.Answer]]:
     """
     Build question body and collect answers (new pattern).
     Questions should override this to return (body, answers) tuple.
@@ -612,7 +611,7 @@ class Question(abc.ABC):
     body = self.get_body()
     return body, []
 
-  def _get_explanation(self) -> Tuple[ContentAST.Element, List[Answer]]:
+  def _get_explanation(self) -> Tuple[ContentAST.Element, List[ContentAST.Answer]]:
     """
     Build question explanation and collect answers (new pattern).
     Questions can override this to include answers in explanations.
@@ -646,7 +645,7 @@ class Question(abc.ABC):
       explanation=explanation
     )
 
-  def get_answers(self, *args, **kwargs) -> Tuple[Answer.AnswerKind, List[Dict[str,Any]]]:
+  def get_answers(self, *args, **kwargs) -> Tuple[ContentAST.Answer.CanvasAnswerKind, List[Dict[str,Any]]]:
     """
     Return answers from cached components (new pattern) or self.answers dict (old pattern).
     """
@@ -664,7 +663,7 @@ class Question(abc.ABC):
       answers = self._components.answers
       if self.can_be_numerical():
         return (
-          Answer.AnswerKind.NUMERICAL_QUESTION,
+          ContentAST.Answer.CanvasAnswerKind.NUMERICAL_QUESTION,
           list(itertools.chain(*[a.get_for_canvas(single_answer=True) for a in answers]))
         )
       return (
@@ -676,7 +675,7 @@ class Question(abc.ABC):
     if len(self.answers.values()) > 0:
       if self.can_be_numerical():
         return (
-          Answer.AnswerKind.NUMERICAL_QUESTION,
+          ContentAST.Answer.CanvasAnswerKind.NUMERICAL_QUESTION,
           list(itertools.chain(*[a.get_for_canvas(single_answer=True) for a in self.answers.values()]))
         )
       return (
@@ -684,7 +683,7 @@ class Question(abc.ABC):
         list(itertools.chain(*[a.get_for_canvas() for a in self.answers.values()]))
       )
 
-    return (Answer.AnswerKind.ESSAY, [])
+    return (ContentAST.Answer.CanvasAnswerKind.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.
@@ -751,7 +750,7 @@ class Question(abc.ABC):
   
   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]
+          and isinstance(list(self.answers.values())[0], AnswerTypes.Float)
     ):
       return True
     return False

{quizgenerator-0.5.1.dist-info → quizgenerator-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QuizGenerator
-Version: 0.5.1
+Version: 0.6.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