Update app.py

app.py

@@ -39,7 +39,6 @@ from appStore.crs_utils import lookup_crs_value
 ###########################################
 # Model Config
 ###########################################
-
 config = configparser.ConfigParser()
 config.read('model_params.cfg')
 
@@ -123,13 +122,28 @@ country_name_mapping, iso_code_to_sub_region = get_country_name_and_region_mappi
 )
 unique_country_names = sorted(country_name_mapping.keys())
 
+###########################################
+# Define reset_filters function using session_state
+###########################################
+def reset_filters():
+    st.session_state["region_filter"] = "All/Not allocated"
+    st.session_state["country_filter"] = "All/Not allocated"
+    current_year = datetime.now().year
+    default_start_year = current_year - 4
+    st.session_state["end_year_range"] = (default_start_year, max_end_year)
+    st.session_state["crs_filter"] = "All/Not allocated"
+    st.session_state["min_budget"] = min_budget_val
+    st.session_state["client_filter"] = "All/Not allocated"
+    # Optionally reset page number
+    st.session_state["page"] = 1
+
 ###########################################
 # Filter Controls - Row 1
 ###########################################
 col1, col2, col3, col4, col5 = st.columns([1, 1, 1, 1, 1])
 
 with col1:
-    region_filter = st.selectbox("Region", ["All/Not allocated"] + sorted(unique_sub_regions))
+    region_filter = st.selectbox("Region", ["All/Not allocated"] + sorted(unique_sub_regions), key="region_filter")
 
 if region_filter == "All/Not allocated":
     filtered_country_names = unique_country_names
@@ -140,7 +154,7 @@ else:
     ]
 
 with col2:
-    country_filter = st.selectbox("Country", ["All/Not allocated"] + filtered_country_names)
+    country_filter = st.selectbox("Country", ["All/Not allocated"] + filtered_country_names, key="country_filter")
 
 with col3:
     current_year = datetime.now().year
@@ -149,33 +163,32 @@ with col3:
         "Project End Year", 
         min_value=2010, 
         max_value=max_end_year, 
-        value=(default_start_year, max_end_year)
+        value=(default_start_year, max_end_year),
+        key="end_year_range"
     )
 
 with col4:
     crs_options = ["All/Not allocated"] + get_crs_options(client, collection_name)
-    crs_filter = st.selectbox("CRS", crs_options)
+    crs_filter = st.selectbox("CRS", crs_options, key="crs_filter")
 
 with col5:
     min_budget = st.slider(
         "Minimum Project Budget (Million €)",
         min_value=min_budget_val,
         max_value=max_budget_val,
-        value=min_budget_val
+        value=min_budget_val,
+        key="min_budget"
     )
 
 
-
 ###########################################
 # Filter Controls - Row 2 (Additional Filters)
 ###########################################
 col1_2, col2_2, col3_2, col4_2, col5_2 = st.columns(5)
 
 with col1_2:
-    # Get unique clients from project_data; adjust column name as needed.
     client_options = sorted(project_data["client"].dropna().unique().tolist())
-    client_filter = st.selectbox("Client", ["All/Not allocated"] + client_options)
-# Columns 2-4 reserved (empty)
+    client_filter = st.selectbox("Client", ["All/Not allocated"] + client_options, key="client_filter")
 with col2_2:
     st.empty()
 with col3_2:
@@ -183,10 +196,11 @@ with col3_2:
 with col4_2:
     st.empty()
 with col5_2:
-    if st.button("Reset Filters"):  # MOD: Reset button in filter row 2, col5
-         st.experimental_rerun()
+    st.button("Reset Filters", on_click=reset_filters)
+
 
 show_exact_matches = st.checkbox("Show only exact matches", value=False)
+
 ###########################################
 # Main Search / Results
 ###########################################
@@ -230,7 +244,7 @@ else:
         get_country_name
     )
 
-    # Additional filter by client (MOD: added client filter)
+    # Additional filter by client
     if client_filter != "All/Not allocated":
         filtered_semantic = [r for r in filtered_semantic if r.payload.get("metadata", {}).get("client", "Unknown Client") == client_filter]
         filtered_lexical = [r for r in filtered_lexical if r.payload.get("metadata", {}).get("client", "Unknown Client") == client_filter]
@@ -240,9 +254,6 @@ else:
     filtered_lexical_no_dupe = remove_duplicates(filtered_lexical)
 
     def format_currency(value):
