Update app.py

app.py

@@ -60,7 +60,7 @@ unique_country_names = sorted(country_name_mapping.keys())  # List of country na
 col1, col2, col3 = st.columns([1, 1, 4])
 
 with col1:
-    country_filter = st.selectbox("Country", ["All"] + unique_country_names)  # Display country names
+    country_filter = st.selectbox("Country", ["All/Not allocated"] + 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))
 
@@ -81,18 +81,20 @@ if button:
             # Process countries string to a list
             try:
                 country_list = json.loads(countries.replace("'", '"'))
-                country_list = [code.upper() for code in country_list]  # Convert to uppercase
+                # Normalize to uppercase and filter only 2-digit ISO codes
+                country_list = [code.upper() for code in country_list if len(code) == 2]
             except json.JSONDecodeError:
                 country_list = []
     
-            # Translate selected country name back to ISO code
+            # Translate selected country name back to 2-digit ISO code
             selected_iso_code = country_name_mapping.get(country_filter, None)
     
             # Apply country and year filters
-            if (country_filter == "All" or selected_iso_code in country_list) and (end_year_range[0] <= end_year <= end_year_range[1]):
+            if (country_filter == "All/Not allocated" or selected_iso_code in country_list) and (end_year_range[0] <= end_year <= end_year_range[1]):
                 filtered.append(res)
         return filtered
 
+
     # Check user preference for exact matches
     if show_exact_matches:
         st.write(f"Showing **Top 10 Lexical Search results** for query: {var}")
@@ -103,6 +105,31 @@ if button:
             url = res.payload['metadata'].get('url', '#')
             st.markdown(f"#### [{project_name}]({url})")
             st.write(res.payload['page_content'])
+
+            # Additional text below the content
+            metadata = res.payload.get('metadata', {})
+            countries = metadata.get('countries', "[]")
+            client = metadata.get('client', 'Unknown Client')
+            start_year = metadata.get('start_year', None)
+            end_year = metadata.get('end_year', None)
+
+            # Process countries
+            try:
+                country_list = json.loads(countries.replace("'", '"'))
+                # Normalize to uppercase and map to country names
+                country_names = [get_country_name(code.upper(), region_df) for code in country_list if len(code) == 2]
+                country_names = country_names if country_names else country_list  # Fallback if no names found
+            except json.JSONDecodeError:
+                country_names = countries
+
+            # Format start and end year
+            start_year = f"{int(round(float(start_year)))}" if start_year else "Unknown"
+            end_year = f"{int(round(float(end_year)))}" if end_year else "Unknown"
+
+            # Generate additional text
+            additional_text = f"{', '.join(country_names)}, commissioned by {client}, {start_year}-{end_year}"
+            st.write(additional_text)
+
             st.divider()
     else:
         st.write(f"Showing **Top 10 Semantic Search results** for query: {var}")
@@ -113,6 +140,30 @@ if button:
             url = res.payload['metadata'].get('url', '#')
             st.markdown(f"#### [{project_name}]({url})")
             st.write(res.payload['page_content'])
+
+            # Additional text below the content
+            metadata = res.payload.get('metadata', {})
+            countries = metadata.get('countries', "[]")
+            client = metadata.get('client', 'Unknown Client')
+            start_year = metadata.get('start_year', None)
+            end_year = metadata.get('end_year', None)
+
+            # Process countries
+            try:
+                country_list = json.loads(countries.replace("'", '"'))
+                country_names = [get_country_name(code.upper(), region_df) for code in country_list if len(code) == 2]
+                country_names = country_names if country_names else country_list
+            except json.JSONDecodeError:
+                country_names = countries
+
+            # Format start and end year
+            start_year = f"{int(round(float(start_year)))}" if start_year else "Unknown"
+            end_year = f"{int(round(float(end_year)))}" if end_year else "Unknown"
+
+            # Generate additional text
+            additional_text = f"{', '.join(country_names)}, commissioned by {client}, {start_year}-{end_year}"
+            st.write(additional_text)
+
             st.divider()