Add weekly weather cards and improve news API fallback

OpenJibo/tests/Jibo.Cloud.Tests/Infrastructure/ProviderCachingTests.cs

@@ -149,6 +149,103 @@ public sealed class ProviderCachingTests
         Assert.Equal(1, handler.GetCallCount("/v2/everything"));
     }
 
+    [Fact]
+    public async Task NewsApiBriefingProvider_ContinuesFallbackChain_WhenCategoryReturnsHttpError()
+    {
+        var handler = new CountingHttpMessageHandler(message =>
+        {
+            var path = message.RequestUri?.AbsolutePath ?? string.Empty;
+            if (!string.Equals(path, "/v2/top-headlines", StringComparison.OrdinalIgnoreCase))
+            {
+                return new HttpResponseMessage(HttpStatusCode.NotFound);
+            }
+
+            var query = message.RequestUri?.Query ?? string.Empty;
+            if (query.Contains("category=sports", StringComparison.OrdinalIgnoreCase))
+            {
+                return new HttpResponseMessage(HttpStatusCode.BadRequest)
+                {
+                    Content = new StringContent(
+                        """{"status":"error","code":"parameterInvalid","message":"Category not supported for this key."}""",
+                        Encoding.UTF8,
+                        "application/json")
+                };
+            }
+
+            return JsonResponse(
+                """{"status":"ok","articles":[{"title":"General robotics update","description":"Top story","source":{"name":"AP News"},"url":"https://example.com/general"}]}""");
+        });
+        var provider = new NewsApiBriefingProvider(
+            new HttpClient(handler),
+            new NewsApiOptions
+            {
+                ApiKey = "test-key",
+                CacheTtlSeconds = 300,
+                FailureCacheTtlSeconds = 30
+            },
+            NullLogger<NewsApiBriefingProvider>.Instance);
+
+        var result = await provider.GetBriefingAsync(new NewsBriefingRequest(["sports"], 3));
+
+        Assert.NotNull(result);
+        Assert.Single(result!.Headlines);
+        Assert.Equal("General robotics update", result.Headlines[0].Title);
+        Assert.Equal("success", result.ProviderStatus);
+        Assert.Equal(2, handler.GetCallCount("/v2/top-headlines"));
+    }
+
+    [Fact]
+    public async Task NewsApiBriefingProvider_PropagatesApiErrorCodeAndMessage_WhenAllEndpointsFail()
+    {
+        var handler = new CountingHttpMessageHandler(message =>
+        {
+            var path = message.RequestUri?.AbsolutePath ?? string.Empty;
+            if (string.Equals(path, "/v2/top-headlines", StringComparison.OrdinalIgnoreCase))
+            {
+                return new HttpResponseMessage(HttpStatusCode.BadRequest)
+                {
+                    Content = new StringContent(
+                        """{"status":"error","code":"parameterInvalid","message":"Category 'general' is not available for this account."}""",
+                        Encoding.UTF8,
+                        "application/json")
+                };
+            }
+
+            if (string.Equals(path, "/v2/everything", StringComparison.OrdinalIgnoreCase))
+            {
+                return new HttpResponseMessage(HttpStatusCode.BadRequest)
+                {
+                    Content = new StringContent(
+                        """{"status":"error","code":"parametersMissing","message":"Missing required search query."}""",
+                        Encoding.UTF8,
+                        "application/json")
+                };
+            }
+
+            return new HttpResponseMessage(HttpStatusCode.NotFound);
+        });
+        var provider = new NewsApiBriefingProvider(
+            new HttpClient(handler),
+            new NewsApiOptions
+            {
+                ApiKey = "test-key",
+                DefaultCategories = ["general"],
+                CacheTtlSeconds = 300,
+                FailureCacheTtlSeconds = 30
+            },
+            NullLogger<NewsApiBriefingProvider>.Instance);
+
+        var result = await provider.GetBriefingAsync(new NewsBriefingRequest([], 3));
+
+        Assert.NotNull(result);
+        Assert.Empty(result!.Headlines);
+        Assert.Equal("http_error", result.ProviderStatus);
+        Assert.Equal("parameterInvalid", result.ProviderErrorCode);
+        Assert.Equal("Category 'general' is not available for this account.", result.ProviderMessage);
+        Assert.Equal((int)HttpStatusCode.BadRequest, result.ProviderHttpStatusCode);
+        Assert.Contains("/v2/top-headlines", result.ProviderEndpoint, StringComparison.OrdinalIgnoreCase);
+    }
+
     private static HttpResponseMessage JsonResponse(string body)
     {
         return new HttpResponseMessage(HttpStatusCode.OK)

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

@@ -1801,6 +1801,14 @@ public sealed class JiboInteractionServiceTests
         Assert.Contains("Tuesday: light rain, high 61, low 52.", decision.ReplyText, StringComparison.OrdinalIgnoreCase);
         Assert.Contains("Saturday: light rain, high 61, low 52.", decision.ReplyText, StringComparison.OrdinalIgnoreCase);
         Assert.Contains("Temperatures are in Fahrenheit.", decision.ReplyText, StringComparison.OrdinalIgnoreCase);
+        Assert.NotNull(decision.SkillPayload);
+        Assert.True(decision.SkillPayload!.TryGetValue("weather_weekly_cards", out var weeklyCardsValue));
+        var weeklyCards = Assert.IsAssignableFrom<IReadOnlyList<IDictionary<string, object?>>>(weeklyCardsValue);
+        Assert.Equal(5, weeklyCards.Count);
+        var firstCard = weeklyCards[0];
+        Assert.Equal("Tuesday", firstCard["weather_day"]);
+        Assert.Equal(61, firstCard["weather_high"]);
+        Assert.Equal(52, firstCard["weather_low"]);
     }
 
     [Fact]
