Update app.py

app.py

@@ -27,7 +27,7 @@ from appStore.rag_utils import (
     highlight_query,
     get_rag_answer,
     compute_title,
-    format_project_id  # <-- Imported formatting function
+    format_project_id  # formatting function for project IDs
 )
 from appStore.filter_utils import (
     parse_budget,
@@ -145,8 +145,10 @@ def reset_filters():
 col1, col2, col3, col4, col5 = st.columns([1, 1, 1, 1, 1])
 
 with col1:
-    region_filter = st.multiselect("Region", options=["All/Not allocated"] + sorted(unique_sub_regions),
-                                   default=["All/Not allocated"], key="region_filter")
+    region_filter = st.multiselect(
+        "Region", options=["All/Not allocated"] + sorted(unique_sub_regions),
+        default=["All/Not allocated"], key="region_filter"
+    )
 if "All/Not allocated" in region_filter or not region_filter:
     filtered_country_names = unique_country_names
 else:
@@ -156,8 +158,10 @@ else:
     ]
 
 with col2:
-    country_filter = st.multiselect("Country", options=["All/Not allocated"] + filtered_country_names,
-                                    default=["All/Not allocated"], key="country_filter")
+    country_filter = st.multiselect(
+        "Country", options=["All/Not allocated"] + filtered_country_names,
+        default=["All/Not allocated"], key="country_filter"
+    )
 
 with col3:
     current_year = datetime.now().year
@@ -172,8 +176,10 @@ with col3:
 
 with col4:
     crs_options = ["All/Not allocated"] + get_crs_options(client, collection_name)
