Improved feedback customization

Added ability to replace feedback generated by a specific tag

Author: KarlLundengaard

app/evaluation.py

@@ -205,6 +205,7 @@ def generate_feedback(main_criteria, criteria_graphs, evaluation_parameters):
     response = evaluation_parameters["reserved_expressions"]["response"]
     criteria_feedback = set()
     is_correct = True
+    custom_feedback = evaluation_parameters.get("custom_feedback",{})
     for (criterion_identifier, graph) in criteria_graphs.items():
         # TODO: Find better way to identify main criteria for criteria graph
         main_criteria = criterion_identifier+"_TRUE"
@@ -219,7 +220,7 @@ def generate_feedback(main_criteria, criteria_graphs, evaluation_parameters):
         #       assumption that some way to return partial feedback
         #       before script has executed completely will be available
         #       in the future
-        evaluation_result.add_feedback_from_tags(criteria_feedback, graph)
+        evaluation_result.add_feedback_from_tags(criteria_feedback, graph, custom_feedback=custom_feedback)
     evaluation_result.is_correct = is_correct
     return
 
@@ -317,6 +318,7 @@ def evaluation_function(response, answer, params, include_test_data=False) -> di
             "numerical": parameters.get("numerical", False),
             "atol": parameters.get("atol", 0),
             "rtol": parameters.get("rtol", 0),
+            "custom_feedback": parameters.get("custom_feedback",{}),
         }
     )
 

app/tests/example_tests.py

@@ -608,5 +608,41 @@ def test_custom_comparison_with_criteria_contains(self, response, value, tags):
         assert result["is_correct"] is value
         assert set(tags) == set(result["tags"])
 
+    @pytest.mark.parametrize(
+        "response, answer, criteria, value, feedback_tags, custom_feedback, additional_params",
+        [
+            (
+                "2*x^2+0.5+0.25*sin(x)^2",
+                "2x^2",
+                "answer <= response, 2+answer > response",
+                False,
+                [
+                    "answer <= response_TRUE",
+                    "2+answer > response_UNKNOWN",
+                ],
+                {
+                    "answer <= response_TRUE": "AAA",
+                    "2+answer > response_UNKNOWN": "BBB",
+                },
+                {
+                    "symbol_assumptions": "('x', 'real')",
+                }
+            ),
+        ]
+    )
+    def test_criteria_custom_feedback(self, response, answer, criteria, value, feedback_tags, custom_feedback, additional_params):
+        params = {
+            "strict_syntax": False,
+            "elementary_functions": True,
+            "criteria": criteria,
+            "custom_feedback": custom_feedback,
+        }
+        params.update(additional_params)
+        result = evaluation_function(response, answer, params, include_test_data=True)
+        assert result["is_correct"] is value
+        assert set(feedback_tags) == set(result["tags"])
+        for string in custom_feedback.values():
+            assert string in result["feedback"]
+
 if __name__ == "__main__":
     pytest.main(['-sk not slow', "--tb=line", os.path.abspath(__file__)])

app/utility/evaluation_result_utilities.py

@@ -25,13 +25,18 @@ def add_feedback(self, feedback_item):
             raise TypeError("Feedback must be on the form (tag, feedback).")
         self._feedback_tags
 
-    def add_feedback_from_tags(self, tags, graph):
+    def add_feedback_from_tags(self, tags, graph, custom_feedback=None):
+        if custom_feedback is None:
+            custom_feedback = {}
         for (tag, inputs) in tags.items():
             if tag not in self._feedback_tags.keys():
-                if inputs is None:
-                    feedback_string = graph.criteria[tag].feedback_string_generator(dict())
+                if tag in custom_feedback.keys():
+                    feedback_string = custom_feedback[tag]
                 else:
-                    feedback_string = graph.criteria[tag].feedback_string_generator(inputs)
+                    if inputs is None:
+                        feedback_string = graph.criteria[tag].feedback_string_generator(dict())
+                    else:
+                        feedback_string = graph.criteria[tag].feedback_string_generator(inputs)
                 self.add_feedback((tag, feedback_string))
 
     def add_criteria_graph(self, name, graph):