FIX propagate params in attack executor functions (microsoft#1187)

Author: hannahwestra25

pyrit/executor/attack/core/attack_executor.py

@@ -195,6 +195,7 @@ async def execute_single_turn_attacks_async(
         prepended_conversations: Optional[List[List[Message]]] = None,
         memory_labels: Optional[Dict[str, str]] = None,
         return_partial_on_failure: bool = False,
+        **attack_params,
     ) -> AttackExecutorResult[AttackStrategyResultT]:
         """
         Execute a batch of single-turn attacks with multiple objectives.
@@ -217,6 +218,7 @@ async def execute_single_turn_attacks_async(
             return_partial_on_failure (bool): If True, returns AttackExecutorResult with completed results
                 even when some objectives don't complete execution. If False, raises the first exception encountered.
                 Defaults to False (raise on failure).
+            **attack_params: Additional parameters specific to the attack strategy.
 
         Returns:
             AttackExecutorResult[AttackStrategyResultT]: Result container with completed results and
@@ -262,6 +264,7 @@ async def execute_with_semaphore(
                     prepended_conversation=prepended_conversation,
                     seed_group=seed_group,
                     memory_labels=memory_labels or {},
+                    **attack_params,
                 )
 
         # Create tasks for each objective with its corresponding parameters
@@ -293,6 +296,7 @@ async def execute_multi_turn_attacks_async(
         prepended_conversations: Optional[List[List[Message]]] = None,
         memory_labels: Optional[Dict[str, str]] = None,
         return_partial_on_failure: bool = False,
+        **attack_params,
     ) -> AttackExecutorResult[AttackStrategyResultT]:
         """
         Execute a batch of multi-turn attacks with multiple objectives.
@@ -315,6 +319,7 @@ async def execute_multi_turn_attacks_async(
             return_partial_on_failure (bool): If True, returns AttackExecutorResult with completed results
                 even when some objectives don't complete execution. If False, raises the first exception encountered.
                 Defaults to False (raise on failure).
+            **attack_params: Additional parameters specific to the attack strategy.
 
         Returns:
             AttackExecutorResult[AttackStrategyResultT]: Result container with completed results and
@@ -358,6 +363,7 @@ async def execute_with_semaphore(
                     prepended_conversation=prepended_conversation,
                     custom_prompt=custom_prompt,
                     memory_labels=memory_labels or {},
+                    **attack_params,
                 )
 
         # Create tasks for each objective with its corresponding parameters

pyrit/scenarios/atomic_attack.py

@@ -213,7 +213,11 @@ def _validate_parameters(
             )
 
     async def run_async(
-        self, *, max_concurrency: int = 1, return_partial_on_failure: bool = True
+        self,
+        *,
+        max_concurrency: int = 1,
+        return_partial_on_failure: bool = True,
+        **attack_params,
     ) -> AttackExecutorResult[AttackResult]:
         """
         Execute the atomic attack against all objectives in the dataset.
@@ -236,6 +240,7 @@ async def run_async(
             return_partial_on_failure (bool): If True, returns partial results even when
                 some objectives don't complete execution. If False, raises an exception on
                 any execution failure. Defaults to True.
+            **attack_params: Additional parameters to pass to the attack strategy.
 
         Returns:
             AttackExecutorResult[AttackResult]: Result containing completed attack results and
@@ -268,6 +273,7 @@ async def run_async(
                     prepended_conversations=prepended_conversations,
                     memory_labels=merged_memory_labels,
                     return_partial_on_failure=return_partial_on_failure,
+                    **self._attack_execute_params,
                 )
             elif self._context_type == "multi_turn":
                 results = await executor.execute_multi_turn_attacks_async(
@@ -277,6 +283,7 @@ async def run_async(
                     prepended_conversations=prepended_conversations,
                     memory_labels=merged_memory_labels,
                     return_partial_on_failure=return_partial_on_failure,
+                    **self._attack_execute_params,
                 )
             else:
                 # Fall back to generic execute_multi_objective_attack_async

tests/unit/executor/attack/core/test_attack_executor.py

@@ -835,6 +835,28 @@ async def test_execute_single_turn_validates_prepended_conversations_length(self
                 prepended_conversations=prepended_conversations,
             )
 
+    @pytest.mark.asyncio
+    async def test_execute_single_turn_with_attack_execute_params(self, mock_single_turn_attack_strategy):
+        executor = AttackExecutor(max_concurrency=1)
+        objectives = ["Obj1", "Obj2", "Obj3"]
+
+        mock_single_turn_attack_strategy.execute_async.return_value = MagicMock()
+
+        await executor.execute_single_turn_attacks_async(
+            attack=mock_single_turn_attack_strategy,
+            objectives=objectives,
+            custom_param="test_value",
+            batch_size=10,
+            another_param=42,
+        )
+
+        # Verify all calls included the custom params
+        assert mock_single_turn_attack_strategy.execute_async.call_count == 3
+        for call in mock_single_turn_attack_strategy.execute_async.call_args_list:
+            assert call.kwargs["custom_param"] == "test_value"
+            assert call.kwargs["batch_size"] == 10
+            assert call.kwargs["another_param"] == 42
+
 
 @pytest.mark.usefixtures("patch_central_database")
 class TestExecuteMultiTurnAttacksAsync:
@@ -1028,6 +1050,28 @@ async def track_execution(objective, **kwargs):
 
         assert max_concurrent <= 2
 
+    @pytest.mark.asyncio
+    async def test_execute_multi_turn_with_attack_execute_params(self, mock_multi_turn_attack_strategy):
+        executor = AttackExecutor(max_concurrency=1)
+        objectives = ["Obj1", "Obj2", "Obj3"]
+
+        mock_multi_turn_attack_strategy.execute_async.return_value = MagicMock()
+
+        await executor.execute_multi_turn_attacks_async(
+            attack=mock_multi_turn_attack_strategy,
+            objectives=objectives,
+            custom_param="test_value",
+            max_turns=5,
+            temperature=0.7,
+        )
+
+        # Verify all calls included the custom params
+        assert mock_multi_turn_attack_strategy.execute_async.call_count == 3
+        for call in mock_multi_turn_attack_strategy.execute_async.call_args_list:
+            assert call.kwargs["custom_param"] == "test_value"
+            assert call.kwargs["max_turns"] == 5
+            assert call.kwargs["temperature"] == 0.7
+
 
 @pytest.mark.usefixtures("patch_central_database")
 class TestValidateAttackBatchParameters: