Update app.py

app.py

@@ -6,7 +6,7 @@ import pandas as pd
 import numpy as np
 import joblib
 
-# matplotlib for PREVIEW modal and for the CROSS-PLOT (static)
+# Matplotlib for PREVIEW modal and CROSS-PLOT (static)
 import matplotlib
 matplotlib.use("Agg")
 import matplotlib.pyplot as plt
@@ -26,14 +26,13 @@ MODEL_FALLBACKS = [MODELS_DIR / "model.joblib", MODELS_DIR / "model.pkl"]
 COLORS = {"pred": "#1f77b4", "actual": "#f2b702", "ref": "#5a5a5a"}
 
 # ---- Plot sizing controls ----
-CROSS_W = None          # let the chart fill the column
+CROSS_W = None          # Matplotlib cross-plot width (in px) — None -> fallback used in fn
 CROSS_H = 420
-TRACK_W = None          # let the chart fill the column
+TRACK_W = 380           # Plotly track width in px (kept modest to avoid overlap)
 TRACK_H = 820
 FONT_SZ  = 15
-PLOT_COLS = [42, 2, 30]  # wider left & right, a thicker spacer in the middle
-CROSS_NUDGE = 0.0
-
+PLOT_COLS = [42, 2, 30] # left • spacer • right
+CROSS_NUDGE = 0.0       # set >0 to shove cross-plot inward with a small left pad column
 
 # =========================
 # Page / CSS
