From a9c6196748a46d84bd04792e1fd0d8ae29d0c0a1 Mon Sep 17 00:00:00 2001 From: Tom Laird-McConnell Date: Thu, 18 Jun 2020 11:21:57 -0700 Subject: [PATCH 1/3] If there is no utterance we should return no intents. --- .../Microsoft.Bot.Builder.AI.LUIS/LuisRecognizerOptionsV2.cs | 4 +--- .../Microsoft.Bot.Builder.AI.LUIS/LuisRecognizerOptionsV3.cs | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libraries/Microsoft.Bot.Builder.AI.LUIS/LuisRecognizerOptionsV2.cs b/libraries/Microsoft.Bot.Builder.AI.LUIS/LuisRecognizerOptionsV2.cs index 81c1fb803d..3bb0486a38 100644 --- a/libraries/Microsoft.Bot.Builder.AI.LUIS/LuisRecognizerOptionsV2.cs +++ b/libraries/Microsoft.Bot.Builder.AI.LUIS/LuisRecognizerOptionsV2.cs @@ -62,9 +62,7 @@ internal override async Task RecognizeInternalAsync(ITurnConte { recognizerResult = new RecognizerResult { - Text = utterance, - Intents = new Dictionary() { { string.Empty, new IntentScore() { Score = 1.0 } } }, - Entities = new JObject(), + Text = utterance }; } else diff --git a/libraries/Microsoft.Bot.Builder.AI.LUIS/LuisRecognizerOptionsV3.cs b/libraries/Microsoft.Bot.Builder.AI.LUIS/LuisRecognizerOptionsV3.cs index 4e26d67699..9ee8ac98c3 100644 --- a/libraries/Microsoft.Bot.Builder.AI.LUIS/LuisRecognizerOptionsV3.cs +++ b/libraries/Microsoft.Bot.Builder.AI.LUIS/LuisRecognizerOptionsV3.cs @@ -111,9 +111,7 @@ private async Task RecognizeAsync(ITurnContext turnContext, st { recognizerResult = new RecognizerResult { - Text = utterance, - Intents = new Dictionary() { { string.Empty, new IntentScore() { Score = 1.0 } } }, - Entities = new JObject(), + Text = utterance }; } else From fc2a8b17c8283e1d734243c6c8b15002fa71967f Mon Sep 17 00:00:00 2001 From: Tom Laird-McConnell Date: Thu, 18 Jun 2020 11:25:11 -0700 Subject: [PATCH 2/3] update regexrecognizer to return no intents if there is no utterance just like LuisRecognizer. --- .../Recognizers/RegexRecognizer.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Recognizers/RegexRecognizer.cs b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Recognizers/RegexRecognizer.cs index ab223ab10b..90c1f16e09 100644 --- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Recognizers/RegexRecognizer.cs +++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Recognizers/RegexRecognizer.cs @@ -57,8 +57,13 @@ public override async Task RecognizeAsync(DialogContext dialog var recognizerResult = new RecognizerResult() { Text = text, - Intents = new Dictionary(), }; + + if (string.IsNullOrWhiteSpace(text)) + { + // nothing to recognize, return empty recognizerResult + return recognizerResult; + } // add entities from regexrecgonizer to the entities pool var entityPool = new List(); From 000a926a2c5d51da37932ff256e3eb06ecabd5dd Mon Sep 17 00:00:00 2001 From: Tom Laird-McConnell Date: Thu, 18 Jun 2020 12:19:10 -0700 Subject: [PATCH 3/3] update oracle tests --- tests/Microsoft.Bot.Builder.AI.LUIS.Tests/LuisOracleTests.cs | 4 +--- .../Microsoft.Bot.Builder.AI.LUIS.Tests/LuisV3OracleTests.cs | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/Microsoft.Bot.Builder.AI.LUIS.Tests/LuisOracleTests.cs b/tests/Microsoft.Bot.Builder.AI.LUIS.Tests/LuisOracleTests.cs index e24de798fc..c329b610e6 100644 --- a/tests/Microsoft.Bot.Builder.AI.LUIS.Tests/LuisOracleTests.cs +++ b/tests/Microsoft.Bot.Builder.AI.LUIS.Tests/LuisOracleTests.cs @@ -138,9 +138,7 @@ public async Task NullUtterance() Assert.IsNull(result.AlteredText); Assert.AreEqual(utterance, result.Text); Assert.IsNotNull(result.Intents); - Assert.AreEqual(1, result.Intents.Count); - Assert.IsNotNull(result.Intents[string.Empty]); - Assert.AreEqual(result.GetTopScoringIntent(), (string.Empty, 1.0)); + Assert.AreEqual(0, result.Intents.Count); Assert.IsNotNull(result.Entities); Assert.AreEqual(0, result.Entities.Count); } diff --git a/tests/Microsoft.Bot.Builder.AI.LUIS.Tests/LuisV3OracleTests.cs b/tests/Microsoft.Bot.Builder.AI.LUIS.Tests/LuisV3OracleTests.cs index 97d19f48b7..cbf2204818 100644 --- a/tests/Microsoft.Bot.Builder.AI.LUIS.Tests/LuisV3OracleTests.cs +++ b/tests/Microsoft.Bot.Builder.AI.LUIS.Tests/LuisV3OracleTests.cs @@ -108,9 +108,7 @@ public async Task NullUtterance() Assert.IsNull(result.AlteredText); Assert.AreEqual(utterance, result.Text); Assert.IsNotNull(result.Intents); - Assert.AreEqual(1, result.Intents.Count); - Assert.IsNotNull(result.Intents[string.Empty]); - Assert.AreEqual(result.GetTopScoringIntent(), (string.Empty, 1.0)); + Assert.AreEqual(0, result.Intents.Count); Assert.IsNotNull(result.Entities); Assert.AreEqual(0, result.Entities.Count); }