mirror of
https://github.com/kennethnym/aris.git
synced 2026-04-25 19:21:17 +01:00
fix: use worst-case timeRelevance, improve tests
- Use most urgent timeRelevance across hours instead of hardcoded Ambient - Use HourlyWeatherData type in test casts - Add test for averaged urgency with mixed conditions Co-authored-by: Ona <no-reply@ona.com>
This commit is contained in:
@@ -4,10 +4,10 @@ import { Context } from "@aelis/core"
|
|||||||
import { LocationKey } from "@aelis/source-location"
|
import { LocationKey } from "@aelis/source-location"
|
||||||
import { describe, expect, test } from "bun:test"
|
import { describe, expect, test } from "bun:test"
|
||||||
|
|
||||||
import type { WeatherKitClient, WeatherKitResponse } from "./weatherkit"
|
import type { WeatherKitClient, WeatherKitResponse, HourlyForecast } from "./weatherkit"
|
||||||
|
|
||||||
import fixture from "../fixtures/san-francisco.json"
|
import fixture from "../fixtures/san-francisco.json"
|
||||||
import { WeatherFeedItemType } from "./feed-items"
|
import { WeatherFeedItemType, type HourlyWeatherData } from "./feed-items"
|
||||||
import { WeatherKey, type Weather } from "./weather-context"
|
import { WeatherKey, type Weather } from "./weather-context"
|
||||||
import { WeatherSource, Units } from "./weather-source"
|
import { WeatherSource, Units } from "./weather-source"
|
||||||
|
|
||||||
@@ -132,7 +132,7 @@ describe("WeatherSource", () => {
|
|||||||
const dailyItems = items.filter((i) => i.type === WeatherFeedItemType.Daily)
|
const dailyItems = items.filter((i) => i.type === WeatherFeedItemType.Daily)
|
||||||
|
|
||||||
expect(hourlyItems.length).toBe(1)
|
expect(hourlyItems.length).toBe(1)
|
||||||
expect((hourlyItems[0]!.data as { hours: unknown[] }).hours.length).toBe(3)
|
expect((hourlyItems[0]!.data as HourlyWeatherData).hours.length).toBe(3)
|
||||||
expect(dailyItems.length).toBe(2)
|
expect(dailyItems.length).toBe(2)
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -145,12 +145,53 @@ describe("WeatherSource", () => {
|
|||||||
const hourlyItems = items.filter((i) => i.type === WeatherFeedItemType.Hourly)
|
const hourlyItems = items.filter((i) => i.type === WeatherFeedItemType.Hourly)
|
||||||
expect(hourlyItems.length).toBe(1)
|
expect(hourlyItems.length).toBe(1)
|
||||||
|
|
||||||
const hourlyData = hourlyItems[0]!.data as { hours: unknown[] }
|
const hourlyData = hourlyItems[0]!.data as HourlyWeatherData
|
||||||
expect(Array.isArray(hourlyData.hours)).toBe(true)
|
expect(Array.isArray(hourlyData.hours)).toBe(true)
|
||||||
expect(hourlyData.hours.length).toBeGreaterThan(0)
|
expect(hourlyData.hours.length).toBeGreaterThan(0)
|
||||||
expect(hourlyData.hours.length).toBeLessThanOrEqual(12)
|
expect(hourlyData.hours.length).toBeLessThanOrEqual(12)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test("averages urgency across hours with mixed conditions", async () => {
|
||||||
|
const mildHour: HourlyForecast = {
|
||||||
|
forecastStart: "2026-01-17T01:00:00Z",
|
||||||
|
conditionCode: "Clear",
|
||||||
|
daylight: true,
|
||||||
|
humidity: 0.5,
|
||||||
|
precipitationAmount: 0,
|
||||||
|
precipitationChance: 0,
|
||||||
|
precipitationType: "clear",
|
||||||
|
pressure: 1013,
|
||||||
|
snowfallIntensity: 0,
|
||||||
|
temperature: 20,
|
||||||
|
temperatureApparent: 20,
|
||||||
|
temperatureDewPoint: 10,
|
||||||
|
uvIndex: 3,
|
||||||
|
visibility: 20000,
|
||||||
|
windDirection: 180,
|
||||||
|
windGust: 10,
|
||||||
|
windSpeed: 5,
|
||||||
|
}
|
||||||
|
const severeHour: HourlyForecast = {
|
||||||
|
...mildHour,
|
||||||
|
forecastStart: "2026-01-17T02:00:00Z",
|
||||||
|
conditionCode: "SevereThunderstorm",
|
||||||
|
}
|
||||||
|
const mixedResponse: WeatherKitResponse = {
|
||||||
|
forecastHourly: { hours: [mildHour, severeHour] },
|
||||||
|
}
|
||||||
|
const source = new WeatherSource({ client: createMockClient(mixedResponse) })
|
||||||
|
const context = createMockContext({ lat: 37.7749, lng: -122.4194 })
|
||||||
|
|
||||||
|
const items = await source.fetchItems(context)
|
||||||
|
const hourlyItem = items.find((i) => i.type === WeatherFeedItemType.Hourly)
|
||||||
|
|
||||||
|
expect(hourlyItem).toBeDefined()
|
||||||
|
// Mild urgency = 0.3, severe urgency = 0.6, average = 0.45
|
||||||
|
expect(hourlyItem!.signals!.urgency).toBeCloseTo(0.45, 5)
|
||||||
|
// Worst-case: SevereThunderstorm → Imminent
|
||||||
|
expect(hourlyItem!.signals!.timeRelevance).toBe("imminent")
|
||||||
|
})
|
||||||
|
|
||||||
test("sets timestamp from context.time", async () => {
|
test("sets timestamp from context.time", async () => {
|
||||||
const source = new WeatherSource({ client: mockClient })
|
const source = new WeatherSource({ client: mockClient })
|
||||||
const queryTime = new Date("2026-01-17T12:00:00Z")
|
const queryTime = new Date("2026-01-17T12:00:00Z")
|
||||||
|
|||||||
@@ -328,6 +328,7 @@ function createHourlyForecastFeedItem(
|
|||||||
): WeatherFeedItem {
|
): WeatherFeedItem {
|
||||||
const hours: HourlyWeatherEntry[] = []
|
const hours: HourlyWeatherEntry[] = []
|
||||||
let totalUrgency = 0
|
let totalUrgency = 0
|
||||||
|
let worstTimeRelevance: TimeRelevance = TimeRelevance.Ambient
|
||||||
|
|
||||||
for (const hourly of hourlyForecasts) {
|
for (const hourly of hourlyForecasts) {
|
||||||
hours.push({
|
hours.push({
|
||||||
@@ -346,11 +347,17 @@ function createHourlyForecastFeedItem(
|
|||||||
windSpeed: convertSpeed(hourly.windSpeed, units),
|
windSpeed: convertSpeed(hourly.windSpeed, units),
|
||||||
})
|
})
|
||||||
totalUrgency += adjustUrgencyForCondition(BASE_URGENCY.hourly, hourly.conditionCode)
|
totalUrgency += adjustUrgencyForCondition(BASE_URGENCY.hourly, hourly.conditionCode)
|
||||||
|
const rel = timeRelevanceForCondition(hourly.conditionCode)
|
||||||
|
if (rel === TimeRelevance.Imminent) {
|
||||||
|
worstTimeRelevance = TimeRelevance.Imminent
|
||||||
|
} else if (rel === TimeRelevance.Upcoming && worstTimeRelevance !== TimeRelevance.Imminent) {
|
||||||
|
worstTimeRelevance = TimeRelevance.Upcoming
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const signals: FeedItemSignals = {
|
const signals: FeedItemSignals = {
|
||||||
urgency: totalUrgency / hours.length,
|
urgency: totalUrgency / hours.length,
|
||||||
timeRelevance: TimeRelevance.Ambient,
|
timeRelevance: worstTimeRelevance,
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
Reference in New Issue
Block a user