fixes for clock and photo gallery

OpenJibo/tests/Jibo.Cloud.Tests/WebSockets/JiboInteractionServiceTests.cs

@@ -54,7 +54,8 @@ public sealed class JiboInteractionServiceTests
         });
 
         Assert.Equal("date", decision.IntentName);
-        Assert.Contains("Today is", decision.ReplyText, StringComparison.Ordinal);
+        Assert.Equal("@be/clock", decision.SkillName);
+        Assert.Equal("askForDate", decision.SkillPayload!["clockIntent"]);
     }
 
     [Fact]
@@ -198,6 +199,55 @@ public sealed class JiboInteractionServiceTests
         Assert.Equal("menu", decision.SkillPayload["clockIntent"]);
     }
 
+    [Fact]
+    public async Task BuildDecisionAsync_OpenClock_MapsToDirectClockView()
+    {
+        var service = CreateService();
+
+        var decision = await service.BuildDecisionAsync(new TurnContext
+        {
+            RawTranscript = "open the clock",
+            NormalizedTranscript = "open the clock"
+        });
+
+        Assert.Equal("clock_open", decision.IntentName);
+        Assert.Equal("@be/clock", decision.SkillName);
+        Assert.Equal("clock", decision.SkillPayload!["domain"]);
+        Assert.Equal("askForTime", decision.SkillPayload["clockIntent"]);
+    }
+
+    [Fact]
+    public async Task BuildDecisionAsync_WhatTimeIsIt_MapsToLocalClockTimeIntent()
+    {
+        var service = CreateService();
+
+        var decision = await service.BuildDecisionAsync(new TurnContext
+        {
+            RawTranscript = "what time is it",
+            NormalizedTranscript = "what time is it"
+        });
+
+        Assert.Equal("time", decision.IntentName);
+        Assert.Equal("@be/clock", decision.SkillName);
+        Assert.Equal("askForTime", decision.SkillPayload!["clockIntent"]);
+    }
+
+    [Fact]
+    public async Task BuildDecisionAsync_TodaysDate_MapsToLocalClockDateIntent()
+    {
+        var service = CreateService();
+
+        var decision = await service.BuildDecisionAsync(new TurnContext
+        {
+            RawTranscript = "what's today's date",
+            NormalizedTranscript = "what's today's date"
+        });
+
+        Assert.Equal("date", decision.IntentName);
+        Assert.Equal("@be/clock", decision.SkillName);
+        Assert.Equal("askForDate", decision.SkillPayload!["clockIntent"]);
+    }
+
     [Fact]
     public async Task BuildDecisionAsync_SetTimerForFiveMinutes_MapsToTimerValue()
     {
@@ -237,6 +287,70 @@ public sealed class JiboInteractionServiceTests
         Assert.Equal("am", decision.SkillPayload["ampm"]);
     }
 
+    [Fact]
+    public async Task BuildDecisionAsync_SetAlarmForEightThirty_ParsesCompactTime()
+    {
+        var service = CreateService();
+
+        var decision = await service.BuildDecisionAsync(new TurnContext
+        {
+            RawTranscript = "set an alarm for 830",
+            NormalizedTranscript = "set an alarm for 830"
+        });
+
+        Assert.Equal("alarm_value", decision.IntentName);
+        Assert.Equal("8:30", decision.SkillPayload!["time"]);
+        Assert.Equal("am", decision.SkillPayload["ampm"]);
+    }
+
+    [Fact]
+    public async Task BuildDecisionAsync_SetAlarmForEightThirtySpokenDigits_ParsesSplitTime()
+    {
+        var service = CreateService();
+
+        var decision = await service.BuildDecisionAsync(new TurnContext
+        {
+            RawTranscript = "set an alarm for 8 30",
+            NormalizedTranscript = "set an alarm for 8 30"
+        });
+
+        Assert.Equal("alarm_value", decision.IntentName);
+        Assert.Equal("8:30", decision.SkillPayload!["time"]);
+        Assert.Equal("am", decision.SkillPayload["ampm"]);
+    }
+
+    [Fact]
+    public async Task BuildDecisionAsync_SetAlarmWithoutTime_AsksForClarification()
+    {
+        var service = CreateService();
+
+        var decision = await service.BuildDecisionAsync(new TurnContext
+        {
+            RawTranscript = "set an alarm",
+            NormalizedTranscript = "set an alarm"
+        });
+
+        Assert.Equal("alarm_clarify", decision.IntentName);
+        Assert.Null(decision.SkillName);
+        Assert.Equal("What time should I set the alarm for?", decision.ReplyText);
+    }
+
+    [Fact]
+    public async Task BuildDecisionAsync_SetTimerWithoutDuration_AsksForClarification()
+    {
+        var service = CreateService();
+
+        var decision = await service.BuildDecisionAsync(new TurnContext
+        {
+            RawTranscript = "set a timer",
+            NormalizedTranscript = "set a timer"
+        });
+
+        Assert.Equal("timer_clarify", decision.IntentName);
+        Assert.Null(decision.SkillName);
+        Assert.Equal("How long should I set the timer for?", decision.ReplyText);
+    }
+
     [Fact]
     public async Task BuildDecisionAsync_OpenPhotoGallery_MapsToGalleryLaunch()
     {

OpenJibo/tests/Jibo.Cloud.Tests/WebSockets/JiboWebSocketServiceTests.cs

@@ -383,6 +383,67 @@ public sealed class JiboWebSocketServiceTests
         Assert.Equal("timerValue", redirectPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("intent").GetString());
     }
 
