Added few streamlit_functions

app/app.py

@@ -12,36 +12,13 @@ csv_file = "./world_population.csv"
 if csv_file:
     choosen_data = streamlit_functions.choose_data_view(st)
     if choosen_data == "Show All Continents":
-        opt = choosen_data.replace(" ","")
-        streamlit_functions.display_contents(opt, st)
+        option = choosen_data.replace(" ","")
+        streamlit_functions.display_contents(option, st)
     if choosen_data == "Show All Countries":
-        opt = choosen_data.replace(" ","")
-        streamlit_functions.display_contents(opt, st)
-    if choosen_data == "Show Continent with Highest Population":
-        opt = choosen_data.replace(" ","")
-        streamlit_functions.display_contents(opt, st)
-    if choosen_data == "Show Continent with Lowest Population":
-        opt = choosen_data.replace(" ","")
-        streamlit_functions.display_contents(opt, st)
-    if choosen_data == "Show Country with Highest Population":
-        opt = choosen_data.replace(" ","")
-        streamlit_functions.display_contents(opt, st)
-    if choosen_data == "Show Country with Lowest Population":
-        opt = choosen_data.replace(" ","")
-        streamlit_functions.display_contents(opt, st)
-    
-
-
-
-
-
-
-
-
-    # selected_stat = st.selectbox("Select the stat",stat_list)
-    # list_of_selected_cont = home_page.list_country_by_continent(df,selected_continent)
-    # selected_key = st.selectbox("Select the key's to fetch data:",df.keys())
-    # max_population = home_page.get_continent_with_max_pop(df)
-    # st.write(f"Countries data in {selected_continent}:", list_of_selected_cont)
-    # st.write(f"{selected_continent}'s with max population is :",max_population)
+        option = choosen_data.replace(" ","")
+        streamlit_functions.display_contents(option, st)
+    if choosen_data == "Show Continent Stats":
+        streamlit_functions.display_stats(st,choosen_data)
+    if choosen_data == "Show Country Stats":
+        streamlit_functions.display_stats(st,choosen_data)
 

app/requests_app.py

@@ -2,4 +2,5 @@ import requests
 
 def get_api(end_point : str = None):
     r = requests.get(f"https://velatest-world-data-insights-api.hf.space/{end_point}")
+    # r = requests.get(f"http://127.0.0.1:8000/{end_point}")
     return r.json()

app/streamlit_functions.py

@@ -3,20 +3,29 @@ import sys
 src_directory = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..", "main"))
 sys.path.append(src_directory)
 import requests_app
+import pandas as pd
 
 def choose_data_view(st_interface):
     data_view_options  = [
     "Select an option",
     "Show All Continents",
     "Show All Countries",
-    "Show Continent with Highest Population",
-    "Show Continent with Lowest Population",
-    "Show Country with Highest Population",
-    "Show Country with Lowest Population"
+    "Show Continent Stats",
+    "Show Country Stats",
     ]
     selected_option = st_interface.selectbox("Select Data to Display", data_view_options)
     return selected_option
 
+def choose_stat_to_view(st_interface):
+    stat_options = ["Select an option","highest","lowest"]
+    selected_option = st_interface.selectbox("Select Stat to Display", stat_options)
+    return selected_option
+
+def choose_attribute_to_view(st_interface):
+    attribute_options = ["Select an option","Population", "Area"]
+    selected_option = st_interface.selectbox("Select Attribute to Display", attribute_options)
+    return selected_option
+
 def display_contents(option, streamlit):
     try:
         cont = requests_app.get_api(option)
@@ -25,40 +34,11 @@ def display_contents(option, streamlit):
     except Exception as e:
         streamlit.error(f"An error occurred while processing the CSV: {e}")
 
-# def display_countries(option, streamlit):
-#     cont = requests_app.get_api(option)
-#     return streamlit.table(cont)
-
-# def display_continent_with_highest_population(option, streamlit):
-#     cont = requests_app.get_api(option)
-#     return streamlit.table(cont)
-
-# def display_country_by_continents(selected_continent,streamlit):
-#     if selected_continent is not "Choose a continent to display countries":
-#             countries_list = requests_app.get_api(selected_continent)
-#             streamlit.table(countries_list)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    # else:
-    #         streamlit.warning("Please select a valid continent.")
-        #     selected_continent = streamlit.selectbox(
-    #     "Select a continent",["Choose a continent to display countries"] + list(df['Continent'].unique()),)
-
-
-
-          
+def display_stats(streamlit,choosen_data):
+    clean_choosen_data = choosen_data.replace(" ", "")
+    attribute = choose_attribute_to_view(streamlit)
+    if attribute in ["Population","Area"] :
+        stat = choose_stat_to_view(streamlit)
+        if stat in ["highest" , "lowest"]:
+            option = f"{clean_choosen_data}/{attribute}/{stat}"
+            display_contents(option,streamlit)