Update app.py

app.py

@@ -165,7 +165,7 @@ def filter_results(results, country_filter, region_filter, end_year_range, crs_f
     filtered = []
     for r in results:
         metadata = r.payload.get('metadata', {})
-        countries = metadata.get('countries', "[]")
+        country = metadata.get('country', "[]")
         year_str = metadata.get('end_year')
         if year_str:
             extracted = extract_year(year_str)
@@ -177,16 +177,16 @@ def filter_results(results, country_filter, region_filter, end_year_range, crs_f
             end_year_val = 0
 
         try:
-            c_list = json.loads(countries.replace("'", '"'))
+            c_list = json.loads(country.replace("'", '"'))
             c_list = [code.upper() for code in c_list if len(code) == 2]
         except json.JSONDecodeError:
             c_list = []
 
         selected_iso_code = country_name_mapping.get(country_filter, None)
         if region_filter != "All/Not allocated":
-            countries_in_region = [code for code in c_list if iso_code_to_sub_region.get(code) == region_filter]
+            country_in_region = [code for code in c_list if iso_code_to_sub_region.get(code) == region_filter]
         else:
-            countries_in_region = c_list
+            country_in_region = c_list
 
         crs_key = metadata.get("crs_key", "").strip()
         # Convert crs_key to a string and remove trailing ".0"
@@ -212,7 +212,7 @@ def filter_results(results, country_filter, region_filter, end_year_range, crs_f
         year_ok = True if end_year_val == 0 else (end_year_range[0] <= end_year_val <= end_year_range[1])
 
         if ((country_filter == "All/Not allocated" or (selected_iso_code and selected_iso_code in c_list))
-            and (region_filter == "All/Not allocated" or countries_in_region)
+            and (region_filter == "All/Not allocated" or country_in_region)
             and year_ok):
             filtered.append(r)
     return filtered
@@ -276,9 +276,9 @@ def get_country_name_and_region_mapping(_client, collection_name, region_df):
     results = hybrid_search(_client, "", collection_name)
     country_set = set()
     for res in results[0] + results[1]:
-        countries = res.payload.get('metadata', {}).get('countries', "[]")
+        country = res.payload.get('metadata', {}).get('country', "[]")
         try:
-            country_list = json.loads(countries.replace("'", '"'))
+            country_list = json.loads(country.replace("'", '"'))
             two_digit_codes = [code.upper() for code in country_list if len(code) == 2]
             country_set.update(two_digit_codes)
         except json.JSONDecodeError:
@@ -406,15 +406,15 @@ else:
                     formatted_project_budget = format_currency(total_project)
                     formatted_total_volume = format_currency(total_volume)
                     try:
-                        c_list = json.loads(metadata.get('countries', "[]").replace("'", '"'))
+                        c_list = json.loads(metadata.get('country', "[]").replace("'", '"'))
                     except json.JSONDecodeError:
                         c_list = []
-                    matched_countries = []
+                    matched_country = []
                     for code in c_list:
                         if len(code) == 2:
                             resolved_name = get_country_name(code.upper(), region_df)
                             if resolved_name.upper() != code.upper():
-                                matched_countries.append(resolved_name)
+                                matched_country.append(resolved_name)
                     crs_key = metadata.get("crs_key", "").strip()
                     # Convert to string and remove trailing ".0"
                     crs_key_clean = re.sub(r'\.0$', '', str(crs_key))
@@ -429,7 +429,7 @@ else:
                         f"**Commissioned by:** {client_name}<br>"
                         f"**Projekt duration:** {start_year_str}-{end_year_str}<br>"
                         f"**Budget:** Project: {formatted_project_budget}, Total volume: {formatted_total_volume}<br>"
-                        f"**Country:** {', '.join(matched_countries)}<br>"
+                        f"**Country:** {', '.join(matched_country)}<br>"
                         f"**Sector:** {crs_combined}"
                     )
                     #if contact and contact.lower() != "[email protected]":
@@ -478,15 +478,15 @@ else:
                     formatted_project_budget = format_currency(total_project)
                     formatted_total_volume = format_currency(total_volume)
                     try:
-                        c_list = json.loads(metadata.get('countries', "[]").replace("'", '"'))
+                        c_list = json.loads(metadata.get('country', "[]").replace("'", '"'))
                     except json.JSONDecodeError:
                         c_list = []
-                    matched_countries = []
+                    matched_country = []
                     for code in c_list:
                         if len(code) == 2:
                             resolved_name = get_country_name(code.upper(), region_df)
                             if resolved_name.upper() != code.upper():
-                                matched_countries.append(resolved_name)
+                                matched_country.append(resolved_name)
                     crs_key = metadata.get("crs_key", "").strip()
                     # Convert to string and remove trailing ".0"
                     crs_key_clean = re.sub(r'\.0$', '', str(crs_key))
@@ -500,7 +500,7 @@ else:
                         f"**Commissioned by:** {client_name}<br>"
                         f"**Projekt duration:** {start_year_str}-{end_year_str}<br>"
                         f"**Budget:** Project: {formatted_project_budget}, Total volume: {formatted_total_volume}<br>"
-                        f"**Country:** {', '.join(matched_countries)}<br>"
+                        f"**Country:** {', '.join(matched_country)}<br>"
                         f"**Sector:** {crs_combined}"
                     )
                     #if contact and contact.lower() != "[email protected]":