[IngestionClient] Revert faulty ingestion client commits (#2258)

* reset back to commit 2fd035a

* merge commit 1c5f343

* update template version

* update VisualStudioVersion

samples/ingestion/ingestion-client/BatchIngestionClient.sln

@@ -16,6 +16,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RealtimeTranscription", "Re
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DatabaseMigrator", "DatabaseMigrator\DatabaseMigrator.csproj", "{5BD38646-D3F3-481B-909E-353750AC5384}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7BC59BB6-7DD9-4D72-8AA0-91F774D6E45A}"
+	ProjectSection(SolutionItems) = preProject
+		Setup\ArmTemplateBatch.json = Setup\ArmTemplateBatch.json
+		Setup\ArmTemplateRealtime.json = Setup\ArmTemplateRealtime.json
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

samples/ingestion/ingestion-client/Connector/BatchClient.cs

@@ -21,7 +21,7 @@ public static class BatchClient
     {
         private const string TranscriptionsBasePath = "speechtotext/v3.0/Transcriptions/";
 
-        private const int MaxNumberOfRetries = 3;
+        private const int MaxNumberOfRetries = 10;
 
         private static readonly TimeSpan PostTimeout = TimeSpan.FromMinutes(1);
 
@@ -34,7 +34,7 @@ public static class BatchClient
         private static readonly AsyncRetryPolicy RetryPolicy =
             Policy
                 .Handle<Exception>(e => e is HttpStatusCodeException || e is HttpRequestException)
-                .WaitAndRetryAsync(MaxNumberOfRetries, retryAttempt => TimeSpan.FromSeconds(2));
+                .WaitAndRetryAsync(MaxNumberOfRetries, retryAttempt => TimeSpan.FromSeconds(5));
 
         public static Task<TranscriptionReportFile> GetTranscriptionReportFileFromSasAsync(string sasUri)
         {

samples/ingestion/ingestion-client/Connector/Enums/TranscriptionAnalyticsJobStatus.cs

@@ -0,0 +1,14 @@
+// <copyright file="TranscriptionAnalyticsJobStatus.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 TranscriptionAnalyticsJobStatus
+    {
+        NotSubmitted,
+        Running,
+        Completed
+    }
+}

samples/ingestion/ingestion-client/Connector/Serializable/TranscriptionStartedMessage/TextAnalyticsRequests.cs

@@ -14,15 +14,15 @@ public TextAnalyticsRequests(
             IEnumerable<TextAnalyticsRequest> audioLevelRequests,
             IEnumerable<TextAnalyticsRequest> conversationRequests)
         {
-            this.UtteranceLevelRequests = utteranceLevelRequests;
-            this.AudioLevelRequests = audioLevelRequests;
-            this.ConversationRequests = conversationRequests;
+            this.UtteranceLevelRequests = utteranceLevelRequests ?? new List<TextAnalyticsRequest>();
+            this.AudioLevelRequests = audioLevelRequests ?? new List<TextAnalyticsRequest>();
+            this.ConversationRequests = conversationRequests ?? new List<TextAnalyticsRequest>();
         }
 
-        public IEnumerable<TextAnalyticsRequest> UtteranceLevelRequests { get; }
+        public IEnumerable<TextAnalyticsRequest> UtteranceLevelRequests { get; set; }
 
-        public IEnumerable<TextAnalyticsRequest> AudioLevelRequests { get; }
+        public IEnumerable<TextAnalyticsRequest> AudioLevelRequests { get; set; }
 
-        public IEnumerable<TextAnalyticsRequest> ConversationRequests { get; }
+        public IEnumerable<TextAnalyticsRequest> ConversationRequests { get; set; }
     }
 }

samples/ingestion/ingestion-client/Connector/StorageConnector.cs

