Update engine/live_game_engine.py

engine/live_game_engine.py

@@ -244,103 +244,65 @@ def enrich_game_from_live_feed(game: dict[str, Any], feed: dict[str, Any]) -> di
     linescore = live_data.get("linescore", {}) or {}
     plays = live_data.get("plays", {}) or {}
     current_play = plays.get("currentPlay", {}) or {}
+
+
     matchup = current_play.get("matchup", {}) or {}
     count = current_play.get("count", {}) or {}
 
     offense = linescore.get("offense", {}) or {}
-    teams = linescore.get("teams", {}) or {}
-
-    away_team_stats = teams.get("away", {}) or {}
-    home_team_stats = teams.get("home", {}) or {}
-
-    boxscore = live_data.get("boxscore", {}) or {}
-    boxscore_teams = boxscore.get("teams", {}) or {}
-
-    away_box = boxscore_teams.get("away", {}) or {}
-    home_box = boxscore_teams.get("home", {}) or {}
-
-    away_team_stats_batting = ((away_box.get("teamStats", {}) or {}).get("batting", {}) or {})
-    home_team_stats_batting = ((home_box.get("teamStats", {}) or {}).get("batting", {}) or {})
-
-    away_team_stats_fielding = ((away_box.get("teamStats", {}) or {}).get("fielding", {}) or {})
-    home_team_stats_fielding = ((home_box.get("teamStats", {}) or {}).get("fielding", {}) or {})
-
-    inning_half = str(linescore.get("inningHalf", "")).strip()
-    current_inning = linescore.get("currentInning")
-    outs = count.get("outs", linescore.get("outs"))
-
-    existing_status = str(out.get("status", "")).strip()
-    out["status"] = derive_feed_status(
-        feed=feed,
-        inning_half=inning_half,
-        current_inning=current_inning,
-        fallback=existing_status,
-    )
-
-    try:
-        out["outs"] = 0 if outs is None else int(outs)
-    except Exception:
-        out["outs"] = 0
-
-    out["balls"] = _safe_int(count.get("balls"))
-    out["strikes"] = _safe_int(count.get("strikes"))
-
-    out["runner_on_1b"] = bool(offense.get("first"))
-    out["runner_on_2b"] = bool(offense.get("second"))
-    out["runner_on_3b"] = bool(offense.get("third"))
+    defense = linescore.get("defense", {}) or {}
 
     batter = matchup.get("batter", {}) or {}
     pitcher = matchup.get("pitcher", {}) or {}
 
-    batter_id = batter.get("id")
-    out["batter_name"] = str(batter.get("fullName", "") or "").strip()
-    out["pitcher_name"] = str(pitcher.get("fullName", "") or "").strip()
+    batter_name = str(batter.get("fullName", "") or "").strip()
+    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"] = _first_non_null(
-        away_team_stats.get("runs"),
-        away_team_stats_batting.get("runs"),
-        out.get("away_score"),
-    )
-    out["home_score"] = _first_non_null(
-        home_team_stats.get("runs"),
-        home_team_stats_batting.get("runs"),
-        out.get("home_score"),
-    )
+    if not batter_name:
+        batter_obj = offense.get("batter", {}) or {}
+        batter_name = str(batter_obj.get("fullName", "") or "").strip()
 
-    out["away_hits"] = _first_non_null(
-        away_team_stats.get("hits"),
-        away_team_stats_batting.get("hits"),
-        out.get("away_hits"),
-    )
-    out["home_hits"] = _first_non_null(
-        home_team_stats.get("hits"),
-        home_team_stats_batting.get("hits"),
-        out.get("home_hits"),
-    )
+    if not pitcher_name:
+        pitcher_obj = defense.get("pitcher", {}) or {}
+        pitcher_name = str(pitcher_obj.get("fullName", "") or "").strip()
 
-    out["away_errors"] = _first_non_null(
-        away_team_stats.get("errors"),
-        away_team_stats_fielding.get("errors"),
-        out.get("away_errors"),
-    )
-    out["home_errors"] = _first_non_null(
-        home_team_stats.get("errors"),
-        home_team_stats_fielding.get("errors"),
-        out.get("home_errors"),
-    )
+    out["batter_name"] = batter_name
+    out["pitcher_name"] = pitcher_name
 
-    result = current_play.get("result", {}) or {}
-    out["last_play"] = result.get("description", "")
+    out["balls"] = count.get("balls")
+    out["strikes"] = count.get("strikes")
+    out["outs"] = count.get("outs", linescore.get("outs"))
+
+    out["runner_on_1b"] = offense.get("first") is not None
+    out["runner_on_2b"] = offense.get("second") is not None
+    out["runner_on_3b"] = offense.get("third") is not None
 
+    result = current_play.get("result", {}) or {}
+    out["last_play"] = str(result.get("description", "") or "").strip()
+
+    play_events = current_play.get("playEvents", []) or []
+
+    pitch_event = None
+    for event in reversed(play_events):
+        pitch_data = event.get("pitchData") or {}
+        if pitch_data:
+            pitch_event = event
+            break
+
+    if pitch_event:
+        pitch_data = pitch_event.get("pitchData", {}) or {}
+        pitch_breaks = pitch_data.get("breaks", {}) or {}
+        coords = pitch_data.get("coordinates", {}) or {}
+        details = pitch_event.get("details", {}) or {}
+
+        out["last_pitch"] = str(details.get("description", "") or "").strip()
+        out["pitch_type"] = str(((details.get("type", {}) or {}).get("description", "")) or "").strip()
+        out["pitch_velocity"] = pitch_data.get("startSpeed")
+        out["pitch_spin_rate"] = pitch_breaks.get("spinRate")
+        out["pitch_extension"] = pitch_data.get("extension")
+        out["pitch_pfx_x"] = coords.get("pfxX")
+        out["pitch_pfx_z"] = coords.get("pfxZ")
+    
 def _safe_float(value: Any) -> float | None:
     try:
         if value is None: