Update app.py

app.py

@@ -80,9 +80,9 @@ def parse_excel(data_bytes: bytes):
     xl = pd.ExcelFile(bio)
     return {sh: xl.parse(sh) for sh in xl.sheet_names}
 
-def read_book(upload):
-    if upload is None: return {}
-    try: return parse_excel(upload.getvalue())
+def read_book_bytes(data_bytes: bytes):
+    if not data_bytes: return {}
+    try: return parse_excel(data_bytes)
     except Exception as e:
         st.error(f"Failed to read Excel: {e}"); return {}
 
@@ -114,7 +114,7 @@ def depth_or_index_track(df, title=None, include_actual=True):
         ax.plot(df["UCS_Pred"], df[depth_col], '-', lw=1.8, color=COLORS["pred"], label="UCS_Pred")
         if include_actual and TARGET in df.columns:
             ax.plot(df[TARGET], df[depth_col], ':', lw=2.0, color=COLORS["actual"], alpha=0.95, label="UCS (actual)")
-        ax.set_ylabel(depth_col); ax.set_xlabel("UCS")
+        ax.set.ylabel(depth_col); ax.set_xlabel("UCS")
         ax.xaxis.set_label_position('top'); ax.xaxis.tick_top(); ax.invert_yaxis()
     else:
         idx = np.arange(1, len(df) + 1)
@@ -275,14 +275,20 @@ else:
 if "app_step" not in st.session_state: st.session_state.app_step = "intro"
 if "results" not in st.session_state: st.session_state.results = {}
 if "train_ranges" not in st.session_state: st.session_state.train_ranges = None
-if "dev_ready" not in st.session_state: st.session_state.dev_ready = False
-if "dev_file_loaded" not in st.session_state: st.session_state.dev_file_loaded = False
-if "dev_previewed" not in st.session_state: st.session_state.dev_previewed = False
-if "dev_file_signature" not in st.session_state: st.session_state.dev_file_signature = None
-if "dev_preview_request" not in st.session_state: st.session_state.dev_preview_request = False
 
-if ("Train" in st.session_state.results) or ("Test" in st.session_state.results):
-    st.session_state.dev_ready = True
+# Dev page state (persist file)
+for k, v in {
+    "dev_ready": False,
+    "dev_file_loaded": False,
+    "dev_previewed": False,
+    "dev_file_signature": None,
+    "dev_preview_request": False,
+    "dev_file_bytes": b"",
+    "dev_file_name": "",
+    "dev_file_rows": 0,
+    "dev_file_cols": 0,
+}.items():
+    if k not in st.session_state: st.session_state[k] = v
 
 # =========================
 # Hero header
