Skip to content

Commit a33da18

Browse files
authored
Merge pull request Azure#3 from bowgong/yuxiaowang/aacs-preview-20241215
[draft] update aacs-preview-20241215
2 parents aa9cadd + 6ea8dc2 commit a33da18

File tree

2 files changed

+219
-77
lines changed

2 files changed

+219
-77
lines changed

specification/cognitiveservices/ContentSafety/models.tsp

Lines changed: 72 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -965,11 +965,20 @@ union Modality {
965965
union SourceType {
966966
string,
967967

968-
@doc("The source type for message - message to AI.")
969-
"messageToAI",
968+
@doc("All source types.")
969+
"all",
970+
971+
@doc("The source type for message - prompt.")
972+
"prompt",
973+
974+
@doc("The source type for message - completion.")
975+
"completion",
976+
977+
@doc("The source type for message - system.")
978+
"system",
970979

971-
@doc("The source type for message - message from AI.")
972-
"messageFromAI",
980+
@doc("The source type for message - document.")
981+
"document",
973982
}
974983

975984
@doc("The type of the role.")
@@ -979,46 +988,82 @@ union RoleType {
979988
@doc("All roles.")
980989
"all",
981990

982-
@doc("User role.")
983-
"user",
991+
@doc("Assistant role.")
992+
"assistant",
993+
994+
@doc("Function role.")
995+
"function",
984996

985997
@doc("System role.")
986998
"system",
987999

988-
@doc("Assistant role.")
989-
"assistant",
990-
9911000
@doc("Tool role.")
9921001
"tool",
1002+
1003+
@doc("User role.")
1004+
"user",
9931005
}
9941006

9951007
@doc("The harm category.")
9961008
union HarmCategory {
9971009
string,
9981010

1011+
@doc("Unspecified harm category.")
1012+
"Unspecified",
1013+
9991014
@doc("Celebrity harm category.")
1000-
"celebrity",
1015+
"Celebrity",
1016+
1017+
@doc("Code vulnerability harm category.")
1018+
"CodeVulnerability",
10011019

10021020
@doc("Drug harm category.")
1003-
"drug",
1021+
"Drug",
10041022

10051023
@doc("Hate harm category.")
1006-
"hate",
1024+
"Hate",
10071025

10081026
@doc("Prompt injection harm category.")
1009-
"promptInjection",
1027+
"PromptInjection",
1028+
1029+
@doc("Protected material code harm category.")
1030+
"ProtectedMaterialCode",
10101031

1011-
@doc("Protected material harm category.")
1012-
"protectedMaterial",
1032+
@doc("Protected material text harm category.")
1033+
"ProtectedMaterialText",
10131034

10141035
@doc("Sexual harm category.")
1015-
"sexual",
1036+
"Sexual",
10161037

10171038
@doc("Self-harm category.")
1018-
"selfHarm",
1039+
"SelfHarm",
10191040

10201041
@doc("Violence harm category.")
1021-
"violence",
1042+
"Violence",
1043+
1044+
@doc("Xpia harm category.")
1045+
"Xpia",
1046+
1047+
@doc("Fate inappropriate harm category.")
1048+
"FateInappropriate",
1049+
1050+
@doc("Fate suicide help harm category.")
1051+
"FateSuicideHelp",
1052+
1053+
@doc("Fate offensive harm category.")
1054+
"FateOffensive",
1055+
1056+
@doc("Txt2Code low AUC harm category.")
1057+
"Txt2CodeLowAUC",
1058+
1059+
@doc("Bing jailbreak harm category.")
1060+
"BingJailbreak",
1061+
1062+
@doc("Fate politics harm category.")
1063+
"FatePolitics",
1064+
1065+
@doc("Fate election critical information harm category.")
1066+
"FateElectionCriticalInformation",
10221067
}
10231068

10241069
@doc("The risk level.")
@@ -1067,6 +1112,9 @@ union BlockingCriteriaKind {
10671112

10681113
@doc("The is detected type.")
10691114
"isDetected",
1115+
1116+
@doc("The score type.")
1117+
"score",
10701118
}
10711119

10721120
@doc("Unify content model.")
@@ -1079,9 +1127,6 @@ model UnifyContent {
10791127

10801128
@doc("The base64 encoded image content.")
10811129
imageBase64?: string;
1082-
1083-
@doc("The blob URL of the image content.")
1084-
imageBlob?: string;
10851130
}
10861131

10871132
@doc("Unify message model.")
@@ -1141,13 +1186,16 @@ model BlockingCriteria {
11411186
kind: BlockingCriteriaKind;
11421187

11431188
@doc("The allowed severity level.")
1144-
allowedSeverity: int32;
1189+
allowedSeverity?: int32;
11451190

11461191
@doc("Indicates if it is detected.")
1147-
isDetected: boolean;
1192+
isDetected?: boolean;
11481193

11491194
@doc("The risk level.")
1150-
allowedRiskLevel: RiskLevel;
1195+
allowedRiskLevel?: RiskLevel;
1196+
1197+
@doc("The allowed score.")
1198+
allowedScore?: float32;
11511199
}
11521200

11531201
@doc("Task setting model.")

0 commit comments

Comments
 (0)