-        """
-        Format a numeric or string value as currency (EUR) with commas.
-        """
         try:
             return f"€{int(float(value)):,}"
         except (ValueError, TypeError):
@@ -250,8 +261,7 @@ else:
 
     # 3) Display results
     if show_exact_matches:
-        # Lexical substring match only
-        st.write("Showing **Top Lexical Search results**")  # MOD: Removed RAG answer for lexical search
+        st.write("Showing **Top Lexical Search results**")
         query_substring = var.strip().lower()
         lexical_substring_filtered = [
             r for r in filtered_lexical 
@@ -261,18 +271,15 @@ else:
         if not filtered_lexical_no_dupe:
             st.write('No exact matches, consider unchecking "Show only exact matches"')
         else:
-            # Use all matching lexical results (or slice as desired)
-            top_results = filtered_lexical_no_dupe  # or use [:15] if you want to limit
+            top_results = filtered_lexical_no_dupe  # Show all matching lexical results
             for res in top_results:
                 metadata = res.payload.get('metadata', {})
                 if "title" not in metadata:
                     metadata["title"] = compute_title(metadata)
-                # MOD: Remove hyperlink from title by stripping <a> tags.
                 title_html = highlight_query(metadata["title"], var) if var.strip() else metadata["title"]
                 title_clean = re.sub(r'<a.*?>|</a>', '', title_html)
                 st.markdown(f"#### {title_clean}", unsafe_allow_html=True)
 
-                # Description snippet
                 objective = metadata.get("objective", "None")
                 desc_en = metadata.get("description.en", "").strip()
                 desc_de = metadata.get("description.de", "").strip()
@@ -316,30 +323,28 @@ else:
                     contact = metadata.get("contact", "").strip()
                     if contact and contact.lower() != "transparenz@giz.de":
                         additional_text += f"<br>**Contact:** xxx@giz.de"
-
                     st.markdown(additional_text, unsafe_allow_html=True)
 
                 st.divider()
-
     else:
-        # Semantic results
         if not filtered_semantic_no_dupe:
             st.write("No relevant results found.")
         else:
-            # MOD: Pagination for semantic search results
             page_size = 15
             total_results = len(filtered_semantic_no_dupe)
             total_pages = (total_results - 1) // page_size + 1
-            if total_pages > 1:
-                page = st.selectbox("Page", list(range(1, total_pages + 1)))
-            else:
-                page = 1
-            start_index = (page - 1) * page_size
+
+            # Use session_state for page selection; default to 1 if not set.
+            if "page" not in st.session_state:
+                st.session_state.page = 1
+            current_page = st.session_state.page
+
+            start_index = (current_page - 1) * page_size
             end_index = start_index + page_size
             top_results = filtered_semantic_no_dupe[start_index:end_index]
-            st.write(f"Showing **{len(top_results)}** Semantic Search results (Page {page} of {total_pages})")
-            
-            # MOD: Only display the RAG answer for semantic search and style it distinctively.
+
+            st.write(f"Showing **{len(top_results)}** Semantic Search results (Page {current_page} of {total_pages})")
+
             rag_answer = get_rag_answer(var, top_results, DEDICATED_ENDPOINT, WRITE_ACCESS_TOKEN)
             st.markdown(
                 f"<div style='background-color: #f0f0f0; color: #333; padding: 10px; border-radius: 5px; font-size:1.2em; text-align:center;'>{rag_answer}</div>", 
@@ -351,7 +356,6 @@ else:
                 metadata = res.payload.get('metadata', {})
                 if "title" not in metadata:
                     metadata["title"] = compute_title(metadata)
-                # MOD: Remove hyperlink from project title
                 title_clean = re.sub(r'<a.*?>|</a>', '', metadata["title"])
                 st.markdown(f"#### {title_clean}")
 
@@ -398,7 +402,10 @@ else:
                     contact = metadata.get("contact", "").strip()
                     if contact and contact.lower() != "transparenz@giz.de":
                         additional_text += f"<br>**Contact:** xxx@giz.de"
-
                     st.markdown(additional_text, unsafe_allow_html=True)
 
                 st.divider()
+
+            # Pagination widget moved to the very end of the page
+            new_page = st.selectbox("Select Page", list(range(1, total_pages + 1)), index=current_page - 1, key="page")
+            # The selected page value automatically updates st.session_state["page"]