Update app.py

app.py

@@ -26,49 +26,33 @@ MODEL_FALLBACKS = [MODELS_DIR / "model.joblib", MODELS_DIR / "model.pkl"]
 COLORS = {"pred": "#1f77b4", "actual": "#f2b702", "ref": "#5a5a5a"}
 
 # =========================
-# Page / Theme
+# Page / Theme (must be first)
 # =========================
 st.set_page_config(page_title="ST_GeoMech_UCS", page_icon="logo.png", layout="wide")
-# … your CSS …
-# 🔒 Password gate
-add_password_gate()
-# from here on, only authenticated users proceed
-st.markdown("<style>header, footer{visibility:hidden !important;}</style>", unsafe_allow_html=True)
-st.markdown(
-    """
-    <style>
-    .stApp { background: #FFFFFF; }
-    section[data-testid="stSidebar"] { background: #F6F9FC; }
-    .block-container { padding-top: .5rem; padding-bottom: .5rem; }
-    .stButton>button{ background:#007bff; color:#fff; font-weight:bold; border-radius:8px; border:none; padding:10px 24px; }
-    .stButton>button:hover{ background:#0056b3; }
-    .st-hero { display:flex; align-items:center; gap:16px; padding-top: 4px; }
-    .st-hero .brand { width:110px; height:110px; object-fit:contain; }
-    .st-hero h1 { margin:0; line-height:1.05; }
-    .st-hero .tagline { margin:2px 0 0 2px; color:#6b7280; font-size:1.05rem; font-style:italic; }
-    [data-testid="stBlock"]{ margin-top:0 !important; }
-    </style>
-    """,
-    unsafe_allow_html=True
-)
-# =========================
-# Password
-# =========================
-# --- Password gate (branded, strict) ---
+
+# ---------- utilities used by the gate ----------
+def inline_logo(path="logo.png") -> str:
+    try:
+        p = Path(path)
+        if p.exists():
+            return f"data:image/png;base64,{base64.b64encode(p.read_bytes()).decode('ascii')}"
+    except Exception:
+        pass
+    return ""
+
+# ---------- Password gate (define BEFORE calling) ----------
 def add_password_gate() -> bool:
     """
     Shows a branded access screen until the correct password is entered.
-    Returns True when access is granted.
-    Blocks (shows admin instructions) if APP_PASSWORD is not configured.
+    Set the password through Settings → Secrets as APP_PASSWORD (or an env var).
     """
-    # 1) Read password from Secrets or Env
-    required = ""
+    # 1) Read required password
     try:
         required = st.secrets.get("APP_PASSWORD", "")
     except Exception:
         required = os.environ.get("APP_PASSWORD", "")
 
