refactor

app.py

@@ -4,7 +4,6 @@ from src.markers import display_interventions, display_solved, show_requests, sh
 from src.filters import show_requests_filters, show_interventions_filters
 
 import folium
-import pandas as pd
 import streamlit as st
 from huggingface_hub import HfApi
 from streamlit_folium import st_folium
@@ -14,19 +13,13 @@ from src.text_content import (
     LOGO,
     SLOGAN,
 )
-from src.utils import add_latlng_col, init_map, parse_gg_sheet, is_request_in_list, parse_json_file
+from src.utils import init_map
 from src.map_utils import get_legend_macro
 from src.dataframes import display_dataframe
+from src.dataframes import load_data, VERIFIED_REQUESTS_URL, REQUESTS_URL, INTERVENTIONS_URL
 
 TOKEN = os.environ.get("HF_TOKEN", None)
-VERIFIED_REQUESTS_URL = (
-    "https://docs.google.com/spreadsheets/d/1PXcAtI5L95hHSXAiRl3Y4v5O4coG39S86OTfBEcvLTE/edit#gid=0"
-)
-REQUESTS_URL = "https://docs.google.com/spreadsheets/d/1gYoBBiBo1L18IVakHkf3t1fOGvHWb23loadyFZUeHJs/edit#gid=966953708"
-INTERVENTIONS_URL = (
-    "https://docs.google.com/spreadsheets/d/1eXOTqunOWWP8FRdENPs4cU9ulISm4XZWYJJNR1-SrwY/edit#gid=2089222765"
-)
-DOUARS_URL = "data/regions.json"
+
 api = HfApi(TOKEN)
 
 
@@ -49,49 +42,31 @@ if auto_refresh:
     number = st.sidebar.number_input("Refresh rate in seconds", value=st.session_state.sleep_time)
     st.session_state.sleep_time = number
 
-
-# Streamlit functions
-
 # Logo and Title
 st.markdown(LOGO, unsafe_allow_html=True)
 # st.title("Nt3awnou نتعاونو")
 st.markdown(SLOGAN, unsafe_allow_html=True)
 
+# Initialize map
 m, emergency_fgs, intervention_fgs = init_map()
 fg = folium.FeatureGroup(name="Markers")
 
 # Selection of requests
-
 selected_options, options, show_unverified, show_interventions = show_requests_filters()
-# Load data and initialize map with plugins
-df = parse_gg_sheet(REQUESTS_URL)
-if show_unverified:
-    df = add_latlng_col(df, process_column=15)
-interventions_df = parse_gg_sheet(INTERVENTIONS_URL)
-interventions_df = add_latlng_col(interventions_df, process_column="Automatic Extracted Coordinates")
-verified_df = parse_gg_sheet(VERIFIED_REQUESTS_URL)
-verified_df = add_latlng_col(verified_df, process_column="Automatic Extracted Coordinates")
-douar_df = parse_json_file(DOUARS_URL)
-
-# check if verified requests have been solved
-solved_verified_requests = verified_df[~pd.isnull(verified_df["Status"])]
-verified_df = verified_df[pd.isnull(verified_df["Status"])]
-
-len_requests = len(df)
-len_interventions = len(interventions_df)
-len_verified_requests = len(verified_df)
-len_solved_verified_requests = len(solved_verified_requests)
-
-df["id"] = df.index  # Needed to display request id
-verified_df["id"] = verified_df.index  # Needed to display request id
-# keep rows with at least one request in selected_options
-filtered_df = df[
-    df["ما هي احتياجاتك؟ (أضفها إذا لم يتم ذكرها)"].apply(lambda x: is_request_in_list(x, selected_options, options))
-]
-filtered_verified_df = verified_df[
-    verified_df["Help Details"].apply(lambda x: is_request_in_list(x, selected_options, options))
-]
 
+# Load data
+(
+    df,
+    filtered_df,
+    interventions_df,
+    verified_df,
+    filtered_verified_df,
+    solved_verified_requests,
+    douar_df,
+    len_requests,
+    len_interventions,
+    len_solved_verified_requests,
+) = load_data(show_unverified, selected_options, options)
 
 # Selection of interventions
 (
@@ -111,7 +86,7 @@ if show_unverified:
     show_requests(filtered_df, fg)
 
 # Add verified requests markers to map
-show_verified_requests(verified_df, emergency_fgs)
+show_verified_requests(filtered_verified_df, emergency_fgs)
 
 # Add legend
 legend_macro = get_legend_macro(show_unverified)

src/dataframes.py

@@ -1,5 +1,57 @@
 
 import streamlit as st
+from src.utils import add_latlng_col, parse_gg_sheet, parse_json_file, is_request_in_list
+import pandas as pd
+
+VERIFIED_REQUESTS_URL = (
+    "https://docs.google.com/spreadsheets/d/1PXcAtI5L95hHSXAiRl3Y4v5O4coG39S86OTfBEcvLTE/edit#gid=0"
+)
+REQUESTS_URL = "https://docs.google.com/spreadsheets/d/1gYoBBiBo1L18IVakHkf3t1fOGvHWb23loadyFZUeHJs/edit#gid=966953708"
+INTERVENTIONS_URL = (
+    "https://docs.google.com/spreadsheets/d/1eXOTqunOWWP8FRdENPs4cU9ulISm4XZWYJJNR1-SrwY/edit#gid=2089222765"
+)
+DOUARS_URL = "data/regions.json"
+
+def load_data(show_unverified, selected_options, options):
+    df = parse_gg_sheet(REQUESTS_URL)
+    if show_unverified:
+        df = add_latlng_col(df, process_column=15)
+    interventions_df = parse_gg_sheet(INTERVENTIONS_URL)
+    interventions_df = add_latlng_col(interventions_df, process_column="Automatic Extracted Coordinates")
+    verified_df = parse_gg_sheet(VERIFIED_REQUESTS_URL)
+    verified_df = add_latlng_col(verified_df, process_column="Automatic Extracted Coordinates")
+    douar_df = parse_json_file(DOUARS_URL)
+
+    # check if verified requests have been solved
+    solved_verified_requests = verified_df[~pd.isnull(verified_df["Status"])]
+    verified_df = verified_df[pd.isnull(verified_df["Status"])]
+
+    len_requests = len(df)
+    len_interventions = len(interventions_df)
+    len_solved_verified_requests = len(solved_verified_requests)
+
+    df["id"] = df.index  # Needed to display request id
+    verified_df["id"] = verified_df.index  # Needed to display request id
+    # keep rows with at least one request in selected_options
+    filtered_df = df[
+        df["ما هي احتياجاتك؟ (أضفها إذا لم يتم ذكرها)"].apply(lambda x: is_request_in_list(x, selected_options, options))
+    ]
+    filtered_verified_df = verified_df[
+        verified_df["Help Details"].apply(lambda x: is_request_in_list(x, selected_options, options))
+    ]
+    return (
+        df,
+        filtered_df,
+        interventions_df,
+        verified_df,
+        filtered_verified_df,
+        solved_verified_requests,
+        douar_df,
+        len_requests,
+        len_interventions,
+        len_solved_verified_requests,
+    )
+
 
 
 def display_dataframe(df, drop_cols, data_url, search_id=True, status=False, for_help_requests=False, show_link=True):