Update engine/live_game_engine.py

engine/live_game_engine.py

@@ -250,25 +250,41 @@ def enrich_game_from_live_feed(game: dict[str, Any], feed: dict[str, Any]) -> di
     current_play = plays.get("currentPlay", {}) or {}
 
 
-    matchup = current_play.get("matchup", {}) or {}
     count = current_play.get("count", {}) or {}
 
     offense = linescore.get("offense", {}) or {}
     defense = linescore.get("defense", {}) or {}
 
+    matchup = current_play.get("matchup", {}) or {}
     batter = matchup.get("batter", {}) or {}
     pitcher = matchup.get("pitcher", {}) or {}
 
-    batter_name = str(batter.get("fullName", "") or "").strip()
-    pitcher_name = str(pitcher.get("fullName", "") or "").strip()
+    # Primary source: current play matchup
+    batter_name = _extract_person_name(batter)
+    pitcher_name = _extract_person_name(pitcher)
 
-    if not batter_name:
-        batter_obj = offense.get("batter", {}) or {}
-        batter_name = str(batter_obj.get("fullName", "") or "").strip()
+    batter_id = batter.get("id")
+    pitcher_id = pitcher.get("id")
 
+    # Fallback 1: linescore offense / defense objects
+    offense = linescore.get("offense", {}) or {}
+    defense = linescore.get("defense", {}) or {}
+
+    if not batter_name:
+        batter_name = _extract_person_name(offense.get("batter", {}))
     if not pitcher_name:
-        pitcher_obj = defense.get("pitcher", {}) or {}
-        pitcher_name = str(pitcher_obj.get("fullName", "") or "").strip()
+        pitcher_name = _extract_person_name(defense.get("pitcher", {}))
+
+    if not batter_id:
+        batter_id = (offense.get("batter", {}) or {}).get("id")
+    if not pitcher_id:
+        pitcher_id = (defense.get("pitcher", {}) or {}).get("id")
+
+    # Fallback 2: global players lookup by id
+    if not batter_name and batter_id:
+        batter_name = _player_name_from_id(feed, batter_id)
+    if not pitcher_name and pitcher_id:
+        pitcher_name = _player_name_from_id(feed, pitcher_id)
 
     out["batter_name"] = batter_name
     out["pitcher_name"] = pitcher_name