Update app.py

app.py

@@ -45,10 +45,11 @@ CANDS = {
 COLORS = {"pred_bo":"#1f77b4","pred_bd":"#d62728","actual_bo":"#f2b702","actual_bd":"#2ca02c","ref":"#5a5a5a"}
 
 # Plot sizing
-CROSS_W, CROSS_H = 350, 350
+CROSS_W, CROSS_H = 350, 350       # X-plot size
 TRACK_H, TRACK_W = 1000, 500
 FONT_SZ = 13
 BOLD_FONT = "Arial Black, Arial, sans-serif"
+PLAIN_FONT = "Arial, sans-serif"
 
 # =========================
 # Page / CSS
@@ -319,8 +320,10 @@ def cross_plot_static(actual, pred, xlabel, ylabel, color="#1f77b4"):
     ax.set_xticks(ticks); ax.set_yticks(ticks); ax.set_aspect("equal", adjustable="box")
     fmt = FuncFormatter(lambda x, _: f"{x:.2f}")
     ax.xaxis.set_major_formatter(fmt); ax.yaxis.set_major_formatter(fmt)
-    ax.set_xlabel(xlabel, fontweight="bold", fontsize=10); ax.set_ylabel(ylabel, fontweight="bold", fontsize=10)
-    ax.tick_params(labelsize=6); ax.grid(True, linestyle=":", alpha=0.3)
+    ax.set_xlabel(xlabel, fontweight="bold", fontsize=10, color="black")
+    ax.set_ylabel(ylabel, fontweight="bold", fontsize=10, color="black")
+    ax.tick_params(labelsize=6, colors="black")
+    ax.grid(True, linestyle=":", alpha=0.3)
     for s in ax.spines.values(): s.set_linewidth(1.1); s.set_color("#444")
     fig.subplots_adjust(left=0.16, bottom=0.16, right=0.98, top=0.98); return fig
 
@@ -362,14 +365,21 @@ def track_plot_single(df, pred_col, actual_col=None, title_suffix=""):
         legend=dict(x=0.98, y=0.05, xanchor="right", yanchor="bottom",
                     bgcolor="rgba(255,255,255,0.75)", bordercolor="#ccc", borderwidth=1),
         legend_title_text="", title=title_suffix)
-    fig.update_xaxes(title_text=st.session_state.get("X_UNITS","MW (pcf)"),
-                     title_font=dict(size=20, family=BOLD_FONT), tickfont=dict(size=15, family=BOLD_FONT),
-                     side="top", range=[xmin, xmax], ticks="outside", tickformat=",.2f",
-                     tickmode="auto", tick0=tick0, showline=True, linewidth=1.2, linecolor="#444",
-                     mirror=True, showgrid=True, gridcolor="rgba(0,0,0,0.12)", automargin=True)
-    fig.update_yaxes(title_text=ylab, title_font=dict(size=20, family=BOLD_FONT), tickfont=dict(size=15, family=BOLD_FONT),
-                     range=y_range, ticks="outside", showline=True, linewidth=1.2, linecolor="#444",
-                     mirror=True, showgrid=True, gridcolor="rgba(0,0,0,0.12)", automargin=True)
+    fig.update_xaxes(
+        title_text=st.session_state.get("X_UNITS","MW (pcf)"),
+        title_font=dict(size=20, family=BOLD_FONT, color="#000"),
+        tickfont=dict(size=15, family=PLAIN_FONT, color="#000"),
+        side="top", range=[xmin, xmax], ticks="outside", tickformat=",.2f",
+        tickmode="auto", tick0=tick0, showline=True, linewidth=1.2, linecolor="#444",
+        mirror=True, showgrid=True, gridcolor="rgba(0,0,0,0.12)", automargin=True
+    )
+    fig.update_yaxes(
+        title_text=ylab,
+        title_font=dict(size=20, family=BOLD_FONT, color="#000"),
+        tickfont=dict(size=15, family=PLAIN_FONT, color="#000"),
+        range=y_range, ticks="outside", showline=True, linewidth=1.2, linecolor="#444",
+        mirror=True, showgrid=True, gridcolor="rgba(0,0,0,0.12)", automargin=True
+    )
     return fig
 
 def track_plot_combined(df):
