open jibo architecture narrowing and streamlining

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

@@ -0,0 +1,73 @@
+using Jibo.Cloud.Application.Services;
+using Jibo.Cloud.Infrastructure.Content;
+using Jibo.Runtime.Abstractions;
+
+namespace Jibo.Cloud.Tests.WebSockets;
+
+public sealed class JiboInteractionServiceTests
+{
+    [Fact]
+    public async Task BuildDecisionAsync_Joke_UsesCatalogBackedRandomContent()
+    {
+        var service = CreateService();
+
+        var decision = await service.BuildDecisionAsync(new TurnContext
+        {
+            RawTranscript = "tell me a joke",
+            NormalizedTranscript = "tell me a joke"
+        });
+
+        Assert.Equal("joke", decision.IntentName);
+        Assert.Equal("@be/joke", decision.SkillName);
+        Assert.Equal("Why did the robot cross the road? Because it was programmed by the chicken.", decision.ReplyText);
+    }
+
+    [Fact]
+    public async Task BuildDecisionAsync_Dance_UsesCatalogBackedAnimation()
+    {
+        var service = CreateService();
+
+        var decision = await service.BuildDecisionAsync(new TurnContext
+        {
+            RawTranscript = "do a dance",
+            NormalizedTranscript = "do a dance"
+        });
+
+        Assert.Equal("dance", decision.IntentName);
+        Assert.Equal("chitchat-skill", decision.SkillName);
+        Assert.Equal("Okay. Watch this.", decision.ReplyText);
+        Assert.Equal("<speak>Okay.<break size='0.2'/> Watch this.<anim cat='dance' filter='music, rom-upbeat' /></speak>", decision.SkillPayload!["esml"]);
+    }
+
+    [Fact]
+    public async Task BuildDecisionAsync_ClientNluAskForDate_MapsToDateIntent()
+    {
+        var service = CreateService();
+
+        var decision = await service.BuildDecisionAsync(new TurnContext
+        {
+            Attributes = new Dictionary<string, object?>
+            {
+                ["clientIntent"] = "askForDate"
+            }
+        });
+
+        Assert.Equal("date", decision.IntentName);
+        Assert.Contains("Today is", decision.ReplyText, StringComparison.Ordinal);
+    }
+
+    private static JiboInteractionService CreateService()
+    {
+        return new JiboInteractionService(
+            new JiboExperienceContentCache(new InMemoryJiboExperienceContentRepository()),
+            new FirstItemRandomizer());
+    }
+
+    private sealed class FirstItemRandomizer : IJiboRandomizer
+    {
+        public T Choose<T>(IReadOnlyList<T> items)
+        {
+            return items[0];
+        }
+    }
+}

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

@@ -2,6 +2,7 @@ using System.Text.Json;
 using Jibo.Cloud.Application.Abstractions;
 using Jibo.Cloud.Application.Services;
 using Jibo.Cloud.Domain.Models;
+using Jibo.Cloud.Infrastructure.Content;
 using Jibo.Cloud.Infrastructure.Persistence;
 using Jibo.Cloud.Tests.Fixtures;
 
@@ -16,7 +17,9 @@ public sealed class JiboWebSocketServiceTests
     {
         _store = new InMemoryCloudStateStore();
         var turnContextMapper = new ProtocolToTurnContextMapper();
-        var conversationBroker = new DemoConversationBroker();
+        var contentRepository = new InMemoryJiboExperienceContentRepository();
+        var contentCache = new JiboExperienceContentCache(contentRepository);
+        var conversationBroker = new DemoConversationBroker(new JiboInteractionService(contentCache, new DefaultJiboRandomizer()));
         var replyMapper = new ResponsePlanToSocketMessagesMapper();
         var sttSelector = new DefaultSttStrategySelector(
         [
@@ -53,7 +56,7 @@ public sealed class JiboWebSocketServiceTests
 
         using var listenPayload = JsonDocument.Parse(replies[0].Text!);
         Assert.Equal("hello jibo", listenPayload.RootElement.GetProperty("data").GetProperty("asr").GetProperty("text").GetString());
-        Assert.Equal("chat", listenPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("intent").GetString());
+        Assert.Equal("hello", listenPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("intent").GetString());
 
         using var eosPayload = JsonDocument.Parse(replies[1].Text!);
         Assert.True(eosPayload.RootElement.TryGetProperty("ts", out _));
@@ -475,7 +478,7 @@ public sealed class JiboWebSocketServiceTests
         Assert.Equal(3, finalizeReplies.Count);
         using var listenPayload = JsonDocument.Parse(finalizeReplies[0].Text!);
         Assert.Equal("hello from buffered audio", listenPayload.RootElement.GetProperty("data").GetProperty("asr").GetProperty("text").GetString());
-        Assert.Equal("chat", listenPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("intent").GetString());
+        Assert.Equal("hello", listenPayload.RootElement.GetProperty("data").GetProperty("nlu").GetProperty("intent").GetString());
 
         using var skillPayload = JsonDocument.Parse(finalizeReplies[2].Text!);
         Assert.Equal("chitchat-skill", skillPayload.RootElement.GetProperty("data").GetProperty("skill").GetProperty("id").GetString());
@@ -535,6 +538,45 @@ public sealed class JiboWebSocketServiceTests
         Assert.False(meta.TryGetProperty("transcript", out _));
     }
 
+    [Fact]
+    public async Task ClientAsrDanceFlow_EmitsAnimatedSkillAction()
+    {
+        await _service.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-client-asr-dance-token",
+            Text = """{"type":"LISTEN","transID":"trans-dance-shape","data":{"rules":["wake-word"]}}"""
+        });
+
+        var replies = await _service.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-client-asr-dance-token",
+            Text = """{"type":"CLIENT_ASR","transID":"trans-dance-shape","data":{"text":"do a dance"}}"""
+        });
+
+        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("<anim cat='dance' filter='music, ", esml, StringComparison.Ordinal);
+        Assert.Equal("chitchat-skill", skillPayload.RootElement.GetProperty("data").GetProperty("skill").GetProperty("id").GetString());
+    }
+
     [Fact]
     public async Task FollowUpTurn_UsesNewTurnStateWithoutLeakingBufferedAudio()
     {