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

QuizGenerator/premade_questions/cst463/models/attention.py

@@ -3,10 +3,10 @@ import logging
 import math
 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
 
@@ -60,15 +60,17 @@ class AttentionForwardPass(MatrixQuestion, TableQuestionMixin):
     
     ## Answers:
     # Q, K, V, output, weights
-    
-    self.answers["weights"] = MatrixAnswer("weights", self.output)
-    self.answers["output"] = MatrixAnswer("output", self.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) -> ContentAST.Section:
+  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
+    """Build question body and collect answers."""
     body = ContentAST.Section()
-    
+    answers = []
+
     body.add_element(
       ContentAST.Text("Given the below information about a self attention layer, please calculate the output sequence.")
     )
@@ -81,19 +83,27 @@ class AttentionForwardPass(MatrixQuestion, TableQuestionMixin):
         }
       )
     )
-    
+
+    answers.append(self.answers["weights"])
+    answers.append(self.answers["output"])
     body.add_elements([
       ContentAST.LineBreak(),
-      self.answers["weights"].get_ast_element(label=f"Weights"),
+      self.answers["weights"],
       ContentAST.LineBreak(),
-      self.answers["output"].get_ast_element(label=f"Output"),
+      self.answers["output"],
     ])
-    
+
+    return body, answers
+
+  def get_body(self, **kwargs) -> ContentAST.Section:
+    """Build question body (backward compatible interface)."""
+    body, _ = self._get_body(**kwargs)
     return body
   
-  def get_explanation(self, **kwargs) -> ContentAST.Section:
+  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([
@@ -188,5 +198,10 @@ class AttentionForwardPass(MatrixQuestion, TableQuestionMixin):
     )
     explanation.add_element(ContentAST.Matrix(np.round(self.output, digits)))
 
+    return explanation, []
+
+  def get_explanation(self, **kwargs) -> ContentAST.Section:
+    """Build question explanation (backward compatible interface)."""
+    explanation, _ = self._get_explanation(**kwargs)
     return explanation
 

QuizGenerator/premade_questions/cst463/models/cnns.py

@@ -3,10 +3,10 @@ import logging
 import math
 import keras
 import numpy as np
+from typing import List, Tuple
 
 from QuizGenerator.question import Question, QuestionRegistry
-from QuizGenerator.misc import Answer, MatrixAnswer
-from QuizGenerator.contentast import ContentAST
+from QuizGenerator.contentast import ContentAST, AnswerTypes
 from QuizGenerator.constants import MathRanges
 from .matrices import MatrixQuestion
 
@@ -65,22 +65,24 @@ 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])
+      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) -> ContentAST.Section:
+  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
+    """Build question body and collect answers."""
     body = ContentAST.Section()
-    
+    answers = []
+
     body.add_elements(
       [
         ContentAST.Text("Given image represented as matrix: "),
         ContentAST.Matrix(self.image, name="image")
       ]
     )
-    
+
     body.add_elements(
       [
         ContentAST.Text("And convolution filters: "),
@@ -89,7 +91,7 @@ class ConvolutionCalculation(MatrixQuestion):
         for i in range(self.kernel.shape[-1])
       ]
     )
-    
+
     body.add_element(
       ContentAST.Paragraph(
         [
@@ -97,24 +99,29 @@ class ConvolutionCalculation(MatrixQuestion):
         ]
       )
     )
-    
+
     body.add_element(ContentAST.LineBreak())
