Add 40s timeout to baseline build branches to prevent props page hang

Wraps Branch 2 (patch build) and Branch 3 (full fallback build) in
threading.Thread with join(timeout=40). On timeout: returns empty/partial
bundle immediately, queues a persist-when-done background thread so next
load hits the fast snapshot path. Props page shows an info banner and
auto-reloads ~80s later once snapshots are populated.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

data/shared_baseline.py

@@ -26,6 +26,7 @@ _MAX_ROWS_PER_PLAYER = 420
 _MIN_CURRENT_ROWS_WHEN_AVAILABLE = 20
 _SNAPSHOT_VERSION = "shared_baseline_v1"
 _DEFAULT_SNAPSHOT_MAX_AGE_SECONDS = 60 * 30
+_FALLBACK_BUILD_TIMEOUT_SECONDS: int = 40
 _PRIOR_SEASON_RECENCY_WEIGHTS = {
     2025: 1.00,
     2024: 0.85,
@@ -1731,50 +1732,118 @@ def load_or_build_shared_baseline_bundle_complete_for_request(
         )
 
     if snapshot_has_data and (missing_hitter_names or missing_pitcher_names):
-        patch_bundle = build_shared_baseline_bundle(
-            batter_names=tuple(sorted(missing_hitter_names)),
-            pitcher_names=tuple(sorted(missing_pitcher_names)),
-        )
-        if persist_runtime_refresh:
-            _queue_shared_baseline_bundle_persist(
-                patch_bundle,
-                source_status="runtime_request_patch",
+        patch_result: list[dict | None] = [None]
+
+        def _run_patch() -> None:
+            try:
+                patch_result[0] = build_shared_baseline_bundle(
+                    batter_names=tuple(sorted(missing_hitter_names)),
+                    pitcher_names=tuple(sorted(missing_pitcher_names)),
+                )
+            except Exception as exc:
+                _log.warning("[shared_baseline] patch build error: %s", exc)
+
+        _pt = threading.Thread(target=_run_patch, daemon=True)
+        _pt.start()
+        _pt.join(timeout=_FALLBACK_BUILD_TIMEOUT_SECONDS)
+
+        if patch_result[0] is not None:
+            patch_bundle = patch_result[0]
+            if persist_runtime_refresh:
+                _queue_shared_baseline_bundle_persist(patch_bundle, source_status="runtime_request_patch")
+            merged_bundle = _merge_shared_baseline_bundles(snapshot_bundle, patch_bundle)
+            if snapshot_stale:
+                merged_bundle["background_refresh_queued"] = queue_shared_baseline_refresh(
+                    batter_names=snapshot_batter_names,
+                    pitcher_names=snapshot_pitcher_names,
+                )
+            return _annotate_request_coverage(
+                merged_bundle,
+                requested_hitter_names=snapshot_batter_names,
+                requested_pitcher_names=snapshot_pitcher_names,
+                coverage_mode="request_completed_patch",
+                background_refresh_queued=bool(merged_bundle.get("background_refresh_queued")),
             )
-        merged_bundle = _merge_shared_baseline_bundles(snapshot_bundle, patch_bundle)
-        if snapshot_stale:
-            merged_bundle["background_refresh_queued"] = queue_shared_baseline_refresh(
+        else:
+            _log.warning(
+                "[shared_baseline] patch build timed out after %ds — serving partial snapshot",
+                _FALLBACK_BUILD_TIMEOUT_SECONDS,
+            )
+            if persist_runtime_refresh:
+                def _persist_patch_when_done() -> None:
+                    _pt.join()
+                    if patch_result[0] is not None:
+                        _queue_shared_baseline_bundle_persist(patch_result[0], source_status="runtime_request_patch")
+                threading.Thread(target=_persist_patch_when_done, daemon=True).start()
+            snapshot_bundle["snapshot_source_status"] = "patch_build_timeout"
+            return _annotate_request_coverage(
+                snapshot_bundle,
+                requested_hitter_names=snapshot_batter_names,
+                requested_pitcher_names=snapshot_pitcher_names,
+                coverage_mode="request_completed_patch_partial",
+                background_refresh_queued=False,
+            )
+
+    runtime_result: list[dict | None] = [None]
+
+    def _run_fallback() -> None:
+        try:
+            runtime_result[0] = build_shared_baseline_bundle(
                 batter_names=snapshot_batter_names,
                 pitcher_names=snapshot_pitcher_names,
             )
+        except Exception as exc:
+            _log.warning("[shared_baseline] runtime fallback build error: %s", exc)
+
+    _rt = threading.Thread(target=_run_fallback, daemon=True)
+    _rt.start()
+    _rt.join(timeout=_FALLBACK_BUILD_TIMEOUT_SECONDS)
+
+    if runtime_result[0] is not None:
+        runtime_bundle = runtime_result[0]
+        runtime_bundle["snapshot_source_status"] = "runtime_fallback"
+        runtime_bundle["runtime_fallback_used"] = True
+        runtime_bundle["request_patch_used"] = False
+        if persist_runtime_refresh:
+            _queue_shared_baseline_bundle_persist(runtime_bundle, source_status="runtime_refreshed")
+        if "snapshot_status" not in runtime_bundle:
+            runtime_bundle["snapshot_status"] = snapshot_status
         return _annotate_request_coverage(
-            merged_bundle,
+            runtime_bundle,
             requested_hitter_names=snapshot_batter_names,
             requested_pitcher_names=snapshot_pitcher_names,
-            coverage_mode="request_completed_patch",
-            background_refresh_queued=bool(merged_bundle.get("background_refresh_queued")),
+            coverage_mode="runtime_fallback",
+            background_refresh_queued=False,
         )
-
-    runtime_bundle = build_shared_baseline_bundle(
-        batter_names=snapshot_batter_names,
-        pitcher_names=snapshot_pitcher_names,
-    )
-    runtime_bundle["snapshot_source_status"] = "runtime_fallback"
-    runtime_bundle["runtime_fallback_used"] = True
-    runtime_bundle["request_patch_used"] = False
-    if persist_runtime_refresh:
-        _queue_shared_baseline_bundle_persist(
-            runtime_bundle,
-            source_status="runtime_refreshed",
+    else:
+        _log.warning(
+            "[shared_baseline] full fallback build timed out after %ds — returning empty bundle, "
+            "will persist when complete",
+            _FALLBACK_BUILD_TIMEOUT_SECONDS,
+        )
+        if persist_runtime_refresh:
+            def _persist_runtime_when_done() -> None:
+                _rt.join()
+                if runtime_result[0] is not None:
+                    _queue_shared_baseline_bundle_persist(runtime_result[0], source_status="runtime_refreshed")
+            threading.Thread(target=_persist_runtime_when_done, daemon=True).start()
+        degraded: dict[str, Any] = {
+            "blended_batter_df": pd.DataFrame(),
+            "blended_pitcher_df": pd.DataFrame(),
+            "batter_baseline_meta": pd.DataFrame(),
+            "pitcher_baseline_meta": pd.DataFrame(),
+            "snapshot_status": snapshot_status,
+            "snapshot_source_status": "runtime_fallback_timeout",
+            "runtime_fallback_used": True,
+            "request_patch_used": False,
+        }
+        return _annotate_request_coverage(
+            degraded,
+            requested_hitter_names=snapshot_batter_names,
+            requested_pitcher_names=snapshot_pitcher_names,
+            coverage_mode="runtime_fallback_timeout",
+            background_refresh_queued=False,
         )
-    if "snapshot_status" not in runtime_bundle:
-        runtime_bundle["snapshot_status"] = snapshot_status
-    return _annotate_request_coverage(
-        runtime_bundle,
-        requested_hitter_names=snapshot_batter_names,
-        requested_pitcher_names=snapshot_pitcher_names,
-        coverage_mode="runtime_fallback",
-        background_refresh_queued=False,
-    )
 
 
 def build_shared_baseline_bundle(

visualization/props_page.py

@@ -679,6 +679,9 @@ def _load_props_prepared_bundle(
         max_age_seconds=60 * 60,
         persist_runtime_refresh=True,
     )
+    if bundle.get("snapshot_source_status") in ("runtime_fallback_timeout", "patch_build_timeout"):
+        import time as _time
+        st.session_state["props_baseline_reload_at"] = _time.time() + 80
     pitcher_statcast_df = bundle.get("blended_pitcher_df", pd.DataFrame())
     starter_bundle = _load_props_starter_bundle(
         raw=raw,
@@ -1987,6 +1990,19 @@ def render_props(
         raw=raw,
         probable_starters=probable_starters,
     )
+    import time as _time
+    _reload_at = st.session_state.get("props_baseline_reload_at")
+    if _reload_at:
+        if _time.time() < _reload_at:
+            st.info(
+                "📊 **Player baseline data is loading in the background.** "
+                "Props are shown with basic line analysis. "
+                "The page will refresh automatically with full Statcast enrichment in about a minute."
+            )
+        else:
+            del st.session_state["props_baseline_reload_at"]
+            _load_props_prepared_bundle.clear()
+            st.rerun()
     prepared_signature = prepared_bundle.get("signature")
     if st.session_state.get("_props_prepared_signature") != prepared_signature:
         st.session_state["_props_prepared_signature"] = prepared_signature