return to commit 82f1167e2b824e8eed9a8c440714d67efd84726b

app.py

@@ -1,5 +1,4 @@
 import streamlit as st
-
 # PAGE CONFIG
 st.set_page_config(
     page_title='Development Banks Collaboration Analyzer',

functions/filter_projects.py

@@ -5,13 +5,9 @@ def contains_code(crs_codes, code_list):
     codes = str(crs_codes).split(';')
     return any(code in code_list for code in codes)
 
-def filter_projects(df, crs3_list, crs5_list, sdg_str, country_code_list, orga_code_list, 
-                    #query, 
-                    model, 
-                    #embeddings, 
-                    TOP_X_PROJECTS=30):
+def filter_projects(df, crs3_list, crs5_list, sdg_str, country_code_list, orga_code_list, query, model, embeddings, TOP_X_PROJECTS=30):
     # Check if filters where not all should be selected are empty
-    if crs3_list != [] or crs5_list != [] or sdg_str != "": #or query != "":
+    if crs3_list != [] or crs5_list != [] or sdg_str != "" or query != "":
 
         # FILTER CRS
         if crs3_list and not crs5_list:  
@@ -39,12 +35,11 @@ def filter_projects(df, crs3_list, crs5_list, sdg_str, country_code_list, orga_c
             df = df[df['orga_abbreviation'].isin(orga_code_list)]
 
         # FILTER QUERY
-        """
         if query != "" and len(df) > 0:
             if len(df) < TOP_X_PROJECTS:
                 TOP_X_PROJECTS = len(df)
             df = search(query, model, embeddings, df, TOP_X_PROJECTS)
-        """
+
 
 
         return df

modules/navbar.py

@@ -1,4 +1,5 @@
 import streamlit as st
+from streamlit_option_menu import option_menu # https://github.com/victoryhb/streamlit-option-menu
 import similarity_page
 
 # giz-dsc colors

requirements.txt

@@ -6,5 +6,4 @@ scipy==1.12.0
 faiss-cpu==1.8.0
 faiss-gpu==1.7.2
 sentence-transformers==2.5.1
-streamlit-aggrid==0.3.4
-psutil==5.9.0
+streamlit-aggrid==0.3.4.

similarity_page.py

@@ -111,7 +111,6 @@ def load_model():
     return model
 
 # Load Embeddings
-"""
 @st.cache_data 
 def load_embeddings_and_index():
     # Load embeddings
@@ -120,7 +119,7 @@ def load_embeddings_and_index():
     embeddings = stored_data["embeddings"]
 
     return embeddings
-"""    
+    
 
 # USE CACHE FUNCTIONS 
 sim_matrix = load_sim_matrix()
@@ -135,7 +134,7 @@ COUNTRY_OPTION_LIST = getCountry()
 
 # LOAD MODEL FROM CACHE FO SEMANTIC SEARCH
 model = load_model()
-#embeddings = load_embeddings_and_index()
+embeddings = load_embeddings_and_index()
 
 def show_multi_matching_page():
     #st.write(f"Current RAM usage of this app: {get_process_memory():.2f} MB")
@@ -199,7 +198,7 @@ def show_multi_matching_page():
                 )
 
         # SEARCH BOX
-        #query = st.text_input("Search Query")
+        query = st.text_input("Search Query")
     
     with col3:
         # COUNTRY SELECTION
@@ -243,11 +242,7 @@ def show_multi_matching_page():
 
     # FILTER DF WITH SELECTED FILTER OPTIONS
     TOP_X_PROJECTS = 30
-    filtered_df = filter_projects(projects_df, crs3_list, crs5_list, sdg_str, country_code_list, orga_code_list, 
-                                #query, 
-                                model, 
-                                #embeddings, 
-                                TOP_X_PROJECTS)
+    filtered_df = filter_projects(projects_df, crs3_list, crs5_list, sdg_str, country_code_list, orga_code_list, query, model, embeddings, TOP_X_PROJECTS)
     if isinstance(filtered_df, pd.DataFrame) and len(filtered_df) != 0:
         # FIND MATCHES
         ## If only same country checkbox i sactivated
@@ -317,7 +312,6 @@ def show_single_matching_page():
         else:
             search_list = title_search_list
 
-
         project_option = st.selectbox(
                     label = 'Search for a project',
                     index = None,

src/embeddings.pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c9bce42b5bef1adebd5b8e157c7dc3197d75c488931960dd8aa736329c024b1
+size 67450241

src/extended_similarities.npz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ae30cf9cbc19ace8dcd5c5f1e817d8e9597a32798b19c8cfd677ace7734e35e
-size 30499836
+oid sha256:7ae835bcd73475fdfc959b9f3682f0efa33240550a9405fb4e48638ea2e3175a
+size 38542579

src/extended_similarities_nonsimorga.npz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef348fe69f2d937824178b5991a7b298e783886db369cc1e10ba8a9d084e2374
-size 11330845
+oid sha256:f7737f324bf8e6998d1c761b92266d3677bac052a4db1872ecd3e3ba1d920913
+size 27134286

src/projects/project_region.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09959ff959f13fafb468277ae0bdf6a1f0d068550f8ed2e36104edd2008d0b1e
+oid sha256:09ff7b7aefbd3cf3a0f651b8120609d755ca7b8abc0b4026170385a5b8b903f9
 size 2788348