Update app.py

app.py

@@ -6,7 +6,7 @@ import pandas as pd
 import numpy as np
 import joblib
 
-# Matplotlib for PREVIEW modal and CROSS-PLOT (static)
+# Matplotlib for PREVIEW modal and for the CROSS-PLOT (static)
 import matplotlib
 matplotlib.use("Agg")
 import matplotlib.pyplot as plt
@@ -26,58 +26,43 @@ MODEL_FALLBACKS = [MODELS_DIR / "model.joblib", MODELS_DIR / "model.pkl"]
 COLORS = {"pred": "#1f77b4", "actual": "#f2b702", "ref": "#5a5a5a"}
 
 # ---- Plot sizing controls ----
-CROSS_W = 420      # px   (explicit, not None)
-CROSS_H = 420      # px
-TRACK_W = 320      # px   (slightly narrower to avoid crowding)
-TRACK_H = 740      # px
+CROSS_W = 420    # px (matplotlib figure size; Streamlit will still scale)
+CROSS_H = 420
+TRACK_H = 740    # px (plotly height; width auto-fits column)
 FONT_SZ  = 13
-PLOT_COLS = [36, 6, 28]   # wider spacer so plots never bump into each other
-CROSS_NUDGE = 0.0         # keep 0 unless you really want an inner pad
 
 # =========================
 # Page / CSS
 # =========================
 st.set_page_config(page_title="ST_GeoMech_UCS", page_icon="logo.png", layout="wide")
-st.markdown("""
-<style>
-  /* Reusable logo style */
-  .brand-logo { width: 16px; height: auto; object-fit: contain; }
 
-  /* Sidebar header layout */
-  .sidebar-header { display:flex; align-items:center; gap:12px; }
-  .sidebar-header .text h1 { font-size: 1.05rem; margin:0; line-height:1.1; }
-  .sidebar-header .text .tag { font-size: .85rem; color:#6b7280; margin:2px 0 0; }
-</style>
-""", unsafe_allow_html=True)
-# Hide file-uploader helper text; keep only Browse button
+# Hide uploader helper text ("Drag and drop file here", limits, etc.)
 st.markdown("""
 <style>
 /* Older builds (helper wrapped in a Markdown container) */
-section[data-testid="stFileUploader"] div[data-testid="stMarkdownContainer"] { display:none !important; }
-/* 1.31–1.34 style (first child inside the dropzone is the helper row) */
-section[data-testid="stFileUploader"] [data-testid="stFileUploaderDropzone"] > div:first-child { display:none !important; }
-/* 1.35+ explicit helper container */
-section[data-testid="stFileUploader"] [data-testid="stFileUploaderInstructions"] { display:none !important; }
-/* Fallback: any paragraph/small helper inside uploader */
-section[data-testid="stFileUploader"] p, section[data-testid="stFileUploader"] small { display:none !important; }
-
-/* Center headers & cells in all st.dataframe tables */
-[data-testid="stDataFrame"] table td, 
-[data-testid="stDataFrame"] table th {
-  text-align: center !important;
-  vertical-align: middle !important;
-}
+section[data-testid="stFileUploader"] div[data-testid="stMarkdownContainer"]{display:none !important;}
+/* 1.31–1.34: helper is the first child in the dropzone */
+section[data-testid="stFileUploader"] [data-testid="stFileUploaderDropzone"] > div:first-child{display:none !important;}
+/* 1.35+: explicit helper container */
+section[data-testid="stFileUploader"] [data-testid="stFileUploaderInstructions"]{display:none !important;}
+/* Fallback: any paragraph/small text inside the uploader */
+section[data-testid="stFileUploader"] p, section[data-testid="stFileUploader"] small{display:none !important;}
 </style>
 """, unsafe_allow_html=True)
 
+# Center text in all pandas Styler tables (headers + cells)
+TABLE_CENTER_CSS = [
+    dict(selector="th", props=[("text-align", "center")]),
+    dict(selector="td", props=[("text-align", "center")]),
+]
+
 # =========================
 # Password gate
 # =========================
 def inline_logo(path="logo.png") -> str:
     try:
         p = Path(path)
-        if not p.exists():
-            return ""
+        if not p.exists(): return ""
         return f"data:image/png;base64,{base64.b64encode(p.read_bytes()).decode('ascii')}"
     except Exception:
         return ""
@@ -95,7 +80,7 @@ def add_password_gate() -> None:
     if st.session_state.get("auth_ok", False):
         return
 
-    st.sidebar.image("logo.png", use_column_width=False)
+    st.sidebar.image("logo.png", use_column_width=True)
     st.sidebar.markdown("### ST_GeoMech_UCS\nSmart Thinking • Secure Access")
     pwd = st.sidebar.text_input("Access key", type="password", placeholder="••••••••")
     if st.sidebar.button("Unlock", type="primary"):