@@ -401,14 +411,21 @@ def track_plot_combined(df):
         legend=dict(x=0.98, y=0.05, xanchor="right", yanchor="bottom",
                     bgcolor="rgba(255,255,255,0.75)", bordercolor="#ccc", borderwidth=1),
         legend_title_text="", title="Combined (Breakout / Breakdown)")
-    fig.update_xaxes(title_text=st.session_state.get("X_UNITS","MW (pcf)"),
-                     title_font=dict(size=20, family=BOLD_FONT), tickfont=dict(size=15, family=BOLD_FONT),
-                     side="top", range=[xmin, xmax], ticks="outside", tickformat=",.2f",
-                     tickmode="auto", tick0=tick0, showline=True, linewidth=1.2, linecolor="#444",
-                     mirror=True, showgrid=True, gridcolor="rgba(0,0,0,0.12)", automargin=True)
-    fig.update_yaxes(title_text=ylab, title_font=dict(size=20, family=BOLD_FONT), tickfont=dict(size=15, family=BOLD_FONT),
-                     range=y_range, ticks="outside", showline=True, linewidth=1.2, linecolor="#444",
-                     mirror=True, showgrid=True, gridcolor="rgba(0,0,0,0.12)", automargin=True)
+    fig.update_xaxes(
+        title_text=st.session_state.get("X_UNITS","MW (pcf)"),
+        title_font=dict(size=20, family=BOLD_FONT, color="#000"),
+        tickfont=dict(size=15, family=PLAIN_FONT, color="#000"),
+        side="top", range=[xmin, xmax], ticks="outside", tickformat=",.2f",
+        tickmode="auto", tick0=tick0, showline=True, linewidth=1.2, linecolor="#444",
+        mirror=True, showgrid=True, gridcolor="rgba(0,0,0,0.12)", automargin=True
+    )
+    fig.update_yaxes(
+        title_text=ylab,
+        title_font=dict(size=20, family=BOLD_FONT, color="#000"),
+        tickfont=dict(size=15, family=PLAIN_FONT, color="#000"),
+        range=y_range, ticks="outside", showline=True, linewidth=1.2, linecolor="#444",
+        mirror=True, showgrid=True, gridcolor="rgba(0,0,0,0.12)", automargin=True
+    )
     return fig
 
 def preview_tracks(df: pd.DataFrame, cols: list[str]):
@@ -463,7 +480,6 @@ def _try_load_or_explain(p: Path, name: str):
     try:
         return load_model(str(p))
     except Exception as e:
-        # Prefer BO meta versions if available, else BD
         want_np  = (meta_bo.get("versions",{}) or meta_bd.get("versions",{})).get("numpy", "N/A")
         want_skl = (meta_bo.get("versions",{}) or meta_bd.get("versions",{})).get("scikit_learn", "N/A")
         st.error(
@@ -473,11 +489,9 @@ def _try_load_or_explain(p: Path, name: str):
         )
         st.stop()
 
-# Unwrap payload-style joblibs: {"model": pipeline, "model_info": {...}}
 def _unwrap(payload):
     if isinstance(payload, dict) and "model" in payload:
         return payload["model"], payload.get("model_info", {})
-    # Fallback: estimator saved bare or custom object
     return payload, getattr(payload, "model_info", {})
 
 payload_bo = _try_load_or_explain(bo_model_path, "BO model")
@@ -486,23 +500,17 @@ payload_bd = _try_load_or_explain(bd_model_path, "BD model")
 model_bo, info_bo = _unwrap(payload_bo)
 model_bd, info_bd = _unwrap(payload_bd)
 
-# Resolve features per model (prefer model_info → meta → fallback)
 features_bo = list((info_bo.get("features") or meta_bo.get("features") or FEATURES_DEFAULT))
 features_bd = list((info_bd.get("features") or meta_bd.get("features") or FEATURES_DEFAULT))
