Mirrors/JiboExperiments
1
1
Fork 0
mirror of https://kevinblog.sytes.net/Code/Jibo-Revival-Group/JiboExperiments.git synced 2026-06-16 20:16:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix weather forecast routing and Hi/Lo rendering

Browse Source
This commit is contained in:
Jacob Dubin
2026-05-09 21:46:03 -05:00
parent 7fd732ad17
commit ffb444e4f9
5 changed files with 165 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenJibo/src/Jibo.Cloud/dotnet/src/Jibo.Cloud.Application/Services/JiboInteractionService.cs
View File

@@ -419,6 +419,12 @@ public sealed class JiboInteractionService(
{
var referenceLocalTime = TryResolveReferenceLocalTime(turn);
var weatherDate = ResolveWeatherDateEntity(turn, transcript, referenceLocalTime);
var normalizedTranscript = NormalizeCommandPhrase(transcript);
if (ShouldDefaultForecastToTomorrow(normalizedTranscript, weatherDate))
{
weatherDate = new WeatherDateEntity("tomorrow", 1, "Tomorrow");
}
if (weatherReportProvider is null)
{
return new JiboInteractionDecision(
@@ -434,7 +440,9 @@ public sealed class JiboInteractionService(
}
var locationQuery = TryResolveWeatherLocationQuery(transcript);
var weatherCoordinates = TryResolveWeatherCoordinates(turn);
var weatherCoordinates = string.IsNullOrWhiteSpace(locationQuery)
? TryResolveWeatherCoordinates(turn)
: null;
var useCelsius = ShouldUseCelsius(turn, transcript);
WeatherReportSnapshot? snapshot;
try
@@ -504,6 +512,26 @@ public sealed class JiboInteractionService(
return $"Right now in {location}, it is {summary} and {snapshot.Temperature} degrees {unit}.";
}
private static bool ShouldDefaultForecastToTomorrow(string normalizedTranscript, WeatherDateEntity weatherDate)
{
if (weatherDate.ForecastDayOffset > 0 ||
string.IsNullOrWhiteSpace(normalizedTranscript) ||
!normalizedTranscript.Contains("forecast", StringComparison.Ordinal))
{
return false;
}
return !MatchesAny(
normalizedTranscript,
"today",
"today s",
"today's",
"tonight",
"right now",
"current weather",
"currently");
}
private static IDictionary<string, object?> BuildWeatherSkillPayload(
string spokenReply,
WeatherReportSnapshot snapshot,

28
OpenJibo/src/Jibo.Cloud/dotnet/src/Jibo.Cloud.Application/Services/ResponsePlanToSocketMessagesMapper.cs
View File

@@ -824,20 +824,42 @@ public sealed class ResponsePlanToSocketMessagesMapper
var weatherHiLoView = BuildWeatherHiLoView(skillPayload);
if (weatherHiLoView is not null)
{
var guiConfig = new
var resolvedGuiConfig = new Dictionary<string, object?>(StringComparer.OrdinalIgnoreCase)
{
["type"] = "Javascript",
["data"] = weatherHiLoView,
["pause"] = true
};
var legacyGuiConfig = new
{
type = "Javascript",
data = "views.weatherHiLo",
pause = true
};
jcpConfig["gui"] = guiConfig;
playConfig["gui"] = guiConfig;
jcpConfig["gui"] = legacyGuiConfig;
jcpConfig["display"] = new Dictionary<string, object?>(StringComparer.OrdinalIgnoreCase)
{
["view"] = resolvedGuiConfig
};
playConfig["gui"] = resolvedGuiConfig;
playConfig["no_matches_for_gui"] = 0;
playConfig["no_inputs_for_gui"] = 0;
var weatherViews = new Dictionary<string, object?>(StringComparer.OrdinalIgnoreCase)
{
["weatherHiLo"] = weatherHiLoView
};
jcpConfig["views"] = new Dictionary<string, object?>(StringComparer.OrdinalIgnoreCase)
{
["weatherHiLo"] = weatherHiLoView
};
jcpConfig["local"] = new Dictionary<string, object?>(StringComparer.OrdinalIgnoreCase)
{
["views"] = weatherViews
};
}
return new

16
OpenJibo/src/Jibo.Cloud/dotnet/src/Jibo.Cloud.Infrastructure/Weather/OpenWeatherReportProvider.cs
View File

@@ -53,14 +53,20 @@ public sealed class OpenWeatherReportProvider(
WeatherReportRequest request,
CancellationToken cancellationToken)
{
if (request is { Latitude: not null, Longitude: not null })
var query = string.IsNullOrWhiteSpace(request.LocationQuery)
? null
: request.LocationQuery.Trim();
if (string.IsNullOrWhiteSpace(query))
{
return new LocationPoint(request.Latitude.Value, request.Longitude.Value, null);
if (request is { Latitude: not null, Longitude: not null })
{
return new LocationPoint(request.Latitude.Value, request.Longitude.Value, null);
}
query = options.DefaultLocation;
}
var query = string.IsNullOrWhiteSpace(request.LocationQuery)
? options.DefaultLocation
: request.LocationQuery.Trim();
if (string.IsNullOrWhiteSpace(query))
{
return null;