Fix suite success/reward metrics and baseline payload

app/routes.py

@@ -38,7 +38,9 @@ class BaselineResponse(BaseModel):
 	seed: int | None
 	agent: str
 	steps_executed: int = Field(..., ge=0)
+	total_reward: float
 	done: bool
+	success: bool
 	score: float = Field(..., ge=0.0, le=1.0)
 	report: GradeReport
 
@@ -79,7 +81,7 @@ TASKS_ACTION_SCHEMA: Dict[str, Any] = {
 
 
 class EnvironmentService:
-	BASELINE_MAX_STEPS = 128
+	BASELINE_MAX_STEPS = 256
 
 	def __init__(self) -> None:
 		self._lock = RLock()
@@ -183,7 +185,7 @@ class EnvironmentService:
 			resolved_task = task or self._task or "easy"
 			config = get_task_config(task_name=resolved_task, seed=seed)
 			rollout_env = LastMileDeliveryEnvironment(config=config)
-			observation = rollout_env.reset()
+			observation = rollout_env.reset(seed=seed)
 
 			step_cap = config.max_steps
 			if max_steps is not None:
@@ -206,12 +208,15 @@ class EnvironmentService:
 				rollout_env.current_observation(),
 				success_condition=success_condition,
 			)
+			final_state = rollout_env.state()
 			return BaselineResponse(
 				task=resolved_task,
 				seed=seed,
 				agent="BaselineGreedyAgent",
 				steps_executed=len(trajectory),
-				done=rollout_env.state().done,
+				total_reward=final_state.total_reward,
+				done=final_state.done,
+				success=report.success,
 				score=report.score,
 				report=report,
 			)

app/static/results.html

@@ -691,7 +691,8 @@
           tr.appendChild(successTd);
 
           const scoreTd = document.createElement("td");
-          scoreTd.textContent = Number(item.score || 0).toFixed(4);
+          scoreTd.textContent =
+            item.score === null || item.score === undefined ? "n/a" : Number(item.score).toFixed(4);
           tr.appendChild(scoreTd);
 
           const stepsTd = document.createElement("td");
@@ -699,7 +700,10 @@
           tr.appendChild(stepsTd);
 
           const rewardTd = document.createElement("td");
-          rewardTd.textContent = Number(item.total_reward || 0).toFixed(2);
+          rewardTd.textContent =
+            item.total_reward === null || item.total_reward === undefined
+              ? "n/a"
+              : Number(item.total_reward).toFixed(2);
           tr.appendChild(rewardTd);
 
           tbody.appendChild(tr);
@@ -717,7 +721,17 @@
         return;
       }
 
-      const average = rows.reduce((acc, item) => acc + Number(item.score || 0), 0) / rows.length;
+      const numericScores = rows
+        .map((item) => item.score)
+        .filter((value) => value !== null && value !== undefined)
+        .map((value) => Number(value));
+
+      if (!numericScores.length) {
+        nodes.suiteAverage.textContent = "average_score: n/a";
+        return;
+      }
+
+      const average = numericScores.reduce((acc, value) => acc + value, 0) / numericScores.length;
       nodes.suiteAverage.textContent = `average_score: ${average.toFixed(4)}`;
     }
 
@@ -992,12 +1006,21 @@
           setStatus(`Running suite ${i + 1}/${tasks.length}: ${task}`, "warn");
           const query = new URLSearchParams({ task, seed: String(state.seed) });
           const payload = await apiCall(`/baseline?${query.toString()}`, { method: "GET" });
+          const success =
+            payload.success !== undefined
+              ? Boolean(payload.success)
+              : payload.report?.success !== undefined
+                ? Boolean(payload.report.success)
+                : Boolean(payload.done);
           suiteRows.push({
             task,
-            success: Boolean(payload.done),
-            score: Number(payload.score || 0),
+            success,
+            score: payload.score === undefined || payload.score === null ? null : Number(payload.score),
             steps_executed: Number(payload.steps_executed || 0),
-            total_reward: Number(payload.report?.total_reward || 0),
+            total_reward:
+              payload.total_reward === undefined || payload.total_reward === null
+                ? null
+                : Number(payload.total_reward),
           });
         }
 
@@ -1007,9 +1030,16 @@
         return {
           seed: state.seed,
           tasks: suiteRows,
-          average_score: suiteRows.length
-            ? Number((suiteRows.reduce((acc, item) => acc + Number(item.score || 0), 0) / suiteRows.length).toFixed(4))
-            : 0,
+          average_score: (() => {
+            const numericScores = suiteRows
+              .map((item) => item.score)
+              .filter((value) => value !== null && value !== undefined)
+              .map((value) => Number(value));
+            if (!numericScores.length) {
+              return null;
+            }
+            return Number((numericScores.reduce((acc, value) => acc + value, 0) / numericScores.length).toFixed(4));
+          })(),
         };
       });
     }

grader/grader.py

@@ -22,6 +22,7 @@ DEFAULT_HIGH_PRIORITY_DEADLINE = 12
 
 class GradeReport(BaseModel):
     score: float = Field(..., ge=0.0, le=1.0)
+    success: bool
 
     delivered_orders: int = Field(..., ge=0)
     total_orders: int = Field(..., ge=0)
@@ -190,6 +191,23 @@ class DeliveryEpisodeGrader:
 
         score = round_score(raw_score, decimals=4)
 
+        meets_completion = completion_rate_value >= targets.completion_target
+        meets_priority = True
+        if targets.priority_target is not None:
+            meets_priority = high_priority_on_time_rate >= targets.priority_target
+        meets_steps = episode_stats.steps_taken <= targets.max_steps_target
+        meets_invalid_actions = invalid_action_rate <= targets.invalid_action_rate_max
+        meets_battery_rule = (not targets.require_no_battery_depletion) or (episode_stats.battery_depletion_events == 0)
+        success = all(
+            [
+                meets_completion,
+                meets_priority,
+                meets_steps,
+                meets_invalid_actions,
+                meets_battery_rule,
+            ]
+        )
+
         logic = (
             "metrics follow success_condition keys: completion_rate(_min), "
             "high_priority_on_time_rate_min, max_steps, invalid_action_rate_max. "
@@ -211,6 +229,7 @@ class DeliveryEpisodeGrader:
 
         return GradeReport(
             score=score,
+            success=success,
             delivered_orders=delivered_orders,
             total_orders=total_orders,
             high_priority_total_orders=high_priority_total,