Changeset 9db70f7 in flexograder

Timestamp:

11/27/25 11:25:20 (4 months ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

fake-data, main, master

Children:

8e6a433

Parents:

e70dd79

Message:

some fixes

Files:

• builder/exam.py (modified) (2 diffs)
• builder/exam_elements.py (modified) (11 diffs)
• builder/flexo_entity.py (deleted)
• builder/question_factory.py (modified) (2 diffs)
• tests/conftest.py (modified) (2 diffs)
• tests/test_question_factory.py (modified) (3 diffs)

builder/exam.py

@@ -145 +145 @@
         meta = data.get("exam", {})
         domains = data.get("domains", {})
-       
+  
         flexo_id = FlexOID(meta.get("flexo_id"))
 
@@ -214 +214 @@
     def to_question_catalog(self, questions, catalog_id, title, author="unknown", version="1.0"):
         catalog = {
-            "meta": {
-                "catalog_id": catalog_id,
+            "QuestionCatalog": {
+                "flexo_id": catalog_id,
                 "title": title,
                 "created_on": datetime.utcnow().isoformat() + "Z",

builder/exam_elements.py

@@ -53 +53 @@
         return cls.with_domain_id(domain_id="DEF_DEFAULT")
 
-    @property
-    @abstractmethod
-    def qtype(self):
-        pass
-
     @abstractmethod
     def to_html(self) -> str:
@@ -77 +72 @@
 
     def __hash__(self):
-        return hash((self.flexo_id, self.qtype))
+        return hash((self.flexo_id, self.subtype))
 
     def evaluate(self, answer):
@@ -123 +118 @@
         return obj
 
-    def to_dict(self):
-        base = super().to_dict()  # from FlexoEntity
-        base.update({
+    def _serialize_content(self):
+        return {
             "topic": self.topic,
-            "qtype": self.qtype,  # avoid name clash with built-in type
             "text": self.text,
             "media": [m.to_dict() for m in self.media],
-        })
-        return base
+        }
 
     def has_media(self):
@@ -153 +145 @@
     def __post_init__(self):
         super().__post_init__()
-
-    @property
-    def qtype(self):
-        return "instruction"
 
     @property
@@ -201 +189 @@
         super().__post_init__()
 
-    @property
-    @abstractmethod
-    def qtype(self):
-        pass
-
-    def to_dict(self):
-        base = super().to_dict()
-        base.update({
-            "options": [opt.to_dict() for opt in self.options],
-        })
-        return base
+    def _serialize_content(self):
+        return {
+            "options": [opt.to_dict() for opt in self.options]
+        }
 
     @classmethod
@@ -239 +220 @@
 @dataclass
 class SingleChoiceQuestion(ChoiceQuestion):
-
-    @property
-    def qtype(self):
-        return "single_choice"
 
     def to_html(self) -> str:
@@ -269 +246 @@
 @dataclass
 class MultipleChoiceQuestion(ChoiceQuestion):
-
-    @property
-    def qtype(self):
-        return "multiple_choice"
 
     def to_html(self) -> str:
@@ -311 +284 @@
     validation: Optional[Validation] = None
 
-    @property
-    def qtype(self):
-        return "text"
-
     @classmethod
     def from_dict(cls, data):
@@ -323 +292 @@
         return obj
 
-    def to_dict(self):
-        d = super().to_dict()
-        if self.validation:
-            d["validation"] = self.validation.to_dict()
-        return d
+    def _serialize_content(self):
+        return {
+            "validation": self.validation.to_dict()
+        }
 
     def answer_options_for_display(self):
@@ -355 +323 @@
 
 @dataclass
-class CandidateIDQuestion(ExamElement):
+class IDForm(ExamElement):
 
     fields: List[dict] = field(default_factory=list)
-
-    @property
-    def qtype(self):
-        return "candidate_id"
 
     def __post_init__(self):
@@ -393 +357 @@
         return [("Last Name, First Name, Personal ID", "0")]
 
-    def to_dict(self):
-        d = super().to_dict()
-        d["fields"] = self.fields
-        return d
+    def _serialize_content(self):
+        return {
+            "fields": self.fields
+        }
 
     @classmethod

builder/question_factory.py

@@ -5 +5 @@
     MultipleChoiceQuestion,
     TextQuestion,
-    CandidateIDQuestion,
+    IDForm,
     InstructionBlock,
     AnswerOption,
@@ -33 +33 @@
     """
 
-    qtype = q.get("qtype")
-    if not qtype:
-        raise ValueError("Question missing 'qtype'")
+    subtype = q.get("subtype")
+    if not subtype:
+        raise ValueError("Question missing 'subtype'")
 
-    mapping = {
-        "single_choice": SingleChoiceQuestion,
-        "multiple_choice": MultipleChoiceQuestion,
-        "text": TextQuestion,
-        "instruction": InstructionBlock,
-        "candidate_id": CandidateIDQuestion,
-    }
-
-    cls = mapping.get(qtype)
+    cls = globals()[subtype]
     if not cls:
         raise ValueError(f"Unknown question type: {qtype}")

tests/conftest.py

@@ -6 +6 @@
     SingleChoiceQuestion,
     MultipleChoiceQuestion,
-    CandidateIDQuestion,
+    IDForm,
     InstructionBlock,
     TextQuestion,
@@ -31 +31 @@
     # ──────────────────────────────────────────────────────────────
 
-    q_id = CandidateIDQuestion.with_domain_id(domain_id="ADMIN_CANDIDATE",
+    q_id = IDForm.with_domain_id(domain_id="ADMIN_CANDIDATE",
                                               text="Please enter your candidate ID and name.",
                                               fields=["Name", "Candidate ID"],

tests/test_question_factory.py

@@ -5 +5 @@
 
 def test_radio_question_autoid():
-    q = {"domain_id": "WIP_TEST", "qtype": "single_choice", "text": "What is Ohm’s law?",
+    q = {"domain_id": "WIP_TEST", "subtype": "SingleChoiceQuestion", "text": "What is Ohm’s law?",
          "options": [{"id": "A", "text": "U = R / I"}, {"id": "B", "text": "U = R * I"}]}
     obj = question_factory(q)
@@ -16 +16 @@
 def test_multiple_choice_question_existing_id():
     Domain.with_domain_id("WIP_TEST")
-    q = {"domain_id": "WIP_TEST", "qtype": "multiple_choice",
+    q = {"domain_id": "WIP_TEST", "subtype": "MultipleChoiceQuestion",
          "text": "Select power units"}
     obj = question_factory(q)
@@ -27 +27 @@
 def test_text_question_validation_optional():
     Domain.with_domain_id(domain_id="WIP_TEST")
-    q = {"domain_id": "WIP_TEST", "qtype": "text",
+    q = {"domain_id": "WIP_TEST", "subtype": "TextQuestion",
          "text": "Explain", "validation": {"maxlength": 5}}
     obj = question_factory(q)