Update app.py

app.py

@@ -25,18 +25,18 @@ MODEL_FALLBACKS = [MODELS_DIR / "model.joblib", MODELS_DIR / "model.pkl"]
 COLORS = {"pred": "#1f77b4", "actual": "#f2b702", "ref": "#5a5a5a"}
 
 # ---- Plot sizing controls (edit here) ----
-CROSS_W = 500; CROSS_H = 500      # square cross-plot
-TRACK_W = 400; TRACK_H = 950      # log-strip style (tall, slightly wider)
+CROSS_W = 500; CROSS_H = 500      # square cross-plot (Build + Validate)
+TRACK_W = 400; TRACK_H = 950      # log-strip style (all pages)
 FONT_SZ  = 13
-PLOT_COLS = [14, 0.3, 10]         # 3-column band: left • spacer • right
+PLOT_COLS = [14, 0.3, 10]         # 3-column band: left • spacer • right (Build + Validate)
+CROSS_NUDGE = 1.2                 # push cross-plot to the RIGHT inside its band:
+                                  # inner columns [CROSS_NUDGE : 1] → bigger = more right
 
 # =========================
 # Page / CSS
 # =========================
 st.set_page_config(page_title="ST_GeoMech_UCS", page_icon="logo.png", layout="wide")
 st.markdown("<style>header, footer{visibility:hidden !important;}</style>", unsafe_allow_html=True)
