Resolve merge conflict: drop /preview case, fix healthcheck indentation in handle_muEd_command

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: m-messer

handler.py

@@ -122,26 +122,49 @@ def handle_muEd_command(event: JsonType, command: str) -> HandlerResponse:
     Returns:
         HandlerResponse: The response object returned by the handler.
     """
-    version_error = check_muEd_version(event)
-    if version_error:
-        return wrap_muEd_response(version_error, event, 406)
+    try:
+        version_error = check_muEd_version(event)
+        if version_error:
+            return wrap_muEd_response(version_error, event, 406)
 
-    if command == "eval":
-        body = parse.body(event)
-        validate.body(body, MuEdReqBodyValidators.EVALUATION)
-        response = commands.evaluate_muEd(body)
-        validate.body(response, MuEdResBodyValidators.EVALUATION)
+        if command == "eval":
+            body = parse.body(event)
+            validate.body(body, MuEdReqBodyValidators.EVALUATION)
+            response = commands.evaluate_muEd(body)
+            validate.body(response, MuEdResBodyValidators.EVALUATION)
 
-    elif command == "healthcheck":
-        response = commands.healthcheck_muEd()
-        validate.body(response, MuEdResBodyValidators.HEALTHCHECK)
+        elif command == "healthcheck":
+            response = commands.healthcheck_muEd()
+            validate.body(response, MuEdResBodyValidators.HEALTHCHECK)
 
-    else:
-        response = Response(
-            error=ErrorResponse(message=f"Unknown command '{command}'.")
-        )
+        else:
+            error = {
+                "title": "Not implemented",
+                "message": f"Unknown command '{command}'.",
+                "code": "NOT_IMPLEMENTED",
+            }
+            return wrap_muEd_response(error, event, 501)
 
-    return wrap_muEd_response(response, event)
+        return wrap_muEd_response(response, event)
+
+    except (ParseError, ValidationError) as e:
+        error = {
+            "title": "Bad request",
+            "message": e.message,
+            "code": "VALIDATION_ERROR",
+            "details": {"error": str(e.error_thrown)} if e.error_thrown else None,
+        }
+        return wrap_muEd_response(error, event, 400)
+
+    except EvaluationException as e:
+        detail = str(e) if str(e) else repr(e)
+        error = {"title": "Internal server error", "message": detail, "code": "INTERNAL_ERROR"}
+        return wrap_muEd_response(error, event, 500)
+
+    except Exception as e:
+        detail = str(e) if str(e) else repr(e)
+        error = {"title": "Internal server error", "message": detail, "code": "INTERNAL_ERROR"}
+        return wrap_muEd_response(error, event, 500)
 
 
 def handler(event: JsonType, _=None) -> HandlerResponse:

tests/mued_handling_test.py

@@ -78,8 +78,9 @@ def test_evaluate_missing_submission_returns_error(self):
 
         response = handler(event)
 
-        self.assertIn("error", response)
-        self.assertIn("submission", response["error"]["detail"])  # type: ignore
+        self.assertEqual(response["statusCode"], 400)
+        body = json.loads(response["body"])
+        self.assertEqual(body["code"], "VALIDATION_ERROR")
 
     def test_evaluate_invalid_submission_type_returns_error(self):
         event = {
@@ -89,18 +90,19 @@ def test_evaluate_invalid_submission_type_returns_error(self):
 
         response = handler(event)
 
-        self.assertIn("error", response)
+        self.assertEqual(response["statusCode"], 400)
+        body = json.loads(response["body"])
+        self.assertEqual(body["code"], "VALIDATION_ERROR")
 
     def test_evaluate_bodyless_event_returns_error(self):
         event = {"path": "/evaluate", "random": "metadata"}
 
         response = handler(event)
 
-        self.assertIn("error", response)
-        self.assertEqual(
-            response["error"]["message"],  # type: ignore
-            "No data supplied in request body.",
-        )
+        self.assertEqual(response["statusCode"], 400)
+        body = json.loads(response["body"])
+        self.assertEqual(body["code"], "VALIDATION_ERROR")
+        self.assertEqual(body["message"], "No data supplied in request body.")
 
     def test_healthcheck(self):
         event = {"path": "/evaluate/health"}
@@ -325,18 +327,19 @@ def test_preview_missing_submission_returns_error(self):
 
         response = handler(event)
 
-        self.assertIn("error", response)
+        self.assertEqual(response["statusCode"], 400)
+        body = json.loads(response["body"])
+        self.assertEqual(body["code"], "VALIDATION_ERROR")
 
     def test_preview_bodyless_event_returns_error(self):
         event = {"path": "/evaluate", "random": "metadata"}
 
         response = handler(event)
 
-        self.assertIn("error", response)
-        self.assertEqual(
-            response["error"]["message"],  # type: ignore
-            "No data supplied in request body.",
-        )
+        self.assertEqual(response["statusCode"], 400)
+        body = json.loads(response["body"])
+        self.assertEqual(body["code"], "VALIDATION_ERROR")
+        self.assertEqual(body["message"], "No data supplied in request body.")
 
     def test_preview_invalid_submission_type_returns_error(self):
         event = {
@@ -349,7 +352,9 @@ def test_preview_invalid_submission_type_returns_error(self):
 
         response = handler(event)
 
-        self.assertIn("error", response)
+        self.assertEqual(response["statusCode"], 400)
+        body = json.loads(response["body"])
+        self.assertEqual(body["code"], "VALIDATION_ERROR")
 
     def test_presubmission_disabled_runs_normal_evaluation(self):
         event = {