Fixing column mapping validation regex (Azure#39429)

Author: singankit

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_evaluate/_evaluate.py

@@ -525,7 +525,7 @@ def _process_column_mappings(
 
     processed_config: Dict[str, Dict[str, str]] = {}
 
-    unexpected_references = re.compile(r"\${(?!target\.|data\.).+?}")
+    expected_references = re.compile(r"^\$\{(target|data)\.[a-zA-Z_]+\}$")
 
     if column_mapping:
         for evaluator, mapping_config in column_mapping.items():
@@ -534,7 +534,7 @@ def _process_column_mappings(
 
                 for map_to_key, map_value in mapping_config.items():
                     # Check if there's any unexpected reference other than ${target.} or ${data.}
-                    if unexpected_references.search(map_value):
+                    if not expected_references.search(map_value):
                         msg = "Unexpected references detected in 'column_mapping'. Ensure only ${target.} and ${data.} are used."
                         raise EvaluationException(
                             message=msg,

sdk/evaluation/azure-ai-evaluation/tests/unittests/test_evaluate.py

@@ -383,18 +383,31 @@ def test_apply_column_mapping_target(self, json_data, inputs_mapping, response):
             assert "else2" in new_data_df.columns
             assert new_data_df["else2"][0] == "Another column 1"
 
-    def test_evaluate_invalid_evaluator_config(self, mock_model_config, evaluate_test_data_jsonl_file):
+    @pytest.mark.parametrize(
+        "column_mapping",
+        [
+            {"query": "${foo.query}"},
+            {"query": "${data.query"},
+            {"query": "data.query", "response": "target.response"},
+            {"query": "${data.query}", "response": "${target.response.one}"},
+        ]
+    )
+    def test_evaluate_invalid_column_mapping(self, mock_model_config, evaluate_test_data_jsonl_file, column_mapping):
         # Invalid source reference
         with pytest.raises(EvaluationException) as exc_info:
             evaluate(
                 data=evaluate_test_data_jsonl_file,
                 evaluators={"g": GroundednessEvaluator(model_config=mock_model_config)},
-                evaluator_config={"g": {"column_mapping": {"query": "${foo.query}"}}},
+                evaluator_config={
+                    "g": {
+                        "column_mapping": column_mapping,
+                    }
+                }
             )
 
         assert (
-            "Unexpected references detected in 'column_mapping'. Ensure only ${target.} and ${data.} are used."
-            in exc_info.value.args[0]
+                "Unexpected references detected in 'column_mapping'. Ensure only ${target.} and ${data.} are used."
+                in exc_info.value.args[0]
         )
 
     def test_renaming_column(self):