Add name extraction for onboarding (#2120)

* add name extraction for onboarding

* Add name extraction for onboarding

* Rename some files

* move onboarding model into general model

* fix a problem

* rename OnboardingState to AssistantState

* make the changes in Template

* fix some format

* fix format

* remove old file

* update format

Author: xhr0804

templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Resources/LU/de/General.lu

@@ -104,6 +104,21 @@
 - Sprechen Sie mit einem Menschen
 
 
+## ExtractName
+- rufen Sie mich steve !
+- ich bin anna
+- ich bin john jackson.
+- ich bin Lily
+- es ist jackson .
+- es ist alice anderson!
+- mein Name ist bill jones
+- dies ist john w.smith .
+- ([Sie können]| [bitte]) Ruf mich an  {PersonName.Any} [.]
+- mein Name ist  {PersonName.Any} [.]
+- (i'm|i am)  {PersonName.Any} [.]
+- (es ist|es ist|dies ist)  {PersonName.Any} [.]
+
+
 ## FinishTask
 - Alles fertig
 - Alles gesetzt
@@ -514,6 +529,7 @@ $PREBUILT:number
 
 $PREBUILT:ordinal
 
+$PREBUILT:personName
 
 > # Phrase list definitions
 

templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Resources/LU/en/General.lu

@@ -104,6 +104,21 @@
 - talk to a human
 
 
+## ExtractName
+- call me steve !
+- i am anna
+- i'm john jackson.
+- i'm lily
+- it is jackson .
+- it's alice anderson!
+- my name is bill jones
+- this is john w.smith .
+- ([you can]|[please]) call me {PersonName.Any}[.]
+- my name is {PersonName.Any}[.]
+- (i'm|i am) {PersonName.Any}[.]
+- (it's|it is|this is) {PersonName.Any}[.]
+
+
 ## FinishTask
 - all finished
 - all set
@@ -516,6 +531,8 @@ $PREBUILT:number
 
 $PREBUILT:ordinal
 
+$PREBUILT:personName
+
 
 > # Phrase list definitions
 

templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Resources/LU/es/General.lu

@@ -104,6 +104,21 @@
 - hablar con un humano
 
 
+## ExtractName
+- llámame steve !
+- Soy anna
+- Soy John Jackson.
+- Soy lirio
+- es Jackson .
+- es Alice Anderson!
+- mi nombre es Bill Jones
+- este es John w.smith .
+- ([se puede] [por favor]) Llámame  {PersonName.Any} [.]
+- Mi nombre es  {PersonName.Any} [.]
+- (Soy yo)  {PersonName.Any} [.]
+- (es esto)  {PersonName.Any} [.]
+
+
 ## FinishTask
 - todo terminado
 - Todo listo
@@ -514,6 +529,8 @@ $PREBUILT:number
 
 $PREBUILT:ordinal
 
+$PREBUILT:personName
+
 
 > # Phrase list definitions
 

templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Resources/LU/fr/General.lu

@@ -104,6 +104,21 @@
 - parler à un humain
 
 
+## ExtractName
+- appelez-moi steve !
+- je suis anna
+- Je suis John Jackson.
+- Je suis lys
+- c'est jackson .
+- c'est Alice anderson!
+- mon nom est bill jones
+- c'est john w.smith .
+- ([vous pouvez] [s'il vous plaît]) Appelle-moi  {PersonName.Any} [.]
+- mon nom est  {PersonName.Any} [.]
+- (je suis)  {PersonName.Any} [.]
+- (c'est c'est ça)  {PersonName.Any} [.]
+
+
 ## FinishTask
 - tous finis
 - tous ensemble
@@ -514,6 +529,7 @@ $PREBUILT:number
 
 $PREBUILT:ordinal
 
+$PREBUILT:personName
 
 > # Phrase list definitions
 

templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Resources/LU/it/General.lu

@@ -104,6 +104,21 @@
 - parlare con un umano
 
 
+## ExtractName
+- chiamami steve !
+- Io sono anna
+- Sono John Jackson.
+- Sono giglio
+- è jackson .
+- è Alice Anderson!
+- il mio nome è Bill Jones
+- questo è john w.smith .
+- ([si può] [per favore]) Chiamami  {PersonName.Any} [.]
+- mi chiamo  {PersonName.Any} [.]
+- (Io sono)  {PersonName.Any} [.]
+- (è, è, questo è)  {PersonName.Any} [.]
+
+
 ## FinishTask
 - Tutto finito
 - tutti insieme
@@ -514,6 +529,7 @@ $PREBUILT:number
 
 $PREBUILT:ordinal
 
+$PREBUILT:personName
 
 > # Phrase list definitions
 

templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Resources/LU/zh/General.lu

@@ -87,6 +87,20 @@
 - 是的
 
 
+## ExtractName
+- 叫我史蒂夫！
+- 我是安娜
+- 我是约翰·杰克逊！
+- 我是莉莉
+- 请叫我杰克逊。
+- 可以叫我爱丽丝·安德森！
+- 我的名字是比尔·琼斯
+- 我是约翰·史密斯。
+- [你]（[可以][请]）叫我{PersonName.Any} [吧][.]
+- 我的名字是{PersonName.Any} [.]
+- 我是{PersonName.Any} [.]
+
+
 ## Escalate
 - 我能和一个人交谈吗？
 - 联系支持
@@ -514,6 +528,7 @@ $PREBUILT:number
 
 $PREBUILT:ordinal
 
+$PREBUILT:personName
 
 > # Phrase list definitions
 

templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Dialogs/MainDialog.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 using System;

templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Dialogs/OnboardingDialog.cs

@@ -1,22 +1,25 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 using System;
 using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
+using Luis;
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Dialogs;
 using Microsoft.Bot.Builder.Solutions.Extensions;
 using Microsoft.Bot.Builder.Solutions.Responses;
 using Microsoft.Extensions.DependencyInjection;
 using VirtualAssistantSample.Models;
+using VirtualAssistantSample.Services;
 
 namespace VirtualAssistantSample.Dialogs
 {
     // Example onboarding dialog to initial user profile information.
     public class OnboardingDialog : ComponentDialog
     {
+        private BotServices _services;
         private LocaleTemplateEngineManager _templateEngine;
         private IStatePropertyAccessor<UserProfileState> _accessor;
 
@@ -29,6 +32,7 @@ public OnboardingDialog(
 
             var userState = serviceProvider.GetService<UserState>();
             _accessor = userState.CreateProperty<UserProfileState>(nameof(UserProfileState));
+            _services = serviceProvider.GetService<BotServices>();
 
             var onboarding = new WaterfallStep[]
             {
@@ -64,6 +68,27 @@ public async Task<DialogTurnResult> FinishOnboardingDialog(WaterfallStepContext
         {
             var userProfile = await _accessor.GetAsync(sc.Context, () => new UserProfileState());
             var name = (string)sc.Result;
+            
+            var generalResult = sc.Context.TurnState.Get<GeneralLuis>(StateProperties.GeneralResult);
+            if (generalResult == null)
+            {
+                var locale = CultureInfo.CurrentUICulture.TwoLetterISOLanguageName;
+                var localizedServices = _services.CognitiveModelSets[locale];
+                generalResult = await localizedServices.LuisServices["General"].RecognizeAsync<GeneralLuis>(sc.Context, cancellationToken);
+            }
+
+            (var generalIntent, var generalScore) = generalResult.TopIntent();
+            if (generalIntent == GeneralLuis.Intent.ExtractName && generalScore > 0.5)
+            {
+                if (generalResult.Entities.PersonName_Any != null)
+                {
+                    name = generalResult.Entities.PersonName_Any[0];
+                }
+                else if (generalResult.Entities.personName != null)
+                {
+                    name = generalResult.Entities.personName[0];
+                }
+            }
 
             // Captialize name
             userProfile.Name = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(name.ToLower());
@@ -82,5 +107,10 @@ private class DialogIds
         {
             public const string NamePrompt = "namePrompt";
         }
+        
+        private class StateProperties
+        {
+            public const string GeneralResult = "generalResult";
+        }
     }
 }

templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Services/GeneralLuis.cs

@@ -19,6 +19,7 @@ public enum Intent
             Cancel,
             Confirm,
             Escalate,
+            ExtractName,
             FinishTask,
             GoBack,
             Help,
@@ -45,13 +46,19 @@ public class _Entities
             // Built-in entities
             public double[] number;
             public double[] ordinal;
+            public string[] personName;
+
+            // Pattern.any
+            public string[] PersonName_Any;
 
             // Instance
             public class _Instance
             {
                 public InstanceData[] DirectionalReference;
                 public InstanceData[] number;
                 public InstanceData[] ordinal;
+                public InstanceData[] personName;
+                public InstanceData[] PersonName_Any;
             }
             [JsonProperty("$instance")]
             public _Instance _instance;

templates/Virtual-Assistant-Template/csharp/Template/VA/Deployment/Resources/LU/de/general.lu

@@ -104,6 +104,21 @@
 - Sprechen Sie mit einem Menschen
 
 
+## ExtractName
+- rufen Sie mich steve !
+- ich bin anna
+- ich bin john jackson.
+- ich bin Lily
+- es ist jackson .
+- es ist alice anderson!
+- mein Name ist bill jones
+- dies ist john w.smith .
+- ([Sie können]| [bitte]) Ruf mich an  {PersonName.Any} [.]
+- mein Name ist  {PersonName.Any} [.]
+- (i'm|i am)  {PersonName.Any} [.]
+- (es ist|es ist|dies ist)  {PersonName.Any} [.]
+
+
 ## FinishTask
 - Alles fertig
 - Alles gesetzt
@@ -514,6 +529,7 @@ $PREBUILT:number
 
 $PREBUILT:ordinal
 
+$PREBUILT:personName
 
 > # Phrase list definitions