Update app.py

app.py

@@ -1,6 +1,7 @@
 import streamlit as st
 import requests
 import pandas as pd
+import re
 from appStore.prep_data import process_giz_worldwide, remove_duplicates, get_max_end_year, extract_year
 from appStore.prep_utils import create_documents, get_client
 from appStore.embed import hybrid_embed_chunks
@@ -275,6 +276,13 @@ if show_exact_matches:
             if top_keywords:
                 st.markdown(f"_{' · '.join(top_keywords)}_")
             
+            # Format year range and budget info
+            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)
+            
+            # Compute matched country names (as before)
             try:
                 c_list = json.loads(metadata.get('countries', "[]").replace("'", '"'))
             except json.JSONDecodeError:
@@ -286,10 +294,23 @@ if show_exact_matches:
                     if resolved_name.upper() != code.upper():
                         matched_countries.append(resolved_name)
             
-            additional_text = f"Country: **{', '.join(matched_countries) if matched_countries else 'Unknown'}**"
+            # Compute CRS combined value
+            crs_key = metadata.get("crs_key", "").strip()
+            crs_value = metadata.get("crs_value", "").strip()
+            crs_combined = f"{crs_key}: {crs_value}" if (crs_key or crs_value) else "Unknown"
+            
+            # Build the additional text with original details, then add Sector and contact.
+            additional_text = (
+                f"**{', '.join(matched_countries)}**, 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}**\n"
+                f"Country: **{', '.join(matched_countries)}**\n"
+                f"Sector: **{crs_combined}**"
+            )
             contact = metadata.get("contact", "").strip()
             if contact and contact.lower() != "[email protected]":
                 additional_text += f" | Contact: **{contact}**"
+            
             st.markdown(additional_text)
             st.divider()
 
@@ -331,6 +352,13 @@ else:
             if top_keywords:
                 st.markdown(f"_{' · '.join(top_keywords)}_")
             
+            # Format year range and budget info
+            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)
+            
+            # Compute matched country names (as before)
             try:
                 c_list = json.loads(metadata.get('countries', "[]").replace("'", '"'))
             except json.JSONDecodeError:
@@ -342,12 +370,25 @@ else:
                     if resolved_name.upper() != code.upper():
                         matched_countries.append(resolved_name)
             
-            additional_text = f"Country: **{', '.join(matched_countries) if matched_countries else 'Unknown'}**"
+            # Compute CRS combined value
+            crs_key = metadata.get("crs_key", "").strip()
+            crs_value = metadata.get("crs_value", "").strip()
+            crs_combined = f"{crs_key}: {crs_value}" if (crs_key or crs_value) else "Unknown"
+            
+            # Build the additional text with original details, then add Sector and contact.
+            additional_text = (
+                f"**{', '.join(matched_countries)}**, 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}**\n"
+                f"Country: **{', '.join(matched_countries)}**\n"
+                f"Sector: **{crs_combined}**"
+            )
             contact = metadata.get("contact", "").strip()
             if contact and contact.lower() != "[email protected]":
                 additional_text += f" | Contact: **{contact}**"
+            
             st.markdown(additional_text)
-            st.divider()
+            st.divider()                
     #  for i in results: 
     #      st.subheader(str(i.metadata['id'])+":"+str(i.metadata['title_main']))
     #      st.caption(f"Status:{str(i.metadata['status'])}, Country:{str(i.metadata['country_name'])}")