Fixed IO and stucture

Author: m-messer

Dockerfile

@@ -1,7 +1,4 @@
-FROM ghcr.io/lambda-feedback/evaluation-function-base/wolfram:latest AS final
-
-# Use the WSTP server as a kernel backend
-ENV WSTP_SERVER="true"
+FROM ghcr.io/lambda-feedback/evaluation-function-base/wolfram:latest as base
 
 # Command to start the evaluation function with
 ENV FUNCTION_COMMAND="wolframscript"
@@ -12,22 +9,17 @@ ENV FUNCTION_ARGS="-f,/app/evaluation_function.wl"
 # Interface to use for the evaluation function
 ENV FUNCTION_INTERFACE="file"
 
+ENV LOG_LEVEL="DEBUG"
+
 # Copy the evaluation function to the app directory
 COPY ./evaluation_function.wl /app/evaluation_function.wl
 
-# Final layer for private images, which contains the wolfram licence key,
-# and is started with the shimmy handle command.
-FROM final AS final-private
-
-# Copy the mathpass secret to the Wolfram Engine licensing directory.
-# See https://hub.docker.com/r/wolframresearch/wolframengine for more information.
-RUN --mount=type=secret,id=mathpass \
-    mkdir -p /tmp/home/.WolframEngine/Licensing && \
-    cp /run/secrets/mathpass /tmp/home/.WolframEngine/Licensing/mathpass
-
+FROM base AS with-license
+COPY ./dist/LICENCE.txt /home/wolframengine/.WolframEngine/Licensing/mathpass
 
-RUN apt-get update && apt-get install -y \
-    netcat \
-    && rm -rf /var/lib/apt/lists/*
+FROM base AS without-license
+# no COPY, no error
 
-COPY ./entrypoint.sh /entrypoint.sh
+# Choose final stage with build arg
+ARG WITH_LICENSE=false
+FROM ${WITH_LICENSE:+with-license}${WITH_LICENSE:-without-license}

config.json

@@ -1,3 +1,3 @@
 {
-  "EvaluationFunctionName": ""
+  "EvaluationFunctionName": "wolframEvaluationFunction"
 }

evaluation_function.wl

@@ -140,25 +140,36 @@ evalQ[type_, answer_, response_, params_] := Module[{},
 ];
 
 EvaluationFunction[type_, answer_, response_, params_] := Module[{tolerance, correctQ, error},
+  Print["Running Evaluation Function"];
   result = evalQ[type, answer, response, params];
-  <|
-    "is_correct" -> result["is_correct"],
-    "feedback" -> If[result["is_correct"],
+  Print["Results"];
+  Print[result];
+  feedback = If[result["is_correct"],
       Lookup[params, "correct_response_feedback", "Correct!"],
       Lookup[params, "incorrect_response_feedback", "Incorrect!"]
-    ],
-    "error" -> result["error"]
+      ];
+  <|
+        "command" -> "eval",
+        "result" -> <|
+          "is_correct" -> result["is_correct"],
+          "feedback" -> feedback,
+          "error" -> result["error"]
+        |>
   |>
 ];
 
 evalQuestionIO = Function[
   Module[{jsonData, result},
     jsonData = Import[#1, "JSON"] //. List :> Association;
-    type = jsonData["comparisonType"];
-    answer = jsonData["answerTemplate"];
-    response = jsonData["response"];
-    params = jsonData["params"];
+    requestData = jsonData["params"];
+    answer = requestData["answer"];
+    response = requestData["response"];
+    params = requestData["params"];
+    type = params["comparisonType"];
+    Print["Evaluating Response Against Answer"];
     result = EvaluationFunction[type, answer, response, params];
+    Print["Response"];
+    Print[result];
     Export[#2, result, "JSON", "Compact" -> True]
   ]
 ];

structure_match_example1.json

@@ -1,10 +1,13 @@
 {
-	"comparisonType":"structure",
-	"answerTemplate":"Sin[p x + q]",
+  "method": "eval",
+  "params": {
+    "answer":"Sin[p x + q]",
 	"response":"Sin[a x + b]",
 	"params":{
+		"comparisonType":"structure",
 		"named_variables":"{x}",
 		"correct_response_feedback":"Your answer is correct!",
 		"incorrect_response_feedback":"Your answer is incorrect!"
 	}
-}
+  }
+}