Update app.py

app.py

@@ -26,8 +26,7 @@ from appStore.region_utils import (
 from appStore.rag_utils import (
     highlight_query,
     get_rag_answer,
-    compute_title,
-    format_project_id  # formatting function for project IDs
+    compute_title
 )
 from appStore.filter_utils import (
     parse_budget,
@@ -94,8 +93,8 @@ with col_about:
             """, unsafe_allow_html=True
         )
 
-# Main query input (with a key so we can reset it)
-var = st.text_input("Enter Question", key="query")
+# Main query input
+var = st.text_input("Enter Question")
 
 ###########################################
 # Create or load the embeddings collection
@@ -127,16 +126,15 @@ 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"]
+    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["crs_filter"] = "All/Not allocated"
     st.session_state["min_budget"] = min_budget_val
-    st.session_state["client_filter"] = ["All/Not allocated"]
-    st.session_state["query"] = ""
-    st.session_state["show_exact_matches"] = False
+    st.session_state["client_filter"] = "All/Not allocated"
+    # Optionally reset page number
     st.session_state["page"] = 1
 
 ###########################################
@@ -145,23 +143,18 @@ 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"
-    )
-if "All/Not allocated" in region_filter or not region_filter:
+    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
 else:
     filtered_country_names = [
         name for name, code in country_name_mapping.items() 
-        if iso_code_to_sub_region.get(code) in region_filter
+        if iso_code_to_sub_region.get(code) == region_filter
     ]
 
 with col2:
-    country_filter = st.multiselect(
-        "Country", options=["All/Not allocated"] + filtered_country_names,
-        default=["All/Not allocated"], key="country_filter"
-    )
+    country_filter = st.selectbox("Country", ["All/Not allocated"] + filtered_country_names, key="country_filter")
 
 with col3:
     current_year = datetime.now().year
@@ -176,10 +169,7 @@ 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.selectbox("CRS", crs_options, key="crs_filter")
 
 with col5:
     min_budget = st.slider(
@@ -190,6 +180,7 @@ with col5:
         key="min_budget"
     )
 
+
 ###########################################
 # Filter Controls - Row 2 (Additional Filters)
 ###########################################
@@ -197,10 +188,7 @@ 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.selectbox("Client", ["All/Not allocated"] + client_options, key="client_filter")
 with col2_2:
     st.empty()
 with col3_2:
@@ -208,42 +196,10 @@ with col3_2:
 with col4_2:
     st.empty()
 with col5_2:
-    st.button("Reset Filters", on_click=reset_filters, key="reset_button_row2")
+    st.button("Reset Filters", on_click=reset_filters)
 
-###########################################
-# Filter Controls - Row 3 (Remaining Filter)
-###########################################
-col1_3, col2_3, col3_3, col4_3, col5_3 = st.columns(5)
-with col1_3:
-    # Place the "Show only exact matches" checkbox here
-    show_exact_matches = st.checkbox("Show only exact matches", key="show_exact_matches")
-with col2_3:
-    st.empty()
-with col3_3:
-    st.empty()
-with col4_3:
-    st.empty()
-with col5_3:
-    # Right-align a more prominent reset button
-    with st.container():
-        st.markdown("<div style='text-align: right;'>", unsafe_allow_html=True)
-        if st.button("**Reset Filters**", key="reset_button_row3"):
-            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)
+show_exact_matches = st.checkbox("Show only exact matches", value=False)
 
 ###########################################
 # Main Search / Results
@@ -262,13 +218,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 using the processed values
+    # 2) Filter results based on the user’s selections
     filtered_semantic = filter_results(
         semantic_thresholded, 
-        country_filter_val, 
-        region_filter_val, 
+        country_filter, 
+        region_filter, 
         end_year_range, 
-        crs_filter_val, 
+        crs_filter, 
         min_budget,
         region_df, 
         iso_code_to_sub_region,
@@ -277,10 +233,10 @@ else:
     )
     filtered_lexical = filter_results(
         lexical_all, 
-        country_filter_val, 
-        region_filter_val, 
+        country_filter, 
+        region_filter, 
         end_year_range, 
-        crs_filter_val, 
+        crs_filter, 
         min_budget,
         region_df, 
         iso_code_to_sub_region,
@@ -288,10 +244,10 @@ else:
         get_country_name
     )
 
-    # 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]
+    # 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]
 
     # Remove duplicates
     filtered_semantic_no_dupe = remove_duplicates(filtered_semantic)
@@ -303,11 +259,7 @@ else:
         except (ValueError, TypeError):
             return value
 
-    # --- Reprint Query (Left aligned with "Query:") ---
-    st.markdown(f"<div style='text-align: left; font-size:2.1em; font-style: italic; font-weight: bold;'>Query: {var}</div>", unsafe_allow_html=True)
-
     # 3) Display results
-    # Lexical Search Results Branch
     if show_exact_matches:
         st.write("Showing **Top Lexical Search results**")
         query_substring = var.strip().lower()
@@ -320,32 +272,13 @@ else:
             st.write('No exact matches, consider unchecking "Show only exact matches"')
         else:
             top_results = filtered_lexical_no_dupe  # Show all matching lexical results
-
-            # --- Pagination (Above Lexical Results) ---
-            page_size = 15
-            total_results = len(top_results)
-            total_pages = (total_results - 1) // page_size + 1
-            if "page" not in st.session_state:
-                st.session_state.page = 1
-            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")
-            st.session_state.page = new_page_top
-
-            start_index = (st.session_state.page - 1) * page_size
-            end_index = start_index + page_size
-            paged_results = top_results[start_index:end_index]
-
-            for i, res in enumerate(paged_results, start=start_index+1):
+            for res in top_results:
                 metadata = res.payload.get('metadata', {})
                 if "title" not in metadata:
                     metadata["title"] = compute_title(metadata)
                 title_html = highlight_query(metadata["title"], var) if var.strip() else metadata["title"]
                 title_clean = re.sub(r'<a.*?>|</a>', '', title_html)
-                # Prepend the result number and make title bold
-                st.markdown(f"#### {i}. **{title_clean}**", unsafe_allow_html=True)
+                st.markdown(f"#### {title_clean}", unsafe_allow_html=True)
 
                 objective = metadata.get("objective", "None")
                 desc_en = metadata.get("description.en", "").strip()
@@ -364,6 +297,7 @@ else:
                     if remainder_text:
                         with st.expander("Show more"):
                             st.markdown(highlight_query(remainder_text, var), unsafe_allow_html=True)
+
                 with col_right:
                     start_year_str = extract_year(metadata.get('start_year', None)) or "Unknown"
                     end_year_str = extract_year(metadata.get('end_year', None)) or "Unknown"
@@ -377,41 +311,21 @@ else:
                     new_crs_value = lookup_crs_value(crs_key_clean)
                     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 in one row, formatted with format_project_id
-                    predecessor = metadata.get("predecessor_id", "").strip()
-                    successor = metadata.get("successor_id", "").strip()
-                    extra_line = ""
-                    if predecessor or successor:
-                        parts = []
-                        if predecessor:
-                            parts.append(f"**Predecessor Project:** {format_project_id(predecessor)}")
-                        if successor:
-                            parts.append(f"**Successor Project:** {format_project_id(successor)}")
-                        extra_line = "<br>" + " | ".join(parts)
-                    
+
                     additional_text = (
                         f"**Objective:** {highlight_query(objective, var)}<br>"
                         f"**Commissioned by:** {metadata.get('client', 'Unknown Client')}<br>"
                         f"**Projekt duration:** {start_year_str}-{end_year_str}<br>"
-                        f"**Budget:** Project: <b>{formatted_project_budget}</b>, Total volume: <b>{formatted_total_volume}</b>"
-                        + extra_line +
-                        f"<br>**Country:** {country_raw}<br>"
+                        f"**Budget:** Project: {formatted_project_budget}, Total volume: {formatted_total_volume}<br>"
+                        f"**Country:** {country_raw}<br>"
                         f"**Sector:** {crs_combined}"
                     )
                     contact = metadata.get("contact", "").strip()
                     if contact and contact.lower() != "[email protected]":
                         additional_text += f"<br>**Contact:** [email protected]"
                     st.markdown(additional_text, unsafe_allow_html=True)
-                st.divider()
 
-            # 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")
-            st.session_state.page = new_page_bot
-
-    # Semantic Search Results Branch
+                st.divider()
     else:
         if not filtered_semantic_no_dupe:
             st.write("No relevant results found.")
@@ -420,42 +334,30 @@ else:
             total_results = len(filtered_semantic_no_dupe)
             total_pages = (total_results - 1) // page_size + 1
 
+            # 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
 
-            # 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")
-            st.session_state.page = new_page_top
-
-            start_index = (st.session_state.page - 1) * page_size
+            start_index = (current_page - 1) * page_size
             end_index = start_index + page_size
             top_results = filtered_semantic_no_dupe[start_index:end_index]
 
-            # Prominent page info with bold numbers (green if current page != 1)
-            page_num = f"<b style='color: green;'>{st.session_state.page}</b>" if st.session_state.page != 1 else f"<b>{st.session_state.page}</b>"
-            total_pages_str = f"<b>{total_pages}</b>"
-            st.markdown(f"Showing **{len(top_results)}** Semantic Search results (Page {page_num} of {total_pages_str})", unsafe_allow_html=True)
+            st.write(f"Showing **{len(top_results)}** Semantic Search results (Page {current_page} of {total_pages})")
 
-            # --- RAG Answer (Left aligned, bullet points, with bold numbers) ---
             rag_answer = get_rag_answer(var, top_results, DEDICATED_ENDPOINT, WRITE_ACCESS_TOKEN)
-            bullet_lines = []
-            for line in rag_answer.splitlines():
-                if line.strip():
-                    line_bold = re.sub(r'(\d+)', r'<b>\1</b>', line)
-                    bullet_lines.append(f"<li>{line_bold}</li>")
-            formatted_rag_answer = "<ul style='text-align: left; list-style-position: inside;'>" + "".join(bullet_lines) + "</ul>"
-            st.markdown(formatted_rag_answer, unsafe_allow_html=True)
+            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>", 
+                unsafe_allow_html=True
+            )
             st.divider()
 
-            for i, res in enumerate(top_results, start=start_index+1):
+            for res in top_results:
                 metadata = res.payload.get('metadata', {})
                 if "title" not in metadata:
                     metadata["title"] = compute_title(metadata)
                 title_clean = re.sub(r'<a.*?>|</a>', '', metadata["title"])
-                st.markdown(f"#### {i}. **{title_clean}**", unsafe_allow_html=True)
+                st.markdown(f"#### {title_clean}")
 
                 desc_en = metadata.get("description.en", "").strip()
                 desc_de = metadata.get("description.de", "").strip()
@@ -474,6 +376,7 @@ else:
                     if remainder_text:
                         with st.expander("Show more"):
                             st.markdown(highlight_query(remainder_text, var), unsafe_allow_html=True)
+
                 with col_right:
                     start_year_str = extract_year(metadata.get('start_year', None)) or "Unknown"
                     end_year_str = extract_year(metadata.get('end_year', None)) or "Unknown"
@@ -487,35 +390,22 @@ else:
                     new_crs_value = lookup_crs_value(crs_key_clean)
                     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"
-                    
-                    predecessor = metadata.get("predecessor_id", "").strip()
-                    successor = metadata.get("successor_id", "").strip()
-                    extra_line = ""
-                    if predecessor or successor:
-                        parts = []
-                        if predecessor:
-                            parts.append(f"**Predecessor Project:** {format_project_id(predecessor)}")
-                        if successor:
-                            parts.append(f"**Successor Project:** {format_project_id(successor)}")
-                        extra_line = "<br>" + " | ".join(parts)
-                    
+
                     additional_text = (
                         f"**Objective:** {metadata.get('objective', '')}<br>"
                         f"**Commissioned by:** {metadata.get('client', 'Unknown Client')}<br>"
                         f"**Projekt duration:** {start_year_str}-{end_year_str}<br>"
-                        f"**Budget:** Project: <b>{formatted_project_budget}</b>, Total volume: <b>{formatted_total_volume}</b>"
-                        + extra_line +
-                        f"<br>**Country:** {country_raw}<br>"
+                        f"**Budget:** Project: {formatted_project_budget}, Total volume: {formatted_total_volume}<br>"
+                        f"**Country:** {country_raw}<br>"
                         f"**Sector:** {crs_combined}"
                     )
                     contact = metadata.get("contact", "").strip()
                     if contact and contact.lower() != "[email protected]":
                         additional_text += f"<br>**Contact:** [email protected]"
                     st.markdown(additional_text, unsafe_allow_html=True)
+
                 st.divider()
 
-            # 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")
-            st.session_state.page = new_page_bot
+            # 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"]