Skip to content

MAINT: declare PromptInject templates as required data - #3546

Merged
Roman Lutz (romanlutz) merged 24 commits into
microsoft:mainfrom
u7k4rs6:feat/required-data-prompt-inject
Nov 10, 2026
Merged

Roman Lutz (romanlutz) merged 24 commits into
microsoft:mainfrom
u7k4rs6:feat/required-data-prompt-inject

Conversation

@u7k4rs6

@u7k4rs6 Utkarsh Bahuguna (u7k4rs6) commented Oct 26, 2026 •

Copy link
Copy Markdown
Contributor

Second scenario for #3336, built on the required data support from #3464. PromptInject's context and technique templates move to get_required_data, and PromptInjectDatasetConfiguration keeps just goal_texts and max_total with the per-goal coverage sampling. Its own uncapped and exact-datasets checks are gone, filters and fetch overrides still reach the templates, and the identity still lists both datasets so old runs resume. Passing the templates as sources still works with a deprecation warning.

Part of #3336

Comment thread pyrit/scenario/core/scenario.py Resolved
…s to selected techniques

A required-data refresh committed before the scenario assembled its population, so a
refresh that the assembly or the population validators would reject had already replaced
the stored datasets, breaking resume of earlier runs. The refresh now runs the scenario's
full unsampled assembly against the candidates first, so a rejected refresh changes nothing.

Legacy dataset_config validators wrote against the raw template seeds, so they move onto
the required data when an old configuration migrates, instead of receiving the assembled
objectives. ApiKey now requires a prompt template only for the techniques a run selects.
Comment thread pyrit/scenario/core/scenario.py Resolved
Comment thread pyrit/scenario/core/scenario.py Resolved
Roman Lutz (romanlutz) and others added 10 commits November 1, 2026 21:03
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
…work

A validator can be any callable, including an unhashable instance such as a plain
dataclass, so the migration can't collect them in a set. Remove the moved validators
by object identity instead.
…ject empty population

Required data and the population configuration are now fetched first and validated as one
batch: when either half refreshes, each configuration and the scenario's full unsampled
assembly run against all candidates before anything is written. A refresh of templates now
sees records fetched in the same run, a valid joint refresh is accepted, and a records-only
refresh that the assembly rejects leaves the stored rows and ids unchanged.

A global fetch override now reaches required sources without their own policy even when the
population has sources, and a source selection that names only required datasets is rejected
instead of silently restoring the default population.
…ataset names

A compound population names its datasets through its children, so its own sources are empty
and its parent fetch is not the requested one. Required data now keeps its resolved fetch
policy whenever the population names any dataset, so fetch=never and fetch=always reach the
required sources for compound populations too.

Preparing required data and the population together now rejects a dataset named by both
before anything is fetched. Candidates are keyed by name, so a shared name validated one
batch and then committed both.
… contract

A compound configuration has no root sources even when its children name datasets, so it
passed the source guard in select_assembled_groups and its children's validators and limits
were skipped. It now raises a clear error instead; use a single source-free configuration.

The docs said required data is read without filters, but its filters do narrow the input
rows. The module, Scenario.get_required_data() and the scenario instructions now say every
row that remains after filtering is read, without sampling or size caps.
Copilot AI balanced review requested due to automatic review settings November 9, 2026 11:07

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has insufficient remaining quota. Try requesting a review at a lower effort level.

Preserve the PromptInject assembled-population limit contract when reconciling the run-size estimate tests.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@u7k4rs6
Utkarsh Bahuguna (u7k4rs6) marked this pull request as ready for review November 10, 2026 07:08
@romanlutz
Roman Lutz (romanlutz) added this pull request to the merge queue Nov 10, 2026
Merged via the queue into microsoft:main with commit 4fbbc5f Nov 10, 2026
61 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants