Error fix in integrated recognize tests

Author: ATILATosta

src/IBM.WatsonDeveloperCloud.SpeechToText/v1/SpeechToTextService.cs

@@ -191,7 +191,7 @@ public object DeleteSession(string sessionId)
             return result;
         }
 
-        public SpeechRecognitionEvent Recognize(string contentType, FileStream audio, string transferEncoding = "", string model = "", string customizationId = "", bool? continuous = null, int? inactivityTimeout = null, string[] keywords = null, double? keywordsThreshold = null, int? maxAlternatives = null, double? wordAlternativesThreshold = null, bool? wordConfidence = null, bool? timestamps = null, bool profanityFilter = false, bool? smartFormatting = null, bool? speakerLabels = null)
+        public SpeechRecognitionEvent Recognize(string contentType, FileStream audio, string transferEncoding = "", string model = "en-US_BroadbandModel", string customizationId = "", bool? continuous = null, int? inactivityTimeout = null, string[] keywords = null, double? keywordsThreshold = null, int? maxAlternatives = null, double? wordAlternativesThreshold = null, bool? wordConfidence = null, bool? timestamps = null, bool profanityFilter = false, bool? smartFormatting = null, bool? speakerLabels = null)
         {
             if (audio == null)
                 throw new ArgumentNullException($"{nameof(audio)}");
@@ -217,7 +217,7 @@ public SpeechRecognitionEvent Recognize(string contentType, FileStream audio, st
                                model: model);
         }
 
-        public SpeechRecognitionEvent Recognize(string contentType, Metadata metaData, FileStream audio, string transferEncoding = "", string model = "", string customizationId = "")
+        public SpeechRecognitionEvent Recognize(string contentType, Metadata metaData, FileStream audio, string transferEncoding = "", string model = "en-US_BroadbandModel", string customizationId = "")
         {
             if (metaData == null)
                 throw new ArgumentNullException($"{nameof(metaData)}");
@@ -235,7 +235,7 @@ public SpeechRecognitionEvent Recognize(string contentType, Metadata metaData, F
                                model: model);
         }
 
-        public SpeechRecognitionEvent RecognizeWithSession(string sessionId, string contentType, FileStream audio, string transferEncoding = "", string model = "", string customizationId = "", bool? continuous = null, int? inactivityTimeout = null, string[] keywords = null, double? keywordsThreshold = null, int? maxAlternatives = null, double? wordAlternativesThreshold = null, bool? wordConfidence = null, bool? timestamps = null, bool profanityFilter = false, bool? smartFormatting = null, bool? speakerLabels = null)
+        public SpeechRecognitionEvent RecognizeWithSession(string sessionId, string contentType, FileStream audio, string transferEncoding = "", string model = "en-US_BroadbandModel", string customizationId = "", bool? continuous = null, int? inactivityTimeout = null, string[] keywords = null, double? keywordsThreshold = null, int? maxAlternatives = null, double? wordAlternativesThreshold = null, bool? wordConfidence = null, bool? timestamps = null, bool profanityFilter = false, bool? smartFormatting = null, bool? speakerLabels = null)
         {
             if (string.IsNullOrEmpty(sessionId))
                 throw new ArgumentNullException($"{nameof(sessionId)}");
@@ -264,7 +264,7 @@ public SpeechRecognitionEvent RecognizeWithSession(string sessionId, string cont
                                model: model);
         }
 
