Image simulator scenario rename (Azure#38798)

* Adding pr prv

* Adversarial-Sim-Multi-modal

* lint fix

Author: w-javed

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/simulator/_adversarial_scenario.py

@@ -28,8 +28,6 @@ class AdversarialScenario(Enum):
     ADVERSARIAL_CONTENT_GEN_UNGROUNDED = "adv_content_gen_ungrounded"
     ADVERSARIAL_CONTENT_GEN_GROUNDED = "adv_content_gen_grounded"
     ADVERSARIAL_CONTENT_PROTECTED_MATERIAL = "adv_content_protected_material"
-    ADVERSARIAL_IMAGE_GEN = "adv_image_gen"
-    ADVERSARIAL_IMAGE_UNDERSTANDING = "adv_image_understanding"
 
 
 @experimental
@@ -46,3 +44,5 @@ class _UnstableAdversarialScenario(Enum):
     """
 
     ECI = "adv_politics"
+    ADVERSARIAL_IMAGE_GEN = "adv_image_gen"
+    ADVERSARIAL_IMAGE_MULTIMODAL = "adv_image_understanding"

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/simulator/_adversarial_simulator.py

@@ -383,8 +383,8 @@ def __call__(self) -> None:
                     pass
 
             if scenario in [
-                AdversarialScenario.ADVERSARIAL_IMAGE_GEN,
-                AdversarialScenario.ADVERSARIAL_IMAGE_UNDERSTANDING,
+                _UnstableAdversarialScenario.ADVERSARIAL_IMAGE_GEN,
+                _UnstableAdversarialScenario.ADVERSARIAL_IMAGE_MULTIMODAL,
             ]:
                 return MultiModalConversationBot(
                     callback=target,

sdk/evaluation/azure-ai-evaluation/tests/e2etests/test_adv_simulator.py

@@ -146,7 +146,8 @@ async def callback(
 
     def test_adv_conversation_image_understanding_sim_responds_with_responses(self, azure_cred, project_scope):
         os.environ.pop("RAI_SVC_URL", None)
-        from azure.ai.evaluation.simulator import AdversarialScenario, AdversarialSimulator
+        from azure.ai.evaluation.simulator import AdversarialSimulator
+        from azure.ai.evaluation.simulator._adversarial_scenario import _UnstableAdversarialScenario
 
         azure_ai_project = {
             "subscription_id": project_scope["subscription_id"],
@@ -175,7 +176,7 @@ async def callback(
 
         outputs = asyncio.run(
             simulator(
-                scenario=AdversarialScenario.ADVERSARIAL_IMAGE_UNDERSTANDING,
+                scenario=_UnstableAdversarialScenario.ADVERSARIAL_IMAGE_MULTIMODAL,
                 max_conversation_turns=1,
                 max_simulation_results=1,
                 target=callback,
@@ -214,6 +215,7 @@ def has_image_url_with_url(content):
     def test_adv_conversation_image_gen_sim_responds_with_responses(self, azure_cred, project_scope):
         os.environ.pop("RAI_SVC_URL", None)
         from azure.ai.evaluation.simulator import AdversarialScenario, AdversarialSimulator
+        from azure.ai.evaluation.simulator._adversarial_scenario import _UnstableAdversarialScenario
 
         azure_ai_project = {
             "subscription_id": project_scope["subscription_id"],
@@ -248,7 +250,7 @@ async def callback(
 
         outputs = asyncio.run(
             simulator(
-                scenario=AdversarialScenario.ADVERSARIAL_IMAGE_GEN,
+                scenario=_UnstableAdversarialScenario.ADVERSARIAL_IMAGE_GEN,
                 max_conversation_turns=1,
                 max_simulation_results=1,
                 target=callback,

sdk/evaluation/azure-ai-evaluation/tests/e2etests/test_sim_and_eval.py

@@ -20,6 +20,7 @@
     evaluate,
 )
 from azure.ai.evaluation.simulator import AdversarialScenario, AdversarialSimulator
+from azure.ai.evaluation.simulator._adversarial_scenario import _UnstableAdversarialScenario
 from azure.identity import DefaultAzureCredential
 
 
@@ -172,7 +173,7 @@ async def callback(
         # Run simulator to produce 2 results with 2 conversation turns each (4 messages)
         simulator_output = asyncio.run(
             simulator(
-                scenario=AdversarialScenario.ADVERSARIAL_IMAGE_UNDERSTANDING,
+                scenario=_UnstableAdversarialScenario.ADVERSARIAL_IMAGE_MULTIMODAL,
                 max_conversation_turns=1,
                 max_simulation_results=1,
                 target=callback,
@@ -257,7 +258,7 @@ async def callback(
         # Run simulator to produce 2 results with 2 conversation turns each (4 messages)
         simulator_output = asyncio.run(
             simulator(
-                scenario=AdversarialScenario.ADVERSARIAL_IMAGE_GEN,
+                scenario=_UnstableAdversarialScenario.ADVERSARIAL_IMAGE_GEN,
                 max_conversation_turns=1,
                 max_simulation_results=1,
                 target=callback,
@@ -343,7 +344,7 @@ async def callback(
 
         simulator_output = asyncio.run(
             simulator(
-                scenario=AdversarialScenario.ADVERSARIAL_IMAGE_GEN,
+                scenario=_UnstableAdversarialScenario.ADVERSARIAL_IMAGE_GEN,
                 max_conversation_turns=1,
                 max_simulation_results=1,
                 target=callback,

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

@@ -54,8 +54,6 @@ def test_initialization_with_all_valid_scenarios(
             AdversarialScenario.ADVERSARIAL_REWRITE,
             AdversarialScenario.ADVERSARIAL_CONTENT_GEN_UNGROUNDED,
             AdversarialScenario.ADVERSARIAL_CONTENT_GEN_GROUNDED,
-            AdversarialScenario.ADVERSARIAL_IMAGE_GEN,
-            AdversarialScenario.ADVERSARIAL_IMAGE_UNDERSTANDING,
         ]
         for scenario in available_scenarios:
             simulator = AdversarialSimulator(azure_ai_project=azure_ai_project, credential=azure_cred)