Update app.py

app.py

@@ -34,9 +34,9 @@ collection_name = "giz_worldwide"
 client = get_client()
 print(client.get_collections())
 
-# Fetch unique country codes from the metadata for the dropdown
+# Fetch unique country codes and map to country names
 @st.cache_data
-def get_unique_countries_with_names(_client, collection_name, region_df):
+def get_country_name_mapping(_client, collection_name, region_df):
     results = hybrid_search(_client, "", collection_name)
     country_set = set()
     for res in results[0] + results[1]:
@@ -47,28 +47,27 @@ def get_unique_countries_with_names(_client, collection_name, region_df):
         except json.JSONDecodeError:
             pass
     
-    # Map ISO codes to country names
-    country_names = [get_country_name(code, region_df) for code in country_set]
-    return sorted(country_names)
+    # Create a mapping of country names to ISO codes
+    country_name_to_code = {get_country_name(code, region_df): code for code in country_set}
+    return country_name_to_code
 
+# Get country name mapping
 client = get_client()
-unique_countries = get_unique_countries_with_names(client, collection_name, region_df)
+country_name_mapping = get_country_name_mapping(client, collection_name, region_df)
+unique_country_names = sorted(country_name_mapping.keys())  # List of country names
 
 # Layout filters in columns
 col1, col2, col3 = st.columns([1, 1, 4])
 
 with col1:
-    country_filter = st.selectbox("Country Code", ["All"] + unique_countries)
+    country_filter = st.selectbox("Country", ["All"] + unique_country_names)  # Display country names
 with col2:
     end_year_range = st.slider("Project End Year", min_value=2010, max_value=2030, value=(2010, 2030))
 
 # Checkbox to control whether to show only exact matches
 show_exact_matches = st.checkbox("Show only exact matches", value=False)
 
-button=st.button("Search")
-#found_docs = vectorstore.similarity_search(var)
-#print(found_docs)
-# results= get_context(vectorstore, f"find the relvant paragraphs for: {var}")
+button = st.button("Search")
 if button:
     results = hybrid_search(client, var, collection_name)
 
@@ -86,8 +85,11 @@ if button:
             except json.JSONDecodeError:
                 country_list = []
 
+            # Translate selected country name back to ISO code
+            selected_iso_code = country_name_mapping.get(country_filter, None)
+
             # Apply country and year filters
-            if (country_filter == "All" or country_filter in country_list) and (end_year_range[0] <= end_year <= end_year_range[1]):
+            if (country_filter == "All" or selected_iso_code in country_list) and (end_year_range[0] <= end_year <= end_year_range[1]):
                 filtered.append(res)
         return filtered