Merge pull request #18 from lambda-feedback/feature/muEd-versioning

Feature/mu ed versioning

Author: m-messer

handler.py

@@ -1,8 +1,11 @@
+import json
 from evaluation_function_utils.errors import EvaluationException
 
 from .tools import commands, docs, parse, validate
 from .tools.parse import ParseError
-from .tools.utils import ErrorResponse, HandlerResponse, JsonType, Response
+from typing import Any, Optional
+
+from .tools.utils import DocsResponse, ErrorResponse, HandlerResponse, JsonType, Response
 from .tools.validate import (
     LegacyReqBodyValidators,
     LegacyResBodyValidators,
@@ -58,6 +61,57 @@ def handle_legacy_command(event: JsonType, command: str) -> HandlerResponse:
     return response
 
 
+def wrap_muEd_response(body: Any, event: JsonType, status_code: int = 200) -> DocsResponse:
+    """Wrap a muEd response body in Lambda proxy format with X-Api-Version header.
+
+    Args:
+        body: The response body to serialise.
+        event (JsonType): The incoming event (used to resolve the served version).
+        status_code (int): The HTTP status code. Defaults to 200.
+
+    Returns:
+        DocsResponse: Proxy-format response with X-Api-Version header set.
+    """
+    requested = (event.get("headers") or {}).get("X-Api-Version")
+    if requested and requested in commands.SUPPORTED_MUED_VERSIONS:
+        version = requested
+    else:
+        version = commands.SUPPORTED_MUED_VERSIONS[-1]
+    return DocsResponse(
+        statusCode=status_code,
+        headers={"X-Api-Version": version},
+        body=json.dumps(body),
+        isBase64Encoded=False,
+    )
+
+
+def check_muEd_version(event: JsonType) -> Optional[HandlerResponse]:
+    """Check the X-Api-Version header against supported muEd versions.
+
+    Args:
+        event (JsonType): The AWS Lambda event received by the handler.
+
+    Returns:
+        Optional[HandlerResponse]: A version-not-supported error response if
+        the requested version is unsupported, otherwise None.
+    """
+    version = (event.get("headers") or {}).get("X-Api-Version")
+    if version and version not in commands.SUPPORTED_MUED_VERSIONS:
+        return {
+            "title": "API version not supported",
+            "message": (
+                f"The requested API version '{version}' is not supported. "
+                f"Supported versions are: {commands.SUPPORTED_MUED_VERSIONS}."
+            ),
+            "code": "VERSION_NOT_SUPPORTED",
+            "details": {
+                "requestedVersion": version,
+                "supportedVersions": commands.SUPPORTED_MUED_VERSIONS,
+            },
+        }
+    return None
+
+
 def handle_muEd_command(event: JsonType, command: str) -> HandlerResponse:
     """Switch case for handling different command options using muEd schemas.
 
@@ -68,21 +122,26 @@ 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)
+
     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()
+        response = commands.healthcheck_muEd()
+        validate.body(response, MuEdResBodyValidators.HEALTHCHECK)
 
     else:
         response = Response(
             error=ErrorResponse(message=f"Unknown command '{command}'.")
         )
 
-    return response
+    return wrap_muEd_response(response, event)
 
 
 def handler(event: JsonType, _=None) -> HandlerResponse: