Merge 1015

specification/cognitiveservices/ContentSafety/examples/2023-10-15-preview/AddOrUpdateBlocklistItems.json

@@ -0,0 +1,30 @@
+{
+  "title": "Add or Update BlocklistItems To Text Blocklist",
+  "operationId": "TextBlocklists_AddOrUpdateBlocklistItems",
+  "parameters": {
+    "api-version": "2023-10-15-preview",
+    "blocklistName": "TestBlocklist",
+    "body": {
+      "blocklistItems": [
+        {
+          "blocklistItemId": null,
+          "description": "Hate word",
+          "text": "hate"
+        }
+      ]
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "blocklistItems": [
+          {
+            "blocklistItemId": "9511969e-f1e3-4604-9127-05ee16c509ec",
+            "description": "Hate word",
+            "text": "hate"
+          }
+        ]
+      }
+    }
+  }
+}

specification/cognitiveservices/ContentSafety/examples/2023-10-15-preview/AnalyzeImage.json

@@ -0,0 +1,36 @@
+{
+  "title": "Analyze Image",
+  "operationId": "ImageOperations_AnalyzeImage",
+  "parameters": {
+    "api-version": "2023-10-15-preview",
+    "body": {
+      "image": {
+        "content": "Y29udGVudDE="
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "categoriesAnalysis": [
+          {
+            "category": "Hate",
+            "severity": 0
+          },
+          {
+            "category": "SelfHarm",
+            "severity": 0
+          },
+          {
+            "category": "Sexual",
+            "severity": 0
+          },
+          {
+            "category": "Violence",
+            "severity": 2
+          }
+        ]
+      }
+    }
+  }
+}

specification/cognitiveservices/ContentSafety/examples/2023-10-15-preview/AnalyzeText.json

@@ -0,0 +1,35 @@
+{
+  "title": "Analyze Text",
+  "operationId": "TextOperations_AnalyzeText",
+  "parameters": {
+    "api-version": "2023-10-15-preview",
+    "body": {
+      "text": "This is text example"
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "blocklistsMatch": [],
+        "categoriesAnalysis": [
+          {
+            "category": "Hate",
+            "severity": 0
+          },
+          {
+            "category": "SelfHarm",
+            "severity": 0
+          },
+          {
+            "category": "Sexual",
+            "severity": 0
+          },
+          {
+            "category": "Violence",
+            "severity": 0
+          }
+        ]
+      }
+    }
+  }
+}

specification/cognitiveservices/ContentSafety/examples/2023-10-15-preview/CreateOrUpdateTextBlocklist.json

@@ -0,0 +1,25 @@
+{
+  "title": "Create Or Update Text Blocklist",
+  "operationId": "TextBlocklists_CreateOrUpdateTextBlocklist",
+  "parameters": {
+    "api-version": "2023-10-15-preview",
+    "blocklistName": "TestBlocklist",
+    "resource": {
+      "description": "Test Blocklist"
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "blocklistName": "TestBlocklist",
+        "description": "Test Blocklist"
+      }
+    },
+    "201": {
+      "body": {
+        "blocklistName": "TestBlocklist",
+        "description": "Test Blocklist"
+      }
+    }
+  }
+}

specification/cognitiveservices/ContentSafety/examples/2023-10-15-preview/DeleteTextBlocklist.json

@@ -0,0 +1,11 @@
+{
+  "title": "Delete Text Blocklist By blocklistName",
+  "operationId": "TextBlocklists_DeleteTextBlocklist",
+  "parameters": {
+    "api-version": "2023-10-15-preview",
+    "blocklistName": "TestBlocklist"
+  },
+  "responses": {
+    "204": {}
+  }
+}

specification/cognitiveservices/ContentSafety/examples/2023-10-15-preview/GetTextBlocklist.json

@@ -0,0 +1,16 @@
+{
+  "title": "Get Text Blocklist By blocklistName",
+  "operationId": "TextBlocklists_GetTextBlocklist",
+  "parameters": {
+    "api-version": "2023-10-15-preview",
+    "blocklistName": "TestBlocklist"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "blocklistName": "TestBlocklist",
+        "description": "Test Blocklist"
+      }
+    }
+  }
+}

specification/cognitiveservices/ContentSafety/examples/2023-10-15-preview/GetTextBlocklistItem.json

@@ -0,0 +1,18 @@
+{
+  "title": "Get BlockItem By blocklistName And blocklistItemId",
+  "operationId": "TextBlocklists_GetTextBlocklistItem",
+  "parameters": {
+    "api-version": "2023-10-15-preview",
+    "blocklistName": "TestBlocklist",
+    "blocklistItemId": "9511969e-f1e3-4604-9127-05ee16c509ec"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "blocklistItemId": "9511969e-f1e3-4604-9127-05ee16c509ec",
+        "description": "Hate word",
+        "text": "hate"
+      }
+    }
+  }
+}

specification/cognitiveservices/ContentSafety/examples/2023-10-15-preview/ListTextBlocklistItems.json

@@ -0,0 +1,21 @@
+{
+  "title": "Get All BlockItems By blocklistName",
+  "operationId": "TextBlocklists_ListTextBlocklistItems",
+  "parameters": {
+    "api-version": "2023-10-15-preview",
+    "blocklistName": "TestBlocklist"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "blocklistItemId": "9511969e-f1e3-4604-9127-05ee16c509ec",
+            "description": "Hate word",
+            "text": "hate"
+          }
+        ]
+      }
+    }
+  }
+}

