MAINT: Technique Organization#2155
Merged
rlundeen2 merged 3 commits intoJul 10, 2026
Merged
Conversation
Reorganize how attack techniques are cataloged, tagged, and selected so the catalog can scale to hundreds of techniques. Decisions: - Catalog lives under pyrit/setup/initializers/techniques/. `core.py` is a small, curated standard set; `extra.py` is the broader opt-in collection and the default home for new general-purpose contributions. Per-source modules (e.g. `airt.py`) hold techniques owned by a scenario/source but still reusable, tagged with their owner and kept out of the default pool. - Retire the global `default` tag. What runs by default is scenario-relative, so each scenario declares its own defaults via build_strategy_class_from_factories (available selects the pool, aggregates are named presets, default/default_technique_names set what runs when nothing is chosen). available/aggregate/default relate as strict subsets. - Techniques pinned to one scenario may stay local to it (e.g. Doctor's Policy Puppetry factories); promote to a catalog module only when reusable. - Migrate Doctor's hand-written strategy enum onto the shared factory generator (technique enum attr names go PascalCase -> snake_case; values unchanged). Default loading: - A bare initialize_pyrit_async now auto-runs TechniqueInitializer (core) and TargetInitializer when none are supplied, so `core` techniques and default targets are registered without any config. Users select other subsets by passing initializer tags (core/extra/all) or their own initializer, including from the CLI. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
behnam-o
approved these changes
Jul 9, 2026
Address review feedback: build the Doctor strategy class the same way the other
dynamically-generated scenarios do (rapid_response/leakage/cyber) instead of at
module level.
- `_build_doctor_strategy()` is now `@cache`d and called in `Doctor.__init__`
(`strategy_class = _build_doctor_strategy()`; `default_strategy=strategy_class("default")`).
- The public `DoctorStrategy` symbol is resolved lazily via a `__getattr__` in the
garak package `__init__` (mirroring the airt package), so `@cache` keeps every
instance sharing one enum class.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
varunj-msft
approved these changes
Jul 9, 2026
…techniques # Conflicts: # pyrit/registry/components/attack_technique_registry.py # pyrit/scenario/scenarios/airt/cyber.py # pyrit/scenario/scenarios/airt/leakage.py # pyrit/scenario/scenarios/airt/rapid_response.py # pyrit/scenario/scenarios/garak/__init__.py # pyrit/scenario/scenarios/garak/doctor.py # pyrit/setup/initializers/techniques/core.py # tests/unit/scenario/garak/test_doctor.py
varunj-msft
pushed a commit
to varunj-msft/PyRIT
that referenced
this pull request
Jul 10, 2026
… collisions Re-migrated onto current main (post technique rename microsoft#2153 / technique organization microsoft#2155). garak.encoding was already seam-migrated on main to EncodingTechnique(ScenarioTechnique); this layers the remaining #8380 standardization on top. Add an EncodingTechnique.DEFAULT aggregate (curated 8-scheme spread across base-N, cipher, and symbolic families) with a get_aggregate_tags() override, make it the default technique, and bump VERSION to 2. Follows the hand-written enum DEFAULT pattern used by scam/web_injection (not the factory default_technique_names path, which applies only to the core catalog). Fix atomic-attack name collisions by naming each converter variant f"{variant_slug}_{config_suffix}" and grouping variants under display_group=encoding_name so per-encoding results aggregate. Trim near-duplicate base64 variants (standard_b64encode is byte-identical to the default; b2a_base64 only appends a newline). Keep the default per-dataset cap at main's max_dataset_size=3 (no timing change).
u7k4rs6
added a commit
to u7k4rs6/PyRIT
that referenced
this pull request
Jul 10, 2026
…ues/core.py Upstream (microsoft#2155) replaced initializers/components/scenario_techniques.py with initializers/techniques/core.py and renamed strategy_tags to technique_tags. The core group tag is now injected by build_technique_factories rather than stored in the factory. Port the code_attack entry and its test list update to the new layout.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Reorganizes how attack techniques are cataloged, tagged, and selected so the catalog can scale to hundreds of techniques, and makes a bare
initialize_pyrit_asyncproduce a usable environment by default.Decisions
pyrit/setup/initializers/techniques/):core.py— a small, curated standard set (auto-loaded).extra.py— the broader, opt-in collection, and the default home for new general-purpose contributions.airt.py) — techniques owned by a scenario/source but still reusable; tagged with their owner and kept out of the default pool.defaulttag. What runs by default is scenario-relative, so each scenario declares its own defaults viabuild_strategy_class_from_factories. The three roles are tag queries over the pool and relate as strict subsets:available(the pool), aggregates (named presets likesingle_turn), anddefault/default_technique_names(what runs when nothing is selected).DoctorStrategy.PolicyPuppetry→DoctorStrategy("policy_puppetry")); enum values are unchanged.Default loading
initialize_pyrit_async(...)now auto-runsTechniqueInitializer+TargetInitializeronly when the caller supplies no initializers/scripts, socoretechniques and the available default targets are registered with no config.load_defaults=Falseflag skips them even on a bare call (e.g. to start from an empty state).coretechniques anddefaulttargets are auto-loaded —extra/ per-source technique groups andscorertarget variants stay opt-in (via initializer tagscore/extra/all, a custom initializer, or the CLI).Docs
doc/code/framework.mdto describe the catalog, the tagging model, and the available/aggregate/default selection roles.Tests
tests/unit/scenario/+tests/unit/registry/: 1140 passed. Full pre-commit (ruff, format, ty, doc-structure, async-suffix, etc.) is green.