[Custom Voice] Support to add additional request headers for long audio API. (#183)

Author: cherrycaol

CustomVoice-API-Samples/CSharp/CustomVoice-API/API/APIHelper.cs

@@ -36,6 +36,34 @@ public static T Get<T>(string subscriptionKey, string url)
             }
         }
 
+        public static T Get<T>(string subscriptionKey, string url, Dictionary<string, string> additionalRequestHeaders)
+        {
+            using (var client = new HttpClient())
+            {
+                client.DefaultRequestHeaders.Add("Ocp-Apim-Subscription-Key", subscriptionKey);
+                foreach (var pair in additionalRequestHeaders)
+                {
+                    client.DefaultRequestHeaders.Add(pair.Key, pair.Value);
+                }
+
+                var response = client.GetAsync(url, CancellationToken.None).Result;
+
+                if (response.StatusCode != HttpStatusCode.OK)
+                {
+                    PrintErrorMessage(response);
+                    return default(T);
+                }
+
+                using (var responseStream = response.Content.ReadAsStreamAsync().Result)
+                using (var streamReader = new StreamReader(responseStream))
+                {
+                    string responseJson = streamReader.ReadToEnd();
+                    var items = JsonConvert.DeserializeObject<T>(responseJson);
+                    return items;
+                }
+            }
+        }
+
         public static IEnumerable<T> GetListPaged<T>(string subscriptionKey, string url)
         {
             using (var client = new HttpClient())
@@ -84,8 +112,9 @@ public static HttpResponseMessage Patch<T>(string subscriptionKey, string url, T
             {
                 client.DefaultRequestHeaders.Add("Ocp-Apim-Subscription-Key", subscriptionKey);
                 var method = new HttpMethod("PATCH");
-                using (var request = new HttpRequestMessage(method, url) { 
-                Content = new StringContent(JsonConvert.SerializeObject(payload), Encoding.UTF8, "application/json")
+                using (var request = new HttpRequestMessage(method, url)
+                {
+                    Content = new StringContent(JsonConvert.SerializeObject(payload), Encoding.UTF8, "application/json")
                 })
                 {
                     return client.SendAsync(request).Result;

CustomVoice-API-Samples/CSharp/CustomVoice-API/API/BatchSynthesis.cs

@@ -55,10 +55,10 @@ public static DTO.BatchSynthesis GetById(string subscriptionKey, string hostURI,
             return APIHelper.Get<DTO.BatchSynthesis>(subscriptionKey, url);
         }
 
-        public static IEnumerable<DTO.Voice> Getvoices(string subscriptionKey, string hostURI)
+        public static IEnumerable<DTO.Voice> Getvoices(string subscriptionKey, string hostURI, Dictionary<string, string> additionalRequestHeaders)
         {
             string url = string.Format(CultureInfo.InvariantCulture, hostURI + API_V3.VoiceSynthesis_GetVoice);
-            return APIHelper.Get<IEnumerable<DTO.Voice>>(subscriptionKey, url);
+            return APIHelper.Get<IEnumerable<DTO.Voice>>(subscriptionKey, url, additionalRequestHeaders);
         }
 
         public static bool DeleteById(string subscriptionKey, string hostURI, string batchSynthesisId)

CustomVoice-API-Samples/CSharp/CustomVoice-API/APIArguments.cs

@@ -22,6 +22,7 @@ public class APIArguments
         internal const string BatchSynthesisId = "batchSynthesisId";
         internal const string VoiceTestId = "voiceTestId";
         internal const string HostUriValue = "https://<region>.customvoice.api.speech.microsoft.com/";
+        internal const string AdditionalRequestHeaders = "additionalRequestHeaders";
 
         public static Dictionary<string, string> GetApiKindAndAction(string[] args)
         {
@@ -270,7 +271,7 @@ public static Dictionary<string, List<string>> GetParameters(APIKind apiKind, Ac
                 case nameof(APIKind.batchsynthesis) + "-" + nameof(Action.getvoices):
                     {
                         RequiredParameters = new List<string>() { SubscriptionKey, HostUri };
-                        OptionalParameters = new List<string>();
+                        OptionalParameters = new List<string>() { AdditionalRequestHeaders };
                         break;
                     }
                 case nameof(APIKind.batchsynthesis) + "-" + nameof(Action.delete):

CustomVoice-API-Samples/CSharp/CustomVoice-API/APIHandler.cs

@@ -172,7 +172,7 @@ private static void ExecuteBatchSynthesisApi(Action action, Dictionary<string, s
                     BatchSynthesisGetById(arguments);
                     break;
                 case Action.getvoices:
-                    BatchSynthesisGetvoices(arguments);
+                    BatchSynthesisGetVoices(arguments);
                     break;
                 case Action.delete:
                     BatchSynthesisDeleteById(arguments);
@@ -500,7 +500,7 @@ private static void VoiceTestGet(Dictionary<string, string> arguments)
             string subscriptionKey = arguments["subscriptionkey"];
             string hostURI = arguments["hosturi"];
             string modelId = arguments["modelid"];
-            
+
             var result = VoiceTest.Get(subscriptionKey, hostURI, modelId);
             DisplayResult<API.DTO.VoiceTest>(result);
         }
@@ -676,7 +676,7 @@ private static void BatchSynthesisGet(Dictionary<string, string> arguments)
             {
                 var skipParam = arguments["skip"];
                 var ret = int.TryParse(skipParam, out skip);
-                if(!ret)
+                if (!ret)
                 {
                     Console.WriteLine("skip parameter should be an integer number.");
                 }
@@ -705,12 +705,26 @@ private static void BatchSynthesisGetById(Dictionary<string, string> arguments)
             DisplaySingleResult(result, "  ");
         }
 
-        private static void BatchSynthesisGetvoices(Dictionary<string, string> arguments)
+        private static void BatchSynthesisGetVoices(Dictionary<string, string> arguments)
         {
             string subscriptionKey = arguments["subscriptionkey"];
             string hostURI = arguments["hosturi"];
+            string additionalRequestHeadersStr = arguments["additionalrequestheaders"];
+            Dictionary<string, string> additionalRequestHeaders = new Dictionary<string, string>();
+
+            if (!string.IsNullOrEmpty(additionalRequestHeadersStr))
+            {
+                foreach (string headerStr in additionalRequestHeadersStr.Split(';'))
+                {
+                    var headerKeyValue = headerStr.Split(',');
+                    if (headerKeyValue.Length == 2)
+                    {
+                        additionalRequestHeaders.Add(headerKeyValue[0], headerKeyValue[1]);
+                    }
+                }
+            }
 
-            var result = BatchSynthesis.Getvoices(subscriptionKey, hostURI);
+            var result = BatchSynthesis.Getvoices(subscriptionKey, hostURI, additionalRequestHeaders);
             DisplayResult<API.DTO.Voice>(result);
         }
 
@@ -771,7 +785,7 @@ private static void BatchSynthesisCreate(Dictionary<string, string> arguments)
 
         private static void DisplayResult<T>(IEnumerable<T> result)
         {
-            if(result == null)
+            if (result == null)
             {
                 return;
             }
@@ -790,7 +804,7 @@ private static void DisplaySingleResult(object result, string indentation)
             string key;
             string value;
 
-            if(result == null)
+            if (result == null)
             {
                 return;
             }