return semantic response as dialog result (#2069)

* return semanticAction response in dialog result * add null check
microsoft · Aug 7, 2019 · 66e4a39 · 66e4a39
1 parent a50268c
commit 66e4a39
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/...crosoft.bot.builder.skills/Microsoft.Bot.Builder.Skills.Tests/Mocks/MockSkillTransport.cs b/...crosoft.bot.builder.skills/Microsoft.Bot.Builder.Skills.Tests/Mocks/MockSkillTransport.cs
@@ -19,11 +19,11 @@ public void Disconnect()
         {
         }
 
-		public Task<bool> ForwardToSkillAsync(SkillManifest skillManifest, IServiceClientCredentials serviceClientCredentials, ITurnContext dialogContext, Activity activity, Action<Activity> tokenRequestHandler = null, Action<Activity> fallbackHandler = null)
+		public Task<Activity> ForwardToSkillAsync(SkillManifest skillManifest, IServiceClientCredentials serviceClientCredentials, ITurnContext dialogContext, Activity activity, Action<Activity> tokenRequestHandler = null, Action<Activity> fallbackHandler = null)
 		{
 			_activityForwarded = activity;
 
-            return Task.FromResult(true);
+            return Task.FromResult<Activity>(null);
         }
 
         public bool CheckIfSkillInvoked()

diff --git a/lib/csharp/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/ISkillTransport.cs b/lib/csharp/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/ISkillTransport.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Bot.Builder.Skills
 {
     public interface ISkillTransport
     {
-        Task<bool> ForwardToSkillAsync(SkillManifest skillManifest, IServiceClientCredentials serviceClientCredentials, ITurnContext dialogContext, Activity activity, Action<Activity> tokenRequestHandler = null, Action<Activity> fallbackHandler = null);
+        Task<Activity> ForwardToSkillAsync(SkillManifest skillManifest, IServiceClientCredentials serviceClientCredentials, ITurnContext dialogContext, Activity activity, Action<Activity> tokenRequestHandler = null, Action<Activity> fallbackHandler = null);
 
         Task CancelRemoteDialogsAsync(SkillManifest skillManifest, IServiceClientCredentials serviceClientCredentials, ITurnContext turnContext);
 

diff --git a/...p/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/SkillCallingRequestHandler.cs b/...p/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/SkillCallingRequestHandler.cs
@@ -77,6 +77,7 @@ public SkillCallingRequestHandler(
                                     }
                                     else if (activity.Type == ActivityTypes.EndOfConversation)
                                     {
+                                        var result = await _turnContext.SendActivityAsync(activity).ConfigureAwait(false);
                                         if (_handoffActivityHandler != null)
                                         {
                                             _handoffActivityHandler(activity);

diff --git a/lib/csharp/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/SkillDialog.cs b/lib/csharp/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/SkillDialog.cs
@@ -314,12 +314,12 @@ private async Task<DialogTurnResult> ForwardToSkillAsync(DialogContext innerDc,
         {
             try
             {
-                var endOfConversation = await _skillTransport.ForwardToSkillAsync(_skillManifest, _serviceClientCredentials, innerDc.Context, activity, GetTokenRequestCallback(innerDc), GetFallbackCallback(innerDc));
+                var endOfConversationActivity = await _skillTransport.ForwardToSkillAsync(_skillManifest, _serviceClientCredentials, innerDc.Context, activity, GetTokenRequestCallback(innerDc), GetFallbackCallback(innerDc));
 
-                if (endOfConversation)
+                if (endOfConversationActivity != null)
                 {
                     await innerDc.Context.SendActivityAsync(new Activity(type: ActivityTypes.Trace, text: $"<--Ending the skill conversation with the {_skillManifest.Name} Skill and handing off to Parent Bot."));
-                    return await innerDc.EndDialogAsync();
+                    return await innerDc.EndDialogAsync(endOfConversationActivity.SemanticAction?.Entities);
                 }
                 else
                 {

diff --git a/...harp/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/SkillWebSocketTransport.cs b/...harp/microsoft.bot.builder.skills/Microsoft.Bot.Builder.Skills/SkillWebSocketTransport.cs
@@ -19,7 +19,7 @@ public class SkillWebSocketTransport : ISkillTransport
     {
         private IStreamingTransportClient _streamingTransportClient;
         private readonly IBotTelemetryClient _botTelemetryClient;
-        private bool endOfConversation = false;
+        private Activity endOfConversationActivity;
 
         public SkillWebSocketTransport(
             IBotTelemetryClient botTelemetryClient,
@@ -29,7 +29,7 @@ public SkillWebSocketTransport(
             _streamingTransportClient = streamingTransportClient;
         }
 
-        public async Task<bool> ForwardToSkillAsync(SkillManifest skillManifest, IServiceClientCredentials serviceClientCredentials, ITurnContext turnContext, Activity activity, Action<Activity> tokenRequestHandler = null, Action<Activity> fallbackHandler = null)
+        public async Task<Activity> ForwardToSkillAsync(SkillManifest skillManifest, IServiceClientCredentials serviceClientCredentials, ITurnContext turnContext, Activity activity, Action<Activity> tokenRequestHandler = null, Action<Activity> fallbackHandler = null)
         {
             if (_streamingTransportClient == null)
             {
@@ -67,7 +67,7 @@ public async Task<bool> ForwardToSkillAsync(SkillManifest skillManifest, IServic
 
             await _streamingTransportClient.SendAsync(request);
 
-            return endOfConversation;
+            return endOfConversationActivity;
         }
 
         public async Task CancelRemoteDialogsAsync(SkillManifest skillManifest, IServiceClientCredentials appCredentials, ITurnContext turnContext)
@@ -108,7 +108,7 @@ private Action<Activity> GetHandoffActivityCallback()
         {
             return (activity) =>
             {
-                endOfConversation = true;
+                endOfConversationActivity = activity;
             };
         }
 

diff --git a/...p/microsoft.bot.builder.solutions/microsoft.bot.builder.solutions/Dialogs/RouterDialog.cs b/...p/microsoft.bot.builder.solutions/microsoft.bot.builder.solutions/Dialogs/RouterDialog.cs
@@ -52,7 +52,7 @@ public RouterDialog(string dialogId, IBotTelemetryClient telemetryClient)
                             {
                                 await OnEventAsync(innerDc).ConfigureAwait(false);
                             }
-                            else if (!string.IsNullOrEmpty(activity.Text))
+                            else
                             {
                                 var result = await innerDc.ContinueDialogAsync().ConfigureAwait(false);