2024-10-08T19-27-28Z

src/quizzes/models.py

@@ -28,22 +28,21 @@ class Question(models.Model):
 
 class Answer(models.Model):
     question = models.OneToOneField(Question, on_delete=models.CASCADE)
-    correct_answer = models.CharField(max_length=200, default="")
-    rubrics = models.TextField(
-        blank=True, null=True, verbose_name="Grading Rubrics - For LLM-graded questions only. You can leave this empty."
-    )
 
     class Meta:
         abstract = True
 
     def __str__(self) -> str:
-        return self.correct_answer or self.rubrics or "No answer or rubrics provided"
+        return (
+            getattr(self, "correct_answer", None) or getattr(self, "rubrics", None) or "No answer or rubrics provided"
+        )
 
     def is_correct(self, user_answer) -> bool:
-        return user_answer == self.correct_answer
+        return user_answer == getattr(self, "correct_answer", None)
 
 
 class FreeTextAnswer(Answer):
+    correct_answer = models.CharField(max_length=200, default="")
     case_sensitive = models.BooleanField(default=False)
 
     def is_correct(self, user_answer) -> bool:
@@ -53,6 +52,10 @@ class FreeTextAnswer(Answer):
 
 
 class LLMGradedAnswer(Answer):
+    rubrics = models.TextField(
+        blank=True, null=True, verbose_name="Grading Rubrics - For LLM-graded questions only. You can leave this empty."
+    )
+
     def grade(self, user_answer, rubrics) -> dict:
         import requests
 
@@ -83,6 +86,7 @@ class LLMGradedAnswer(Answer):
 
 
 class MultipleChoiceAnswer(Answer):
+    correct_answer = models.CharField(max_length=200, default="")
     choices = fields.ArrayField(models.CharField(max_length=200, blank=True))
 
     def __str__(self) -> str: