Successfully deployed evaluate API

Author: m-messer

deploy.wls

@@ -1,27 +1,51 @@
 #!/usr/bin/env wolframscript
 
-packagePath = FileNameJoin[{Directory[], "Preview.m"}];
+previewPackagePath = FileNameJoin[{Directory[], "Preview.m"}];
 
-If[!FileExistsQ[packagePath],
-    Print["Error: file not found at " <> packagePath];
+If[!FileExistsQ[previewPackagePath],
+    Print["Error: file not found at " <> previewPackagePath];
+    Abort[];
+];
+
+evaluatePackagePath = FileNameJoin[{Directory[], "Evaluate.m"}];
+
+If[!FileExistsQ[evaluatePackagePath],
+    Print["Error: file not found at " <> evaluatePackagePath];
     Abort[];
 ];
 
 (* Load the package locally first *)
-Get[packagePath];
+Get[previewPackagePath];
+Get[evaluatePackagePath];
 
 (* Test locally *)
-Print["Testing locally:"];
+Print["Testing preview locally:"];
 Print[preview`PreviewFunction["x^2"]];
 
+Print["Testing evaluate locally:"];
+Print[evaluate`EvaluationFunction["structure", "x^2", "y^2",
+    <|"correct_response_feedback" -> "Correct", "incorrect_response_feedback" -> "Incorrect"|>]];
+
 
 
 (* Deploy the API with explicit JSON export *)
-api = APIFunction[
+previewAPI = APIFunction[
     {"response" -> "String"},
     ExportForm[preview`PreviewFunction[#response], "JSON"] &
 ];
 
-obj = CloudDeploy[api, "preview-api", Permissions -> "Public"];
+previewObj = CloudDeploy[previewAPI, "preview-api", Permissions -> "Public"];
+
+Print["Preview API deployed to: ", previewObj];
+
+evaluateAPI = APIFunction[
+    {"type" -> "String",
+     "response" -> "String",
+     "answer" -> "String",
+     "params" -> "JSON"},
+    ExportForm[evaluate`EvaluationFunction[#type, #answer, #response, #params], "JSON"] &
+];
+
+evaluateObj = CloudDeploy[evaluateAPI, "evaluate-api", Permissions -> "Public"];
 
-Print["API deployed to: ", obj];
+Print["Evaluate API deployed to: ", evaluateObj];

evaluate.m

@@ -16,28 +16,24 @@
 
 (* For new style packages see: https://mathematica.stackexchange.com/a/176489) *)
 (* Declare package context *)
-BeginPackage["evaluate`"]
+BeginPackage["evaluate`"];
 
 EvaluationFunction[type_, answer_, response_, params_] := Module[{result, feedback},
   Print["Running Evaluation Function"];
   result = evalQ[type, answer, response, params];
-  Print["Results"];
-  Print[result];
   feedback = If[result["is_correct"],
       Lookup[params, "correct_response_feedback", "Correct!"],
       Lookup[params, "incorrect_response_feedback", "Incorrect!"]
       ];
+
   <|
-    "command" -> "eval",
-    "result" -> <|
-      "is_correct" -> result["is_correct"],
-      "feedback" -> feedback,
-      "error" -> result["error"]
-    |>
+    "is_correct" -> result["is_correct"],
+    "feedback" -> feedback,
+    "error" -> result["error"]
   |>
-]
+];
 
-Begin["`Private`"]
+Begin["`Private`"];
 
 equalQNumeric[answer_, response_, params_] := Module[{tolerance},
   Print["Evaluating Equal Numeric"];
@@ -174,40 +170,5 @@
     equalQOther[answer, response, params]
   ]
 ];
-
-EvaluationFunction[type_, answer_, response_, params_] := Module[{result,feedback},
-  Print["Running Evaluation Function"];
-  result = evalQ[type, answer, response, params];
-  Print["Results"];
-  Print[result];
-  feedback = If[result["is_correct"],
-      Lookup[params, "correct_response_feedback", "Correct!"],
-      Lookup[params, "incorrect_response_feedback", "Incorrect!"]
-      ];
-  <|
-        "command" -> "eval",
-        "result" -> <|
-          "is_correct" -> result["is_correct"],
-          "feedback" -> feedback,
-          "error" -> result["error"]
-        |>
-  |>
-];
-
-evalQuestionIO = Function[
-  Module[{jsonData, result,requestData,answer,response,params,type},
-    jsonData = Import[#1, "JSON"] //. List :> Association;
-    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]
-  ]
-];
-End[]
+End[];
 EndPackage[]