-    
-    body.add_elements([
-      ContentAST.Container([
-        self.answers[f"result_{i}"].get_ast_element(label=f"Result of filter {i}"),
-        ContentAST.LineBreak()
+
+    for i in range(self.result.shape[-1]):
+      answers.append(self.answers[f"result_{i}"])
+      body.add_elements([
+        ContentAST.Container([
+          self.answers[f"result_{i}"],
+          ContentAST.LineBreak()
+        ])
       ])
-      for i in range(self.result.shape[-1])
-    ])
-    
-    
-    
+
+    return body, answers
+
+  def get_body(self, **kwargs) -> ContentAST.Section:
+    """Build question body (backward compatible interface)."""
+    body, _ = self._get_body(**kwargs)
     return body
   
-  def get_explanation(self, **kwargs) -> ContentAST.Section:
+  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([
@@ -183,4 +190,9 @@ class ConvolutionCalculation(MatrixQuestion):
         ContentAST.Matrix(np.round(self.result[:, :, f_idx], digits))
       )
 
+    return explanation, []
+
+  def get_explanation(self, **kwargs) -> ContentAST.Section:
+    """Build question explanation (backward compatible interface)."""
+    explanation, _ = self._get_explanation(**kwargs)
     return explanation

QuizGenerator/premade_questions/cst463/models/rnns.py

@@ -3,10 +3,11 @@ import logging
 import math
 import keras
 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
 
@@ -63,13 +64,15 @@ 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)
+    self.answers["output_sequence"] = AnswerTypes.Matrix(value=self.h_states, label="Hidden states")
     
     return True
   
-  def get_body(self, **kwargs) -> ContentAST.Section:
+  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
+    """Build question body and collect answers."""
     body = ContentAST.Section()
-    
+    answers = []
+
     body.add_element(
       ContentAST.Paragraph([
         ContentAST.Text("Given the below information about an RNN, please calculate the output sequence."),
@@ -87,22 +90,27 @@ class RNNForwardPass(MatrixQuestion, TableQuestionMixin):
         }
       )
     )
-    
+
     body.add_element(ContentAST.LineBreak())
-    
-    body.add_element(
-      self.answers["output_sequence"].get_ast_element(label=f"Hidden states")
-    )
-    
+
+    answers.append(self.answers["output_sequence"])
+    body.add_element(self.answers["output_sequence"])
+
+    return body, answers
+
+  def get_body(self, **kwargs) -> ContentAST.Section:
+    """Build question body (backward compatible interface)."""
+    body, _ = self._get_body(**kwargs)
     return body
   
-  def get_explanation(self, **kwargs) -> ContentAST.Section:
+  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([
-        "For an RNN forward pass, we compute the hidden state at each time step using:"
+    "For an RNN forward pass, we compute the hidden state at each time step using:"
       ])
     )
 
@@ -128,7 +136,7 @@ class RNNForwardPass(MatrixQuestion, TableQuestionMixin):
     # Show detailed examples for first 2 timesteps (or just 1 if seq_len == 1)
     seq_len = len(self.x_seq)
     num_examples = min(2, seq_len)
-    
+
     explanation.add_element(ContentAST.Paragraph([""]))
 
     for t in range(num_examples):
@@ -198,5 +206,10 @@ class RNNForwardPass(MatrixQuestion, TableQuestionMixin):
       ContentAST.Matrix(np.round(self.h_states, digits))
     )
 
+    return explanation, []
+
+  def get_explanation(self, **kwargs) -> ContentAST.Section:
+    """Build question explanation (backward compatible interface)."""
+    explanation, _ = self._get_explanation(**kwargs)
     return explanation
 

QuizGenerator/premade_questions/cst463/models/text.py

@@ -3,11 +3,11 @@ import logging
 import math
 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
 
@@ -59,17 +59,19 @@ 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)
+    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)
+    self.answers["center_word"] = AnswerTypes.String(most_likely_word, label="Most likely context word")
     
     
     return True
   
-  def get_body(self, **kwargs) -> ContentAST.Section:
+  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
+    """Build question body and collect answers."""
     body = ContentAST.Section()