-
-# Use the UNION so BD's 'Depth (ft)' is required and both models can run from one input
-# Order: keep BO order, then append BD-only columns in order
 features_union = list(dict.fromkeys(features_bo + [c for c in features_bd if c not in features_bo]))
 
-# Resolve targets / units
 TARGET_BO = str(meta_bo.get("target") or TARGET_BO_DEFAULT)
 TARGET_BD = str(meta_bd.get("target") or TARGET_BD_DEFAULT)
 X_UNITS    = str(meta_bo.get("units") or meta_bd.get("units") or "MW (pcf)")
 
-# Stash in session
 st.session_state["FEATURES_BO"] = features_bo
 st.session_state["FEATURES_BD"] = features_bd
-st.session_state["FEATURES"]    = features_union  # strict check uses the union
+st.session_state["FEATURES"]    = features_union
 st.session_state["TARGET_BO"]   = TARGET_BO
 st.session_state["TARGET_BD"]   = TARGET_BD
 st.session_state["X_UNITS"]     = X_UNITS
@@ -601,7 +609,7 @@ if st.session_state.app_step == "dev":
         sticky_header("Case Building", "📄 **Preview** then click **Run Model**.")
     else:
         sticky_header("Case Building", "**Upload your data** and run the model.")
-    render_bo_bd_note()
+    
 
     if run and st.session_state.dev_file_bytes:
         book = read_book_bytes(st.session_state.dev_file_bytes)
@@ -643,13 +651,35 @@ if st.session_state.app_step == "dev":
         t1, t2, t3 = st.tabs(["Breakout", "Breakdown", "Combined"])
         units = st.session_state.get("X_UNITS","MW (pcf)")
         with t1:
-            st.plotly_chart(track_plot_single(df, PRED_BO, actual_col=TARGET_BO, title_suffix="Breakout"),
-                            use_container_width=False, config={"displayModeBar": False, "scrollZoom": True})
-            st.pyplot(cross_plot_static(df[TARGET_BO], df[PRED_BO], f"Actual {TARGET_BO} ({units})", f"Predicted {TARGET_BO} ({units})", COLORS["pred_bo"]), use_container_width=False)
+            left, right = st.columns([3,1], gap="large")
+            with left:
+                st.plotly_chart(
+                    track_plot_single(df, PRED_BO, actual_col=TARGET_BO, title_suffix="Breakout"),
+                    use_container_width=False, config={"displayModeBar": False, "scrollZoom": True}
+                )
+            with right:
+                st.pyplot(
+                    cross_plot_static(df[TARGET_BO], df[PRED_BO],
+                                      f"Actual {TARGET_BO} ({units})",
+                                      f"Predicted {TARGET_BO} ({units})",
+                                      COLORS["pred_bo"]),
+                    use_container_width=False
+                )
         with t2:
-            st.plotly_chart(track_plot_single(df, PRED_BD, actual_col=TARGET_BD, title_suffix="Breakdown"),
-                            use_container_width=False, config={"displayModeBar": False, "scrollZoom": True})
-            st.pyplot(cross_plot_static(df[TARGET_BD], df[PRED_BD], f"Actual {TARGET_BD} ({units})", f"Predicted {TARGET_BD} ({units})", COLORS["pred_bd"]), use_container_width=False)
+            left, right = st.columns([3,1], gap="large")
+            with left:
+                st.plotly_chart(
+                    track_plot_single(df, PRED_BD, actual_col=TARGET_BD, title_suffix="Breakdown"),
+                    use_container_width=False, config={"displayModeBar": False, "scrollZoom": True}
+                )
+            with right:
+                st.pyplot(
+                    cross_plot_static(df[TARGET_BD], df[PRED_BD],
+                                      f"Actual {TARGET_BD} ({units})",
+                                      f"Predicted {TARGET_BD} ({units})",
+                                      COLORS["pred_bd"]),
+                    use_container_width=False
+                )
         with t3:
             st.plotly_chart(track_plot_combined(df), use_container_width=False, config={"displayModeBar": False, "scrollZoom": True})
 
