[C#] fix: content safety public preview deprecation

dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI.Tests/AITests/AzureContentSafetyModeratorTests.cs

@@ -97,7 +97,8 @@ public async Task Test_ReviewPrompt_Flagged(ModerationType moderate)
             };
 
             var clientMock = new Mock<ContentSafetyClient>(new Uri(endpoint), new AzureKeyCredential(apiKey));
-            AnalyzeTextResult analyzeTextResult = ContentSafetyModelFactory.AnalyzeTextResult(hateResult: ContentSafetyModelFactory.TextAnalyzeSeverityResult(TextCategory.Hate, 2));
+            var analyses = new List<TextCategoriesAnalysis>() { ContentSafetyModelFactory.TextCategoriesAnalysis(TextCategory.Hate, 2) };
+            AnalyzeTextResult analyzeTextResult = ContentSafetyModelFactory.AnalyzeTextResult(null, analyses);
             Response? response = null;
             clientMock.Setup(client => client.AnalyzeTextAsync(It.IsAny<AnalyzeTextOptions>(), It.IsAny<CancellationToken>())).ReturnsAsync(Response.FromValue(analyzeTextResult, response));
 
@@ -173,7 +174,8 @@ public async Task Test_ReviewPrompt_NotFlagged(ModerationType moderate)
             };
 
             var clientMock = new Mock<ContentSafetyClient>(new Uri(endpoint), new AzureKeyCredential(apiKey));
-            AnalyzeTextResult analyzeTextResult = ContentSafetyModelFactory.AnalyzeTextResult(hateResult: ContentSafetyModelFactory.TextAnalyzeSeverityResult(TextCategory.Hate, 0));
+            var analyses = new List<TextCategoriesAnalysis>() { ContentSafetyModelFactory.TextCategoriesAnalysis(TextCategory.Hate, 0) };
+            AnalyzeTextResult analyzeTextResult = ContentSafetyModelFactory.AnalyzeTextResult(null, analyses); 
             Response? response = null;
             clientMock.Setup(client => client.AnalyzeTextAsync(It.IsAny<AnalyzeTextOptions>(), It.IsAny<CancellationToken>())).ReturnsAsync(Response.FromValue(analyzeTextResult, response));
 
@@ -237,7 +239,8 @@ public async Task Test_ReviewPlan_Flagged(ModerationType moderate)
             });
 
             var clientMock = new Mock<ContentSafetyClient>(new Uri(endpoint), new AzureKeyCredential(apiKey));
-            AnalyzeTextResult analyzeTextResult = ContentSafetyModelFactory.AnalyzeTextResult(hateResult: ContentSafetyModelFactory.TextAnalyzeSeverityResult(TextCategory.Hate, 2));
+            var analyses = new List<TextCategoriesAnalysis>() { ContentSafetyModelFactory.TextCategoriesAnalysis(TextCategory.Hate, 2) };
+            AnalyzeTextResult analyzeTextResult = ContentSafetyModelFactory.AnalyzeTextResult(null, analyses);
             Response? response = null;
             clientMock.Setup(client => client.AnalyzeTextAsync(It.IsAny<AnalyzeTextOptions>(), It.IsAny<CancellationToken>())).ReturnsAsync(Response.FromValue(analyzeTextResult, response));
 
@@ -298,7 +301,8 @@ public async Task Test_ReviewPlan_NotFlagged(ModerationType moderate)
             });
 
             var clientMock = new Mock<ContentSafetyClient>(new Uri(endpoint), new AzureKeyCredential(apiKey));
-            AnalyzeTextResult analyzeTextResult = ContentSafetyModelFactory.AnalyzeTextResult(hateResult: ContentSafetyModelFactory.TextAnalyzeSeverityResult(TextCategory.Hate, 0));
+            var analyses = new List<TextCategoriesAnalysis>() { ContentSafetyModelFactory.TextCategoriesAnalysis(TextCategory.Hate, 0) };
+            AnalyzeTextResult analyzeTextResult = ContentSafetyModelFactory.AnalyzeTextResult(null, analyses);
             Response? response = null;
             clientMock.Setup(client => client.AnalyzeTextAsync(It.IsAny<AnalyzeTextOptions>(), It.IsAny<CancellationToken>())).ReturnsAsync(Response.FromValue(analyzeTextResult, response));
 

dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI/AI/Moderator/AzureContentSafetyModerator.cs