-# helper class to right-align the cross-plot inside its column
-st.markdown("<style>.align-right{display:flex;justify-content:flex-end;width:100%;}</style>", unsafe_allow_html=True)
 st.markdown(
     """
     <style>
@@ -147,7 +147,14 @@ def parse_excel(data_bytes: bytes):
     return {sh: xl.parse(sh) for sh in xl.sheet_names}
 
 def read_book_bytes(b: bytes): return parse_excel(b) if b else {}
-def ensure_cols(df, cols): return not [c for c in cols if c not in df.columns] or False
+
+def ensure_cols(df, cols):
+    miss = [c for c in cols if c not in df.columns]
+    if miss:
+        st.error(f"Missing columns: {miss}\nFound: {list(df.columns)}")
+        return False
+    return True
+
 def find_sheet(book, names):
     low2orig = {k.lower(): k for k in book.keys()}
     for nm in names:
@@ -160,15 +167,6 @@ def _nice_tick0(xmin: float, step: int = 100) -> float:
         return xmin
     return step * math.floor(xmin / step)
 
-def _nice_dtick(xmin: float, xmax: float) -> int:
-    width = max(xmax - xmin, 1.0)
-    candidates = [50, 100, 200, 250, 500, 1000]
-    for dt in candidates:
-        n = width / dt
-        if 5 <= n <= 12:
-            return dt
-    return 100
-
 # ---------- Plot builders ----------
 def cross_plot(actual, pred):
     a = pd.Series(actual).astype(float)
@@ -226,8 +224,7 @@ def track_plot(df, include_actual=True):
     x_lo, x_hi = float(x_series.min()), float(x_series.max())
     x_pad = 0.03 * (x_hi - x_lo if x_hi > x_lo else 1.0)
     xmin, xmax = x_lo - x_pad, x_hi + x_pad
-    tick0 = _nice_tick0(xmin, step=100)
-    dtick = _nice_dtick(xmin, xmax)
+    tick0 = _nice_tick0(xmin, step=100)  # sensible first tick at left border
 
     fig = go.Figure()
     fig.add_trace(go.Scatter(
@@ -257,7 +254,7 @@ def track_plot(df, include_actual=True):
     fig.update_xaxes(
         title_text="<b>UCS (psi)</b>", side="top", range=[xmin, xmax],
         ticks="outside", tickformat=",.0f",
-        tickmode="linear", tick0=tick0, dtick=dtick,
+        tickmode="auto", tick0=tick0,
         showline=True, linewidth=1.2, linecolor="#444", mirror=True,
         showgrid=True, gridcolor="rgba(0,0,0,0.12)", automargin=True
     )
@@ -412,7 +409,16 @@ if st.session_state.app_step == "dev":
             df0 = next(iter(tmp.values()))
             st.sidebar.caption(f"**Data loaded:** {st.session_state.dev_file_name} • {df0.shape[0]} rows × {df0.shape[1]} cols")
 
-    # ---- Pinned helper at the very top of the page (before preview call) ----
+    if st.sidebar.button("Preview data", use_container_width=True, disabled=not st.session_state.dev_file_loaded):
+        preview_modal(read_book_bytes(st.session_state.dev_file_bytes))
+        st.session_state.dev_preview = True
+
+    run = st.sidebar.button("Run Model", type="primary", use_container_width=True)
+    # always available nav
+    if st.sidebar.button("Proceed to Validation ▶", use_container_width=True): st.session_state.app_step="validate"; st.rerun()
+    if st.sidebar.button("Proceed to Prediction ▶", use_container_width=True): st.session_state.app_step="predict"; st.rerun()
+
+    # ---- Pinned helper at the very top of the page ----
     helper_top = st.container()
     with helper_top:
         st.subheader("Case Building (Development)")
@@ -423,15 +429,6 @@ if st.session_state.app_step == "dev":
         else:
             st.write("**Upload your data to build a case, then run the model to review development performance.**")
 
-    # preview modal call AFTER helper, so helper stays pinned above
-    if st.sidebar.button("Preview data", use_container_width=True, disabled=not st.session_state.dev_file_loaded):
-        preview_modal(read_book_bytes(st.session_state.dev_file_bytes))
-        st.session_state.dev_preview = True
-
-    run = st.sidebar.button("Run Model", type="primary", use_container_width=True)
-    if st.sidebar.button("Proceed to Validation ▶", use_container_width=True): st.session_state.app_step="validate"; st.rerun()
-    if st.sidebar.button("Proceed to Prediction ▶", use_container_width=True): st.session_state.app_step="predict"; st.rerun()
-
     if run and st.session_state.dev_file_bytes:
         book = read_book_bytes(st.session_state.dev_file_bytes)
         sh_train = find_sheet(book, ["Train","Training","training2","train","training"])
@@ -457,13 +454,13 @@ if st.session_state.app_step == "dev":
         c1.metric("R²", f"{m['R2']:.4f}"); c2.metric("RMSE", f"{m['RMSE']:.4f}"); c3.metric("MAE", f"{m['MAE']:.4f}")
         left, spacer, right = st.columns(PLOT_COLS)
         with left:
-            st.markdown("<div class='align-right'>", unsafe_allow_html=True)
-            st.plotly_chart(
-                cross_plot(df[TARGET], df["UCS_Pred"]),
-                use_container_width=False,
-                config={"displayModeBar": False, "scrollZoom": True}
-            )
-            st.markdown("</div>", unsafe_allow_html=True)
+            pad, plotcol = left.columns([CROSS_NUDGE, 1])  # shift cross-plot right inside its band
+            with plotcol:
+                st.plotly_chart(
+                    cross_plot(df[TARGET], df["UCS_Pred"]),
+                    use_container_width=False,
+                    config={"displayModeBar": False, "scrollZoom": True}
+                )
         with right:
             st.plotly_chart(
                 track_plot(df, include_actual=True),
@@ -489,16 +486,15 @@ if st.session_state.app_step == "validate":
         if book:
             df0 = next(iter(book.values()))
             st.sidebar.caption(f"**Data loaded:** {up.name} • {df0.shape[0]} rows × {df0.shape[1]} cols")
-
-    st.subheader("Validate the Model")
-    st.write("Upload a dataset with the same **features** and **UCS** to evaluate performance.")
-
     if st.sidebar.button("Preview data", use_container_width=True, disabled=(up is None)):
         preview_modal(read_book_bytes(up.getvalue()))
     go_btn = st.sidebar.button("Predict", type="primary", use_container_width=True)
     if st.sidebar.button("⬅ Back to Case Building", use_container_width=True): st.session_state.app_step="dev"; st.rerun()
     if st.sidebar.button("Proceed to Prediction ▶", use_container_width=True): st.session_state.app_step="predict"; st.rerun()
 
+    st.subheader("Validate the Model")
+    st.write("Upload a dataset with the same **features** and **UCS** to evaluate performance.")
+
     if go_btn and up is not None:
         book = read_book_bytes(up.getvalue())
         name = find_sheet(book, ["Validation","Validate","validation2","Val","val"]) or list(book.keys())[0]
@@ -519,25 +515,26 @@ if st.session_state.app_step == "validate":
         st.session_state.results["oor_tbl"]=tbl
 
     if "Validate" in st.session_state.results:
-        m = st.session_state.results["m_val"]; sv = st.session_state.results["sv_val"]
+        m = st.session_state.results["m_val"]
         c1,c2,c3 = st.columns(3)
         c1.metric("R²", f"{m['R2']:.4f}"); c2.metric("RMSE", f"{m['RMSE']:.4f}"); c3.metric("MAE", f"{m['MAE']:.4f}")
 
         left, spacer, right = st.columns(PLOT_COLS)
         with left:
-            st.markdown("<div class='align-right'>", unsafe_allow_html=True)
-            st.plotly_chart(
-                cross_plot(st.session_state.results["Validate"][TARGET],
-                           st.session_state.results["Validate"]["UCS_Pred"]),
-                use_container_width=False, config={"displayModeBar": False, "scrollZoom": True}
-            )
-            st.markdown("</div>", unsafe_allow_html=True)
+            pad, plotcol = left.columns([CROSS_NUDGE, 1])  # same nudge
+            with plotcol:
+                st.plotly_chart(
+                    cross_plot(st.session_state.results["Validate"][TARGET],
+                               st.session_state.results["Validate"]["UCS_Pred"]),
+                    use_container_width=False, config={"displayModeBar": False, "scrollZoom": True}
+                )
         with right:
             st.plotly_chart(
                 track_plot(st.session_state.results["Validate"], include_actual=True),
                 use_container_width=False, config={"displayModeBar": False, "scrollZoom": True}
             )
 
+        sv = st.session_state.results["sv_val"]
         if sv["oor"] > 0: st.warning("Some inputs fall outside **training min–max** ranges.")
         if st.session_state.results["oor_tbl"] is not None:
             st.write("*Out-of-range rows (vs. Training min–max):*")