Update app.py

app.py

@@ -95,23 +95,23 @@ else:
 with col2:
     country_filter = st.selectbox("Country", ["All/Not allocated"] + filtered_country_names)  # Display filtered country names
 
-# # Year range slider # ToDo add end_year filter again
-# with col3:
-#     current_year = datetime.now().year
-#     default_start_year = current_year - 5
-
-#     # 3) The max_value is now the actual max end_year from collection
-#     end_year_range = st.slider(
-#         "Project End Year",
-#         min_value=2010,
-#         max_value=max_end_year,
-#         value=(default_start_year, max_end_year),
-#     )
+# Year range slider # ToDo add end_year filter again
+with col3:
+    current_year = datetime.now().year
+    default_start_year = current_year - 5
+
+    # 3) The max_value is now the actual max end_year from collection
+    end_year_range = st.slider(
+        "Project End Year",
+        min_value=2010,
+        max_value=max_end_year,
+        value=(default_start_year, max_end_year),
+    )
 
 # Checkbox to control whether to show only exact matches
 show_exact_matches = st.checkbox("Show only exact matches", value=False)
 
-def filter_results(results, country_filter, region_filter): ## , end_year_range ToDo add end_year filter again
+def filter_results(results, country_filter, region_filter, end_year_range): ##  ToDo add end_year filter again
     filtered = []
     for r in results:
         metadata = r.payload.get('metadata', {})
@@ -146,7 +146,7 @@ def filter_results(results, country_filter, region_filter): ## , end_year_range
         if (
             (country_filter == "All/Not allocated" or selected_iso_code in c_list)
             and (region_filter == "All/Not allocated" or countries_in_region)
-#            and (end_year_range[0] <= end_year_val <= end_year_range[1]) # ToDo add end_year filter again
+            and (end_year_range[0] <= end_year_val <= end_year_range[1]) # ToDo add end_year filter again
         ):
             filtered.append(r)
     return filtered
@@ -172,8 +172,8 @@ lexical_all = [
 semantic_thresholded = [r for r in semantic_all if r.score >= 0.0]
 
 # 2) Filter the entire sets
-filtered_semantic = filter_results(semantic_thresholded, country_filter, region_filter) ## , end_year_range ToDo add end_year filter again
-filtered_lexical = filter_results(lexical_all, country_filter, region_filter)## , end_year_range ToDo add end_year filter again
+filtered_semantic = filter_results(semantic_thresholded, country_filter, region_filter, end_year_range) ##  ToDo add end_year filter again
+filtered_lexical = filter_results(lexical_all, country_filter, region_filter, end_year_range)## ToDo add end_year filter again
 
 filtered_semantic_no_dupe = remove_duplicates(filtered_semantic) # ToDo remove duplicates again?
 filtered_lexical_no_dupe = remove_duplicates(filtered_lexical)
@@ -205,8 +205,8 @@ if show_exact_matches:
 
     # 3) Now apply your region/country/year filter on that new list
     filtered_lexical = filter_results(
-        lexical_substring_filtered, country_filter, region_filter
-    ) ## , end_year_range ToDo add end_year filter again
+        lexical_substring_filtered, country_filter, region_filter, end_year_range
+    ) ## ToDo add end_year filter again
 
     # 4) Remove duplicates
     filtered_lexical_no_dupe = remove_duplicates(filtered_lexical)
@@ -277,8 +277,10 @@ if show_exact_matches:
 
             additional_text = (
                 f"Commissioned by **{client_name}**\n"
+                
                 f"Projekt duration **{start_year_str}-{end_year_str}**\n"
-                f"Budget: Project: **{formatted_project_budget}**, total volume: **{formatted_total_volume}**"
+                
+                f"Budget: Project: **{formatted_project_budget}**, Total volume: **{formatted_total_volume}**"
             )
             st.markdown(additional_text)
             st.divider()
@@ -291,32 +293,37 @@ else:
     else:
         # Show the top 15 from filtered_semantic
         for res in filtered_semantic_no_dupe[:15]:
+            # Metadata
+            metadata = res.payload.get('metadata', {})
+            countries = metadata.get('countries', "[]")
+            client_name = metadata.get('client', 'Unknown Client')
+            start_year = metadata.get('start_year', None)
+            end_year = metadata.get('end_year', None)
+            total_volume = metadata.get('total_volume', "Unknown")
+            total_project = metadata.get('total_project', "Unknown")
+            id = metadata.get('id', "Unknown")
             project_name = res.payload['metadata'].get('project_name', 'Project Link')
-            url = res.payload['metadata'].get('url', '#')
-            st.markdown(f"#### [{project_name}]({url})")
+            proj_id = metadata.get('id', 'Unknown')
+            st.markdown(f"#### {project_name} [{proj_id}]")
 
-            # Snippet logic
-            full_text = res.payload['page_content']
-            words = full_text.split()
-            preview_word_count = 10
+            # Snippet logic (80 words)
+            # Build snippet from objectives and descriptions.
+            objectives = metadata.get("objectives", "")
+            desc_de = metadata.get("description.de", "")
+            desc_en = metadata.get("description.en", "")
+            description = desc_de if desc_de else desc_en
+            full_snippet = f"Objective: {objectives} Description: {description}"
+            words = full_snippet.split()
+            preview_word_count = 200
             preview_text = " ".join(words[:preview_word_count])
             remainder_text = " ".join(words[preview_word_count:])
             st.write(preview_text + ("..." if remainder_text else ""))
 
             # Keywords
+            full_text = res.payload['page_content']
             top_keywords = extract_top_keywords(full_text, top_n=5)
             if top_keywords:
                 st.markdown(f"_{' · '.join(top_keywords)}_")
-
-            # Metadata
-            metadata = res.payload.get('metadata', {})
-            countries = metadata.get('countries', "[]")
-            client_name = metadata.get('client', 'Unknown Client')
-            start_year = metadata.get('start_year', None)
-            end_year = metadata.get('end_year', None)
-            total_volume = metadata.get('total_volume', "Unknown")
-            total_project = metadata.get('total_project', "Unknown")
-            id = metadata.get('id', "Unknown")
             
             try:
                 c_list = json.loads(countries.replace("'", '"'))
@@ -339,16 +346,27 @@ else:
             # Format the year range
             start_year_str = extract_year(start_year) if start_year else "Unknown"
             end_year_str = extract_year(end_year) if end_year else "Unknown"
+
+            formatted_project_budget = format_currency(total_project)
+            formatted_total_volume = format_currency(total_volume)
+
             
             # Build the final string
             if matched_countries:
                 additional_text = (
-                    f"**{', '.join(matched_countries)}**, commissioned by **{client_name}**, "
-                    f"**{start_year_str}-{end_year_str}**, project ID: {id}, project budget: {total_project}, total volumne: {total_volume}"
+                    f"**{', '.join(matched_countries)} f"Commissioned by **{client_name}**\n"
+                    
+                    f"Projekt duration **{start_year_str}-{end_year_str}**\n"
+                    
+                    f"Budget: Project: **{formatted_project_budget}**, Total volume: **{formatted_total_volume}**"
                 )
             else:
                 additional_text = (
-                    f"Commissioned by **{client_name}**, **{start_year_str}-{end_year_str}**, project ID: {id}, project budget: {total_project}, total volumne: {total_volume}"
+                    f"Commissioned by **{client_name}**\n"
+                    
+                    f"Projekt duration **{start_year_str}-{end_year_str}**\n"
+                    
+                    f"Budget: Project: **{formatted_project_budget}**, Total volume: **{formatted_total_volume}**"
                 )