@@ -679,7 +709,7 @@ if st.session_state.app_step == "validate":
     if st.sidebar.button("Proceed to Prediction ▶", use_container_width=True): st.session_state.app_step="predict"; st.rerun()
 
     sticky_header("Validate the Models", "Upload a dataset with the same **feature** columns and **BO/BD** actuals.")
-    render_bo_bd_note()
+    
 
     if go_btn and up is not None:
         book = read_book_bytes(up.getvalue())
@@ -717,15 +747,35 @@ if st.session_state.app_step == "validate":
         t1, t2, t3 = st.tabs(["Breakout", "Breakdown", "Combined"])
         units = st.session_state.get("X_UNITS","MW (pcf)")
         with t1:
-            st.plotly_chart(track_plot_single(df, PRED_BO, actual_col=TARGET_BO, title_suffix="Breakout"),
-                            use_container_width=False, config={"displayModeBar": False, "scrollZoom": True})
-            st.pyplot(cross_plot_static(df[TARGET_BO], df[PRED_BO], f"Actual {TARGET_BO} ({units})", f"Predicted {TARGET_BO} ({units})", COLORS["pred_bo"]),
-                      use_container_width=False)
+            left, right = st.columns([3,1], gap="large")
+            with left:
+                st.plotly_chart(
+                    track_plot_single(df, PRED_BO, actual_col=TARGET_BO, title_suffix="Breakout"),
+                    use_container_width=False, config={"displayModeBar": False, "scrollZoom": True}
+                )
+            with right:
+                st.pyplot(
+                    cross_plot_static(df[TARGET_BO], df[PRED_BO],
+                                      f"Actual {TARGET_BO} ({units})",
+                                      f"Predicted {TARGET_BO} ({units})",
+                                      COLORS["pred_bo"]),
+                    use_container_width=False
+                )
         with t2:
-            st.plotly_chart(track_plot_single(df, PRED_BD, actual_col=TARGET_BD, title_suffix="Breakdown"),
-                            use_container_width=False, config={"displayModeBar": False, "scrollZoom": True})
-            st.pyplot(cross_plot_static(df[TARGET_BD], df[PRED_BD], f"Actual {TARGET_BD} ({units})", f"Predicted {TARGET_BD} ({units})", COLORS["pred_bd"]),
-                      use_container_width=False)
+            left, right = st.columns([3,1], gap="large")
+            with left:
+                st.plotly_chart(
+                    track_plot_single(df, PRED_BD, actual_col=TARGET_BD, title_suffix="Breakdown"),
+                    use_container_width=False, config={"displayModeBar": False, "scrollZoom": True}
+                )
+            with right:
+                st.pyplot(
+                    cross_plot_static(df[TARGET_BD], df[PRED_BD],
+                                      f"Actual {TARGET_BD} ({units})",
+                                      f"Predicted {TARGET_BD} ({units})",
+                                      COLORS["pred_bd"]),
+                    use_container_width=False
+                )
         with t3:
             st.plotly_chart(track_plot_combined(df), use_container_width=False, config={"displayModeBar": False, "scrollZoom": True})
 
@@ -752,7 +802,7 @@ if st.session_state.app_step == "predict":
     if st.sidebar.button("⬅ Back to Case Building", use_container_width=True): st.session_state.app_step="dev"; st.rerun()
 
     sticky_header("Prediction", "Upload a dataset with **feature columns only** (no BO/BD actuals).")
-    render_bo_bd_note()
+   
 
     if go_btn and up is not None:
         book = read_book_bytes(up.getvalue()); name = list(book.keys())[0]
@@ -814,7 +864,6 @@ if st.session_state.show_preview_modal:
             for t, name in zip(tabs, names):
                 with t:
                     df = book_to_preview[name]
-                    # show a strict check summary, but do not stop
                     missing = [c for c in st.session_state["FEATURES"] if c not in df.columns]
                     st.write("**Missing vs required features:**", missing if missing else "None ✅")
                     t1, t2 = st.tabs(["Tracks", "Summary"])