Update engine/live_game_engine.py

engine/live_game_engine.py

@@ -18,6 +18,48 @@ def format_status(inning_half: str, current_inning: int | None, fallback: str =
     return fallback
 
 
+def _player_name_from_id(feed: dict[str, Any], player_id: Any) -> str:
+    if player_id is None or player_id == "":
+        return ""
+    players = (feed.get("gameData", {}) or {}).get("players", {}) or {}
+    key = f"ID{player_id}"
+    player = players.get(key, {}) or {}
+    return str(player.get("fullName", "") or "").strip()
+
+
+def _extract_upcoming_hitters(
+    feed: dict[str, Any],
+    inning_half: str,
+    current_batter_id: Any,
+) -> tuple[str, str, str]:
+    live_data = feed.get("liveData", {}) or {}
+    boxscore = live_data.get("boxscore", {}) or {}
+    teams = boxscore.get("teams", {}) or {}
+
+    batting_side = "home" if str(inning_half).strip().lower() == "bottom" else "away"
+    team_box = teams.get(batting_side, {}) or {}
+
+    batter_ids = team_box.get("batters", []) or []
+    batter_ids = [str(x) for x in batter_ids if x is not None and str(x).strip() != ""]
+
+    current_id = str(current_batter_id) if current_batter_id is not None else ""
+
+    if not batter_ids:
+        return "", "", ""
+
+    if current_id in batter_ids:
+        idx = batter_ids.index(current_id)
+        rotated = batter_ids[idx + 1 :] + batter_ids[:idx]
+    else:
+        rotated = batter_ids[:]
+
+    on_deck = _player_name_from_id(feed, rotated[0]) if len(rotated) >= 1 else ""
+    in_hole = _player_name_from_id(feed, rotated[1]) if len(rotated) >= 2 else ""
+    three_away = _player_name_from_id(feed, rotated[2]) if len(rotated) >= 3 else ""
+
+    return on_deck, in_hole, three_away
+
+
 def enrich_game_from_live_feed(game: dict[str, Any], feed: dict[str, Any]) -> dict[str, Any]:
     out = dict(game)
 
@@ -59,8 +101,18 @@ def enrich_game_from_live_feed(game: dict[str, Any], feed: dict[str, Any]) -> di
     batter = matchup.get("batter", {}) or {}
     pitcher = matchup.get("pitcher", {}) or {}
 
-    out["batter_name"] = batter.get("fullName", "")
-    out["pitcher_name"] = pitcher.get("fullName", "")
+    batter_id = batter.get("id")
+    out["batter_name"] = str(batter.get("fullName", "") or "").strip()
+    out["pitcher_name"] = str(pitcher.get("fullName", "") or "").strip()
+
+    on_deck_name, in_hole_name, three_away_name = _extract_upcoming_hitters(
+        feed=feed,
+        inning_half=inning_half,
+        current_batter_id=batter_id,
+    )
+    out["on_deck_name"] = on_deck_name
+    out["in_hole_name"] = in_hole_name
+    out["three_away_name"] = three_away_name
 
     out["away_score"] = away_team_stats.get("runs")
     out["home_score"] = home_team_stats.get("runs")
@@ -110,4 +162,6 @@ def enrich_game_from_live_feed(game: dict[str, Any], feed: dict[str, Any]) -> di
         out["away_win_prob"] = None
         out["home_win_prob"] = None
 
-    return out
+    return out
+
+![image](https://cdn-uploads.huggingface.co/production/uploads/69a28fc7869e4247f9e11f9b/1FXsrefZDGIBWWaQHq2Tg.png)