Update app.py

app.py

@@ -1,4 +1,3 @@
-# app.py
 import io, json, os, base64, math
 from pathlib import Path
 import streamlit as st
@@ -26,9 +25,9 @@ MODEL_FALLBACKS = [MODELS_DIR / "model.joblib", MODELS_DIR / "model.pkl"]
 COLORS = {"pred": "#1f77b4", "actual": "#f2b702", "ref": "#5a5a5a"}
 
 # ---- Plot sizing controls ----
-CROSS_W = 450    # px (matplotlib figure size; Streamlit will still scale)
+CROSS_W = 450      # px (matplotlib figure size; Streamlit will still scale)
 CROSS_H = 450
-TRACK_H = 740    # px (plotly height; width auto-fits column)
+TRACK_H = 740      # px (plotly height; width auto-fits column)
 FONT_SZ  = 13
 BOLD_FONT = "Arial Black, Arial, sans-serif"  # used for bold axis titles & ticks
 
@@ -36,15 +35,20 @@ BOLD_FONT = "Arial Black, Arial, sans-serif"  # used for bold axis titles & tick
 # Page / CSS
 # =========================
 st.set_page_config(page_title="ST_GeoMech_UCS", page_icon="logo.png", layout="wide")
+
+# General CSS (logo helpers etc.)
 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; }
+  .centered-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    text-align: center;
+  }
 </style>
 """, unsafe_allow_html=True)
 
@@ -62,6 +66,26 @@ section[data-testid="stFileUploader"] p, section[data-testid="stFileUploader"] s
 </style>
 """, unsafe_allow_html=True)
 
