diff --git a/src/web.rs b/src/web.rs index 69df6a7..ac19a27 100644 --- a/src/web.rs +++ b/src/web.rs @@ -162,9 +162,11 @@ fn meta(st: &State) -> Result { let horizons: Vec = c.prepare("SELECT DISTINCT horizon, target_week FROM forecasts WHERE made_at = ?1 ORDER BY horizon")? .query_map([&made], |r| Ok(json!({"h": r.get::<_, i64>(0)?, "week": r.get::<_, String>(1)?})))?.collect::>()?; let run: Option = c.query_row("SELECT max(run_at) FROM backtest_scores", [], |r| r.get(0)).optional()?.flatten(); + // The latest score of each model, horizon and metric (the airplay and add backtests run separately). let scores: Vec = match &run { - Some(run) => c.prepare("SELECT model, horizon, metric, value FROM backtest_scores WHERE run_at = ?1")? - .query_map([run], |r| Ok(json!({"model": r.get::<_, String>(0)?, "h": r.get::<_, i64>(1)?, "metric": r.get::<_, String>(2)?, "value": r.get::<_, Option>(3)?})))? + Some(_) => c.prepare("SELECT model, horizon, metric, value FROM backtest_scores b WHERE run_at = + (SELECT max(run_at) FROM backtest_scores WHERE model = b.model AND horizon = b.horizon AND metric = b.metric)")? + .query_map([], |r| Ok(json!({"model": r.get::<_, String>(0)?, "h": r.get::<_, i64>(1)?, "metric": r.get::<_, String>(2)?, "value": r.get::<_, Option>(3)?})))? .collect::>()?, None => Vec::new(), };