Update engine/live_game_engine.py

engine/live_game_engine.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from typing import Any
 
 from models.win_probability import estimate_win_probability
+from data.live_statcast_feed import fetch_live_statcast_feed
 
 def _safe_int(value: Any) -> int:
     try:
@@ -15,6 +16,120 @@ def _safe_int(value: Any) -> int:
     except Exception:
         return 0
 
+def _safe_float(value: Any) -> float | None:
+    try:
+        if value is None:
+            return None
+        text = str(value).strip().lower()
+        if text in {"", "nan", "none"}:
+            return None
+        return float(value)
+    except Exception:
+        return None
+
+
+def _extract_latest_savant_pitch_metrics(savant_feed: dict[str, Any]) -> dict[str, Any]:
+    """
+    Defensive parser for unofficial Baseball Savant live feed payloads.
+
+    Searches recursively for pitch-like dicts containing any of:
+    - velocity
+    - spin
+    - extension
+    - movement
+    - pitch type / call / description
+    """
+    if not savant_feed:
+        return {}
+
+    candidates: list[dict[str, Any]] = []
+
+    def walk(obj: Any) -> None:
+        if isinstance(obj, dict):
+            lowered = {str(k).lower(): v for k, v in obj.items()}
+
+            keys = set(lowered.keys())
+            interesting = any(
+                key in keys
+                for key in [
+                    "startspeed",
+                    "endspeed",
+                    "pitchvelocity",
+                    "velocity",
+                    "spinrate",
+                    "spin_rate",
+                    "extension",
+                    "pfxx",
+                    "pfxz",
+                    "breakangle",
+                    "breaklength",
+                    "pitchtype",
+                    "pitch_type",
+                    "pitchname",
+                    "pitch_name",
+                    "description",
+                    "pitchresult",
+                    "pitch_result",
+                ]
+            )
+
+            if interesting:
+                candidates.append(obj)
+
+            for value in obj.values():
+                walk(value)
+
+        elif isinstance(obj, list):
+            for item in obj:
+                walk(item)
+
+    walk(savant_feed)
+
+    if not candidates:
+        return {}
+
+    pitch = candidates[-1]
+    lowered = {str(k).lower(): v for k, v in pitch.items()}
+
+    def pick(*names: str) -> Any:
+        for name in names:
+            if name.lower() in lowered:
+                return lowered[name.lower()]
+        return None
+
+    pitch_velocity = _safe_float(
+        pick("startSpeed", "pitchVelocity", "velocity", "release_speed", "velo", "endSpeed")
+    )
+    pitch_spin_rate = _safe_float(pick("spinRate", "spin_rate"))
+    pitch_extension = _safe_float(pick("extension"))
+    pitch_pfx_x = _safe_float(pick("pfxX", "pfx_x", "horzBreak", "horizontalBreak"))
+    pitch_pfx_z = _safe_float(pick("pfxZ", "pfz_z", "vertBreak", "verticalBreak"))
+    pitch_break_angle = _safe_float(pick("breakAngle"))
+    pitch_break_length = _safe_float(pick("breakLength"))
+
+    pitch_type = str(
+        pick("pitchType", "pitch_type", "pitchName", "pitch_name", "type", "pitch")
+        or ""
+    ).strip()
+
+    last_pitch = str(
+        pick("description", "pitchResult", "pitch_result", "call", "result", "outcome")
+        or ""
+    ).strip()
+
+    return {
+        "last_pitch": last_pitch,
+        "pitch_type": pitch_type,
+        "pitch_velocity": round(pitch_velocity, 1) if pitch_velocity is not None and pitch_velocity > 40 else None,
+        "pitch_spin_rate": round(pitch_spin_rate, 0) if pitch_spin_rate is not None else None,
+        "pitch_extension": round(pitch_extension, 1) if pitch_extension is not None else None,
+        "pitch_pfx_x": round(pitch_pfx_x, 2) if pitch_pfx_x is not None else None,
+        "pitch_pfx_z": round(pitch_pfx_z, 2) if pitch_pfx_z is not None else None,
+        "pitch_break_angle": round(pitch_break_angle, 1) if pitch_break_angle is not None else None,
+        "pitch_break_length": round(pitch_break_length, 1) if pitch_break_length is not None else None,
+        "savant_pitch_debug": str(pitch)[:2000],
+    }
+
 def format_status(inning_half: str, current_inning: int | None, fallback: str = "") -> str:
     if inning_half and current_inning:
         half_map = {
@@ -77,6 +192,13 @@ def enrich_game_from_live_feed(game: dict[str, Any], feed: dict[str, Any]) -> di
         return out
 
     live_data = feed.get("liveData", {}) or {}
+    savant_feed = {}
+    try:
+        game_pk = str(out.get("game_pk", "") or "").strip()
+        if game_pk:
+            savant_feed = fetch_live_statcast_feed(game_pk)
+    except Exception:
+        savant_feed = {}
     linescore = live_data.get("linescore", {}) or {}
     plays = live_data.get("plays", {}) or {}
     current_play = plays.get("currentPlay", {}) or {}
@@ -134,93 +256,119 @@ def enrich_game_from_live_feed(game: dict[str, Any], feed: dict[str, Any]) -> di
     result = current_play.get("result", {}) or {}
     out["last_play"] = result.get("description", "")
 
-    play_events = current_play.get("playEvents", []) or []
-    out["play_events_debug"] = str(play_events[-5:])
-
-    last_pitch_event = None
-    last_pitch_with_data = None
-
-    for event in reversed(play_events):
-        details = event.get("details", {}) or {}
-        if details.get("isPitch"):
-            if last_pitch_event is None:
-                last_pitch_event = event
-
-            pitch_data = event.get("pitchData", {}) or {}
-            has_velocity = False
-            for key in ["startSpeed", "endSpeed"]:
-                value = pitch_data.get(key)
-                try:
-                    if value is not None and float(value) > 40:
-                        has_velocity = True
-                        break
-                except Exception:
-                    pass
-
-            if has_velocity:
-                last_pitch_with_data = event
-                break
-
-    selected_pitch_event = last_pitch_with_data or last_pitch_event
-
-    if selected_pitch_event:
-        details = selected_pitch_event.get("details", {}) or {}
-        pitch_data = selected_pitch_event.get("pitchData", {}) or {}
-        breaks = pitch_data.get("breaks", {}) or {}
-        coordinates = pitch_data.get("coordinates", {}) or {}
-
-        out["pitch_data_debug"] = str(pitch_data)
-
-        pitch_type = (details.get("type", {}) or {}).get("description", "")
-        pitch_call = (details.get("call", {}) or {}).get("description", "")
-        pitch_description = str(details.get("description", "") or "").strip()
-
-        out["pitch_type"] = pitch_type
-        out["last_pitch"] = pitch_description or pitch_call or pitch_type
-
-        velocity = None
-        for key in ["startSpeed", "endSpeed"]:
-            try:
-                alt = pitch_data.get(key)
-                if alt is not None and float(alt) > 40:
-                    velocity = float(alt)
-                    break
-            except Exception:
-                pass
-
-        out["pitch_velocity"] = round(velocity, 1) if velocity is not None else None
-
-        # extra live pitch metrics for debug / future UI
-        out["pitch_spin_rate"] = breaks.get("spinRate")
-        out["pitch_spin_direction"] = breaks.get("spinDirection")
-        out["pitch_break_angle"] = breaks.get("breakAngle")
-        out["pitch_break_length"] = breaks.get("breakLength")
-        out["pitch_break_y"] = breaks.get("breakY")
-        out["pitch_extension"] = pitch_data.get("extension")
-        out["pitch_plate_x"] = coordinates.get("pX")
-        out["pitch_plate_z"] = coordinates.get("pZ")
-        out["pitch_pfx_x"] = coordinates.get("pfxX")
-        out["pitch_pfx_z"] = coordinates.get("pfxZ")
-        out["pitch_ax"] = coordinates.get("aX")
-        out["pitch_ay"] = coordinates.get("aY")
-        out["pitch_az"] = coordinates.get("aZ")
-    else:
-        out["pitch_type"] = ""
-        out["last_pitch"] = ""
-        out["pitch_velocity"] = None
-        out["pitch_spin_rate"] = None
-        out["pitch_spin_direction"] = None
-        out["pitch_break_angle"] = None
-        out["pitch_break_length"] = None
-        out["pitch_break_y"] = None
-        out["pitch_extension"] = None
-        out["pitch_plate_x"] = None
-        out["pitch_plate_z"] = None
-        out["pitch_pfx_x"] = None
-        out["pitch_pfx_z"] = None
-        out["pitch_ax"] = None
-        out["pitch_ay"] = None
-        out["pitch_az"] = None
+    def _safe_float(value: Any) -> float | None:
+    try:
+        if value is None:
+            return None
+        text = str(value).strip().lower()
+        if text in {"", "nan", "none"}:
+            return None
+        return float(value)
+    except Exception:
+        return None
+
+
+def _extract_latest_savant_pitch_metrics(savant_feed: dict[str, Any]) -> dict[str, Any]:
+    """
+    Defensive parser for unofficial Baseball Savant live feed payloads.
+
+    Searches recursively for pitch-like dicts containing any of:
+    - velocity
+    - spin
+    - extension
+    - movement
+    - pitch type / call / description
+    """
+    if not savant_feed:
+        return {}
+
+    candidates: list[dict[str, Any]] = []
+
+    def walk(obj: Any) -> None:
+        if isinstance(obj, dict):
+            lowered = {str(k).lower(): v for k, v in obj.items()}
+
+            keys = set(lowered.keys())
+            interesting = any(
+                key in keys
+                for key in [
+                    "startspeed",
+                    "endspeed",
+                    "pitchvelocity",
+                    "velocity",
+                    "spinrate",
+                    "spin_rate",
+                    "extension",
+                    "pfxx",
+                    "pfxz",
+                    "breakangle",
+                    "breaklength",
+                    "pitchtype",
+                    "pitch_type",
+                    "pitchname",
+                    "pitch_name",
+                    "description",
+                    "pitchresult",
+                    "pitch_result",
+                ]
+            )
+
+            if interesting:
+                candidates.append(obj)
+
+            for value in obj.values():
+                walk(value)
+
+        elif isinstance(obj, list):
+            for item in obj:
+                walk(item)
+
+    walk(savant_feed)
+
+    if not candidates:
+        return {}
+
+    pitch = candidates[-1]
+    lowered = {str(k).lower(): v for k, v in pitch.items()}
+
+    def pick(*names: str) -> Any:
+        for name in names:
+            if name.lower() in lowered:
+                return lowered[name.lower()]
+        return None
+
+    pitch_velocity = _safe_float(
+        pick("startSpeed", "pitchVelocity", "velocity", "release_speed", "velo", "endSpeed")
+    )
+    pitch_spin_rate = _safe_float(pick("spinRate", "spin_rate"))
+    pitch_extension = _safe_float(pick("extension"))
+    pitch_pfx_x = _safe_float(pick("pfxX", "pfx_x", "horzBreak", "horizontalBreak"))
+    pitch_pfx_z = _safe_float(pick("pfxZ", "pfz_z", "vertBreak", "verticalBreak"))
+    pitch_break_angle = _safe_float(pick("breakAngle"))
+    pitch_break_length = _safe_float(pick("breakLength"))
+
+    pitch_type = str(
+        pick("pitchType", "pitch_type", "pitchName", "pitch_name", "type", "pitch")
+        or ""
+    ).strip()
+
+    last_pitch = str(
+        pick("description", "pitchResult", "pitch_result", "call", "result", "outcome")
+        or ""
+    ).strip()
+
+    return {
+        "last_pitch": last_pitch,
+        "pitch_type": pitch_type,
+        "pitch_velocity": round(pitch_velocity, 1) if pitch_velocity is not None and pitch_velocity > 40 else None,
+        "pitch_spin_rate": round(pitch_spin_rate, 0) if pitch_spin_rate is not None else None,
+        "pitch_extension": round(pitch_extension, 1) if pitch_extension is not None else None,
+        "pitch_pfx_x": round(pitch_pfx_x, 2) if pitch_pfx_x is not None else None,
+        "pitch_pfx_z": round(pitch_pfx_z, 2) if pitch_pfx_z is not None else None,
+        "pitch_break_angle": round(pitch_break_angle, 1) if pitch_break_angle is not None else None,
+        "pitch_break_length": round(pitch_break_length, 1) if pitch_break_length is not None else None,
+        "savant_pitch_debug": str(pitch)[:2000],
+    }
 
     try:
         score_diff = int(out["away_score"] or 0) - int(out["home_score"] or 0)