+# Make the Preview expander title & tabs sticky (pinned to the top)
+st.markdown("""
+<style>
+div[data-testid="stExpander"] > details > summary {
+  position: sticky;
+  top: 0;
+  z-index: 10;
+  background: #fff;
+  border-bottom: 1px solid #eee;
+}
+div[data-testid="stExpander"] div[data-baseweb="tab-list"] {
+  position: sticky;
+  top: 42px;    /* adjust if your expander header height differs */
+  z-index: 9;
+  background: #fff;
+  padding-top: 6px;
+}
+</style>
+""", unsafe_allow_html=True)
+
 # Center text in all pandas Styler tables (headers + cells)
 TABLE_CENTER_CSS = [
     dict(selector="th", props=[("text-align", "center")]),
@@ -92,8 +116,16 @@ 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.markdown("### ST_GeoMech_UCS\nSmart Thinking • Secure Access")
+    # st.sidebar.image("logo.png", use_column_width=False)
+    # st.sidebar.markdown("### ST_GeoMech_UCS\nSmart Thinking • Secure Access")
+    st.sidebar.markdown(f"""
+        <div class="centered-container">
+            <img src="{inline_logo('logo.png')}" style="width: 16px; height: auto; object-fit: contain;">
+            <div style='font-weight:800;font-size:1.2rem; margin-top: 10px;'>ST_GeoMech_UCS</div>
+            <div style='color:#667085;'>Smart Thinking • Secure Access</div>
+        </div>
+        """, unsafe_allow_html=True
+    )
     pwd = st.sidebar.text_input("Access key", type="password", placeholder="••••••••")
     if st.sidebar.button("Unlock", type="primary"):
         if pwd == required:
@@ -146,13 +178,15 @@ 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."""
+    """Center headers & cells; format numeric columns to 2 decimals."""
     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))
+    styler = (
+        out.style
+           .format({c: "{:.2f}" for c in numcols})
+           .set_properties(**{"text-align": "center"})
+           .set_table_styles(TABLE_CENTER_CSS)
+    )
     st.dataframe(styler, use_container_width=True, hide_index=hide_index)
 
 # =========================
@@ -160,7 +194,7 @@ def df_centered_rounded(df: pd.DataFrame, hide_index=True):
 # =========================
 def cross_plot_static(actual, pred):
     a = pd.Series(actual, dtype=float)
-    p = pd.Series(pred,   dtype=float)
+    p = pd.Series(pred,    dtype=float)
 
     fixed_min, fixed_max = 6000, 10000
     ticks = np.arange(fixed_min, fixed_max + 1, 1000)
@@ -180,15 +214,15 @@ def cross_plot_static(actual, pred):
     ax.set_ylim(fixed_min, fixed_max)
     ax.set_xticks(ticks)
     ax.set_yticks(ticks)
-    ax.set_aspect("equal", adjustable="box")
+    ax.set_aspect("equal", adjustable="box")  # true 45°
 
     fmt = FuncFormatter(lambda x, _: f"{int(x):,}")
     ax.xaxis.set_major_formatter(fmt)
     ax.yaxis.set_major_formatter(fmt)
 
-    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)
+    ax.set_xlabel("Actual UCS (psi)", fontweight="bold", fontsize=12, color="black")
+    ax.set_ylabel("Predicted UCS (psi)", fontweight="bold", fontsize=12, color="black")
+    ax.tick_params(labelsize=10, colors="black")
 
     ax.grid(True, linestyle=":", alpha=0.3)
     for spine in ax.spines.values():
@@ -199,7 +233,7 @@ def cross_plot_static(actual, pred):
     return fig
 
 # =========================
-# Track plot (Plotly) — FIXED
+# 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)
@@ -240,7 +274,7 @@ def track_plot(df, include_actual=True):
         height=TRACK_H, width=None,  # width auto-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),
+        font=dict(size=FONT_SZ, color="#000"),
         legend=dict(
             x=0.98, y=0.05, xanchor="right", yanchor="bottom",
             bgcolor="rgba(255,255,255,0.75)", bordercolor="#ccc", borderwidth=1
@@ -248,11 +282,11 @@ def track_plot(df, include_actual=True):
         legend_title_text=""
     )
 
-    # Bold axis titles & tick labels
+    # Bold, black axis titles & ticks
     fig.update_xaxes(
         title_text="UCS (psi)",
-        title_font=dict(size=16, family=BOLD_FONT),
-        tickfont=dict(size=13, family=BOLD_FONT),
+        title_font=dict(size=16, family=BOLD_FONT, color="#000"),
+        tickfont=dict(size=11, family=BOLD_FONT, color="#000"),
         side="top",
         range=[xmin, xmax],
         ticks="outside",
@@ -262,11 +296,10 @@ def track_plot(df, include_actual=True):
         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=16, family=BOLD_FONT),
-        tickfont=dict(size=13, family=BOLD_FONT),
+        title_font=dict(size=16, family=BOLD_FONT, color="#000"),
+        tickfont=dict(size=11, family=BOLD_FONT, color="#000"),
         range=y_range,
         ticks="outside",
         showline=True, linewidth=1.2, linecolor="#444", mirror=True,
@@ -275,7 +308,7 @@ def track_plot(df, include_actual=True):
 
     return fig
 
-# ---------- Preview modal (matplotlib)
+# ---------- 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)
@@ -376,11 +409,19 @@ st.session_state.setdefault("dev_preview",False)
 # =========================
 # Branding in Sidebar
 # =========================
-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>",
-    unsafe_allow_html=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>",
+#     unsafe_allow_html=True
+# )
+st.sidebar.markdown(f"""
+    <div class="centered-container">
+        <img src="{inline_logo('logo.png')}" style="width: 16px; height: auto; object-fit: contain;">
+        <div style='font-weight:800;font-size:1.2rem;'>ST_GeoMech_UCS</div>
+        <div style='color:#667085;'>Real-Time UCS Tracking While Drilling</div>
+    </div>
+    """, unsafe_allow_html=True
 )
 
 # =========================
@@ -391,7 +432,7 @@ if st.session_state.app_step == "intro":
     st.markdown("This software is developed by *Smart Thinking AI-Solutions Team* to estimate UCS from drilling data.")
     st.subheader("How It Works")
     st.markdown(
-        "1) **Upload your data to build the case and preview the performance of our model.**  \n"
+        "1) **Upload your data to build the case and preview the performance of our model.** \n"
         "2) Click **Run Model** to compute metrics and plots.  \n"
         "3) **Proceed to Validation** (with actual UCS) or **Proceed to Prediction** (no UCS)."
     )
@@ -465,7 +506,7 @@ 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}")
 
-        # clean 2-column layout
+        # 2-column layout, big gap (prevents overlap)
         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)
@@ -519,9 +560,7 @@ if st.session_state.app_step == "validate":
                 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
-                )
+                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"]),
@@ -628,4 +667,4 @@ st.markdown(
     </div>
     """,
     unsafe_allow_html=True
-)
+)