-    crs_filter = st.multiselect("CRS", options=crs_options,
-                                default=["All/Not allocated"], key="crs_filter")
+    crs_filter = st.multiselect(
+        "CRS", options=crs_options,
+        default=["All/Not allocated"], key="crs_filter"
+    )
 
 with col5:
     min_budget = st.slider(
@@ -191,8 +197,10 @@ col1_2, col2_2, col3_2, col4_2, col5_2 = st.columns(5)
 
 with col1_2:
     client_options = sorted(project_data["client"].dropna().unique().tolist())
-    client_filter = st.multiselect("Client", options=["All/Not allocated"] + client_options,
-                                   default=["All/Not allocated"], key="client_filter")
+    client_filter = st.multiselect(
+        "Client", options=["All/Not allocated"] + client_options,
+        default=["All/Not allocated"], key="client_filter"
+    )
 with col2_2:
     st.empty()
 with col3_2:
@@ -223,6 +231,20 @@ with col5_3:
             reset_filters()
         st.markdown("</div>", unsafe_allow_html=True)
 
+###########################################
+# Helper function to process multiselect values
+###########################################
+def process_multiselect(filter_list):
+    if not filter_list or "All/Not allocated" in filter_list:
+        return None
+    return filter_list
+
+# Process filters before passing them on
+region_filter_val = process_multiselect(region_filter)
+country_filter_val = process_multiselect(country_filter)
+crs_filter_val = process_multiselect(crs_filter)
+client_filter_val = process_multiselect(client_filter)
+
 ###########################################
 # Main Search / Results
 ###########################################
@@ -240,14 +262,13 @@ else:
     # Apply threshold to semantic results if desired
     semantic_thresholded = [r for r in semantic_all if r.score >= 0.0]
 
-    # 2) Filter results based on the user’s selections
-    # (Assuming filter_results can handle a string "All/Not allocated" as meaning "no filter")
+    # 2) Filter results based on the user’s selections using the processed values
     filtered_semantic = filter_results(
         semantic_thresholded, 
-        country_filter, 
-        region_filter, 
+        country_filter_val, 
+        region_filter_val, 
         end_year_range, 
-        crs_filter, 
+        crs_filter_val, 
         min_budget,
         region_df, 
         iso_code_to_sub_region,
@@ -256,10 +277,10 @@ else:
     )
     filtered_lexical = filter_results(
         lexical_all, 
-        country_filter, 
-        region_filter, 
+        country_filter_val, 
+        region_filter_val, 
         end_year_range, 
-        crs_filter, 
+        crs_filter_val, 
         min_budget,
         region_df, 
         iso_code_to_sub_region,
@@ -267,10 +288,10 @@ else:
         get_country_name
     )
 
-    # Additional filter by client (if "All/Not allocated" is not selected)
-    if "All/Not allocated" not in client_filter:
-        filtered_semantic = [r for r in filtered_semantic if r.payload.get("metadata", {}).get("client", "Unknown Client") in client_filter]
-        filtered_lexical = [r for r in filtered_lexical if r.payload.get("metadata", {}).get("client", "Unknown Client") in client_filter]
+    # Additional filter by client (if client_filter_val is not None)
+    if client_filter_val is not None:
+        filtered_semantic = [r for r in filtered_semantic if r.payload.get("metadata", {}).get("client", "Unknown Client") in client_filter_val]
+        filtered_lexical = [r for r in filtered_lexical if r.payload.get("metadata", {}).get("client", "Unknown Client") in client_filter_val]
 
     # Remove duplicates
     filtered_semantic_no_dupe = remove_duplicates(filtered_semantic)
@@ -309,7 +330,8 @@ else:
             current_page = st.session_state.page
             # Top pagination widget (right aligned, occupying 1/7 of page width)
             col_pag_top = st.columns([6, 1])[1]
-            new_page_top = col_pag_top.selectbox("Select Page", list(range(1, total_pages + 1)), index=current_page - 1, key="page_top")
+            new_page_top = col_pag_top.selectbox("Select Page", list(range(1, total_pages + 1)),
+                                                  index=current_page - 1, key="page_top")
             st.session_state.page = new_page_top
 
             start_index = (st.session_state.page - 1) * page_size
@@ -356,7 +378,7 @@ else:
                     new_crs_value_clean = re.sub(r'\.0$', '', str(new_crs_value))
                     crs_combined = f"{crs_key_clean}: {new_crs_value_clean}" if crs_key_clean else "Unknown"
                     
-                    # Combine Predecessor and Successor (if available) in one row
+                    # Combine Predecessor and Successor in one row, formatted with format_project_id
                     predecessor = metadata.get("predecessor_id", "").strip()
                     successor = metadata.get("successor_id", "").strip()
                     extra_line = ""
@@ -385,7 +407,8 @@ else:
 
             # Bottom pagination widget
             col_pag_bot = st.columns([6, 1])[1]
-            new_page_bot = col_pag_bot.selectbox("Select Page", list(range(1, total_pages + 1)), index=st.session_state.page - 1, key="page_bot")
+            new_page_bot = col_pag_bot.selectbox("Select Page", list(range(1, total_pages + 1)),
+                                                  index=st.session_state.page - 1, key="page_bot")
             st.session_state.page = new_page_bot
 
     # Semantic Search Results Branch
@@ -403,7 +426,8 @@ else:
 
             # Top pagination widget (right aligned, occupying 1/7 of page width)
             col_pag_top = st.columns([6, 1])[1]
-            new_page_top = col_pag_top.selectbox("Select Page", list(range(1, total_pages + 1)), index=current_page - 1, key="page_top_sem")
+            new_page_top = col_pag_top.selectbox("Select Page", list(range(1, total_pages + 1)),
+                                                  index=current_page - 1, key="page_top_sem")
             st.session_state.page = new_page_top
 
             start_index = (st.session_state.page - 1) * page_size
@@ -492,5 +516,6 @@ else:
 
             # Bottom pagination widget (right aligned, occupying 1/7 width)
             col_pag_bot = st.columns([6, 1])[1]
-            new_page_bot = col_pag_bot.selectbox("Select Page", list(range(1, total_pages + 1)), index=st.session_state.page - 1, key="page_bot_sem")
+            new_page_bot = col_pag_bot.selectbox("Select Page", list(range(1, total_pages + 1)),
+                                                  index=st.session_state.page - 1, key="page_bot_sem")
             st.session_state.page = new_page_bot