-        public SpeechRecognitionEvent RecognizeWithSession(string sessionId, string contentType, Metadata metaData, FileStream audio, string transferEncoding = "", string model = "", string customizationId = "")
+        public SpeechRecognitionEvent RecognizeWithSession(string sessionId, string contentType, Metadata metaData, FileStream audio, string transferEncoding = "", string model = "en-US_BroadbandModel", string customizationId = "")
         {
             if (string.IsNullOrEmpty(sessionId))
                 throw new ArgumentNullException($"{nameof(sessionId)}");
@@ -307,13 +307,15 @@ private SpeechRecognitionEvent Recognize(string sessionId, string contentType, M
                 {
                     request =
                         this.Client.WithAuthentication(this.UserName, this.Password)
-                                   .PostAsync($"{this.Endpoint}{string.Format(PATH_SESSION_RECOGNIZE, sessionId)}");
-                                   //.WithHeader("Cookie", sessionId);
+                                   .PostAsync($"{this.Endpoint}{string.Format(PATH_SESSION_RECOGNIZE, sessionId)}")
+                                   .WithHeader("Cookie", sessionId);
                 }
 
                 if (metaData == null)
                 {
-                    request.WithArgument("model", model);
+                    // if a session exists, the model should not be sent
+                    if (string.IsNullOrEmpty(sessionId))
+                        request.WithArgument("model", model);
 
                     if (!string.IsNullOrEmpty(customizationId))
                         request.WithArgument("customization_id", customizationId);
@@ -351,9 +353,7 @@ private SpeechRecognitionEvent Recognize(string sessionId, string contentType, M
                     if (speakerLabels.HasValue)
                         request.WithArgument("speaker_labels", speakerLabels.Value);
 
-                    //StreamContent bodyContent = new StreamContent(audio);
-                    ByteArrayContent bodyContent = new ByteArrayContent(audio.ReadAllBytes());
-
+                    StreamContent bodyContent = new StreamContent(audio);
                     bodyContent.Headers.Add("Content-Type", contentType);
 
                     request.WithBodyContent(bodyContent);
@@ -366,11 +366,14 @@ private SpeechRecognitionEvent Recognize(string sessionId, string contentType, M
                     metadata.Headers.ContentType = MediaTypeHeaderValue.Parse(HttpMediaType.APPLICATION_JSON);
 
                     var audioContent = new ByteArrayContent((audio as Stream).ReadAllBytes());
-                    //var audioContent = new StreamContent((audio as Stream));
                     audioContent.Headers.ContentType = MediaTypeHeaderValue.Parse(contentType);
 
                     MultipartFormDataContent formData = new MultipartFormDataContent();
-                    request.WithArgument("model", model);
+
+                    // if a session exists, the model should not be sent
+                    if (string.IsNullOrEmpty(sessionId))
+                        request.WithArgument("model", model);
+
                     formData.Add(metadata, "metadata");
                     formData.Add(audioContent, "upload", Path.GetFileName(audio.Name));
 
@@ -401,7 +404,7 @@ public List<SpeechRecognitionEvent> ObserveResult(string sessionId, int? sequenc
             {
                 var request =
                     this.Client.WithAuthentication(this.UserName, this.Password)
-                               .PostAsync($"{this.Endpoint}{string.Format(PATH_OBSERVE_RESULT, sessionId)}");
+                               .GetAsync($"{this.Endpoint}{string.Format(PATH_OBSERVE_RESULT, sessionId)}");
 
                 if (sequenceId.HasValue)
                     request.WithArgument("sequence_id", sequenceId);

test/IBM.WatsonDeveloperCloud.SpeechToText.IntegrationTests/SpeechToTextServiceIntegrationTest.cs

@@ -133,7 +133,7 @@ public void t05_Recognize_BodyContent_Sucess()
                 File.OpenRead(@"Assets\test-audio.wav");
 
             var results =
-                service.Recognize(audio.GetMediaTypeFromFile(), audio, "", "en-US_BroadbandModel");
+                service.Recognize(audio.GetMediaTypeFromFile(), audio, "");
 
             Assert.IsNotNull(results);
             Assert.IsNotNull(results.Results);
@@ -245,7 +245,7 @@ public void t09_ObserveResult_Success()
                 service.RecognizeWithSession(session.SessionId, audio.GetMediaTypeFromFile(), metadata, audio, "", modelName);
 
             var results =
-                service.ObserveResult(session.SessionId);
+                service.ObserveResult(session.SessionId, interimResults: true);
 
             Assert.IsNotNull(results);
             Assert.IsTrue(results.Count > 0);