Update page_files/Categorized_Search.py

page_files/Categorized_Search.py

@@ -10,21 +10,14 @@ from streamlit_scroll_to_top import scroll_to_here
 
 from data_loader import get_all_sections, load_material_data
 import streamlit.components.v1 as components
+import time
+t0 = time.time()
 def clear_search():
     """Clear the search box and search term. Called as a callback from other widgets."""
     st.session_state._search_term = None
     st.session_state["_pending_clear_search"] = True  
 
 def switch_tab(index, clear=True):
-    count = st.session_state.get('_tab_switch_count', 0) + 1
-    st.session_state['_tab_switch_count'] = count
-    components.html(f"""
-        <script>
-            var _unique = {count};
-            var tabs = window.parent.document.querySelectorAll('[data-testid="stTabs"] button[role="tab"]');
-            if (tabs.length > {index}) tabs[{index}].click();
-        </script>
-    """, height=0)
     st.session_state.current_tab = index
     if clear:
         clear_search()
@@ -352,6 +345,15 @@ def load_all_data() -> pd.DataFrame:
     return pd.concat(frames, ignore_index=True)
 
 
+@st.cache_data
+def get_all_sections_cached() -> list:
+    # get_all_sections() re-queries the DB directly (bypassing load_data's
+    # cache) every time it's called. Wrapping it here means the 3 DB round
+    # trips only happen once per session instead of on every single rerun
+    # (every row click, class pill click, page nav, etc).
+    return get_all_sections()
+
+
 def extract_matrix_fiber(abbr: str):
     if not isinstance(abbr, str):
         return None, None
@@ -435,6 +437,7 @@ defaults = {
     "inspect_property": None,
     "_reset_prop_checks": False,
     "_scroll_to_results": False, 
+    "current_tab": 0,
 }
 
 for key, value in defaults.items():
@@ -481,8 +484,8 @@ meta["Matrix"] = matrix_fiber.apply(
 meta["Fiber"] = matrix_fiber.apply(
     lambda pair: pair[1] if isinstance(pair, tuple) and len(pair) >= 2 else None
 )
-
-all_sections = get_all_sections()
+st.sidebar.write(f"meta build: {time.time() - t0:.2f}s")
+all_sections = get_all_sections_cached()
 
 if st.session_state._reset_prop_checks:
     selected = set(st.session_state.selected_props)
@@ -641,6 +644,39 @@ with left_col:
         #    st.session_state.current_page = 0
         #    st.rerun()
 
+        # if st.button(
+        #     "🔎 Inspect",
+        #     key="inspect_btn",
+        #     use_container_width=True,
+        #     type="primary",
+        #     disabled=st.session_state.selected_row is None,
+        # ):
+        #     st.info("Open the Inspect tab on the right panel.")
+        #     st.session_state["_switch_to_tab"] = 1
+        # if st.session_state.selected_row:
+        #     selected_abbr, selected_name = st.session_state.selected_row
+        #     st.markdown(
+        #         f"<div class='aim-selected'><b>Selected</b><br>{selected_name}<br><span style='font-family:monospace'>{selected_abbr}</span></div>",
+        #         unsafe_allow_html=True,
+        #     )
+                
+        #st.markdown("<div class='aim-sec'>📋 Property Types</div>", unsafe_allow_html=True)
+        #selected_props = []
+        #with st.container(height=480):
+        #    for index, section in enumerate(all_sections):
+        #        key = f"prop_check_{index}"
+        #        if key not in st.session_state:
+        #            st.session_state[key] = section in st.session_state.selected_props
+
+        #        if st.checkbox(section, key=key):
+        #            selected_props.append(section)
+
+        #if selected_props != st.session_state.selected_props:
+        #    st.session_state.selected_props = selected_props
+        #    st.session_state.current_page = 0
+        #    st.rerun()
+
+    with st.container(border=True):
         if st.button(
             "🔎 Inspect",
             key="inspect_btn",
@@ -648,7 +684,6 @@ with left_col:
             type="primary",
             disabled=st.session_state.selected_row is None,
         ):
-            st.info("Open the Inspect tab on the right panel.")
             st.session_state["_switch_to_tab"] = 1
         if st.session_state.selected_row:
             selected_abbr, selected_name = st.session_state.selected_row
@@ -656,6 +691,7 @@ with left_col:
                 f"<div class='aim-selected'><b>Selected</b><br>{selected_name}<br><span style='font-family:monospace'>{selected_abbr}</span></div>",
                 unsafe_allow_html=True,
             )
+
 if st.session_state.pop("_pending_clear_search", False):
     st.session_state.top_search_input = ""
 if st.session_state._search_term != st.session_state.get("_previous_search_term"):
@@ -711,21 +747,28 @@ with right_col:
         st.markdown(
             """
             <div style='padding:14px 18px 0;'>
-                <div class='aim-breadcrumb'>INVENTORY / <span>MATERIALS DATABASE</span></div>
+                <!-- <div class='aim-breadcrumb'>INVENTORY / <span>MATERIALS DATABASE</span></div> -->
                 <div class='aim-title'>Materials Database</div>
             </div>
             """,
             unsafe_allow_html=True,
         )
 
-        tab_materials, tab_inspect = st.tabs(
-            ["All Materials", "Inspect"]
-        )
+        if st.button("Clear Selection", key="clear_selection_btn", type="primary"):
+            st.session_state.selected_row = None
+            st.session_state["last_synced_abbr"] = None
+            df_key = f"materials_df_{st.session_state.current_page}"
+            if df_key in st.session_state:
+                st.session_state[df_key] = {"selection": {"rows": [], "columns": [], "cells": []}}
+            st.session_state["_switch_to_tab"] = 0
+            st.rerun()
+
         if st.session_state.get("_switch_to_tab") is not None:
             tab_index = st.session_state["_switch_to_tab"]
             switch_tab(tab_index, clear=(tab_index != 1))
             del st.session_state["_switch_to_tab"]
-        with tab_materials:
+
+        if st.session_state.current_tab == 0:
             filter_label = (
                 ", ".join(st.session_state.active_classes)
                 if st.session_state.active_classes
@@ -924,7 +967,7 @@ with right_col:
                                 
                                 st.rerun()
 
-        with tab_inspect:
+        else:
             if not st.session_state.selected_row:
                 st.warning("Select a material in All Materials first.")
             else:
@@ -1095,38 +1138,4 @@ with right_col:
 
                         if st.session_state._scroll_to_results:
                             scroll_to_here(0, key="inspect_results_scroll")
-                            st.session_state._scroll_to_results = False
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+                            st.session_state._scroll_to_results = False