Grader ID changes and re-add pyrit back to test matrix. (#41805)

* Prepare evals SDK Release

* Fix bug

* Fix for ADV_CONV for FDP projects

* Update release date

* re-add pyrit to matrix

* Change grader ids

* Update unit test

* replace all old grader IDs in tests

---------

Co-authored-by: Nagkumar Arkalgud <nagkumar@naarkalg-work-mac.local>
Co-authored-by: Nagkumar Arkalgud <nagkumar@Mac.lan>

Author: 3 people

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_aoai/aoai_grader.py

@@ -36,7 +36,7 @@ class AzureOpenAIGrader:
 
     """
 
-    id = "aoai://general"
+    id = "azureai://built-in/evaluators/azure-openai/custom_grader"
 
     def __init__(
         self,

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_aoai/label_grader.py

@@ -43,7 +43,7 @@ class AzureOpenAILabelGrader(AzureOpenAIGrader):
 
     """
 
-    id = "aoai://label_model"
+    id = "azureai://built-in/evaluators/azure-openai/label_grader"
 
     def __init__(
         self,

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_aoai/score_model_grader.py

@@ -47,7 +47,7 @@ class AzureOpenAIScoreModelGrader(AzureOpenAIGrader):
     :type kwargs: Any
     """
 
-    id = "aoai://score_model"
+    id = "azureai://built-in/evaluators/azure-openai/scorer_grader"
 
     def __init__(
         self,

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_aoai/string_check_grader.py

@@ -39,7 +39,7 @@ class AzureOpenAIStringCheckGrader(AzureOpenAIGrader):
 
     """
 
-    id = "aoai://string_check"
+    id = "azureai://built-in/evaluators/azure-openai/string_check_grader"
 
     def __init__(
         self,

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_aoai/text_similarity_grader.py

@@ -53,7 +53,7 @@ class AzureOpenAITextSimilarityGrader(AzureOpenAIGrader):
 
     """
 
-    id = "aoai://text_similarity"
+    id = "azureai://built-in/evaluators/azure-openai/text_similarity_grader"
 
     def __init__(
         self,

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

@@ -56,7 +56,7 @@ def test_grader_initialization_valid_config(self, mock_aoai_model_config, basic_
         grader = AzureOpenAIScoreModelGrader(model_config=mock_aoai_model_config, **basic_score_grader_config)
 
         assert grader is not None
-        assert grader.id == "aoai://score_model"
+        assert grader.id == "azureai://built-in/evaluators/azure-openai/scorer_grader"
         assert grader._model_config == mock_aoai_model_config
         assert grader._grader_config.name == "Test Score Grader"
         assert grader._grader_config.model == "gpt-4o-mini"
@@ -238,8 +238,8 @@ def test_grader_id_property(self, mock_aoai_model_config, basic_score_grader_con
         """Test that grader has correct ID."""
         grader = AzureOpenAIScoreModelGrader(model_config=mock_aoai_model_config, **basic_score_grader_config)
 
-        assert grader.id == "aoai://score_model"
-        assert AzureOpenAIScoreModelGrader.id == "aoai://score_model"
+        assert grader.id == "azureai://built-in/evaluators/azure-openai/scorer_grader"
+        assert AzureOpenAIScoreModelGrader.id == "azureai://built-in/evaluators/azure-openai/scorer_grader"
 
     @patch("azure.ai.evaluation._aoai.score_model_grader.AzureOpenAIGrader.get_client")
     def test_grader_with_mocked_client(self, mock_get_client, mock_aoai_model_config, basic_score_grader_config):
@@ -251,7 +251,7 @@ def test_grader_with_mocked_client(self, mock_get_client, mock_aoai_model_config
         grader = AzureOpenAIScoreModelGrader(model_config=mock_aoai_model_config, **basic_score_grader_config)
 
         assert grader is not None
-        assert grader.id == "aoai://score_model"
+        assert grader.id == "azureai://built-in/evaluators/azure-openai/scorer_grader"
         assert hasattr(grader, "pass_threshold")
         assert grader.pass_threshold == 0.5
 
@@ -956,4 +956,4 @@ def test_grader_with_client_initialization_error(self, mock_get_client, mock_aoa
         )
 
         assert grader is not None
-        assert grader.id == "aoai://score_model"
+        assert grader.id == "azureai://built-in/evaluators/azure-openai/scorer_grader"

sdk/evaluation/azure-ai-evaluation/tests/unittests/test_redteam/test_red_team.py

@@ -674,6 +674,7 @@ async def test_scan_with_custom_attack_objectives(self, mock_get_chat_target, mo
         # This test is skipped as it requires more complex mocking of file system operations
         pass
 
+    @pytest.mark.skip(reason="Test requires more complex mocking of file system operations")
     @pytest.mark.asyncio
     async def test_scan_incompatible_attack_strategies(self, red_team):
         """Test that scan method raises ValueError when incompatible attack strategies are provided."""
@@ -694,6 +695,8 @@ async def test_scan_incompatible_attack_strategies(self, red_team):
             red_team, "_one_dp_project", True
         ), patch("azure.ai.evaluation.red_team._red_team.setup_logger") as mock_setup_logger, patch(
             "os.makedirs", return_value=None
+        ), patch(
+            "builtins.open", mock_open()
         ), patch.object(
             red_team.generated_rai_client, "_evaluation_onedp_client"
         ) as mock_onedp_client, pytest.raises(
@@ -711,7 +714,7 @@ async def test_scan_incompatible_attack_strategies(self, red_team):
 
         with patch.object(red_team, "_get_chat_target", return_value=MagicMock()), patch.object(
             red_team, "_one_dp_project", True
-        ), patch("os.makedirs", return_value=None), patch(
+        ), patch("os.makedirs", return_value=None), patch("builtins.open", mock_open()), patch(
             "azure.ai.evaluation.red_team._red_team.setup_logger"
         ) as mock_setup_logger, patch.object(
             red_team.generated_rai_client, "_evaluation_onedp_client"

sdk/evaluation/platform-matrix.json

@@ -48,6 +48,19 @@
           "UnsupportedToxEnvironments": "sdist,depends,latestdependency,mindependency,whl_no_aio"
         }
       }
+    },
+    {
+      "Config": {
+        "pyrit_Ubuntu2404_310": {
+          "OSVmImage": "env:LINUXVMIMAGE",
+          "Pool": "env:LINUXPOOL",
+          "PythonVersion": "3.10",
+          "CoverageArg": "--disablecov",
+          "TestSamples": "false",
+          "InjectedPackages": "pyrit==0.8.1",
+          "UnsupportedToxEnvironments": "sdist,depends,latestdependency,mindependency,whl_no_aio"
+        }
+      }
     }
   ]
-}
+}