@@ -111,25 +96,13 @@ add_password_gate()
 # =========================
 # Utilities
 # =========================
-try:
-    dialog = st.dialog
-except AttributeError:
-    def dialog(title):
-        def deco(fn):
-            def wrapper(*args, **kwargs):
-                with st.expander(title, expanded=True):
-                    return fn(*args, **kwargs)
-            return wrapper
-        return deco
-
 def rmse(y_true, y_pred) -> float:
     return float(np.sqrt(mean_squared_error(y_true, y_pred)))
 
 def pearson_r(y_true, y_pred) -> float:
     a = np.asarray(y_true, dtype=float)
     p = np.asarray(y_pred, dtype=float)
-    if a.size < 2:
-        return float("nan")
+    if a.size < 2: return float("nan")
     return float(np.corrcoef(a, p)[0, 1])
 
 @st.cache_resource(show_spinner=False)
@@ -142,8 +115,7 @@ def parse_excel(data_bytes: bytes):
     xl = pd.ExcelFile(bio)
     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 read_book_bytes(b: bytes): return parse_excel(b) if b else {}
 
 def ensure_cols(df, cols):
     miss = [c for c in cols if c not in df.columns]
@@ -155,13 +127,22 @@ def ensure_cols(df, cols):
 def find_sheet(book, names):
     low2orig = {k.lower(): k for k in book.keys()}
     for nm in names:
-        if nm.lower() in low2orig:
-            return low2orig[nm.lower()]
+        if nm.lower() in low2orig: return low2orig[nm.lower()]
     return None
 
 def _nice_tick0(xmin: float, step: int = 100) -> float:
     return step * math.floor(xmin / step) if np.isfinite(xmin) else xmin
 
+def df_centered_rounded(df: pd.DataFrame, hide_index=True):
+    """Round numeric columns to 2 decimals and center headers & cells."""
+    out = df.copy()
+    numcols = out.select_dtypes(include=[np.number]).columns
+    out[numcols] = out[numcols].round(2)
+    styler = (out.style
+                  .set_properties(**{"text-align": "center"})
+                  .set_table_styles(TABLE_CENTER_CSS))
+    st.dataframe(styler, use_container_width=True, hide_index=hide_index)
+
 # =========================
 # Cross plot (Matplotlib, fixed limits & ticks)
 # =========================
@@ -172,7 +153,6 @@ def cross_plot_static(actual, pred):
     fixed_min, fixed_max = 6000, 10000
     ticks = np.arange(fixed_min, fixed_max + 1, 1000)
 
-    # fixed px size = (figsize * dpi)
     dpi = 110
     fig, ax = plt.subplots(
         figsize=(CROSS_W / dpi, CROSS_H / dpi),
@@ -180,43 +160,32 @@ def cross_plot_static(actual, pred):
         constrained_layout=False
     )
 
-    # points
     ax.scatter(a, p, s=16, c=COLORS["pred"], alpha=0.9, linewidths=0)
-
-    # 1:1 diagonal
     ax.plot([fixed_min, fixed_max], [fixed_min, fixed_max],
             linestyle="--", linewidth=1.2, color=COLORS["ref"])
 
-    # identical axes limits + ticks
     ax.set_xlim(fixed_min, fixed_max)
     ax.set_ylim(fixed_min, fixed_max)
     ax.set_xticks(ticks)
     ax.set_yticks(ticks)
-
-    # equal aspect → true 45°
     ax.set_aspect("equal", adjustable="box")
 
-    # thousands formatting
     fmt = FuncFormatter(lambda x, _: f"{int(x):,}")
     ax.xaxis.set_major_formatter(fmt)
     ax.yaxis.set_major_formatter(fmt)
 
-    # labels + ticks (smaller so they don't dominate)
     ax.set_xlabel("Actual UCS (psi)", fontweight="bold", fontsize=12)
     ax.set_ylabel("Predicted UCS (psi)", fontweight="bold", fontsize=12)
     ax.tick_params(labelsize=10)
 
-    # grid & frame
     ax.grid(True, linestyle=":", alpha=0.3)
     for spine in ax.spines.values():
         spine.set_linewidth(1.1)
         spine.set_color("#444")
 
-    # moderate margins; keeps labels readable but not huge
     fig.subplots_adjust(left=0.16, bottom=0.16, right=0.98, top=0.98)
     return fig
 
-
 # =========================
 # Track plot (Plotly)
 # =========================