@@ -41,40 +40,32 @@ CROSS_NUDGE = 0.0
 st.set_page_config(page_title="ST_GeoMech_UCS", page_icon="logo.png", layout="wide")
 st.markdown("""
 <style>
-  /* Reusable logo style */
-  .brand-logo { width: 100px; height: auto; object-fit: contain; }
+  /* 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; }
+  /* 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 + center dataframes (headers & cells)
+# Hide file-uploader helper text; keep only Browse button
 st.markdown("""
 <style>
-/* Keep the uploader and its Browse button, but hide the drag/drop helper lines */
-
 /* Older builds (helper wrapped in a Markdown container) */
-section[data-testid="stFileUploader"] div[data-testid="stMarkdownContainer"] {
-  display: none !important;
-}
-
+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;
-}
-
+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: remove any paragraph/small text inside the uploader */
-section[data-testid="stFileUploader"] p,
-section[data-testid="stFileUploader"] small {
-  display: none !important;
+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;
 }
 </style>
 """, unsafe_allow_html=True)
@@ -85,7 +76,8 @@ section[data-testid="stFileUploader"] small {
 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 ""
@@ -103,7 +95,7 @@ def add_password_gate() -> None:
     if st.session_state.get("auth_ok", False):
         return
 
-    st.sidebar.image("logo.png", use_column_width=True)
+    st.sidebar.image("logo.png", use_column_width=False)
     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"):
@@ -136,7 +128,8 @@ def rmse(y_true, y_pred) -> float:
 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)
@@ -149,7 +142,8 @@ 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]
@@ -161,15 +155,13 @@ 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
 
-# =========================
-# Cross-plot (Matplotlib, static)
-# =========================
 # =========================
 # Cross plot (Matplotlib, fixed limits & ticks)
 # =========================
@@ -180,11 +172,10 @@ def cross_plot_static(actual, pred):
     fixed_min, fixed_max = 6000, 10000
     ticks = np.arange(fixed_min, fixed_max + 1, 1000)
 
-    # use constrained_layout + generous margins so big labels never overlap
     fig, ax = plt.subplots(
-        figsize=((CROSS_W or 500)/100, (CROSS_H or 500)/100),
+        figsize=((CROSS_W or 500)/100, (CROSS_H or 420)/100),
         dpi=100,
-        constrained_layout=True
+        constrained_layout=False
     )
 
     # points
@@ -220,20 +211,90 @@ def cross_plot_static(actual, pred):
 
     # extra room for the large labels
     fig.subplots_adjust(left=0.23, bottom=0.20, right=0.98, top=0.98)
-
     return fig
 
+# =========================
+# Track plot (Plotly)
+# =========================
+def track_plot(df, include_actual=True):
+    depth_col = next((c for c in df.columns if 'depth' in str(c).lower()), None)
+    if depth_col is not None:
+        y = pd.Series(df[depth_col]).astype(float)
+        ylab = depth_col
+        y_range = [float(y.max()), float(y.min())]  # reverse
+    else:
+        y = pd.Series(np.arange(1, len(df) + 1))
+        ylab = "Point Index"
+        y_range = [float(y.max()), float(y.min())]
+
+    # X (UCS) range & ticks
+    x_series = pd.Series(df.get("UCS_Pred", pd.Series(dtype=float))).astype(float)
+    if include_actual and TARGET in df.columns:
+        x_series = pd.concat([x_series, pd.Series(df[TARGET]).astype(float)], ignore_index=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)
+
+    fig = go.Figure()
+    fig.add_trace(go.Scatter(
+        x=df["UCS_Pred"], y=y, mode="lines",
+        line=dict(color=COLORS["pred"], width=1.8),
+        name="UCS_Pred",
+        hovertemplate="UCS_Pred: %{x:.0f}<br>"+ylab+": %{y}<extra></extra>"
+    ))
+    if include_actual and TARGET in df.columns:
+        fig.add_trace(go.Scatter(
+            x=df[TARGET], y=y, mode="lines",
+            line=dict(color=COLORS["actual"], width=2.0, dash="dot"),
+            name="UCS (actual)",
+            hovertemplate="UCS (actual): %{x:.0f}<br>"+ylab+": %{y}<extra></extra>"
+        ))
+
+    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",
+        font=dict(size=FONT_SZ),
+        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=""
+    )
+    fig.update_xaxes(
+        title_text="<b>UCS (psi)</b>", title_font=dict(size=16),
+        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),
+        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
 
-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
+# ---------- Preview modal (matplotlib) ----------
+def preview_tracks(df: pd.DataFrame, cols: list[str]):
+    cols = [c for c in cols if c in df.columns]
+    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")
+        return fig
+    fig, axes = plt.subplots(1, n, figsize=(2.2*n, 7.0), sharey=True, dpi=100)
+    if n == 1: axes = [axes]
+    idx = np.arange(1, len(df) + 1)
+    for ax, col in zip(axes, cols):
+        ax.plot(df[col], idx, '-', lw=1.4, color="#333")
+        ax.set_xlabel(col); ax.xaxis.set_label_position('top'); ax.xaxis.tick_top(); ax.invert_yaxis()
+        ax.grid(True, linestyle=":", alpha=0.3)
+        for s in ax.spines.values(): s.set_visible(True)
+    axes[0].set_ylabel("Point Index")
+    return fig
 
 @dialog("Preview data")
 def preview_modal(book: dict[str, pd.DataFrame]):
@@ -304,7 +365,7 @@ st.session_state.setdefault("dev_preview",False)
 # =========================
 # Branding in Sidebar
 # =========================
-st.sidebar.image("logo.png", use_column_width=True)
+st.sidebar.image("logo.png", use_column_width=False)
 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>",
@@ -396,10 +457,13 @@ if st.session_state.app_step == "dev":
         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)
-        with left:
+        # Robust nudge: only make the inner columns if weight > 0
+        if CROSS_NUDGE and CROSS_NUDGE > 0:
             pad, plotcol = left.columns([CROSS_NUDGE, 1])
-            with plotcol:
-                st.pyplot(cross_plot_static(df[TARGET], df["UCS_Pred"]), use_container_width=False)
+        else:
+            plotcol = left
+        with plotcol:
+            st.pyplot(cross_plot_static(df[TARGET], df["UCS_Pred"]), use_container_width=False)
         with right:
             st.plotly_chart(
                 track_plot(df, include_actual=True),
@@ -451,7 +515,9 @@ if st.session_state.app_step == "validate":
                 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)
+                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"]),
@@ -466,14 +532,16 @@ if st.session_state.app_step == "validate":
         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)
-        with left:
+        if CROSS_NUDGE and CROSS_NUDGE > 0:
             pad, plotcol = left.columns([CROSS_NUDGE, 1])
-            with plotcol:
-                st.pyplot(
-                    cross_plot_static(st.session_state.results["Validate"][TARGET],
-                                      st.session_state.results["Validate"]["UCS_Pred"]),
-                    use_container_width=False
-                )
+        else:
+            plotcol = left
+        with plotcol:
+            st.pyplot(
+                cross_plot_static(st.session_state.results["Validate"][TARGET],
+                                  st.session_state.results["Validate"]["UCS_Pred"]),
+                use_container_width=False
+            )
         with right:
             st.plotly_chart(
                 track_plot(st.session_state.results["Validate"], include_actual=True),