-    
+    answers = []
+
     body.add_element(
       ContentAST.Paragraph([
         f"Given center word: `{self.center_word}` with embedding {self.center_emb}, compute the skip-gram probabilities for each context word and identify the most likely one."
@@ -78,23 +80,30 @@ class word2vec__skipgram(MatrixQuestion, TableQuestionMixin):
     body.add_elements([
       ContentAST.Paragraph([ContentAST.Text(f"`{w}` : "), str(e)]) for w, e in zip(self.context_words, self.context_embs)
     ])
-    
+
+    answers.append(self.answers["logits"])
+    answers.append(self.answers["center_word"])
     body.add_elements([
       ContentAST.LineBreak(),
-      self.answers["logits"].get_ast_element("Logits"),
+      self.answers["logits"],
       ContentAST.LineBreak(),
-      self.answers["center_word"].get_ast_element("Most likely context word")
+      self.answers["center_word"]
     ])
-    
-    
+
     log.debug(f"output: {self.logits}")
     log.debug(f"weights: {self.probs}")
-    
+
+    return body, answers
+
+  def get_body(self, **kwargs) -> ContentAST.Section:
+    """Build question body (backward compatible interface)."""
+    body, _ = self._get_body(**kwargs)
     return body
   
-  def get_explanation(self, **kwargs) -> ContentAST.Section:
+  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([
@@ -199,5 +208,10 @@ class word2vec__skipgram(MatrixQuestion, TableQuestionMixin):
       ])
     )
 
+    return explanation, []
+
+  def get_explanation(self, **kwargs) -> ContentAST.Section:
+    """Build question explanation (backward compatible interface)."""
+    explanation, _ = self._get_explanation(**kwargs)
     return explanation
 

QuizGenerator/premade_questions/cst463/models/weight_counting.py

@@ -3,9 +3,10 @@ import logging
 import math
 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__)
@@ -84,16 +85,15 @@ class WeightCounting(Question, abc.ABC):
         continue
     
     self.num_parameters = self.model.count_params()
-    self.answers["num_parameters"] = Answer.integer(
-      "num_parameters",
-      self.num_parameters
-    )
+    self.answers["num_parameters"] = AnswerTypes.Int(self.num_parameters, label="Number of Parameters")
     
     return True
   
-  def get_body(self, **kwargs) -> ContentAST.Section:
+  def _get_body(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
+    """Build question body and collect answers."""
     body = ContentAST.Section()
-    
+    answers = []
+
     body.add_element(
       ContentAST.Paragraph(
         [
@@ -101,7 +101,7 @@ class WeightCounting(Question, abc.ABC):
         ]
       )
     )
-    
+
     body.add_element(
       ContentAST.Code(
         self.model_to_python(
@@ -110,18 +110,23 @@ class WeightCounting(Question, abc.ABC):
         )
       )
     )
-    
+
     body.add_element(ContentAST.LineBreak())
-    
-    body.add_element(
-      ContentAST.Answer(self.answers["num_parameters"], "Number of Parameters")
-    )
-    
+
+    answers.append(self.answers["num_parameters"])
+    body.add_element(self.answers["num_parameters"])
+
+    return body, answers
+
+  def get_body(self, **kwargs) -> ContentAST.Section:
+    """Build question body (backward compatible interface)."""
+    body, _ = self._get_body(**kwargs)
     return body
   
-  def get_explanation(self, **kwargs) -> ContentAST.Section:
+  def _get_explanation(self, **kwargs) -> Tuple[ContentAST.Section, List[ContentAST.Answer]]:
+    """Build question explanation."""
     explanation = ContentAST.Section()
-    
+
     def markdown_summary(model) -> ContentAST.Table:
       # Ensure the model is built by running build() or calling it once
       if not model.built:
@@ -129,37 +134,42 @@ class WeightCounting(Question, abc.ABC):
           model.build(model.input_shape)
         except:
           pass  # Some subclassed models need real data to build
-      
+
       data = []
-      
+
       total_params = 0
-      
+
       for layer in model.layers:
         name = layer.name
         ltype = layer.__class__.__name__
-        
+
         # Try to extract output shape
         try:
           outshape = tuple(layer.output.shape)
         except:
           outshape = "?"
-        
+
         params = layer.count_params()
         total_params += params
-        
+
         data.append([name, ltype, outshape, params])
-        
+
       data.append(["**Total**", "", "", f"**{total_params}**"])
       return ContentAST.Table(data=data, headers=["Layer", "Type", "Output Shape", "Params"])
-      
-    
+
+
     summary_lines = []
     self.model.summary(print_fn=lambda x: summary_lines.append(x))
     explanation.add_element(
       # ContentAST.Text('\n'.join(summary_lines))
       markdown_summary(self.model)
     )
-    
+
+    return explanation, []
+
+  def get_explanation(self, **kwargs) -> ContentAST.Section:
+    """Build question explanation (backward compatible interface)."""
+    explanation, _ = self._get_explanation(**kwargs)
     return explanation
 
 
@@ -222,6 +232,4 @@ class WeightCounting_RNN(WeightCounting):
     return model, ["units", "return_sequences"]
 
 
-@QuestionRegistry.register()
-class ConvolutionCalculation(Question):
-  pass
+# ConvolutionCalculation is implemented in cnns.py