Expanded _extract_muEd_submission to handle missing content_key gracefully, added fallback logic for value key, and updated test cases for evaluate workflow.

Author: m-messer

tests/mued_handling_test.py

@@ -28,7 +28,7 @@ def tearDown(self) -> None:
     def test_evaluate_returns_feedback_list(self):
         event = {
             "path": "/evaluate",
-            "body": {"submission": {"type": "TEXT", "content": {}}},
+            "body": {"submission": {"type": "TEXT", "content": {"text": ""}}},
         }
 
         response = handler(event)
@@ -205,6 +205,29 @@ def test_other_submission_extracts_value(self):
         self.assertEqual(self.captured["answer"], "some text")
         self.assertEqual(result[0]["awardedPoints"], True)  # type: ignore
 
+    def test_typed_submission_falls_back_to_value_key(self):
+        event = {
+            "path": "/evaluate",
+            "body": {
+                "submission": {"type": "MATH", "content": {"value": "x+1"}},
+                "task": {"title": "T", "referenceSolution": {"value": "x+1"}},
+            },
+        }
+        result = handler(event)
+        self.assertEqual(self.captured["response"], "x+1")
+        self.assertEqual(self.captured["answer"], "x+1")
+
+    def test_missing_content_key_returns_error(self):
+        event = {
+            "path": "/evaluate",
+            "body": {
+                "submission": {"type": "MATH", "content": {"unknown_key": "x+1"}},
+            },
+        }
+        result = handler(event)
+        self.assertIn("error", result)
+        self.assertIn("expression", result["error"]["message"])
+
     def test_configuration_params_forwarded(self):
         event = {
             "path": "/evaluate",
@@ -412,6 +435,19 @@ def test_other_submission_extracts_value(self):
 
         self.assertEqual(self.captured["response"], "some text")
 
+    def test_typed_submission_falls_back_to_value_key(self):
+        event = {
+            "path": "/evaluate",
+            "body": {
+                "submission": {"type": "MATH", "content": {"value": "x+1"}},
+                "preSubmissionFeedback": {"enabled": True},
+            },
+        }
+
+        handler(event)
+
+        self.assertEqual(self.captured["response"], "x+1")
+
     def test_configuration_params_forwarded(self):
         event = {
             "path": "/evaluate",

tools/commands.py

@@ -144,7 +144,15 @@ def _extract_muEd_submission(body: JsonType):
     sub_type = submission.get("type", "OTHER")
     _type_key = {"MATH": "expression", "TEXT": "text", "CODE": "code", "MODEL": "model"}
     content_key = _type_key.get(sub_type, "value")
-    response = submission.get("content", {}).get(content_key)
+    content = submission.get("content", {})
+    response = content.get(content_key)
+    if response is None and content_key != "value":
+        response = content.get("value")
+    if response is None:
+        raise EvaluationException(
+            f"Could not extract response: expected '{content_key}' (or 'value') "
+            f"in submission content."
+        )
     params = body.get("configuration", {}).get("params", {})
     return response, params, content_key
 
@@ -162,6 +170,8 @@ def _run_muEd_evaluation(body: JsonType) -> List[Dict]:
     if task:
         ref = task.get("referenceSolution") or {}
         answer = ref.get(content_key)
+        if answer is None and content_key != "value":
+            answer = ref.get("value")
     else:
         answer = None