probe: drop AdaptiveAttacksFull, ship single capped probe

neerazz-parafin · neerazz-parafin · commit 3ceba9b10d1a · 2026-06-09T10:03:26.000-07:00
AdaptiveAttacksFull was inactive by default (active=False) to prevent
prompt duplication when both probes run together. Removing it entirely
gives the same safety guarantee with a simpler surface: one probe,
one configurable cap, no opt-in class to maintain.

AdaptiveAttacks keeps follow_prompt_cap=True and the soft_probe_prompt_cap
guard. Uncapped runs remain possible via --config follow_prompt_cap=false.
diff --git a/garak/probes/adaptiveattacks.py b/garak/probes/adaptiveattacks.py
@@ -105,23 +105,3 @@ def __init__(self, config_root=_config):
         super().__init__(config_root=config_root)
         if self.follow_prompt_cap:
             self._prune_data(cap=self.soft_probe_prompt_cap)
-
-
-class AdaptiveAttacksFull(AdaptiveAttacks):
-    """Simple adaptive attacks probe (full, no prompt cap)
-
-    Uncapped variant of :class:`AdaptiveAttacks`. Generates one prompt per
-    (seed, suffix) pair without sampling. Inactive by default to avoid
-    duplicating prompts emitted by the capped :class:`AdaptiveAttacks` when
-    both probes are selected. Opt in explicitly with
-    ``--probes adaptiveattacks.AdaptiveAttacksFull``."""
-
-    aliases = ["adaptiveattacks.AdaptiveAttacksFull"]
-    # Opt-in only: keeping this inactive prevents the prompt duplication that
-    # occurs when AdaptiveAttacks (capped) and AdaptiveAttacksFull (uncapped)
-    # are both active in the same run.
-    active = False
-
-    DEFAULT_PARAMS = AdaptiveAttacks.DEFAULT_PARAMS | {
-        "follow_prompt_cap": False,
-    }
diff --git a/tests/probes/test_probes_adaptiveattacks.py b/tests/probes/test_probes_adaptiveattacks.py
@@ -10,7 +10,6 @@
 
 ADAPTIVE_PROBES = (
     "probes.adaptiveattacks.AdaptiveAttacks",
-    "probes.adaptiveattacks.AdaptiveAttacksFull",
 )
 
 
@@ -51,18 +50,3 @@ def test_adaptiveattacks_respects_soft_probe_prompt_cap():
         ), f"AdaptiveAttacks has {len(probe.prompts)} prompts, expected at most {cap}"
     finally:
         _config.run.soft_probe_prompt_cap = original_cap
-
-
-def test_adaptiveattacks_full_ignores_cap():
-    cap = 1
-    original_cap = _config.run.soft_probe_prompt_cap
-    _config.run.soft_probe_prompt_cap = cap
-    try:
-        from garak.probes.adaptiveattacks import AdaptiveAttacksFull
-
-        probe = AdaptiveAttacksFull()
-        assert (
-            len(probe.prompts) > cap
-        ), "AdaptiveAttacksFull should not be pruned by soft_probe_prompt_cap"
-    finally:
-        _config.run.soft_probe_prompt_cap = original_cap
