Text analytics + ARM changes, cleanup (#858)

Henry van der Vegte · web-flow · commit 995d20d9d49b · 2020-11-10T11:35:57.000+01:00
* text analytics + arm changes, cleanup

* remove bom
diff --git a/samples/batch/transcription-enabled-storage/Connector/CostEstimation.cs b/samples/batch/transcription-enabled-storage/Connector/CostEstimation.cs
@@ -6,6 +6,7 @@
 namespace Connector
 {
     using System;
+    using Connector.Enums;
 
     public static class CostEstimation
     {
@@ -20,18 +21,18 @@ public static double GetCostEstimation(
             TimeSpan timeSpan,
             int numberOfChannels,
             bool isCustomModel,
-            bool sentimentAnalysisAdded,
-            bool entityRedactionAdded)
+            SentimentAnalysisSetting sentimentSetting,
+            EntityRedactionSetting entityRedactionSetting)
         {
             double costPerHour = isCustomModel ? STTCustomModelCostPerHour : STTCostPerHour;
             var price = timeSpan.TotalHours * costPerHour;
 
-            if (sentimentAnalysisAdded)
+            if (sentimentSetting != SentimentAnalysisSetting.None)
             {
                 price += timeSpan.TotalHours * TextAnalyticsCostPerHour;
             }
 
-            if (entityRedactionAdded)
+            if (entityRedactionSetting != EntityRedactionSetting.None)
             {
                 price += timeSpan.TotalHours * TextAnalyticsCostPerHour;
             }
diff --git a/samples/batch/transcription-enabled-storage/Connector/DatabaseConnector.cs b/samples/batch/transcription-enabled-storage/Connector/DatabaseConnector.cs
@@ -107,29 +107,23 @@ private async Task StoreCombinedRecognizedPhrasesAsync(Guid transcriptionId, int
 
             var combinedPhrases = speechTranscript.CombinedRecognizedPhrases.Where(t => t.Channel == channel).FirstOrDefault();
 
-            var query = "INSERT INTO dbo.CombinedRecognizedPhrases (ID, TranscriptionID, Channel, Lexical, Itn, MaskedItn, Display)" +
-                " VALUES (@id, @transcriptionID, @channel, @lexical, @itn, @maskedItn, @display)";
+            var query = "INSERT INTO dbo.CombinedRecognizedPhrases (ID, TranscriptionID, Channel, Lexical, Itn, MaskedItn, Display, SentimentPositive, SentimentNeutral, SentimentNegative)" +
+                " VALUES (@id, @transcriptionID, @channel, @lexical, @itn, @maskedItn, @display, @sentimentPositive, @sentimentNeutral, @sentimentNegative)";
 
             using (var command = new SqlCommand(query, Connection))
             {
                 command.Parameters.AddWithValue("@id", combinedRecognizedPhraseID);
                 command.Parameters.AddWithValue("@transcriptionID", transcriptionId);
                 command.Parameters.AddWithValue("@channel", channel);
 
-                if (combinedPhrases != null)
-                {
-                    command.Parameters.AddWithValue("@lexical", combinedPhrases.Lexical);
-                    command.Parameters.AddWithValue("@itn", combinedPhrases.ITN);
-                    command.Parameters.AddWithValue("@maskedItn", combinedPhrases.MaskedITN);
-                    command.Parameters.AddWithValue("@display", combinedPhrases.Display);
-                }
-                else
-                {
-                    command.Parameters.AddWithValue("@lexical", string.Empty);
-                    command.Parameters.AddWithValue("@itn", string.Empty);
-                    command.Parameters.AddWithValue("@maskedItn", string.Empty);
-                    command.Parameters.AddWithValue("@display", string.Empty);
-                }
+                command.Parameters.AddWithValue("@lexical", combinedPhrases.Lexical ?? string.Empty);
+                command.Parameters.AddWithValue("@itn", combinedPhrases.ITN ?? string.Empty);
+                command.Parameters.AddWithValue("@maskedItn", combinedPhrases.MaskedITN ?? string.Empty);
+                command.Parameters.AddWithValue("@display", combinedPhrases.Display ?? string.Empty);
+
+                command.Parameters.AddWithValue("@sentimentPositive", combinedPhrases?.Sentiment?.Positive ?? 0f);
+                command.Parameters.AddWithValue("@sentimentNeutral", combinedPhrases?.Sentiment?.Neutral ?? 0f);
+                command.Parameters.AddWithValue("@sentimentNegative", combinedPhrases?.Sentiment?.Negative ?? 0f);
 
                 var result = await command.ExecuteNonQueryAsync().ConfigureAwait(false);
 
@@ -194,18 +188,10 @@ private async Task StoreNBestAsync(Guid recognizedPhraseID, NBest nBest)
                 command.Parameters.AddWithValue("@itn", nBest.ITN);
                 command.Parameters.AddWithValue("@maskedItn", nBest.MaskedITN);
                 command.Parameters.AddWithValue("@display", nBest.Display);
-                if (nBest.Sentiment != null)
-                {
-                    command.Parameters.AddWithValue("@sentimentNegative", nBest.Sentiment.Negative);
-                    command.Parameters.AddWithValue("@sentimentNeutral", nBest.Sentiment.Neutral);
-                    command.Parameters.AddWithValue("@sentimentPositive", nBest.Sentiment.Positive);
-                }
-                else
-                {
-                    command.Parameters.AddWithValue("@sentimentNegative", 0f);
-                    command.Parameters.AddWithValue("@sentimentNeutral", 0f);
-                    command.Parameters.AddWithValue("@sentimentPositive", 0f);
-                }
+
+                command.Parameters.AddWithValue("@sentimentNegative", nBest?.Sentiment?.Negative ?? 0f);
+                command.Parameters.AddWithValue("@sentimentNeutral", nBest?.Sentiment?.Neutral ?? 0f);
+                command.Parameters.AddWithValue("@sentimentPositive", nBest?.Sentiment?.Positive ?? 0f);
 
                 var result = await command.ExecuteNonQueryAsync().ConfigureAwait(false);
 
diff --git a/samples/batch/transcription-enabled-storage/Connector/Enums/EntityRedactionSetting.cs b/samples/batch/transcription-enabled-storage/Connector/Enums/EntityRedactionSetting.cs
@@ -0,0 +1,13 @@
+// <copyright file="EntityRedactionSetting.cs" company="Microsoft Corporation">
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
+// </copyright>
+
+namespace Connector.Enums
+{
+    public enum EntityRedactionSetting
+    {
+        None,
+        UtteranceLevel
+    }
+}
diff --git a/samples/batch/transcription-enabled-storage/Connector/Enums/SentimentAnalysisSetting.cs b/samples/batch/transcription-enabled-storage/Connector/Enums/SentimentAnalysisSetting.cs
@@ -0,0 +1,14 @@
+// <copyright file="SentimentAnalysisSetting.cs" company="Microsoft Corporation">
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
+// </copyright>
+
+namespace Connector.Enums
+{
+    public enum SentimentAnalysisSetting
+    {
+        None,
+        UtteranceLevel,
+        AudioLevel
+    }
+}
diff --git a/samples/batch/transcription-enabled-storage/Connector/Serializable/TranscriptionResult/CombinedRecognizedPhrase.cs b/samples/batch/transcription-enabled-storage/Connector/Serializable/TranscriptionResult/CombinedRecognizedPhrase.cs
@@ -9,13 +9,14 @@ namespace Connector
 
     public class CombinedRecognizedPhrase
     {
-        public CombinedRecognizedPhrase(int channel, string lexical, string itn, string maskedItn, string display)
+        public CombinedRecognizedPhrase(int channel, string lexical, string itn, string maskedItn, string display, Sentiment sentiment)
         {
             Channel = channel;
             Lexical = lexical;
             ITN = itn;
             MaskedITN = maskedItn;
             Display = display;
+            Sentiment = sentiment;
         }
 
         [JsonProperty("channel")]
@@ -32,5 +33,8 @@ public CombinedRecognizedPhrase(int channel, string lexical, string itn, string
 
         [JsonProperty("display")]
         public string Display { get; set; }
+
+        [JsonProperty("sentiment")]
+        public Sentiment Sentiment { get; set; }
     }
 }
diff --git a/samples/batch/transcription-enabled-storage/FetchTranscription/FetchTranscriptionEnvironmentVariables.cs b/samples/batch/transcription-enabled-storage/FetchTranscription/FetchTranscriptionEnvironmentVariables.cs
@@ -6,13 +6,14 @@
 namespace FetchTranscriptionFunction
 {
     using System;
+    using Connector.Enums;
     using Connector.Extensions;
 
     public static class FetchTranscriptionEnvironmentVariables
     {
-        public static readonly bool AddEntityRedaction = bool.TryParse(Environment.GetEnvironmentVariable(nameof(AddEntityRedaction), EnvironmentVariableTarget.Process), out AddEntityRedaction) && AddEntityRedaction;
+        public static readonly SentimentAnalysisSetting SentimentAnalysisSetting = Enum.TryParse(Environment.GetEnvironmentVariable(nameof(SentimentAnalysisSetting), EnvironmentVariableTarget.Process), out SentimentAnalysisSetting) ? SentimentAnalysisSetting : SentimentAnalysisSetting.None;
 
-        public static readonly bool AddSentimentAnalysis = bool.TryParse(Environment.GetEnvironmentVariable(nameof(AddSentimentAnalysis), EnvironmentVariableTarget.Process), out AddSentimentAnalysis) && AddSentimentAnalysis;
+        public static readonly EntityRedactionSetting EntityRedactionSetting = Enum.TryParse(Environment.GetEnvironmentVariable(nameof(EntityRedactionSetting), EnvironmentVariableTarget.Process), out EntityRedactionSetting) ? EntityRedactionSetting : EntityRedactionSetting.None;
 
         public static readonly bool CreateHtmlResultFile = bool.TryParse(Environment.GetEnvironmentVariable(nameof(CreateHtmlResultFile), EnvironmentVariableTarget.Process), out CreateHtmlResultFile) && CreateHtmlResultFile;
 
diff --git a/samples/batch/transcription-enabled-storage/FetchTranscription/TextAnalytics.cs b/samples/batch/transcription-enabled-storage/FetchTranscription/TextAnalytics.cs
diff --git a/samples/batch/transcription-enabled-storage/FetchTranscription/TranscriptionProcessor.cs b/samples/batch/transcription-enabled-storage/FetchTranscription/TranscriptionProcessor.cs
diff --git a/samples/batch/transcription-enabled-storage/Setup/ArmTemplate.json b/samples/batch/transcription-enabled-storage/Setup/ArmTemplate.json

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`namespace Connector`
`7`	`7`	`{`
`8`	`8`	`using System;`
	`9`	`+ using Connector.Enums;`
`9`	`10`
`10`	`11`	`public static class CostEstimation`
`11`	`12`	`{`
`@@ -20,18 +21,18 @@ public static double GetCostEstimation(`
`20`	`21`	`TimeSpan timeSpan,`
`21`	`22`	`int numberOfChannels,`
`22`	`23`	`bool isCustomModel,`
`23`		`- bool sentimentAnalysisAdded,`
`24`		`- bool entityRedactionAdded)`
	`24`	`+ SentimentAnalysisSetting sentimentSetting,`
	`25`	`+ EntityRedactionSetting entityRedactionSetting)`
`25`	`26`	`{`
`26`	`27`	`double costPerHour = isCustomModel ? STTCustomModelCostPerHour : STTCostPerHour;`
`27`	`28`	`var price = timeSpan.TotalHours * costPerHour;`
`28`	`29`
`29`		`- if (sentimentAnalysisAdded)`
	`30`	`+ if (sentimentSetting != SentimentAnalysisSetting.None)`
`30`	`31`	`{`
`31`	`32`	`price += timeSpan.TotalHours * TextAnalyticsCostPerHour;`
`32`	`33`	`}`
`33`	`34`
`34`		`- if (entityRedactionAdded)`
	`35`	`+ if (entityRedactionSetting != EntityRedactionSetting.None)`
`35`	`36`	`{`
`36`	`37`	`price += timeSpan.TotalHours * TextAnalyticsCostPerHour;`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,14 @@ namespace Connector`
`9`	`9`
`10`	`10`	`public class CombinedRecognizedPhrase`
`11`	`11`	`{`
`12`		`- public CombinedRecognizedPhrase(int channel, string lexical, string itn, string maskedItn, string display)`
	`12`	`+ public CombinedRecognizedPhrase(int channel, string lexical, string itn, string maskedItn, string display, Sentiment sentiment)`
`13`	`13`	`{`
`14`	`14`	`Channel = channel;`
`15`	`15`	`Lexical = lexical;`
`16`	`16`	`ITN = itn;`
`17`	`17`	`MaskedITN = maskedItn;`
`18`	`18`	`Display = display;`
	`19`	`+ Sentiment = sentiment;`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`[JsonProperty("channel")]`
`@@ -32,5 +33,8 @@ public CombinedRecognizedPhrase(int channel, string lexical, string itn, string`
`32`	`33`
`33`	`34`	`[JsonProperty("display")]`
`34`	`35`	`public string Display { get; set; }`
	`36`	`+`
	`37`	`+ [JsonProperty("sentiment")]`
	`38`	`+ public Sentiment Sentiment { get; set; }`
`35`	`39`	`}`
`36`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,14 @@`
`6`	`6`	`namespace FetchTranscriptionFunction`
`7`	`7`	`{`
`8`	`8`	`using System;`
	`9`	`+ using Connector.Enums;`
`9`	`10`	`using Connector.Extensions;`
`10`	`11`
`11`	`12`	`public static class FetchTranscriptionEnvironmentVariables`
`12`	`13`	`{`
`13`		`- public static readonly bool AddEntityRedaction = bool.TryParse(Environment.GetEnvironmentVariable(nameof(AddEntityRedaction), EnvironmentVariableTarget.Process), out AddEntityRedaction) && AddEntityRedaction;`
	`14`	`+ public static readonly SentimentAnalysisSetting SentimentAnalysisSetting = Enum.TryParse(Environment.GetEnvironmentVariable(nameof(SentimentAnalysisSetting), EnvironmentVariableTarget.Process), out SentimentAnalysisSetting) ? SentimentAnalysisSetting : SentimentAnalysisSetting.None;`
`14`	`15`
`15`		`- public static readonly bool AddSentimentAnalysis = bool.TryParse(Environment.GetEnvironmentVariable(nameof(AddSentimentAnalysis), EnvironmentVariableTarget.Process), out AddSentimentAnalysis) && AddSentimentAnalysis;`
	`16`	`+ public static readonly EntityRedactionSetting EntityRedactionSetting = Enum.TryParse(Environment.GetEnvironmentVariable(nameof(EntityRedactionSetting), EnvironmentVariableTarget.Process), out EntityRedactionSetting) ? EntityRedactionSetting : EntityRedactionSetting.None;`
`16`	`17`
`17`	`18`	`public static readonly bool CreateHtmlResultFile = bool.TryParse(Environment.GetEnvironmentVariable(nameof(CreateHtmlResultFile), EnvironmentVariableTarget.Process), out CreateHtmlResultFile) && CreateHtmlResultFile;`
`18`	`19`