Skip to content

Updates/post release #40400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 133 commits into from
Closed
Changes from all commits
Commits
Show all changes
133 commits
Select commit Hold shift + click to select a range
7de6367
Update task_query_response.prompty
nagkumar91 Oct 1, 2024
f288b34
Update task_simulate.prompty
nagkumar91 Oct 1, 2024
2a4b6f7
Update task_query_response.prompty
nagkumar91 Oct 2, 2024
c8ce251
Update task_simulate.prompty
nagkumar91 Oct 2, 2024
4522ae4
Merge branch 'Azure:main' into main
nagkumar91 Oct 3, 2024
32e9c1d
Merge branch 'Azure:main' into main
nagkumar91 Oct 7, 2024
76df69d
Merge branch 'Azure:main' into main
nagkumar91 Oct 8, 2024
aeddcb4
Merge branch 'Azure:main' into main
nagkumar91 Oct 8, 2024
65a759c
Merge branch 'Azure:main' into main
nagkumar91 Oct 9, 2024
e4cdd30
Fix the api_key needed
Oct 9, 2024
e3ab026
Merge branch 'Azure:main' into main
nagkumar91 Oct 11, 2024
4fb09c4
Merge branch 'Azure:main' into main
nagkumar91 Oct 15, 2024
e71a52d
Merge branch 'Azure:main' into main
nagkumar91 Oct 15, 2024
87166b3
Merge branch 'Azure:main' into main
nagkumar91 Oct 16, 2024
b478651
Update for release
nagkumar91 Oct 16, 2024
8e5a264
Black fix for file
nagkumar91 Oct 16, 2024
2077d6d
Merge branch 'Azure:main' into main
nagkumar91 Oct 17, 2024
3ab59c8
Merge branch 'Azure:main' into main
nagkumar91 Oct 17, 2024
3a80606
Add original text in global context
Oct 17, 2024
6768f9a
Update test
Oct 17, 2024
f7cc4bb
Update the indirect attack simulator
Oct 18, 2024
07eb466
Black suggested fixes
Oct 18, 2024
942bfd5
Update simulator prompty
Oct 18, 2024
2d4c376
Merge branch 'main' into main
nagkumar91 Oct 18, 2024
98cad97
Update adversarial scenario enum to exclude XPIA
Oct 18, 2024
d510316
Update changelog
Oct 18, 2024
742943e
Black fixes
Oct 18, 2024
12e0615
Remove duplicate import
Oct 18, 2024
de32b50
Fix the mypy error
Oct 19, 2024
4b64132
Mypy please be happy
Oct 21, 2024
1c0b4dd
Updates to non adv simulator
Oct 22, 2024
c4f9111
Merge branch 'Azure:main' into main
nagkumar91 Oct 22, 2024
6de617c
accept context from assistant messages, exclude them when using them …
Oct 23, 2024
1e5d40c
update changelog
Oct 23, 2024
93b29c7
pylint fixes
Oct 23, 2024
8e3ddc3
pylint fixes
Oct 23, 2024
31e0d29
Merge branch 'main' into main
nagkumar91 Oct 23, 2024
4ccc7c8
remove redundant quotes
Oct 23, 2024
bed5196
Fix typo
Oct 23, 2024
0fdd644
pylint fix
Oct 23, 2024
1f695cc
Update broken tests
Oct 23, 2024
3da3a94
Merge branch 'main' into main
nagkumar91 Oct 23, 2024
56c2657
Merge branch 'Azure:main' into main
nagkumar91 Oct 23, 2024
b04b3e6
Merge branch 'Azure:main' into main
nagkumar91 Oct 24, 2024
b9793ca
Merge branch 'Azure:main' into main
nagkumar91 Oct 25, 2024
92c9a6d
Include the grounding json in the manifest
Oct 25, 2024
0673cd5
Fix typo
Oct 25, 2024
7b360fc
Come on package
Oct 25, 2024
e3fd2bb
Merge branch 'Azure:main' into main
nagkumar91 Oct 28, 2024
c9f38c9
Release 1.0.0b5
Oct 28, 2024
bbb78fd
Merge branch 'main' of https://github.com/nagkumar91/azure-sdk-for-py…
Oct 28, 2024
ed7eed1
Notice from Chang
Oct 28, 2024
103f397
Merge branch 'Azure:main' into main
nagkumar91 Oct 28, 2024
3de5b66
Remove adv_conv template parameters from the outputs
Oct 28, 2024
21e3551
Merge branch 'main' of https://github.com/nagkumar91/azure-sdk-for-py…
Oct 28, 2024
78df8c9
Merge branch 'Azure:main' into main
nagkumar91 Oct 28, 2024
2b693bc
Merge branch 'Azure:main' into main
nagkumar91 Oct 29, 2024
f2e95d1
Update chanagelog
Oct 29, 2024
20b6d47
Merge branch 'Azure:main' into main
nagkumar91 Oct 29, 2024
a920c28
Merge branch 'main' of https://github.com/nagkumar91/azure-sdk-for-py…
Oct 29, 2024
f9ac10c
Experimental tags on adv scenarios
Oct 29, 2024
b570a51
Merge branch 'Azure:main' into main
nagkumar91 Oct 30, 2024
6c81cbb
Readme fix onbreaking change
Oct 30, 2024
b48f8ab
Add the category and both user and assistant context to the response …
Oct 30, 2024
d422e05
Update changelog
Oct 30, 2024
de105db
Merge branch 'Azure:main' into main
nagkumar91 Oct 30, 2024
d9b80f7
Merge branch 'Azure:main' into main
nagkumar91 Nov 4, 2024
04823fd
Merge branch 'Azure:main' into main
nagkumar91 Nov 5, 2024
988f2ad
Merge branch 'Azure:main' into main
nagkumar91 Nov 7, 2024
fb12fdd
Rename _kwargs to _options
Nov 7, 2024
d912c52
_options as prefix
Nov 7, 2024
059e767
update troubleshooting for simulator
Nov 7, 2024
f91228f
Rename according to suggestions
Nov 7, 2024
e660918
Merge branch 'Azure:main' into main
nagkumar91 Nov 7, 2024
5ad5a26
Merge branch 'Azure:main' into main
nagkumar91 Nov 11, 2024
cde740c
Clean up readme
Nov 11, 2024
a90c788
more links
Nov 11, 2024
11cf0ba
Merge branch 'Azure:main' into main
nagkumar91 Nov 14, 2024
3050ce7
Merge branch 'Azure:main' into main
nagkumar91 Nov 18, 2024
ae461cc
Merge branch 'Azure:main' into main
nagkumar91 Nov 20, 2024
035881e
Merge branch 'Azure:main' into main
nagkumar91 Nov 22, 2024
87c871c
Merge branch 'Azure:main' into main
nagkumar91 Nov 26, 2024
a1519dd
Merge branch 'Azure:main' into main
nagkumar91 Dec 2, 2024
3ad53d5
Bugfix: zip_longest created null parameters
Dec 2, 2024
e9f3241
Updated changelog
Dec 2, 2024
79c2f0d
zip does the job
Dec 2, 2024
a0bc930
remove ununsed import
Dec 3, 2024
32b15eb
Merge branch 'Azure:main' into main
nagkumar91 Dec 9, 2024
19c4ea1
Merge branch 'Azure:main' into main
nagkumar91 Dec 11, 2024
95052bd
Merge branch 'Azure:main' into main
nagkumar91 Dec 12, 2024
a03abdf
Merge branch 'Azure:main' into main
nagkumar91 Dec 17, 2024
74d8553
Fix changelog merge
Dec 18, 2024
c78f768
Merge branch 'Azure:main' into main
nagkumar91 Dec 19, 2024
d37d0c3
Merge branch 'Azure:main' into main
nagkumar91 Jan 5, 2025
151f4c4
Merge branch 'Azure:main' into main
nagkumar91 Jan 7, 2025
0a417ae
Merge branch 'Azure:main' into main
nagkumar91 Jan 9, 2025
ede99b8
Remove print statements
Jan 9, 2025
a824f83
Merge branch 'Azure:main' into main
nagkumar91 Jan 13, 2025
7c8eae9
Merge branch 'Azure:main' into main
nagkumar91 Jan 15, 2025
5feeabb
Merge branch 'Azure:main' into main
nagkumar91 Jan 17, 2025
1df3839
Merge branch 'Azure:main' into main
nagkumar91 Jan 20, 2025
4616896
Merge branch 'Azure:main' into main
nagkumar91 Jan 22, 2025
ed5d87c
Merge branch 'Azure:main' into main
nagkumar91 Jan 23, 2025
66c7c5b
Merge branch 'Azure:main' into main
nagkumar91 Jan 24, 2025
4019245
Merge branch 'Azure:main' into main
nagkumar91 Jan 27, 2025
c37b6c5
Merge branch 'Azure:main' into main
nagkumar91 Jan 28, 2025
246ab9b
Merge branch 'Azure:main' into main
nagkumar91 Feb 4, 2025
4767587
Merge branch 'Azure:main' into main
nagkumar91 Feb 11, 2025
f7e6089
Merge branch 'Azure:main' into main
nagkumar91 Feb 17, 2025
5b45900
Merge branch 'Azure:main' into main
nagkumar91 Feb 19, 2025
b394fe2
Merge branch 'Azure:main' into main
nagkumar91 Feb 20, 2025
54602fe
Merge branch 'Azure:main' into main
nagkumar91 Mar 4, 2025
ff36631
Merge branch 'Azure:main' into main
nagkumar91 Mar 5, 2025
f3e1850
Merge branch 'Azure:main' into main
nagkumar91 Mar 6, 2025
16173c3
Merge branch 'Azure:main' into main
nagkumar91 Mar 6, 2025
f856210
Merge branch 'Azure:main' into main
nagkumar91 Mar 10, 2025
602a2e1
Merge branch 'Azure:main' into main
nagkumar91 Mar 11, 2025
747c0db
Merge branch 'Azure:main' into main
nagkumar91 Mar 12, 2025
7741608
Merge branch 'Azure:main' into main
nagkumar91 Mar 13, 2025
5e36ddf
Merge branch 'Azure:main' into main
nagkumar91 Mar 13, 2025
648d45b
Merge branch 'Azure:main' into main
nagkumar91 Mar 17, 2025
b37ba2a
Merge branch 'Azure:main' into main
nagkumar91 Mar 19, 2025
3782341
Merge branch 'Azure:main' into main
nagkumar91 Mar 19, 2025
35682be
Merge branch 'Azure:main' into main
nagkumar91 Mar 20, 2025
c8dd420
Merge branch 'Azure:main' into main
nagkumar91 Mar 20, 2025
15c2b23
Merge branch 'Azure:main' into main
nagkumar91 Apr 1, 2025
da2ebe1
Merge branch 'Azure:main' into main
nagkumar91 Apr 1, 2025
5e338be
Merge branch 'Azure:main' into main
nagkumar91 Apr 1, 2025
c61d41c
Merge branch 'Azure:main' into main
nagkumar91 Apr 4, 2025
1beb30d
Merge branch 'Azure:main' into main
nagkumar91 Apr 4, 2025
49a4ee9
Merge branch 'Azure:main' into main
nagkumar91 Apr 5, 2025
888b254
Merge branch 'Azure:main' into main
nagkumar91 Apr 5, 2025
a557eca
some todos
Apr 7, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -674,14 +674,26 @@ async def _prompt_sending_orchestrator(
batches = [all_prompts[i:i + batch_size] for i in range(0, len(all_prompts), batch_size)]

for batch_idx, batch in enumerate(batches):
"""
# TODO: Store the results from orchestrator for each batch
# fetch the results even on errors/exceptions
# use the batch's memory label to extract data batch_memory_label(type = dict)
# ensure each batch has a unique memory label
# ensure all the batches have something common in the memory label (like the file name where its stored in _write_pyrit_outputs_to_file method)

"""
self.logger.debug(f"Processing batch {batch_idx+1}/{len(batches)} with {len(batch)} prompts for {strategy_name}/{risk_category}")

batch_start_time = datetime.now()
# Send prompts in the batch concurrently with a timeout
try:
# Use wait_for to implement a timeout
await asyncio.wait_for(
orchestrator.send_prompts_async(prompt_list=batch),
orchestrator.send_prompts_async(
prompt_list=batch,
# memory_labels # TODO: identify the right memory label and create them for each batch before sending, ensure this has uuid.
#
),
timeout=timeout # Use provided timeout
)
batch_duration = (datetime.now() - batch_start_time).total_seconds()
Expand All @@ -700,12 +712,14 @@ async def _prompt_sending_orchestrator(
self.task_statuses[batch_task_key] = TASK_STATUS["TIMEOUT"]
self.red_team_info[strategy_name][risk_category]["status"] = TASK_STATUS["INCOMPLETE"]
# Continue with partial results rather than failing completely
# TODO: ensure the output is written to the file
continue
except Exception as e:
log_error(self.logger, f"Error processing batch {batch_idx+1}", e, f"{strategy_name}/{risk_category}")
self.logger.debug(f"ERROR: Strategy {strategy_name}, Risk {risk_category}, Batch {batch_idx+1}: {str(e)}")
self.red_team_info[strategy_name][risk_category]["status"] = TASK_STATUS["INCOMPLETE"]
# Continue with other batches even if one fails
# TODO: ensure the output is written to the file
continue
else:
# Small number of prompts, process all at once with a timeout
Expand Down Expand Up @@ -747,6 +761,12 @@ def _write_pyrit_outputs_to_file(self, orchestrator: Orchestrator) -> str:
:return: Path to the output file
:rtype: Union[str, os.PathLike]
"""
"""
#TODO: This path needs to be generated earlier, when the batches are identified Lets call them
# use the batch's memory label to extract data by orchestrator.get_memory().get_prompt_request_pieces(labels=batch_memory_label)
if len(conversations) > number of lines found in jsonfile/base_path (as we know the name generated before batches are created.)
replace the file contents with the new conversations
"""
base_path = str(uuid.uuid4())

# If scan output directory exists, place the file there
Expand Down