@@ -308,7 +314,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("Required Input Columns")
+    st.subheader("Expected Input Features")
     st.markdown(
         "- Q, gpm — Flow rate (gallons per minute)  \n"
         "- SPP(psi) — Stand pipe pressure  \n"
@@ -331,35 +337,43 @@ if st.session_state.app_step == "intro":
 # =========================
 if st.session_state.app_step == "dev":
     st.sidebar.header("Model Development Data")
-    dev_label = "Upload Data (Excel)" if not st.session_state.get("dev_file_name") else "Replace data (Excel)"
+    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 by signature (name + size)
+    # Detect new/changed file and PERSIST BYTES
     if train_test_file is not None:
         try:
-            size = train_test_file.size
+            file_bytes = train_test_file.getvalue()
+            size = len(file_bytes)
         except Exception:
-            size = len(train_test_file.getvalue())
+            file_bytes = b""
+            size = 0
         sig = (train_test_file.name, size)
-        if sig != st.session_state.dev_file_signature:
-            # NEW upload => reset state
+        if sig != st.session_state.dev_file_signature and size > 0:
             st.session_state.dev_file_signature = sig
             st.session_state.dev_file_name = train_test_file.name
-            _book_tmp = read_book(train_test_file)
+            st.session_state.dev_file_bytes = file_bytes
+            # Inspect first sheet for rows/cols
+            _book_tmp = read_book_bytes(file_bytes)
             if _book_tmp:
                 first_df = next(iter(_book_tmp.values()))
-                st.sidebar.caption(f"**Data loaded:** {train_test_file.name} • {first_df.shape[0]} rows × {first_df.shape[1]} cols")
+                st.session_state.dev_file_rows = int(first_df.shape[0])
+                st.session_state.dev_file_cols = int(first_df.shape[1])
                 st.session_state.dev_file_loaded = True
                 st.session_state.dev_previewed = False
                 st.session_state.dev_ready = False
-        else:
-            # Same file, keep existing state
-            st.session_state.dev_file_loaded = True
+
+    # Sidebar caption (from persisted info)
+    if st.session_state.dev_file_loaded:
+        st.sidebar.caption(
+            f"**Data loaded:** {st.session_state.dev_file_name} • "
+            f"{st.session_state.dev_file_rows} rows × {st.session_state.dev_file_cols} cols"
+        )
 
     # Sidebar actions
     preview_btn = st.sidebar.button("Preview data", use_container_width=True, disabled=not st.session_state.dev_file_loaded)
-    if preview_btn and st.session_state.dev_file_loaded and train_test_file is not None:
-        st.session_state.dev_preview_request = True  # defer opening modal until after helper renders
+    if preview_btn and st.session_state.dev_file_loaded:
+        st.session_state.dev_preview_request = True
 
     run_btn = st.sidebar.button("Run Model", type="primary", use_container_width=True)
 
@@ -385,16 +399,16 @@ if st.session_state.app_step == "dev":
             st.write("**Upload your data to build a case, then run the model to review development performance.**")
 
     # If user clicked preview, open modal *after* helper so helper stays on top
-    if st.session_state.dev_preview_request and train_test_file is not None:
-        _book = read_book(train_test_file)
+    if st.session_state.dev_preview_request and st.session_state.dev_file_bytes:
+        _book = read_book_bytes(st.session_state.dev_file_bytes)
         st.session_state.dev_previewed = True
         st.session_state.dev_preview_request = False
         preview_modal_dev(_book, FEATURES)
 
-    # Run model
-    if run_btn and train_test_file is not None:
+    # Run model (from persisted bytes)
+    if run_btn and st.session_state.dev_file_bytes:
         with st.status("Processing…", expanded=False) as status:
-            book = read_book(train_test_file)
+            book = read_book_bytes(st.session_state.dev_file_bytes)
             if not book: status.update(label="Failed to read workbook.", state="error"); st.stop()
             status.update(label="Workbook read ✓")
             sh_train = find_sheet(book, ["Train","Training","training2","train","training"])
@@ -470,21 +484,20 @@ if st.session_state.app_step == "dev":
             st.warning(str(e))
 
 # =========================
-# PREDICTION (Validation)
+# PREDICTION (Validation) — (kept simple; uploader works fine)
 # =========================
 if st.session_state.app_step == "predict":
     st.sidebar.header("Prediction (Validation)")
-    val_label = "Upload Validation Excel" if not st.session_state.get("val_file_name") else "Replace data (Excel)"
-    validation_file = st.sidebar.file_uploader(val_label, type=["xlsx","xls"], key="val_upload")
+    validation_file = st.sidebar.file_uploader("Upload Validation Excel", type=["xlsx","xls"], key="val_upload")
     if validation_file is not None:
-        _book_tmp = read_book(validation_file)
+        _book_tmp = read_book_bytes(validation_file.getvalue())
         if _book_tmp:
             first_df = next(iter(_book_tmp.values()))
             st.sidebar.caption(f"**Data loaded:** {validation_file.name} • {first_df.shape[0]} rows × {first_df.shape[1]} cols")
 
     preview_val_btn = st.sidebar.button("Preview data", use_container_width=True, disabled=(validation_file is None))
     if preview_val_btn and validation_file is not None:
-        _book = read_book(validation_file)
+        _book = read_book_bytes(validation_file.getvalue())
         preview_modal_val(_book, FEATURES)
 
     predict_btn = st.sidebar.button("Predict", type="primary", use_container_width=True)
@@ -495,7 +508,7 @@ if st.session_state.app_step == "predict":
 
     if predict_btn and validation_file is not None:
         with st.status("Predicting…", expanded=False) as status:
-            vbook = read_book(validation_file)
+            vbook = read_book_bytes(validation_file.getvalue())
             if not vbook: status.update(label="Could not read the Validation Excel.", state="error"); st.stop()
             status.update(label="Workbook read ✓")
             vname = find_sheet(vbook, ["Validation","Validate","validation2","Val","val"]) or list(vbook.keys())[0]
@@ -581,10 +594,11 @@ if st.session_state.app_step == "predict":
 # =========================
 st.markdown("---")
 st.markdown(
-    "<div style='text-align:center; color:#6b7280;'>"
-    "ST_GeoMech_UCS • © Smart Thinking • "
-    "Visit our Website: "
-         "<a href='https://www.smartthinking.com.sa' target='_blank'>Visit our Website: smartthinking.com.sa</a>"
-    "</div>",
+    """
+    <div style='text-align:center; color:#6b7280; line-height:1.6'>
+      ST_GeoMech_UCS • © Smart Thinking<br/>
+      <strong>Visit our website:</strong> <a href='https://www.smartthinking.com.sa' target='_blank'>smartthinking.com.sa</a>
+    </div>
+    """,
     unsafe_allow_html=True
 )