-    # 2) If not configured, BLOCK with admin message (no accidental bypass)
+    # 2) If not configured, block with an admin hint
     if not required:
         st.markdown(
             f"""
@@ -81,8 +65,8 @@ def add_password_gate() -> bool:
             </div>
             <div style="font-size:1.25rem;font-weight:700;margin:8px 0 4px 0;">Protected Area</div>
             <div style="color:#6b7280;margin-bottom:14px;">
-              Admin action required: set <code>APP_PASSWORD</code> in <b>Settings → Secrets</b> (or as an
-              environment variable) and restart the Space.
+              Admin action required: set <code>APP_PASSWORD</code> in <b>Settings → Secrets</b>
+              (or as an environment variable) and restart the Space.
             </div>
             """,
             unsafe_allow_html=True,
@@ -93,7 +77,7 @@ def add_password_gate() -> bool:
     if st.session_state.get("auth_ok", False):
         return True
 
-    # 4) Branded prompt
+    # 4) Prompt
     st.markdown(
         f"""
         <div style="display:flex;align-items:center;gap:14px;margin:8px 0 6px 0;">
@@ -110,7 +94,6 @@ def add_password_gate() -> bool:
         """,
         unsafe_allow_html=True
     )
-
     pwd = st.text_input("Access key", type="password", placeholder="••••••••")
     col1, _ = st.columns([1, 3])
     with col1:
@@ -120,12 +103,33 @@ def add_password_gate() -> bool:
                 st.rerun()
             else:
                 st.error("Incorrect key. Please try again.")
-
-    # Don’t proceed until correct
     st.stop()
 
+# 🔒 Enforce gate BEFORE any UI is rendered
+add_password_gate()
+
+# After the gate: global CSS/UI may render
+st.markdown("<style>header, footer{visibility:hidden !important;}</style>", unsafe_allow_html=True)
+st.markdown(
+    """
+    <style>
+    .stApp { background: #FFFFFF; }
+    section[data-testid="stSidebar"] { background: #F6F9FC; }
+    .block-container { padding-top: .5rem; padding-bottom: .5rem; }
+    .stButton>button{ background:#007bff; color:#fff; font-weight:bold; border-radius:8px; border:none; padding:10px 24px; }
+    .stButton>button:hover{ background:#0056b3; }
+    .st-hero { display:flex; align-items:center; gap:16px; padding-top: 4px; }
+    .st-hero .brand { width:110px; height:110px; object-fit:contain; }
+    .st-hero h1 { margin:0; line-height:1.05; }
+    .st-hero .tagline { margin:2px 0 0 2px; color:#6b7280; font-size:1.05rem; font-style:italic; }
+    [data-testid="stBlock"]{ margin-top:0 !important; }
+    </style>
+    """,
+    unsafe_allow_html=True
+)
+
 # =========================
-# Helpers
+# Helpers / caching
 # =========================
 try:
     dialog = st.dialog
@@ -173,7 +177,7 @@ def find_sheet(book, names):
         if nm.lower() in low2orig: return low2orig[nm.lower()]
     return None
 
-# ---------- Interactive plotting (full outline, bold axis titles) ----------
+# ---------- Interactive plotting ----------
 def cross_plot_interactive(actual, pred, size=(3.9, 3.9)):
     """Interactive cross-plot: blue points, dashed 1:1, equal axes, no title, numeric ticks, full box outline."""
     a = pd.Series(actual).astype(float)
@@ -184,28 +188,22 @@ def cross_plot_interactive(actual, pred, size=(3.9, 3.9)):
     x0, x1 = lo - pad, hi + pad
 
     fig = go.Figure()
-
-    # Points (blue)
     fig.add_trace(go.Scatter(
         x=a, y=p, mode="markers",
         marker=dict(size=6, color=COLORS["pred"]),
         hovertemplate="Actual: %{x:.2f}<br>Pred: %{y:.2f}<extra></extra>",
         showlegend=False
     ))
-
-    # 1:1 line (dashed grey)
     fig.add_trace(go.Scatter(
         x=[x0, x1], y=[x0, x1], mode="lines",
         line=dict(color=COLORS["ref"], width=1.2, dash="dash"),
         hoverinfo="skip", showlegend=False
     ))
-
     fig.update_layout(
         paper_bgcolor="#ffffff", plot_bgcolor="#ffffff",
         margin=dict(l=50, r=10, t=10, b=36),
         hovermode="closest", font=dict(size=13)
     )
-    # FULL OUTLINE via mirror=True (top/right) + showline
     fig.update_xaxes(
         title_text="<b>Actual UCS</b>",
         range=[x0, x1], ticks="outside",
@@ -221,8 +219,7 @@ def cross_plot_interactive(actual, pred, size=(3.9, 3.9)):
         tickformat=",.0f", scaleanchor="x", scaleratio=1,
         automargin=True
     )
-    w = int(size[0] * 100); h = int(size[1] * 100)
-    fig.update_layout(width=w, height=h)
+    fig.update_layout(width=int(size[0]*100), height=int(size[1]*100))
     return fig
 
 def depth_or_index_track_interactive(df, title=None, include_actual=True):
@@ -234,15 +231,12 @@ def depth_or_index_track_interactive(df, title=None, include_actual=True):
         y = np.arange(1, len(df) + 1); y_label = "Point Index"
 
     fig = go.Figure()
-
-    # Predicted (solid blue)
     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:.2f}<br>"+y_label+": %{y}<extra></extra>"
     ))