specification/cognitiveservices/ContentSafety/examples/2023-10-15-preview/ListTextBlocklists.json

@@ -0,0 +1,19 @@
+{
+  "title": "Get All Text Blocklists",
+  "operationId": "TextBlocklists_ListTextBlocklists",
+  "parameters": {
+    "api-version": "2023-10-15-preview"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "value": [
+          {
+            "blocklistName": "TestBlocklist",
+            "description": "Test Blocklist"
+          }
+        ]
+      }
+    }
+  }
+}

specification/cognitiveservices/ContentSafety/examples/2023-10-15-preview/RemoveBlocklistItems.json

@@ -0,0 +1,16 @@
+{
+  "title": "Remove BlockItems From Text Blocklist",
+  "operationId": "TextBlocklists_RemoveBlocklistItems",
+  "parameters": {
+    "api-version": "2023-10-15-preview",
+    "blocklistName": "TestBlocklist",
+    "body": {
+      "blocklistItemIds": [
+        "9511969e-f1e3-4604-9127-05ee16c509ec"
+      ]
+    }
+  },
+  "responses": {
+    "204": {}
+  }
+}

specification/cognitiveservices/ContentSafety/main.tsp

@@ -42,6 +42,9 @@ enum Versions {
   @useDependency(Azure.Core.Versions.v1_0_Preview_2)
   v2023_10_01: "2023-10-01",
 
+  @useDependency(Azure.Core.Versions.v1_0_Preview_2)
+  v2023_10_15_Preview: "2023-10-15-preview",
+
   @useDependency(Azure.Core.Versions.v1_0_Preview_2)
   v2023_10_30_Preview: "2023-10-30-preview",
 }

specification/cognitiveservices/ContentSafety/models.tsp

@@ -110,6 +110,50 @@ model TextCategoriesAnalysis {
   severity?: int32;
 }
 
+@added(ContentSafety.Versions.v2023_10_15_Preview)
+@doc("The protected material analysis request.")
+model AnalyzeTextProtectedMaterialOptions {
+  @doc("The text needs to be analyzed. We support a maximum of 1k Unicode characters (Unicode code points) in the text of one request.")
+  @maxLength(1000)
+  text: string;
+}
+
+@added(ContentSafety.Versions.v2023_10_15_Preview)
+@doc("The protected material analysis response.")
+model AnalyzeTextProtectedMaterialResult {
+  @doc("Analysis result for protected material.")
+  protectedMaterialAnalysis: ProtectedMaterialAnalysisResult;
+}
+
+@added(ContentSafety.Versions.v2023_10_15_Preview)
+@doc("The text protected material analysis response.")
+model ProtectedMaterialAnalysisResult {
+  @doc("Analysis result for protected material..")
+  detected: boolean;
+}
+
+@added(ContentSafety.Versions.v2023_10_15_Preview)
+@doc("The text jailbreak analysis request.")
+model AnalyzeTextJailbreakOptions {
+  @doc("The text needs to be analyzed if it attempt to jailbreak. We support a maximum of 1k Unicode characters (Unicode code points) in the text of one request.")
+  @maxLength(1000)
+  text: string;
+}
+
+@added(ContentSafety.Versions.v2023_10_15_Preview)
+@doc("The text jailbreak analysis request.")
+model AnalyzeTextJailbreakResult {
+  @doc("Analysis result for jailbreak.")
+  jailbreakAnalysis: JailbreakAnalysisResult;
+}
+
+@added(ContentSafety.Versions.v2023_10_15_Preview)
+@doc("The text jailbreak analysis response.")
+model JailbreakAnalysisResult {
+  @doc("Analysis result for jailbreak.")
+  detected: boolean;
+}
+
 @added(ContentSafety.Versions.v2023_10_30_Preview)
 @doc("The result of text incident match.")
 model IncidentMatch {
@@ -233,6 +277,7 @@ model TextIncident {
   @doc("Incident created time.")
   @visibility("read", "query")
   created: utcDateTime;
+
   @doc("Incident updated time.")
   @visibility("read", "query")
   lastUpdated: utcDateTime;
@@ -293,6 +338,7 @@ model ImageIncident {
   @doc("Incident created time.")
   @visibility("read", "query")
   created: utcDateTime;
+
   @doc("Incident updated time.")
   @visibility("read", "query")
   lastUpdated: utcDateTime;

specification/cognitiveservices/ContentSafety/routes.tsp

@@ -24,6 +24,34 @@ interface TextOperations {
     },
     AnalyzeTextResult
   >;
+
+  @added(ContentSafety.Versions.v2023_10_15_Preview)
+  @summary("Analyze Text Jailbreak")
+  @doc("A synchronous API for the analysis of text jailbreak.")
+  @route("/text:detectJailbreak")
+  @post
+  detectTextJailbreak is Azure.Core.RpcOperation<
+    {
+      @body
+      @doc("The text jailbreak analysis request.")
+      body: AnalyzeTextJailbreakOptions;
+    },
+    AnalyzeTextJailbreakResult
+  >;
+
+  @added(ContentSafety.Versions.v2023_10_15_Preview)
+  @summary("Analyze Protected Material")
+  @doc("A synchronous API for the analysis of protected material.")
+  @route("/text:detectProtectedMaterial")
+  @post
+  detectTextProtectedMaterial is Azure.Core.RpcOperation<
+    {
+      @body
+      @doc("The text analysis request.")
+      body: AnalyzeTextProtectedMaterialOptions;
+    },
+    AnalyzeTextProtectedMaterialResult
+  >;
 }
 
 interface ImageOperations {