@@ -256,8 +225,9 @@ def track_plot(df, include_actual=True):
         ))
 
     fig.update_layout(
-        width=TRACK_W, height=TRACK_H, paper_bgcolor="#fff", plot_bgcolor="#fff",
-        margin=dict(l=72, r=18, t=36, b=48), hovermode="closest",
+        height=TRACK_H, width=None,  # width automatically fits the column
+        paper_bgcolor="#fff", plot_bgcolor="#fff",
+        margin=dict(l=64, r=16, t=36, b=48), hovermode="closest",
         font=dict(size=FONT_SZ),
         legend=dict(
             x=0.98, y=0.05, xanchor="right", yanchor="bottom",
@@ -266,14 +236,14 @@ def track_plot(df, include_actual=True):
         legend_title_text=""
     )
     fig.update_xaxes(
-        title_text="<b>UCS (psi)</b>", title_font=dict(size=16),
+        title_text="<b>UCS (psi)</b>", title_font=dict(size=14),
         side="top", range=[xmin, xmax],
         ticks="outside", tickformat=",.0f", 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=f"<b>{ylab}</b>", title_font=dict(size=16),
+        title_text=f"<b>{ylab}</b>", title_font=dict(size=14),
         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
@@ -286,8 +256,7 @@ def preview_tracks(df: pd.DataFrame, cols: list[str]):
     n = len(cols)
     if n == 0:
         fig, ax = plt.subplots(figsize=(4, 2))
-        ax.text(0.5,0.5,"No selected columns",ha="center",va="center")
-        ax.axis("off")
+        ax.text(0.5,0.5,"No selected columns",ha="center",va="center"); ax.axis("off")
         return fig
     fig, axes = plt.subplots(1, n, figsize=(2.2*n, 7.0), sharey=True, dpi=100)
     if n == 1: axes = [axes]
@@ -300,6 +269,18 @@ def preview_tracks(df: pd.DataFrame, cols: list[str]):
     axes[0].set_ylabel("Point Index")
     return fig
 
+# Modal wrapper (Streamlit compatibility)
+try:
+    dialog = st.dialog
+except AttributeError:
+    def dialog(title):
+        def deco(fn):
+            def wrapper(*args, **kwargs):
+                with st.expander(title, expanded=True):
+                    return fn(*args, **kwargs)
+            return wrapper
+        return deco
+
 @dialog("Preview data")
 def preview_modal(book: dict[str, pd.DataFrame]):
     if not book:
@@ -310,12 +291,13 @@ def preview_modal(book: dict[str, pd.DataFrame]):
         with t:
             df = book[name]
             t1, t2 = st.tabs(["Tracks", "Summary"])
-            with t1: st.pyplot(preview_tracks(df, FEATURES), use_container_width=True)
+            with t1:
+                st.pyplot(preview_tracks(df, FEATURES), use_container_width=True)
             with t2:
-                tbl = df[FEATURES].agg(['min','max','mean','std']).T.rename(
-                    columns={"min":"Min","max":"Max","mean":"Mean","std":"Std"}
-                ).round(2)
-                st.dataframe(tbl.reset_index(names="Feature"), use_container_width=True)
+                tbl = (df[FEATURES]
+                        .agg(['min','max','mean','std'])
+                        .T.rename(columns={"min":"Min","max":"Max","mean":"Mean","std":"Std"}))
+                df_centered_rounded(tbl.reset_index(names="Feature"))
 
 # =========================
 # Load model
@@ -369,7 +351,7 @@ st.session_state.setdefault("dev_preview",False)
 # =========================
 # Branding in Sidebar
 # =========================
-st.sidebar.image("logo.png", use_column_width=False)
+st.sidebar.image("logo.png", use_column_width=True)
 st.sidebar.markdown(
     "<div style='font-weight:800;font-size:1.2rem;'>ST_GeoMech_UCS</div>"
     "<div style='color:#667085;'>Real-Time UCS Tracking While Drilling</div>",
@@ -413,11 +395,9 @@ if st.session_state.app_step == "dev":
         st.session_state.dev_preview = True
 
     run = st.sidebar.button("Run Model", type="primary", use_container_width=True)
-    # 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 ----
     helper_top = st.container()
     with helper_top:
         st.subheader("Case Building")
@@ -460,18 +440,14 @@ if st.session_state.app_step == "dev":
         c1,c2,c3 = st.columns(3)
         c1.metric("R", f"{m['R']:.2f}"); c2.metric("RMSE", f"{m['RMSE']:.2f}"); c3.metric("MAE", f"{m['MAE']:.2f}")
 
-        left, spacer, right = st.columns(PLOT_COLS)
-        # Robust nudge: only make the inner columns if weight > 0
-        if CROSS_NUDGE and CROSS_NUDGE > 0:
-            pad, plotcol = left.columns([CROSS_NUDGE, 1])
-        else:
-            plotcol = left
-        with plotcol:
-            st.pyplot(cross_plot_static(df[TARGET], df["UCS_Pred"]), use_container_width=False)
-        with right:
+        # NEW: 2-column layout, big gap, no nested columns, no 0-weights.
+        col_cross, col_track = st.columns([3, 2], gap="large")
+        with col_cross:
+            st.pyplot(cross_plot_static(df[TARGET], df["UCS_Pred"]), use_container_width=True)
+        with col_track:
             st.plotly_chart(
                 track_plot(df, include_actual=True),
-                use_container_width=False,
+                use_container_width=True,
                 config={"displayModeBar": False, "scrollZoom": True}
             )
 
@@ -517,11 +493,8 @@ if st.session_state.app_step == "validate":
             if any_viol.any():
                 tbl = df.loc[any_viol, FEATURES].copy()
                 for c in FEATURES:
-                    if pd.api.types.is_numeric_dtype(tbl[c]):
-                        tbl[c] = tbl[c].round(2)
-                tbl["Violations"] = pd.DataFrame({f:(df[f]<ranges[f][0])|(df[f]>ranges[f][1]) for f in FEATURES}).loc[any_viol].apply(
-                    lambda r:", ".join([c for c,v in r.items() if v]), axis=1
-                )
+                    if pd.api.types.is_numeric_dtype(tbl[c]): tbl[c] = tbl[c].round(2)
+                tbl["Violations"] = pd.DataFrame({f:(df[f]<ranges[f][0])|(df[f]>ranges[f][1]) for f in FEATURES}).loc[any_viol].apply(lambda r:", ".join([c for c,v in r.items() if v]), axis=1)
         st.session_state.results["m_val"]={
             "R": pearson_r(df[TARGET], df["UCS_Pred"]),
             "RMSE": rmse(df[TARGET], df["UCS_Pred"]),
@@ -535,28 +508,24 @@ if st.session_state.app_step == "validate":
         c1,c2,c3 = st.columns(3)
         c1.metric("R", f"{m['R']:.2f}"); c2.metric("RMSE", f"{m['RMSE']:.2f}"); c3.metric("MAE", f"{m['MAE']:.2f}")
 
-        left, spacer, right = st.columns(PLOT_COLS)
-        if CROSS_NUDGE and CROSS_NUDGE > 0:
-            pad, plotcol = left.columns([CROSS_NUDGE, 1])
-        else:
-            plotcol = left
-        with plotcol:
+        col_cross, col_track = st.columns([3, 2], gap="large")
+        with col_cross:
             st.pyplot(
                 cross_plot_static(st.session_state.results["Validate"][TARGET],
                                   st.session_state.results["Validate"]["UCS_Pred"]),
-                use_container_width=False
+                use_container_width=True
             )
-        with right:
+        with col_track:
             st.plotly_chart(
                 track_plot(st.session_state.results["Validate"], include_actual=True),
-                use_container_width=False, config={"displayModeBar": False, "scrollZoom": True}
+                use_container_width=True, 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):*")
-            st.dataframe(st.session_state.results["oor_tbl"], use_container_width=True)
+            df_centered_rounded(st.session_state.results["oor_tbl"])
 
 # =========================
 # PREDICTION (no actual UCS)
@@ -599,8 +568,9 @@ if st.session_state.app_step == "predict":
 
     if "PredictOnly" in st.session_state.results:
         df = st.session_state.results["PredictOnly"]; sv = st.session_state.results["sv_pred"]
-        left, spacer, right = st.columns(PLOT_COLS)
-        with left:
+
+        col_left, col_right = st.columns([2,3], gap="large")
+        with col_left:
             table = pd.DataFrame({
                 "Metric": ["# points","Pred min","Pred max","Pred mean","Pred std","OOR %"],
                 "Value":  [sv["n"],
@@ -611,12 +581,12 @@ if st.session_state.app_step == "predict":
                            f'{sv["oor"]:.1f}%']
             })
             st.success("Predictions ready ✓")
-            st.dataframe(table, use_container_width=True, hide_index=True)
+            df_centered_rounded(table, hide_index=True)
             st.caption("**★ OOR** = % of rows whose input features fall outside the training min–max range.")
-        with right:
+        with col_right:
             st.plotly_chart(
                 track_plot(df, include_actual=False),
-                use_container_width=False, config={"displayModeBar": False, "scrollZoom": True}
+                use_container_width=True, config={"displayModeBar": False, "scrollZoom": True}
             )
 
 # =========================