Repository navigation
FEAT: Use SeedDataset-backed inline data for GCG - #3607
Roman Lutz (romanlutz) wants to merge 24 commits into
Conversation
…ft#1902) Co-authored-by: Copilot <[email protected]>
Add optional protocol fields on GCGAlgorithmConfig and wire GCGMultiPromptAttack.step to dispatch through protocol objects with default fallbacks that preserve legacy behavior when unset. Also wire suffix initialization through config and add unit coverage for config validation, manager wiring, default parity, and custom dispatch. Co-authored-by: Copilot <[email protected]>
Avoid failing the GCG step when logging tokenized control length for custom candidate-filter outputs that are not directly re-tokenizable by the active tokenizer. Co-authored-by: Copilot <[email protected]>
…handling - Add tests for __init__ with custom sampling/loss/filter protocols - Add tests for _resolve_* methods returning defaults - Add test for _get_control_length success and error paths - Add test for _resolve_control_init raising ValueError when suffix_init configured but no workers These tests cover previously uncovered lines in gcg_attack.py (lines 151, 163-165) and generator.py (line 463) to meet the 90% diff coverage requirement. Co-authored-by: Copilot <[email protected]>
Align test_get_control_length_success with _get_control_length behavior, which intentionally drops the first token before measuring length. Co-authored-by: Copilot <[email protected]>
Cover GCGMultiPromptAttack constructor wiring via real __init__, exercise gradient-shape mismatch sampling path in step(), and cover _resolve_control_init fallback when suffix_init is not configured. Co-authored-by: Copilot <[email protected]>
Use verbose=True in the gradient-shape mismatch step test so the prompt iteration yields integer indices (matching attack.step expectations) and avoids tuple indexing errors. Co-authored-by: Copilot <[email protected]>
Replace the URL-string-centric GCGDataConfig with an inline goal/target carrier so the JSON shipped to Azure ML embeds the resolved data. The compute container no longer fetches data from the public internet, which makes GCG runnable in air-gapped subscriptions. - GCGDataConfig now holds train/test goals+targets inline (paired-length validation) plus a from_seed_dataset adapter and a gcg_target metadata key. - Add fetch_advbench_for_gcg_async + private _AdvBenchGCGLoader to materialize the public AdvBench dataset as a SeedDataset (target under metadata). - load_goals_and_targets becomes a torch-free inline accessor; run.py is now URL-free and drops the random_seed arg. - Lazily export fetch_advbench_for_gcg_async; update the AML notebook to fetch + from_seed_dataset. - Update/add unit tests for serialization, validation, adapter, and fetcher. Co-authored-by: Copilot <[email protected]>
…set-adapter # Conflicts: # pyrit/auxiliary_attacks/gcg/config.py # tests/unit/auxiliary_attacks/gcg/test_config.py
…set-adapter # Conflicts: # doc/code/executor/gcg/1_gcg_azure_ml.ipynb # doc/code/executor/gcg/1_gcg_azure_ml.py # pyrit/executor/promptgen/gcg/__init__.py # pyrit/executor/promptgen/gcg/config.py # pyrit/executor/promptgen/gcg/data.py # tests/unit/executor/promptgen/gcg/test_advbench_fetcher.py # tests/unit/executor/promptgen/gcg/test_data_and_config.py
Co-authored-by: Copilot App <[email protected]> Copilot-Session: 46bcee92-47ce-448a-b0ac-679de6b7f6ae
Co-authored-by: Copilot App <[email protected]> Copilot-Session: 46bcee92-47ce-448a-b0ac-679de6b7f6ae
Reject malformed inline data and completion metadata, use final error-free assistant text, and require configurable scorer acceptance for generated prefixes. Add regression coverage and document migration from CSV-based configuration. Co-authored-by: Copilot App <[email protected]> Copilot-Session: 46bcee92-47ce-448a-b0ac-679de6b7f6ae
Use PyRIT configuration for environment loading without unrelated target initialization, and use the default Azure credential chain for AML. Co-authored-by: Copilot App <[email protected]> Copilot-Session: 46bcee92-47ce-448a-b0ac-679de6b7f6ae
Distinguish five optimization steps per goal from thirty logged checkpoints. Reject empty final suffixes and non-finite final losses. Verified the completed AML run's submitted pairs against bundled AdvBench and runtime target augmentation; retained evidence in session artifacts. Co-authored-by: Copilot App <[email protected]> Copilot-Session: 46bcee92-47ce-448a-b0ac-679de6b7f6ae
Preserve SeedDataset-backed inline data while adopting main's shared lazy export contract and updated GCG implementation. Co-authored-by: Copilot App <[email protected]> Copilot-Session: 46bcee92-47ce-448a-b0ac-679de6b7f6ae
Correct rotated AdvBench completion mappings, demonstrate target generation with a target-less dataset, and cover the torch-free public export in isolation. Co-authored-by: Copilot App <[email protected]> Copilot-Session: 46bcee92-47ce-448a-b0ac-679de6b7f6ae
There was a problem hiding this comment.
🟢 Approval recommended
There are no active review issues requiring changes to the inline GCG data-preparation update.
No open issues 🎉
What changed in this PR
This PR moves experimental GCG data preparation to the caller, using PyRIT’s SeedDataset infrastructure to embed paired objectives and completion prefixes in JSON before Azure ML submission.
Changes:
- Replace CSV paths and row counts with validated inline training and test data.
- Add metadata-backed adaptation and optional scorer-validated generation of missing completions, without requiring Torch.
- Expand regression coverage and update the AML example with migration guidance, environment initialization, and result validation.
| File | Description |
|---|---|
tests/unit/executor/promptgen/gcg/test_torch_free_public_api.py |
Verify the adapter imports without attempting to load Torch. |
tests/unit/executor/promptgen/gcg/test_public_api.py |
Check the new adapter’s public export. |
tests/unit/executor/promptgen/gcg/test_data.py |
Cover completion generation, acceptance scoring, and response validation. |
tests/unit/executor/promptgen/gcg/test_data_and_config.py |
Update data-access and job-runner tests for inline inputs. |
tests/unit/executor/promptgen/gcg/test_config.py |
Test dataset adaptation, serialization, validation, and migration errors. |
tests/unit/datasets/test_adv_bench_dataset.py |
Verify bundled AdvBench completion metadata and selected pairings. |
pyrit/executor/promptgen/gcg/experiments/run.py |
Consume inline data without CSV loading or sampling arguments. |
pyrit/executor/promptgen/gcg/data.py |
Resolve supplied or generated completions into inline configurations. |
pyrit/executor/promptgen/gcg/config.py |
Define validated inline lists and synchronous dataset adaptation. |
pyrit/executor/promptgen/gcg/__init__.py |
Lazily export the asynchronous dataset adapter. |
doc/code/executor/gcg/1_gcg_azure_ml.py |
Update AML setup, dataset preparation, migration examples, and result checks. |
doc/code/executor/gcg/1_gcg_azure_ml.ipynb |
Mirror the updated AML walkthrough in notebook form. |
Review effort: Balanced
Validate seed modality before resolving goals in both dataset adapters, with regression coverage for media and supported text seeds. Refresh saved AML output from the captured result with accurate checkpoint labels. Co-authored-by: Copilot App <[email protected]> Copilot-Session: 46bcee92-47ce-448a-b0ac-679de6b7f6ae
Retain generation requests, intermediate tool messages, and invalid responses before completion validation. Verify persisted exchanges with isolated SQLite tests. Co-authored-by: Copilot App <[email protected]> Copilot-Session: 46bcee92-47ce-448a-b0ac-679de6b7f6ae
Richard Lundeen (richlundeen)
left a comment
There was a problem hiding this comment.
[P2] Give the GCG seed-prefix payload one typed metadata owner
The URL-free SeedDataset-to-AML workflow is useful, but the new persistent gcg_target payload and configurable target_metadata_key readers conflict with the current framework's "Let one value object own each metadata key" convention. Bundled AdvBench writes the payload, while executor helpers interpret it directly (config.py:52-58,132-169; data.py:79-87), with no owning pyrit.models value object. Please retain inline transport, canonical prefixes, explicit splits, and missing-prefix generation, but give this payload one fixed namespaced model with to_metadata()/from_metadata() and use it in both adapters, following ToolExecutionMetadata. Normalize external field names once before adaptation instead of exposing alternate metadata dialects in GCG.
The inclusion decision is simplify. This run stops at that gate; it does not claim implementation-correctness coverage or approval.
Add GCGSeedMetadata with a fixed namespace and symmetric metadata serialization. Migrate both adapters, bundled AdvBench prefixes, and examples, removing alternate metadata-key dialects while preserving inline transport and missing-prefix generation. Co-authored-by: Copilot App <[email protected]> Copilot-Session: 46bcee92-47ce-448a-b0ac-679de6b7f6ae
|
Addressed this review in e14b6a0: |
Move the unchanged helper prompt into a bundled SeedPrompt and load it via asyncio.to_thread. Preserve injected prompts and sandboxed rendering, with focused regression tests. Co-authored-by: Copilot App <[email protected]> Copilot-Session: 46bcee92-47ce-448a-b0ac-679de6b7f6ae
Bring in the upstream GCG subclass factory contract and adapt its regression to inline goals and prefixes. Construct a false score instead of mutating its deprecated raw value. Co-authored-by: Copilot App <[email protected]> Copilot-Session: 46bcee92-47ce-448a-b0ac-679de6b7f6ae
Resolve the GCG metadata import and inline-data subclass test against current main, retaining the reviewed dataset adapter and upstream Self factory annotations. Co-authored-by: Copilot App <[email protected]> Copilot-Session: 46bcee92-47ce-448a-b0ac-679de6b7f6ae
Description
GCG needs paired objectives and target completion prefixes, but its CSV/URL-based input path bypassed PyRIT's dataset loaders and required dataset retrieval on Azure ML compute. This B4 change resolves supplied SeedDatasets locally and embeds the resulting goals and completions in the submitted JSON, making the compute-side data ingestion URL-free.
metadata["gcg_target"], preserving existing harm categories.Experimental API update: GCG is experimental and does not promise API compatibility, so this is not classified as a breaking release change.
GCGDataConfig(train_data=..., test_data=..., n_train_data=..., n_test_data=...)andload_goals_and_targets(..., random_seed=...)are replaced by caller-side loading/selection/splitting and inline config construction. The notebook includes migration examples. This intentionally avoids retaining compute-side URL fetching in the experimental GCG API. Follows the wiring in #2070 and accommodates the GCG migration in #2197.Tests and Documentation
Added regression coverage for inline serialization, dataset adaptation, invalid metadata/JSON, final-response handling, scorer acceptance, custom prompts, and bundled AdvBench completions. Updated both paired AML notebook formats.
Validation performed in this worktree:
uv run --link-mode=copy python -m pytest tests\unit\datasets\test_adv_bench_dataset.py tests\unit\executor\promptgen\gcg\ -q: 136 passed, 9 skipped at the adapter-fix commit. Skips were Torch-dependent tests before installing the GCG extra.uv run --extra gcg --link-mode=copy python -m pytest tests\unit\datasets\test_adv_bench_dataset.py tests\unit\executor\promptgen\gcg\test_config.py tests\unit\executor\promptgen\gcg\test_data.py -q: 121 passed after the final notebook changes.uv run --link-mode=copy ty check pyrit\executor\promptgen\gcg\config.py pyrit\executor\promptgen\gcg\data.py tests\unit\executor\promptgen\gcg\test_config.py tests\unit\executor\promptgen\gcg\test_data.py: passed.uv run --extra gcg --link-mode=copy pre-commit run --files doc\code\executor\gcg\1_gcg_azure_ml.py doc\code\executor\gcg\1_gcg_azure_ml.ipynb: passed. Source/test hooks also passed at their implementation commit.git diff --check: passed. Jupytext-parsed cell sources match between the.pyand.ipynbfiles.Live AML execution: Executed all eight code cells using
uv run --extra gcg --link-mode=copy python -with NBClient and this worktree's kernel. Run dynamic_nerve_96b78cyldr completed successfully onStandard_NC24ads_A100_v4. The submitted JSON exactly matches the first five bundled AdvBench goal/completion pairs; runtime goals match, and runtime targets reflect the existing GCG phrasing augmentation. Five optimization iterations per goal produced 30 logged checkpoints, including five initial checkpoints. The final suffix was nonempty and final loss was 1.451171875.The final notebook result checks were then executed against that downloaded result and rejected six invalid-output cases; no additional GPU job was submitted for that reporting change. The live run covers the metadata-backed dataset path, not missing-completion generation, which has unit coverage only. Optimization completion does not establish suffix effectiveness. The full repository test suite was not run.