@@ -96,11 +96,8 @@ public async Task<Plan> ReviewOutputAsync(ITurnContext turnContext, TState turnS
             {
                 Response<AnalyzeTextResult> response = await _client.AnalyzeTextAsync(analyzeTextOptions);
 
-                bool flagged = response.Value.BlocklistsMatchResults.Count > 0
-                || _ShouldBeFlagged(response.Value.HateResult)
-                || _ShouldBeFlagged(response.Value.SelfHarmResult)
-                || _ShouldBeFlagged(response.Value.SexualResult)
-                || _ShouldBeFlagged(response.Value.ViolenceResult);
+                bool flagged = response.Value.BlocklistsMatch.Count > 0
+                || response.Value.CategoriesAnalysis.Any((ca) => _ShouldBeFlagged(ca));
                 if (flagged)
                 {
                     string actionName = isModelInput ? AIConstants.FlaggedInputActionName : AIConstants.FlaggedOutputActionName;
@@ -138,17 +135,54 @@ public async Task<Plan> ReviewOutputAsync(ITurnContext turnContext, TState turnS
             return null;
         }
 
-        private bool _ShouldBeFlagged(TextAnalyzeSeverityResult result)
+        private bool _ShouldBeFlagged(TextCategoriesAnalysis result)
         {
             return result != null && result.Severity >= _options.SeverityLevel;
         }
 
         private ModerationResult BuildModerationResult(AnalyzeTextResult result)
         {
-            bool hate = _ShouldBeFlagged(result.HateResult);
-            bool selfHarm = _ShouldBeFlagged(result.SelfHarmResult);
-            bool sexual = _ShouldBeFlagged(result.SexualResult);
-            bool violence = _ShouldBeFlagged(result.ViolenceResult);
+            bool hate = false;
+            int hateSeverity = 0;
+            bool selfHarm = false;
+            int selfHarmSeverity = 0;
+            bool sexual = false;
+            int sexualSeverity = 0;
+            bool violence = false;
+            int violenceSeverity = 0;
+
+            foreach (TextCategoriesAnalysis textAnalysis in result.CategoriesAnalysis)
+            {
+                if (textAnalysis.Severity < _options.SeverityLevel)
+                {
+                    continue;
+                }
+
+                int severity = textAnalysis.Severity ?? 0;
+                if (textAnalysis.Category == TextCategory.Hate)
+                {
+                    hate = true;
+                    hateSeverity = severity;
+                }
+
+                if (textAnalysis.Category == TextCategory.Violence)
+                {
+                    violence = true;
+                    violenceSeverity = severity;
+                }
+
+                if (textAnalysis.Category == TextCategory.SelfHarm)
+                {
+                    selfHarm = true;
+                    selfHarmSeverity = severity;
+                }
+
+                if (textAnalysis.Category == TextCategory.Sexual)
+                {
+                    sexual = true;
+                    sexualSeverity = severity;
+                }
+            }
 
             return new()
             {
@@ -166,13 +200,13 @@ private ModerationResult BuildModerationResult(AnalyzeTextResult result)
                 CategoryScores = new()
                 {
                     // Normalize the scores to be between 0 and 1 (highest severity is 6)
-                    Hate = (result.HateResult?.Severity ?? 0) / 6.0,
-                    HateThreatening = (result.HateResult?.Severity ?? 0) / 6.0,
-                    SelfHarm = (result.SelfHarmResult?.Severity ?? 0) / 6.0,
-                    Sexual = (result.SexualResult?.Severity ?? 0) / 6.0,
-                    SexualMinors = (result.SexualResult?.Severity ?? 0) / 6.0,
-                    Violence = (result.ViolenceResult?.Severity ?? 0) / 6.0,
-                    ViolenceGraphic = (result.ViolenceResult?.Severity ?? 0) / 6.0
+                    Hate = hateSeverity / 6.0,
+                    HateThreatening = hateSeverity / 6.0,
+                    SelfHarm = selfHarmSeverity / 6.0,
+                    Sexual = sexualSeverity / 6.0,
+                    SexualMinors = sexualSeverity / 6.0,
+                    Violence = violenceSeverity / 6.0,
+                    ViolenceGraphic = violenceSeverity / 6.0
                 }
             };
         }

dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI/AI/Moderator/AzureContentSafetyModeratorOptions.cs

@@ -36,10 +36,18 @@ public class AzureContentSafetyModeratorOptions
         public IList<string>? BlocklistNames { get; set; }
 
         /// <summary>
-        /// When set to true, further analyses of harmful content will not be performed in cases where blocklists are hit. When set to false, all analyses of harmful content will be performed, whether or not blocklists are hit.
+        /// When set to true, further analyses of harmful content will not be performed in cases where blocklists are hit.
+        /// When set to false, all analyses of harmful content will be performed, whether or not blocklists are hit.
         /// </summary>
+        [Obsolete("use HaltOnBlockListHit")]
         public bool? BreakByBlocklists { get; set; }
 
+        /// <summary>
+        /// When set to true, further analyses of harmful content will not be performed in cases where blocklists are hit.
+        /// When set to false, all analyses of harmful content will be performed, whether or not blocklists are hit.
+        /// </summary>
+        public bool? HaltOnBlockListHit { get; set; }
+
         /// <summary>
         /// Create an instance of the AzureContentSafetyModeratorOptions class.
         /// </summary>

dotnet/packages/Microsoft.TeamsAI/Microsoft.TeamsAI/Microsoft.Teams.AI.csproj

@@ -36,7 +36,7 @@
 
   <ItemGroup>
     <PackageReference Include="AdaptiveCards" Version="3.1.0" />
-    <PackageReference Include="Azure.AI.ContentSafety" Version="1.0.0-beta.1" />
+    <PackageReference Include="Azure.AI.ContentSafety" Version="1.0.0" />
     <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0-beta.1" />
     <PackageReference Include="JsonSchema.Net" Version="5.5.1" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />