Merge branch 'main' into refcheck-citations

Author: romanlutz

.github/instructions/attacks.instructions.md

@@ -37,12 +37,6 @@ Requirements:
   raise `TypeError` at import time.
 - ``super().__init__(...)`` must be invoked with at minimum
   ``objective_target`` and ``context_type``.
-- Existing subclasses that cannot adopt the contract immediately may set
-  the class attribute ``_brick_legacy_init = True`` to opt into a
-  one-release grace period that downgrades the error to a
-  ``DeprecationWarning(removed_in="0.16.0")``. The opt-out is removed in
-  0.16.0; classes that still violate the contract at that point will hard
-  fail.
 - ``AttackTechniqueFactory`` already rejects ``**kwargs`` in attack
   ``__init__`` at factory-registration time
   (`pyrit/scenario/core/attack_technique_factory.py`); the new

.github/instructions/converters.instructions.md

@@ -106,20 +106,6 @@ It rejects:
 def __init__(self, foo: str, bar: int = 0) -> None: ...    # missing *
 ```
 
-### Temporary opt-out: ``_brick_legacy_init``
-
-A handful of legacy converters whose positional ``__init__`` is part of the
-public API are grandfathered with ``_brick_legacy_init = True``. They
-emit a ``DeprecationWarning`` at import time and the opt-out is scheduled
-for removal in **0.16.0**. Do not set this flag on new converters; new
-converters MUST follow the keyword-only contract.
-
-Currently grandfathered (slated for cleanup in 0.16.0):
-``AddImageVideoConverter``, ``AnsiAttackConverter``, ``AsciiArtConverter``,
-``AskToDecodeConverter``, ``DiacriticConverter``, ``InsertPunctuationConverter``,
-``PDFConverter``, ``QRCodeConverter``, ``RandomCapitalLettersConverter``,
-``SearchReplaceConverter``, ``SmugglerConverter`` (and its three subclasses).
-
 ## Exports and External Updates
 
 - New converters MUST be added to `pyrit/prompt_converter/__init__.py` — both the import and the `__all__` list.

.github/instructions/datasets.instructions.md

@@ -14,9 +14,7 @@ Style rules from `style-guide.instructions.md` (async `_async` suffix, keyword-o
 The keyword-only `__init__` rule is **enforced at class-definition time** by
 `SeedDatasetProvider.__init_subclass__` calling `enforce_keyword_only_init` (see
 `pyrit/common/brick_contract.py`). Loaders with positional `__init__` params raise
-`TypeError` at import time; existing offenders may set `_brick_legacy_init = True`
-to opt into a one-release grace period that downgrades the error to a
-`DeprecationWarning(removed_in="0.16.0")`.
+`TypeError` at import time.
 
 ## Use SeedObjective for behavior/goal rows; SeedPrompt for literal messages
 

.github/instructions/scenarios.instructions.md

@@ -76,10 +76,7 @@ Requirements:
 - All parameters keyword-only via `*` — **enforced at class-definition time** by
   `Scenario.__init_subclass__` calling `enforce_keyword_only_init` (see
   `pyrit/common/brick_contract.py`). Violators raise `TypeError` at
-  import time. Existing classes that cannot adopt the contract immediately
-  may opt into a one-release grace period via the class attribute
-  `_brick_legacy_init = True`, which downgrades the error to a
-  `DeprecationWarning(removed_in="0.16.0")`. The opt-out is removed in 0.16.0.
+  import time.
 - **All constructor parameters must be optional** (default to `None`) so the registry can instantiate the scenario with no arguments for metadata introspection. Defer required-input validation to `initialize_async()` or `_build_atomic_attacks_async()`. `ScenarioRegistry._build_metadata` raises `TypeError` if `scenario_class()` cannot be called with no arguments.
 - `super().__init__()` called with `version`, `strategy_class`, `default_strategy`, `default_dataset_config`, `objective_scorer`
 - complex objects like `adversarial_chat` or `objective_scorer` should be passed into the constructor.
@@ -256,8 +253,8 @@ under `max_dataset_size`.
 
 ```python
 AtomicAttack(
-    atomic_attack_name=strategy_name,   # must be unique per AtomicAttack
-    attack=attack_instance,             # AttackStrategy implementation
+    atomic_attack_name=strategy_name,   # groups related attacks
+    attack_technique=AttackTechnique(attack=attack_instance),  # bundles the AttackStrategy
     seed_groups=list(seed_groups),       # must be non-empty
     memory_labels=context.memory_labels, # from the context snapshot
 )

.github/instructions/scorers.instructions.md

@@ -37,20 +37,6 @@ Requirements:
 - ``super().__init__(validator=..., chat_target=...)`` is required so the
   base class wires the validator and validates ``TARGET_REQUIREMENTS``
   against any provided ``chat_target``.
-- Existing subclasses that cannot adopt the contract immediately may set
-  the class attribute ``_brick_legacy_init = True`` to opt into a
-  one-release grace period that downgrades the error to a
-  ``DeprecationWarning(removed_in="0.16.0")``. The opt-out is removed in
-  0.16.0; classes that still violate the contract at that point will hard
-  fail.
-
-### Currently grandfathered
-
-- ``PlagiarismScorer`` (``pyrit/score/float_scale/plagiarism_scorer.py``) —
-  accepts ``reference_text`` positionally as part of its public API. The
-  positional shape is preserved through one release cycle via
-  ``_brick_legacy_init = True`` and is scheduled to become
-  keyword-only in 0.16.0 (``BREAKING CHANGE``).
 
 ## Common pitfalls
 

