removed payload check

Author: ashwin6-dev

evaluation_function/domain/evaluators.py

@@ -102,7 +102,6 @@ def evaluate_with_counterexample(self) -> tuple[bool, dict | None]:
         n = len(atoms1)
         first_counterexample = None
         for perm in permutations(range(n)):
-            # perm[j] = index in atoms2 that atoms1[j] is renamed to; so atoms1[j] gets value of atoms2[perm[j]]
             for assignment_values in product([False, True], repeat=n):
                 assignment2_dict = {atoms2[i]: assignment_values[i] for i in range(n)}
                 assignment1_dict = {atoms1[j]: assignment_values[perm[j]] for j in range(n)}
@@ -112,7 +111,6 @@ def evaluate_with_counterexample(self) -> tuple[bool, dict | None]:
                 v2 = FormulaEvaluator(self._formula2, a2).evaluate()
                 if v1 != v2:
                     if first_counterexample is None:
-                        # Use response formula's atom names (atoms1) so feedback speaks in the user's variables
                         first_counterexample = {
                             "assignment": {atoms1[j].name: assignment_values[perm[j]] for j in range(n)},
                             "response_value": v1,
@@ -121,7 +119,6 @@ def evaluate_with_counterexample(self) -> tuple[bool, dict | None]:
                     break
             else:
                 return True, None
-
         return False, first_counterexample
 
 

evaluation_function/evaluation.py

@@ -10,14 +10,6 @@
 
 from evaluation_function.truth_table.evaluate import evaluate_truth_table
 
-_JSON_STRING_NOTE = ("note", "Response was received as a JSON string and was parsed.")
-
-
-def _feedback_with_json_note(feedback_items: list, response_was_json_string: bool) -> list:
-    if not response_was_json_string:
-        return feedback_items
-    return list(feedback_items) + [_JSON_STRING_NOTE]
-
 
 def evaluation_function(
     response: Any,
@@ -47,37 +39,27 @@ def evaluation_function(
     to output the evaluation response.
     """
 
-    response_was_json_string = isinstance(response, str)
     try:
-        if response_was_json_string:
+        if isinstance(response, str):
             response = json.loads(response)
 
         if not isinstance(answer, dict):
             return Result(
                 is_correct=False,
-                feedback_items=_feedback_with_json_note(
-                    [("incorrect input", "missing answer object")],
-                    response_was_json_string,
-                )
+                feedback_items=[("incorrect input", "missing answer object")]
             )
 
         if not isinstance(response, dict):
             return Result(
                 is_correct=False,
-                feedback_items=_feedback_with_json_note(
-                    [("incorrect input", "missing response object")],
-                    response_was_json_string,
-                )
+                feedback_items=[("incorrect input", "missing response object")]
             )
 
         response_formula = response.get("formula", None)
         if not isinstance(response_formula, str):
             return Result(
                 is_correct=False,
-                feedback_items=_feedback_with_json_note(
-                    [("incorrect input", "response must be type String")],
-                    response_was_json_string,
-                )
+                feedback_items=[("incorrect input", "response must be type String")]
             )
 
         formula = formula_parser(response_formula)
@@ -99,18 +81,12 @@ def evaluation_function(
         if num_selected == 0:
             return Result(
                 is_correct=False,
-                feedback_items=_feedback_with_json_note(
-                    [("invalid param", "please select a param")],
-                    response_was_json_string,
-                )
+                feedback_items=[("invalid param", "please select a param")]
             )
         if num_selected > 1:
             return Result(
                 is_correct=False,
-                feedback_items=_feedback_with_json_note(
-                    [("invalid param", "please only select 1 param")],
-                    response_was_json_string,
-                )
+                feedback_items=[("invalid param", "please only select 1 param")]
             )
 
         # Truth table mode: validate response truth table if present
@@ -119,33 +95,21 @@ def evaluation_function(
             if response_truth_table is None or not isinstance(response_truth_table, dict):
                 return Result(
                     is_correct=False,
-                    feedback_items=_feedback_with_json_note(
-                        [("incorrect input", "truthTable required when answer expects truth table")],
-                        response_was_json_string,
-                    )
+                    feedback_items=[("incorrect input", "truthTable required when answer expects truth table")]
                 )
             variables = response_truth_table.get("variables", [])
             cells = response_truth_table.get("cells", [])
 
             if not isinstance(variables, list) or not isinstance(cells, list):
                 return Result(
                     is_correct=False,
-                    feedback_items=_feedback_with_json_note(
-                        [("incorrect input", "truthTable must contain 'variables' and 'cells' arrays")],
-                        response_was_json_string,
-                    )
+                    feedback_items=[("incorrect input", "truthTable must contain 'variables' and 'cells' arrays")]
                 )
 
             num_atoms = len(_extract_atoms(formula))
             truth_table_result = evaluate_truth_table(variables, cells, num_atoms)
             if not truth_table_result.is_correct:
-                return Result(
-                    is_correct=False,
-                    feedback_items=_feedback_with_json_note(
-                        getattr(truth_table_result, "feedback_items", []) or [],
-                        response_was_json_string,
-                    )
-                )
+                return truth_table_result
 
         is_correct = False
         feedback = []
@@ -194,14 +158,11 @@ def evaluation_function(
             is_correct = True  # already validated above
 
         if feedback:
-            return Result(
-                is_correct=False,
-                feedback_items=_feedback_with_json_note(feedback, response_was_json_string),
-            )
+            return Result(is_correct=False, feedback_items=feedback)
         return Result(is_correct=is_correct)
 
     except Exception as e:
         return Result(
             is_correct=False,
-            feedback_items=_feedback_with_json_note([("Error", str(e))], response_was_json_string),
+            feedback_items=[("Error", str(e))]
         )