Spaces:

GIZ
/

Development-Project-Synergy-Finder

Sleeping

App Files Files Community

Jan Mühlnikel commited on Mar 24, 2024

Commit

784ae4f

1 Parent(s): 83fabd0

rmv checkboxes

Browse files

Files changed (5) hide show

__pycache__/similarity_page.cpython-310.pyc +0 -0
functions/__pycache__/single_similar.cpython-310.pyc +0 -0
functions/single_similar.py +1 -1
modules/singlematch_result_table.py +80 -77
similarity_page.py +7 -5

__pycache__/similarity_page.cpython-310.pyc CHANGED Viewed

Binary files a/__pycache__/similarity_page.cpython-310.pyc and b/__pycache__/similarity_page.cpython-310.pyc differ

functions/__pycache__/single_similar.cpython-310.pyc CHANGED Viewed

Binary files a/functions/__pycache__/single_similar.cpython-310.pyc and b/functions/__pycache__/single_similar.cpython-310.pyc differ

functions/single_similar.py CHANGED Viewed

@@ -3,7 +3,7 @@ import numpy as np
 def find_similar(p_index, similarity_matrix, projects_df, top_x):
     selected_row = similarity_matrix[p_index]
-    top_indexes = np.argsort(selected_row)[-10:][::-1]
     top_values = selected_row[top_indexes]
     top_projects_df = projects_df.iloc[top_indexes]

 def find_similar(p_index, similarity_matrix, projects_df, top_x):
     selected_row = similarity_matrix[p_index]
+    top_indexes = np.argsort(selected_row)[-top_x:][::-1]
     top_values = selected_row[top_indexes]
     top_projects_df = projects_df.iloc[top_indexes]

modules/singlematch_result_table.py CHANGED Viewed

@@ -3,81 +3,84 @@ import pandas as pd
 def show_single_table(result_df):
-    result_df = result_df.reset_index(drop=True)
-    # Transformations
-    result_df["crs_3_code_list"] = result_df['crs_3_code'].str.split(";").apply(lambda x: x[:-1] if x else [])
-    result_df["crs_5_code_list"] = result_df['crs_5_code'].str.split(";").apply(lambda x: x[:-1] if x else [])
-    result_df["sdg_list"] = result_df['sgd_pred_code'].apply(lambda x: [x] if pd.notna(x) else [])
-    result_df["flag"] = result_df['country'].apply(lambda x: f"https://flagicons.lipis.dev/flags/4x3/{x[:2].lower()}.svg" if pd.notna(x) else "https://flagicons.lipis.dev/flags/4x3/xx.svg")
-    st.dataframe(
-        result_df[["similarity", "iati_id", "title_main", "orga_abbreviation", "client", "description_main", "country", "flag", "sdg_list", "crs_3_code_list", "crs_5_code_list"]],
-        use_container_width = True,
-        height = 35 + 35 * len(result_df),
-        column_config={
-            "similarity": st.column_config.TextColumn(
-                "Similarity",
-                help="similarity to selected project",
-                disabled=True,
-                width="small"
-            ),
-            "iati_id": st.column_config.TextColumn(
-                "IATI ID",
-                help="IATI Project ID",
-                disabled=True,
-                width="small"
-            ),
-            "orga_abbreviation": st.column_config.TextColumn(
-                "Organization",
-                help="If description not in English, description in other language provided",
-                disabled=True,
-                width="small"
-            ),
-            "client": st.column_config.TextColumn(
-                "Client",
-                help="Client organization of customer",
-                disabled=True,
-                width="small"
-            ),
-            "title_main": st.column_config.TextColumn(
-                "Title",
-                help="If title not in English, title in other language provided",
-                disabled=True,
-                width="large"
-            ),
-            "description_main": st.column_config.TextColumn(
-                "Description",
-                help="If description not in English, description in other language provided",
-                disabled=True,
-                width="large"
-            ),
-            "country": st.column_config.TextColumn(
-                "Country",
-                help="Country of project",
-                disabled=True,
-                width="small"
-            ),
-            "flag": st.column_config.ImageColumn(
-                "Flag",
-                help="country flag",
-                width="small"
-            ),
-            "sdg_list": st.column_config.ListColumn(
-                "SDG Prediction",
-                help="Prediction of SDG's",
-                width="small"
-            ),
-            "crs_3_code_list": st.column_config.ListColumn(
-                "CRS 3",
-                help="CRS 3 code given by organization",
-                width="small"
-            ),
-            "crs_5_code_list": st.column_config.ListColumn(
-                "CRS 5",
-                help="CRS 5 code given by organization",
-                width="small"
-            ),
-        },
-        hide_index=True,
-    )

 def show_single_table(result_df):