@@ -168,7 +168,7 @@ public async Task MoveFileAsync(string inputContainerName,  string inputFileName
 
                 if (!keepSource)
                 {
-                    await inputBlockBlobClient.DeleteAsync().ConfigureAwait(false);
+                    await inputBlockBlobClient.DeleteIfExistsAsync().ConfigureAwait(false);
                 }
 
                 return;
@@ -178,7 +178,7 @@ public async Task MoveFileAsync(string inputContainerName,  string inputFileName
 
             if (!keepSource)
             {
-                await inputBlockBlobClient.DeleteAsync().ConfigureAwait(false);
+                await inputBlockBlobClient.DeleteIfExistsAsync().ConfigureAwait(false);
             }
         }
 

samples/ingestion/ingestion-client/FetchTranscription/Database/DatabaseConfigProvider.cs

@@ -3,18 +3,16 @@
 // Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
 // </copyright>
 
-using FetchTranscription.Database;
+using FetchTranscription;
 
 using Microsoft.Azure.WebJobs.Hosting;
 
 [assembly: WebJobsStartup(typeof(DatabaseInitializationService), "DatabaseInitialize")]
 
-namespace FetchTranscription.Database
+namespace FetchTranscription
 {
     using Connector.Database;
 
-    using FetchTranscriptionFunction;
-
     using Microsoft.Azure.WebJobs.Description;
     using Microsoft.Azure.WebJobs.Host.Config;
     using Microsoft.EntityFrameworkCore;

samples/ingestion/ingestion-client/FetchTranscription/Database/DatabaseInitializationService.cs

@@ -2,15 +2,14 @@
 // 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>
-
-using FetchTranscription.Database;
+using FetchTranscription;
 
 using Microsoft.Azure.WebJobs;
 using Microsoft.Azure.WebJobs.Hosting;
 
 [assembly: WebJobsStartup(typeof(DatabaseInitializationService), "DatabaseInitialize")]
 
-namespace FetchTranscription.Database
+namespace FetchTranscription
 {
     public class DatabaseInitializationService : IWebJobsStartup
     {

samples/ingestion/ingestion-client/FetchTranscription/FetchTranscription.cs

@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
 // </copyright>
 
-namespace FetchTranscriptionFunction
+namespace FetchTranscription
 {
     using System;
     using System.Threading.Tasks;

samples/ingestion/ingestion-client/FetchTranscription/FetchTranscriptionEnvironmentVariables.cs

@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE.md file in the project root for full license information.
 // </copyright>
 
-namespace FetchTranscriptionFunction
+namespace FetchTranscription
 {
     using System;
     using Connector;
@@ -59,7 +59,7 @@ public static class FetchTranscriptionEnvironmentVariables
 
         public static readonly string TextAnalyticsKey = Environment.GetEnvironmentVariable(nameof(TextAnalyticsKey), EnvironmentVariableTarget.Process);
 
-        public static readonly string TextAnalyticsRegion = Environment.GetEnvironmentVariable(nameof(TextAnalyticsRegion), EnvironmentVariableTarget.Process);
+        public static readonly string TextAnalyticsEndpoint = Environment.GetEnvironmentVariable(nameof(TextAnalyticsEndpoint), EnvironmentVariableTarget.Process);
 
         public static readonly string PiiCategories = Environment.GetEnvironmentVariable(nameof(PiiCategories), EnvironmentVariableTarget.Process);
 

samples/ingestion/ingestion-client/FetchTranscription/Startup.cs

@@ -13,8 +13,6 @@ namespace FetchTranscription
 
     using Connector.Database;
 
-    using FetchTranscriptionFunction;
-
     using Microsoft.Azure.Functions.Extensions.DependencyInjection;
     using Microsoft.EntityFrameworkCore;
     using Microsoft.Extensions.DependencyInjection;

samples/ingestion/ingestion-client/FetchTranscription/TranscriptionAnalytics/ITranscriptionAnalyticsProvider.cs

@@ -0,0 +1,38 @@
+// <copyright file="ITranscriptionAnalyticsProvider.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 FetchTranscription
+{
+    using System.Collections.Generic;
+    using System.Threading.Tasks;
+
+    using Connector;
+    using Connector.Enums;
+    using Connector.Serializable.TranscriptionStartedServiceBusMessage;
+
+    public interface ITranscriptionAnalyticsProvider
+    {
+        /// <summary>
+        /// Gets the status of the transcription analytics jobs that are monitored by the provider
+        /// </summary>
+        /// <param name="audioFileInfos">The audio file infos with transcription analytics jobs info</param>
+        /// <returns>The overall status of all jobs monitored by the provider</returns>
+        Task<TranscriptionAnalyticsJobStatus> GetTranscriptionAnalyticsJobStatusAsync(IEnumerable<AudioFileInfo> audioFileInfos);
+
+        /// <summary>
+        /// Submits transcription analytics jobs based on the transcript in speechtranscript and sets the job ids in the corresponding audio file infos.
+        /// </summary>
+        /// <param name="speechTranscriptMappings">The mapping from audio file info to transcript</param>
+        /// <returns>The errors if any.</returns>
+        Task<IEnumerable<string>> SubmitTranscriptionAnalyticsJobsAsync(Dictionary<AudioFileInfo, SpeechTranscript> speechTranscriptMappings);
+
+        /// <summary>
+        /// Fetches the transcription analytics results and adds them to the corresponding speech transcript
+        /// </summary>
+        /// <param name="speechTranscriptMappings">The mapping from audio file info to transcript</param>
+        /// <returns>The errors if any.</returns>
+        Task<IEnumerable<string>> AddTranscriptionAnalyticsResultsToTranscriptsAsync(Dictionary<AudioFileInfo, SpeechTranscript> speechTranscriptMappings);
+    }
+}