+    [Fact]
+    public async Task ClientAsr_OpenTheClock_RedirectsIntoClockSkillWithAskForTimeIntent()
+    {
+        await _service.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-clock-open-token",
+            Text = """{"type":"LISTEN","transID":"trans-clock-open","data":{"rules":["globals/global_commands_launch"]}}"""
+        });
+
+        var replies = await _service.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-clock-open-token",
+            Text = """{"type":"CLIENT_ASR","transID":"trans-clock-open","data":{"text":"open the clock"}}"""
+        });
+
+        Assert.Equal(4, replies.Count);
+        Assert.Equal("SKILL_REDIRECT", ReadReplyType(replies[2]));
+
+        using var listenPayload = JsonDocument.Parse(replies[0].Text!);
+        Assert.Equal("askForTime", listenPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("intent").GetString());
+        Assert.Equal("clock", listenPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("entities").GetProperty("domain").GetString());
+
+        using var redirectPayload = JsonDocument.Parse(replies[2].Text!);
+        Assert.Equal("@be/clock", redirectPayload.RootElement.GetProperty("data").GetProperty("match").GetProperty("skillID").GetString());
+        Assert.Equal("askForTime", redirectPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("intent").GetString());
+    }
+
+    [Fact]
+    public async Task ClientAsr_WhatTimeIsIt_RedirectsIntoClockSkillWithAskForTimeIntent()
+    {
+        await _service.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-clock-voice-time-token",
+            Text = """{"type":"LISTEN","transID":"trans-clock-voice-time","data":{"rules":["globals/global_commands_launch"]}}"""
+        });
+
+        var replies = await _service.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-clock-voice-time-token",
+            Text = """{"type":"CLIENT_ASR","transID":"trans-clock-voice-time","data":{"text":"what time is it"}}"""
+        });
+
+        Assert.Equal(4, replies.Count);
+
+        using var listenPayload = JsonDocument.Parse(replies[0].Text!);
+        Assert.Equal("askForTime", listenPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("intent").GetString());
+        Assert.Equal("@be/clock", listenPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("skill").GetString());
+    }
+
     [Fact]
     public async Task ClientAsr_SetAlarmForSevenThirtyAm_RedirectsIntoClockSkillWithAlarmEntities()
     {
@@ -414,6 +475,71 @@ public sealed class JiboWebSocketServiceTests
         Assert.Equal("am", listenPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("entities").GetProperty("ampm").GetString());
     }
 
+    [Fact]
+    public async Task ClientAsr_SetAlarmForEightThirty_ParsesCompactAlarmTime()
+    {
+        await _service.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-clock-compact-alarm-token",
+            Text = """{"type":"LISTEN","transID":"trans-clock-compact-alarm","data":{"rules":["globals/global_commands_launch"]}}"""
+        });
+
+        var replies = await _service.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-clock-compact-alarm-token",
+            Text = """{"type":"CLIENT_ASR","transID":"trans-clock-compact-alarm","data":{"text":"set an alarm for 830"}}"""
+        });
+
+        Assert.Equal(4, replies.Count);
+
+        using var listenPayload = JsonDocument.Parse(replies[0].Text!);
+        Assert.Equal("8:30", listenPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("entities").GetProperty("time").GetString());
+        Assert.Equal("am", listenPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("entities").GetProperty("ampm").GetString());
+    }
+
+    [Fact]
+    public async Task ClientAsr_SetAlarmWithoutTime_UsesClarificationSpeechInsteadOfClockRedirect()
+    {
+        await _service.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-clock-clarify-alarm-token",
+            Text = """{"type":"LISTEN","transID":"trans-clock-clarify-alarm","data":{"rules":["globals/global_commands_launch"]}}"""
+        });
+
+        var replies = await _service.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-clock-clarify-alarm-token",
+            Text = """{"type":"CLIENT_ASR","transID":"trans-clock-clarify-alarm","data":{"text":"set an alarm"}}"""
+        });
+
+        Assert.Equal(3, replies.Count);
+        Assert.Equal("SKILL_ACTION", ReadReplyType(replies[2]));
+
+        using var skillPayload = JsonDocument.Parse(replies[2].Text!);
+        var esml = skillPayload.RootElement
+            .GetProperty("data")
+            .GetProperty("action")
+            .GetProperty("config")
+            .GetProperty("jcp")
+            .GetProperty("config")
+            .GetProperty("play")
+            .GetProperty("esml")
+            .GetString();
+        Assert.Contains("What time should I set the alarm for?", esml, StringComparison.Ordinal);
+    }
+
     [Fact]
     public async Task ClientAsr_OpenPhotoGallery_RedirectsIntoGallerySkill()
     {
@@ -1703,9 +1829,9 @@ public sealed class JiboWebSocketServiceTests
             Text = """{"type":"LISTEN","transID":"trans-second","data":{"text":"what time is it","rules":["follow-up"]}}"""
         });
 
-        Assert.Equal(3, followUpReplies.Count);
+        Assert.Equal(4, followUpReplies.Count);
         using var payload = JsonDocument.Parse(followUpReplies[0].Text!);
-        Assert.Equal("time", payload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("intent").GetString());
+        Assert.Equal("askForTime", payload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("intent").GetString());
         Assert.Equal("trans-second", payload.RootElement.GetProperty("transID").GetString());
 
         var session = _store.FindSessionByToken("hub-followup-audio-token");