.github/instructions/style-guide.instructions.md

@@ -181,8 +181,8 @@ package without paying the cost at package load time. See
 Import from the package root when the symbol is exported from `__init__.py`:
 
 ```python
-from pyrit.prompt_target import PromptChatTarget  # CORRECT
-from pyrit.prompt_target.common.prompt_chat_target import PromptChatTarget  # WRONG
+from pyrit.prompt_target import PromptTarget  # CORRECT
+from pyrit.prompt_target.common.prompt_target import PromptTarget  # WRONG
 ```
 
 Heavy submodules not re-exported from `__init__.py` are imported directly:

.github/instructions/targets.instructions.md

@@ -65,23 +65,9 @@ def __init__(self, endpoint: str, api_key: str) -> None: ...    # missing *
 ```
 
 > [!NOTE]
-> ``PromptTarget.__init__`` *itself* still accepts positional parameters and
-> is not currently keyword-only. The ``__init_subclass__`` hook only runs for
-> subclasses, so the base class non-compliance is tolerated during the warn-
-> first phase. The base ``__init__`` will be reshaped to be keyword-only in
-> 0.16.0 as a BREAKING CHANGE.
-
-## Temporary opt-out: ``_brick_legacy_init``
-
-A handful of legacy targets whose positional ``__init__`` is part of the
-public API are grandfathered with ``_brick_legacy_init = True``. They
-emit a ``DeprecationWarning`` at import time and the opt-out is scheduled
-for removal in **0.16.0**. Do not set this flag on new targets; new
-targets MUST follow the keyword-only contract.
-
-Currently grandfathered (slated for cleanup in 0.16.0):
-``HTTPTarget``, ``OpenAICompletionTarget``, ``OpenAIImageTarget``,
-``PromptShieldTarget``.
+> ``PromptTarget.__init__`` *itself* is now keyword-only as well (``*`` after
+> ``self``), so both the base class and its subclasses enforce the same
+> contract.
 
 ## Configuration and Capabilities
 

doc/code/executor/2_multi_turn.ipynb

@@ -233,6 +233,7 @@
     "    RedTeamingAttack,\n",
     "    RTASystemPromptPaths,\n",
     ")\n",
+    "from pyrit.models import SeedPrompt\n",
     "from pyrit.score import SelfAskTrueFalseScorer, TrueFalseQuestion\n",
     "\n",
     "scoring_config = AttackScoringConfig(\n",
@@ -246,7 +247,7 @@
     "    objective_target=objective_target,\n",
     "    attack_adversarial_config=AttackAdversarialConfig(\n",
     "        target=adversarial_chat,\n",
-    "        system_prompt_path=RTASystemPromptPaths.TEXT_GENERATION.value,\n",
+    "        system_prompt=SeedPrompt.from_yaml_file(RTASystemPromptPaths.TEXT_GENERATION.value),\n",
     "    ),\n",
     "    attack_scoring_config=scoring_config,\n",
     "    max_turns=2,\n",

doc/code/executor/2_multi_turn.py

@@ -83,6 +83,7 @@
     RedTeamingAttack,
     RTASystemPromptPaths,
 )
+from pyrit.models import SeedPrompt
 from pyrit.score import SelfAskTrueFalseScorer, TrueFalseQuestion
 
 scoring_config = AttackScoringConfig(
@@ -96,7 +97,7 @@
     objective_target=objective_target,
     attack_adversarial_config=AttackAdversarialConfig(
         target=adversarial_chat,
-        system_prompt_path=RTASystemPromptPaths.TEXT_GENERATION.value,
+        system_prompt=SeedPrompt.from_yaml_file(RTASystemPromptPaths.TEXT_GENERATION.value),
     ),
     attack_scoring_config=scoring_config,
     max_turns=2,

doc/code/executor/3_attack_configuration.ipynb

@@ -471,6 +471,7 @@
     "    RedTeamingAttack,\n",
     "    RTASystemPromptPaths,\n",
     ")\n",
+    "from pyrit.models import SeedPrompt\n",
     "from pyrit.prompt_target import OpenAIChatTarget, OpenAIImageTarget\n",
     "from pyrit.score import SelfAskTrueFalseScorer, TrueFalseQuestion\n",
     "\n",
@@ -482,7 +483,7 @@
     "# Adversarial config: an unfiltered chat model drafts each image prompt, primed for image generation.\n",
     "adversarial_config = AttackAdversarialConfig(\n",
     "    target=OpenAIChatTarget(),\n",
-    "    system_prompt_path=RTASystemPromptPaths.IMAGE_GENERATION.value,\n",
+    "    system_prompt=SeedPrompt.from_yaml_file(RTASystemPromptPaths.IMAGE_GENERATION.value),\n",
     ")\n",
     "\n",
     "# Scoring config: a vision-capable model inspects the generated image and scores the objective.\n",