@@ -1829,6 +1837,10 @@ public sealed class JiboInteractionServiceTests
         Assert.NotNull(provider.LastRequest);
         Assert.Equal("Seattle", provider.LastRequest!.LocationQuery);
         Assert.Equal(5, provider.LastRequest.ForecastDayOffset);
+        Assert.NotNull(decision.SkillPayload);
+        Assert.True(decision.SkillPayload!.TryGetValue("weather_weekly_cards", out var weeklyCardsValue));
+        var weeklyCards = Assert.IsAssignableFrom<IReadOnlyList<IDictionary<string, object?>>>(weeklyCardsValue);
+        Assert.Equal(5, weeklyCards.Count);
     }
 
     [Fact]

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

@@ -2250,6 +2250,53 @@ public sealed class JiboWebSocketServiceTests
         Assert.Contains("tempNormal_v01.crn", payloadText, StringComparison.Ordinal);
     }
 
+    [Fact]
+    public async Task ClientAsr_WeatherNextWeek_WithProvider_EmitsWeatherHiLoSequenceCards()
+    {
+        var customStore = new InMemoryCloudStateStore();
+        var customService = CreateService(
+            customStore,
+            new StubWeatherReportProvider(
+                new WeatherReportSnapshot("Seattle, US", "light rain", 58, 61, 52, "rain", false)));
+
+        await customService.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-weather-next-week-token",
+            Text = """{"type":"LISTEN","transID":"trans-weather-next-week","data":{"hotphrase":true,"rules":["launch","globals/global_commands_launch"]}}"""
+        });
+
+        var replies = await customService.HandleMessageAsync(new WebSocketMessageEnvelope
+        {
+            HostName = "neo-hub.jibo.com",
+            Path = "/listen",
+            Kind = "neo-hub-listen",
+            Token = "hub-weather-next-week-token",
+            Text = """{"type":"CLIENT_ASR","transID":"trans-weather-next-week","data":{"text":"forecast for seattle next week"}}"""
+        });
+
+        Assert.True(replies.Count >= 3);
+        var skillReply = replies.Last(static reply => string.Equals(ReadReplyType(reply), "SKILL_ACTION", StringComparison.Ordinal));
+        using var skillPayload = JsonDocument.Parse(skillReply.Text!);
+        var jcp = skillPayload.RootElement
+            .GetProperty("data")
+            .GetProperty("action")
+            .GetProperty("config")
+            .GetProperty("jcp");
+
+        Assert.Equal("SEQUENCE", jcp.GetProperty("type").GetString());
+        var children = jcp.GetProperty("children");
+        Assert.Equal(5, children.GetArrayLength());
+
+        var firstChildConfig = children[0].GetProperty("config");
+        Assert.True(firstChildConfig.TryGetProperty("display", out var firstDisplay));
+        Assert.Equal(
+            "weatherTempView",
+            firstDisplay.GetProperty("view").GetProperty("data").GetProperty("viewConfig").GetProperty("id").GetString());
+    }
+
     [Fact]
     public async Task ClientAsr_OpenTheRadio_EmitsRadioRedirectAndSilentCompletion()
     {