Lamil/bugfixes (microsoft#272)

* fixed auth bug for skills without auth * changed skill configuration to use TelemetryLuisRecognizer * added handler for trace activities sent from skills * updated cancel message if no active dialog is found * updated "nothing to cancel" message for all languages
ParadoxARG · Nov 10, 2018 · ae873ca · ae873ca
1 parent 6f3232f
commit ae873ca
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 13 deletions.
diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/MainDialog.cs b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/MainDialog.cs
@@ -101,11 +101,8 @@ public MainDialog(BotServices services, BotConfiguration botConfig, Conversation
 
                                 case General.Intent.Cancel:
                                     {
-                                        // send cancelled response
-                                        await _responder.ReplyWith(dc.Context, MainResponses.Cancelled);
-
-                                        // Cancel any active dialogs on the stack
-                                        await dc.CancelAllDialogsAsync();
+                                        // if this was triggered, then there is no active dialog
+                                        await _responder.ReplyWith(dc.Context, MainResponses.NoActiveDialog);
                                         break;
                                     }
 

diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/MainResponses.cs b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/MainResponses.cs
@@ -20,12 +20,14 @@ public class MainResponses : TemplateManager
         public const string Greeting = "greeting";
         public const string Help = "help";
         public const string Intro = "intro";
+        public const string NoActiveDialog = "noActiveDialog";
 
         private static LanguageTemplateDictionary _responseTemplates = new LanguageTemplateDictionary
         {
             ["default"] = new TemplateIdMap
             {
                 { Cancelled, (context, data) => SendAcceptingInputReply(context, MainStrings.CANCELLED) },
+                { NoActiveDialog, (context, data) => SendAcceptingInputReply(context, MainStrings.NO_ACTIVE_DIALOG) },
                 { Completed, (context, data) => SendAcceptingInputReply(context, MainStrings.COMPLETED) },
                 { Confused, (context, data) => SendAcceptingInputReply(context, MainStrings.CONFUSED) },
                 { Greeting, (context, data) => SendAcceptingInputReply(context, MainStrings.GREETING) },

diff --git a/...ons/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.Designer.cs b/...ons/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.Designer.cs
diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.de.resx b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.de.resx
@@ -151,6 +151,9 @@
   <data name="MEETING_SUGGESTEDACTION" xml:space="preserve">
     <value>Ein Treffen planen</value>
   </data>
+  <data name="NO_ACTIVE_DIALOG" xml:space="preserve">
+    <value>Es sieht so aus, als gäbe es nichts zu kündigen. Was kann ich Ihnen helfen?</value>
+  </data>
   <data name="POI_SUGGESTEDACTION" xml:space="preserve">
     <value>Ein Café in der Nähe finden</value>
   </data>

diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.es.resx b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.es.resx
@@ -151,6 +151,9 @@
   <data name="MEETING_SUGGESTEDACTION" xml:space="preserve">
     <value>Programar una reunión</value>
   </data>
+  <data name="NO_ACTIVE_DIALOG" xml:space="preserve">
+    <value>Parece que no hay nada que cancelar. ¿En qué puedo ayudarle?</value>
+  </data>
   <data name="POI_SUGGESTEDACTION" xml:space="preserve">
     <value>Encuentre una cafetería cerca</value>
   </data>

diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.fr.resx b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.fr.resx
@@ -151,6 +151,9 @@
   <data name="MEETING_SUGGESTEDACTION" xml:space="preserve">
     <value>Planifier une réunion</value>
   </data>
+  <data name="NO_ACTIVE_DIALOG" xml:space="preserve">
+    <value>On dirait qu'il n'y a rien à annuler. Que puis-je pour vous?</value>
+  </data>
   <data name="POI_SUGGESTEDACTION" xml:space="preserve">
     <value>Trouver un Coffee Shop à proximité</value>
   </data>

diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.it.resx b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.it.resx
@@ -151,6 +151,9 @@
   <data name="MEETING_SUGGESTEDACTION" xml:space="preserve">
     <value>Pianificare una riunione</value>
   </data>
+  <data name="NO_ACTIVE_DIALOG" xml:space="preserve">
+    <value>Sembra che non c'è nulla da cancellare. Cosa posso aiutarvi?</value>
+  </data>
   <data name="POI_SUGGESTEDACTION" xml:space="preserve">
     <value>Trova un coffee shop nelle vicinanze</value>
   </data>

diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.resx b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.resx
@@ -151,6 +151,9 @@
   <data name="MEETING_SUGGESTEDACTION" xml:space="preserve">
     <value>Schedule a meeting</value>
   </data>
+  <data name="NO_ACTIVE_DIALOG" xml:space="preserve">
+    <value>It looks like there is nothing to cancel. What can I help you with?</value>
+  </data>
   <data name="POI_SUGGESTEDACTION" xml:space="preserve">
     <value>Find a coffee shop nearby</value>
   </data>

diff --git a/...ions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.zh-cn.resx b/...ions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.zh-cn.resx
@@ -151,6 +151,9 @@
   <data name="MEETING_SUGGESTEDACTION" xml:space="preserve">
     <value>安排会议</value>
   </data>
+  <data name="NO_ACTIVE_DIALOG" xml:space="preserve">
+    <value>看来没有什么可以取消的。有什么需要我帮忙的吗？</value>
+  </data>
   <data name="POI_SUGGESTEDACTION" xml:space="preserve">
     <value>查找附近的咖啡店</value>
   </data>

diff --git a/...al-Assistant/src/csharp/microsoft.bot.solutions/Authentication/MultiProviderAuthDialog.cs b/...al-Assistant/src/csharp/microsoft.bot.solutions/Authentication/MultiProviderAuthDialog.cs
@@ -24,7 +24,7 @@ public MultiProviderAuthDialog(ISkillConfiguration skillConfiguration)
         {
             _skillConfiguration = skillConfiguration;
 
-            if (!_skillConfiguration.AuthenticationConnections.Any())
+            if (_skillConfiguration.IsAuthenticatedSkill && !_skillConfiguration.AuthenticationConnections.Any())
             {
                 throw new Exception("You must configure an authentication connection in your bot file before using this component.");
             }

diff --git a/solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Skills/ISkillConfiguration.cs b/solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Skills/ISkillConfiguration.cs
@@ -9,6 +9,8 @@ namespace Microsoft.Bot.Solutions.Skills
 {
     public abstract class ISkillConfiguration
     {
+        public bool IsAuthenticatedSkill { get; set; }
+
         public abstract Dictionary<string, string> AuthenticationConnections { get; set; }
 
         public abstract TelemetryClient TelemetryClient { get; set; }

diff --git a/solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Skills/SkillConfiguration.cs b/solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Skills/SkillConfiguration.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.Bot.Builder;
@@ -16,6 +17,11 @@ public SkillConfiguration()
 
         public SkillConfiguration(BotConfiguration botConfiguration, string[] supportedProviders, string[] parameters, Dictionary<string, object> configuration)
         {
+            if (supportedProviders != null && supportedProviders.Count() > 0)
+            {
+                IsAuthenticatedSkill = true;
+            }
+
             foreach (var service in botConfiguration.Services)
             {
                 switch (service.Type)
@@ -32,7 +38,7 @@ public SkillConfiguration(BotConfiguration botConfiguration, string[] supportedP
                         {
                             var luis = service as LuisService;
                             var luisApp = new LuisApplication(luis.AppId, luis.SubscriptionKey, luis.GetEndpoint());
-                            LuisServices.Add(service.Id, new LuisRecognizer(luisApp));
+                            LuisServices.Add(service.Id, new TelemetryLuisRecognizer(luisApp));
                             break;
                         }
 

diff --git a/solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Skills/SkillDialog.cs b/solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Skills/SkillDialog.cs
@@ -242,7 +242,15 @@ public async Task<DialogTurnResult> ForwardToSkill(DialogContext dc, Activity ac
                     }
                     else
                     {
-                        queue.Add(skillResponse);
+                        if (skillResponse.Type == ActivityTypes.Trace)
+                        {
+                            // Write out any trace messages from the skill to the emulator
+                            await dc.Context.SendActivityAsync(skillResponse);
+                        }
+                        else
+                        {
+                            queue.Add(skillResponse);
+                        }
                     }
 
                     skillResponse = _inProcAdapter.GetNextReply();
@@ -257,11 +265,7 @@ public async Task<DialogTurnResult> ForwardToSkill(DialogContext dc, Activity ac
                 // handle ending the skill conversation
                 if (endOfConversation)
                 {
-                    await dc.Context.SendActivityAsync(
-                        new Activity(
-                            type: ActivityTypes.Trace,
-                            text: $"<--Ending the skill conversation"
-                            ));
+                    await dc.Context.SendActivityAsync(new Activity(type: ActivityTypes.Trace, text: $"<--Ending the skill conversation"));
 
                     return await dc.EndDialogAsync();
                 }