-    # Actual (dotted yellow)
     if include_actual and TARGET in df.columns:
         fig.add_trace(go.Scatter(
             x=df[TARGET], y=y, mode="lines",
@@ -250,7 +244,6 @@ def depth_or_index_track_interactive(df, title=None, include_actual=True):
             name="UCS (actual)",
             hovertemplate="UCS (actual): %{x:.2f}<br>"+y_label+": %{y}<extra></extra>"
         ))
-
     fig.update_layout(
         paper_bgcolor="#ffffff", plot_bgcolor="#ffffff",
         margin=dict(l=60, r=10, t=10, b=36),
@@ -263,7 +256,6 @@ def depth_or_index_track_interactive(df, title=None, include_actual=True):
         width=int(3.1 * 100),
         height=int((7.6 if depth_col is not None else 7.2) * 100),
     )
-    # FULL OUTLINE via mirror=True (adds bottom/right sides)
     fig.update_xaxes(
         title_text="<b>UCS</b>", side="top",
         ticks="outside", showline=True, linewidth=1.2, linecolor="#444", mirror=True,
@@ -340,27 +332,29 @@ def preview_modal_val(book: dict[str, pd.DataFrame], feature_cols: list[str]):
 # =========================
 # Model presence
 # =========================
-MODEL_URL = _get_model_url()
-
-def ensure_model_present() -> Path:
-    for p in [DEFAULT_MODEL, *MODEL_FALLBACKS]:
-        if p.exists() and p.stat().st_size > 0:
-            return p
-    if not MODEL_URL:
-        return None
+def _download_model(url: str, dest: Path) -> bool:
     try:
         import requests
-        DEFAULT_MODEL.parent.mkdir(parents=True, exist_ok=True)
+        dest.parent.mkdir(parents=True, exist_ok=True)
         with st.status("Downloading model…", expanded=False):
-            with requests.get(MODEL_URL, stream=True, timeout=30) as r:
+            with requests.get(url, stream=True, timeout=30) as r:
                 r.raise_for_status()
-                with open(DEFAULT_MODEL, "wb") as f:
-                    for chunk in r.iter_content(chunk_size=1<<20):
+                with open(dest, "wb") as f:
+                    for chunk in r.iter_content(chunk_size=1 << 20):
                         if chunk: f.write(chunk)
-        return DEFAULT_MODEL
+        return True
     except Exception as e:
         st.error(f"Failed to download model from MODEL_URL: {e}")
-        return None
+        return False
+
+MODEL_URL = _get_model_url()
+def ensure_model_present() -> Path | None:
+    for p in [DEFAULT_MODEL, *MODEL_FALLBACKS]:
+        if p.exists() and p.stat().st_size > 0:
+            return p
+    if MODEL_URL and _download_model(MODEL_URL, DEFAULT_MODEL):
+        return DEFAULT_MODEL
+    return None
 
 model_path = ensure_model_present()
 if not model_path:
@@ -379,19 +373,22 @@ if meta_path.exists():
     try:
         meta = json.loads(meta_path.read_text(encoding="utf-8"))
         FEATURES = meta.get("features", FEATURES); TARGET = meta.get("target", TARGET)
-    except Exception: pass
+    except Exception:
+        pass
 else:
     def infer_features_from_model(m):
         try:
             if hasattr(m, "feature_names_in_") and len(getattr(m, "feature_names_in_")):
                 return [str(x) for x in m.feature_names_in_]
-        except Exception: pass
+        except Exception:
+            pass
         try:
             if hasattr(m, "steps") and len(m.steps):
                 last = m.steps[-1][1]
                 if hasattr(last, "feature_names_in_") and len(last.feature_names_in_):
                     return [str(x) for x in last.feature_names_in_]
-        except Exception: pass
+        except Exception:
+            pass
         return None
     infer = infer_features_from_model(model)
     if infer: FEATURES = infer
@@ -418,16 +415,8 @@ for k, v in {
     if k not in st.session_state: st.session_state[k] = v
 
 # =========================
-# Hero header
+# Hero header (after gate)
 # =========================
-def inline_logo(path="logo.png") -> str:
-    try:
-        p = Path(path)
-        if not p.exists(): return ""
-        return f"data:image/png;base64,{base64.b64encode(p.read_bytes()).decode('ascii')}"
-    except Exception:
-        return ""
-
 st.markdown(
     f"""
     <div class="st-hero">
@@ -446,9 +435,7 @@ st.markdown(
 # =========================
 if st.session_state.app_step == "intro":
     st.header("Welcome!")
-    st.markdown(
-        "This software is developed by *Smart Thinking AI-Solutions Team* to estimate UCS from drilling data."
-    )
+    st.markdown("This software is developed by *Smart Thinking AI-Solutions Team* to estimate UCS from drilling data.")
     st.subheader("Expected Input Features (in Order)")
     st.markdown(
         "- Q, gpm — Flow rate (gallons per minute)  \n"
@@ -468,18 +455,17 @@ if st.session_state.app_step == "intro":
         st.session_state.app_step = "dev"; st.rerun()
 
 # =========================
-# MODEL DEVELOPMENT
+# Case Building
 # =========================
 if st.session_state.app_step == "dev":
-    st.sidebar.header("Model Development Data")
+    st.sidebar.header("Data for Case Building")
     dev_label = "Upload Data (Excel)" if not st.session_state.dev_file_name else "Replace data (Excel)"
     train_test_file = st.sidebar.file_uploader(dev_label, type=["xlsx","xls"], key="dev_upload")
 
     # Detect new/changed file and PERSIST BYTES
     if train_test_file is not None:
         try:
-            file_bytes = train_test_file.getvalue()
-            size = len(file_bytes)
+            file_bytes = train_test_file.getvalue(); size = len(file_bytes)
         except Exception:
             file_bytes = b""; size = 0
         sig = (train_test_file.name, size)
@@ -497,7 +483,7 @@ if st.session_state.app_step == "dev":
                 st.session_state.dev_previewed = False
                 st.session_state.dev_ready = False
 
-    # Sidebar caption (from persisted info)
+    # Sidebar caption
     if st.session_state.dev_file_loaded:
         st.sidebar.caption(
             f"**Data loaded:** {st.session_state.dev_file_name} • "
@@ -522,7 +508,7 @@ if st.session_state.app_step == "dev":
     # ----- ALWAYS-ON TOP: Title + helper -----
     helper_top = st.container()
     with helper_top:
-        st.subheader("Model Development")
+        st.subheader("Case Building")
         if st.session_state.dev_ready:
             st.success("Case has been built and results are displayed below.")
         elif st.session_state.dev_file_loaded and st.session_state.dev_previewed:
@@ -704,7 +690,7 @@ if st.session_state.app_step == "predict":
         if sv["oor_pct"] > 0:
             st.warning("Some validation inputs fall outside the **training min–max** ranges. Interpret predictions with caution.")
 
-        # Metrics like Development (R² / RMSE / MAE)
+        # Prefer dev-like metrics when actual UCS exists
         metrics_val = st.session_state.results.get("metrics_val")
         if metrics_val is not None:
             c1, c2, c3 = st.columns(3)
@@ -712,11 +698,11 @@ if st.session_state.app_step == "predict":
             c2.metric("RMSE", f"{metrics_val['RMSE']:.4f}")
             c3.metric("MAE",  f"{metrics_val['MAE']:.4f}")
         else:
-            # Fallback only if actual UCS isn't provided
-            c1, c2, c3 = st.columns(3)
-            c1.metric("# points", f"{sv['n_points']}")
+            c1, c2, c3, c4 = st.columns(4)
+            c1.metric("points", f"{sv['n_points']}")
             c2.metric("Pred min", f"{sv['pred_min']:.2f}")
             c3.metric("Pred max", f"{sv['pred_max']:.2f}")
+            c4.metric("OOR %",   f"{sv['oor_pct']:.1f}%")
 
         left, right = st.columns([0.9, 0.55])
         with left:
@@ -780,4 +766,4 @@ st.markdown(
     </div>
     """,
     unsafe_allow_html=True
-)
+)