+    if len(result_df) == 0:
+        st.write("No resuolts found!")
+    else:
+        result_df = result_df.reset_index(drop=True)
+        # Transformations
+        result_df["crs_3_code_list"] = result_df['crs_3_code'].str.split(";").apply(lambda x: x[:-1] if x else [])
+        result_df["crs_5_code_list"] = result_df['crs_5_code'].str.split(";").apply(lambda x: x[:-1] if x else [])
+        result_df["sdg_list"] = result_df['sgd_pred_code'].apply(lambda x: [x] if pd.notna(x) else [])
+        result_df["flag"] = result_df['country'].apply(lambda x: f"https://flagicons.lipis.dev/flags/4x3/{x[:2].lower()}.svg" if pd.notna(x) else "https://flagicons.lipis.dev/flags/4x3/xx.svg")
+        st.dataframe(
+            result_df[["similarity", "iati_id", "title_main", "orga_abbreviation", "client", "description_main", "country", "flag", "sdg_list", "crs_3_code_list", "crs_5_code_list"]],
+            use_container_width = True,
+            height = 35 + 35 * len(result_df),
+            column_config={
+                "similarity": st.column_config.TextColumn(
+                    "Similarity",
+                    help="similarity to selected project",
+                    disabled=True,
+                    width="small"
+                ),
+                "iati_id": st.column_config.TextColumn(
+                    "IATI ID",
+                    help="IATI Project ID",
+                    disabled=True,
+                    width="small"
+                ),
+                "orga_abbreviation": st.column_config.TextColumn(
+                    "Organization",
+                    help="If description not in English, description in other language provided",
+                    disabled=True,
+                    width="small"
+                ),
+                "client": st.column_config.TextColumn(
+                    "Client",
+                    help="Client organization of customer",
+                    disabled=True,
+                    width="small"
+                ),
+                "title_main": st.column_config.TextColumn(
+                    "Title",
+                    help="If title not in English, title in other language provided",
+                    disabled=True,
+                    width="large"
+                ),
+                "description_main": st.column_config.TextColumn(
+                    "Description",
+                    help="If description not in English, description in other language provided",
+                    disabled=True,
+                    width="large"
+                ),
+                "country": st.column_config.TextColumn(
+                    "Country",
+                    help="Country of project",
+                    disabled=True,
+                    width="small"
+                ),
+                "flag": st.column_config.ImageColumn(
+                    "Flag",
+                    help="country flag",
+                    width="small"
+                ),
+                "sdg_list": st.column_config.ListColumn(
+                    "SDG Prediction",
+                    help="Prediction of SDG's",
+                    width="small"
+                ),
+                "crs_3_code_list": st.column_config.ListColumn(
+                    "CRS 3",
+                    help="CRS 3 code given by organization",
+                    width="small"
+                ),
+                "crs_5_code_list": st.column_config.ListColumn(
+                    "CRS 5",
+                    help="CRS 5 code given by organization",
+                    width="small"
+                ),
+            },
+            hide_index=True,
+        )

similarity_page.py CHANGED Viewed

@@ -268,24 +268,26 @@ def show_single_matching_page():
                 options = search_list,
                 )
-    different_orga_checkbox_ = st.checkbox("Only matches for organisations other than the selected project")
-    filterd_country_only_checkbox_ = st.checkbox("Only matches in the same countries as project selection")
     if project_option:
         if filterd_country_only_checkbox_:
             country = projects_df.iloc[selected_index]["country"]
             same_country_df = projects_df[projects_df['country'] == country]
         else:
             same_country_df = projects_df
-        selected_index = search_list.index(project_option)
         if different_orga_checkbox_:
             orga = projects_df.iloc[selected_index]["orga_abbreviation"]
             different_orga_df = same_country_df[same_country_df['orga_abbreviation'] != orga]
         else:
             different_orga_df = same_country_df
-        top_projects_df = find_similar(selected_index, sim_matrix, different_orga_df, 10)
         show_single_table(top_projects_df)

                 options = search_list,
                 )
+    #different_orga_checkbox_ = st.checkbox("Only matches for organisations other than the selected project")
+    #filterd_country_only_checkbox_ = st.checkbox("Only matches in the same countries as project selection")
+    #selected_index = None
     if project_option:
+        selected_index = search_list.index(project_option)
+        """
         if filterd_country_only_checkbox_:
             country = projects_df.iloc[selected_index]["country"]
             same_country_df = projects_df[projects_df['country'] == country]
         else:
             same_country_df = projects_df
         if different_orga_checkbox_:
             orga = projects_df.iloc[selected_index]["orga_abbreviation"]
             different_orga_df = same_country_df[same_country_df['orga_abbreviation'] != orga]
         else:
             different_orga_df = same_country_df
+        """
+        top_projects_df = find_similar(selected_index, sim_matrix, projects_df, 10)
         show_single_table(top_projects_df)