Update few files

app/app.py

@@ -4,21 +4,69 @@ src_directory = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..",
 sys.path.append(src_directory)
 import streamlit as st
 import streamlit_functions
+import pandas as pd
+import matplotlib.pyplot as plt
+
+def load_data(file):
+    try:
+        data = pd.read_csv(file)
+        return data
+    except Exception as e:
+        st.error(f"Error loading file: {e}")
+        return None
 
 st.title("World Population Data")
-csv_file = "./world_population.csv"
-# csv_file = st.file_uploader("Choose a CSV file", type=['csv'])
-
-if csv_file:
-    choosen_data = streamlit_functions.choose_data_view(st)
-    if choosen_data == "Show All Continents":
-        option = choosen_data.replace(" ","")
-        streamlit_functions.display_contents(option, st)
-    if choosen_data == "Show All Countries":
-        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)
+st.sidebar.title("Navigation")
+
+choosen_data = streamlit_functions.choose_data_to_view(st)
+
+if choosen_data == "Show All Continents":
+    option = choosen_data.replace(" ", "")
+    streamlit_functions.display_contents(option, st)
+
+elif choosen_data == "Show All Countries":
+    option = choosen_data.replace(" ", "")
+    streamlit_functions.display_contents(option, st)
+
+elif choosen_data == "Show Continent Stats":
+    streamlit_functions.display_stats(st, choosen_data)
+
+elif choosen_data == "Show Country Stats":
+    streamlit_functions.display_stats(st, choosen_data)
+
+elif choosen_data == "Show Continent Wise Data":
+    clean_choosen_data = choosen_data.replace(" ", "")
+    attribute = streamlit_functions.choose_attribute_to_view(st)
+    if attribute in ["Population","Area"]:
+        option = f"{clean_choosen_data}/{attribute}"
+        streamlit_functions.display_contents(option,st)
+
+elif choosen_data == "Show Country Data":
+    clean_choosen_data = choosen_data.replace(" ", "")
+    country_list = streamlit_functions.get_list("ShowAllCountries")
+    choosen_country = streamlit_functions.choose_data_from_list(st,country_list)
+    clean_country = choosen_country.replace(" ","").capitalize()
+    attribute = streamlit_functions.choose_attribute_to_view(st)
+    if attribute in ["Population","Area"]:
+        option = f"{clean_choosen_data}/{clean_country}/{attribute}"
+        streamlit_functions.display_contents(option,st)
 
+elif choosen_data == "Upload Custom CSV":
+    uploaded_file = st.sidebar.file_uploader("Choose a CSV file", type=['csv'])
+    
+    if uploaded_file is not None:
+        data = load_data(uploaded_file)
+        
+        if data is not None:
+            st.write("Data Preview:", data.head())
+            
+            if "Continent" in data.columns and "Population" in data.columns:
+                continent_data = data.groupby("Continent")["Population"].sum().reset_index()
+                st.write("Continent-wise Population Summary:", continent_data)
+            else:
+                st.warning("The uploaded CSV does not contain 'Continent' or 'Population' columns.")
+        
+        else:
+            st.warning("There was an error loading the file. Please check the format and try again.")
+else:
+    st.write("Please choose an option from the sidebar to view the data.")

app/requests_app.py

@@ -1,6 +1,6 @@
 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()
+    # 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

@@ -5,35 +5,52 @@ 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 Stats",
-    "Show Country Stats",
-    ]
-    selected_option = st_interface.selectbox("Select Data to Display", data_view_options)
-    return selected_option
+def display_contents(option, streamlit):
+    try:
+        cont = requests_app.get_api(option)
+        continents = streamlit.table(cont)
+        return continents
+    except Exception as e:
+        streamlit.error(f"An error occurred while processing the CSV: {e}")
+
+def get_list(option):
+    data = requests_app.get_api(option)
+    return data["Country"].values()
+
+def choose_data_to_view(st_interface):
+    choosen_option = st_interface.sidebar.selectbox(
+        "Data Insights",
+        options=[
+            "Select an option",  
+            "Show All Continents",
+            "Show Continent Wise Data",
+            "Show Continent Stats",
+            "Show All Countries",
+            "Show Country Data" ,
+            "Show Country Stats",
+            "Upload Custom CSV"
+        ]
+    )
+
+    if choosen_option == "Select an option":
+        return None  
+    return choosen_option
+
+def choose_data_from_list(st_interface,list_option):
+    choosen_option = st_interface.sidebar.selectbox(
+        "Options",list_option)
+    return choosen_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)
+    selected_option = st_interface.sidebar.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)
+    selected_option = st_interface.sidebar.selectbox("Select Attribute to Display", attribute_options)
     return selected_option
 
-def display_contents(option, streamlit):
-    try:
-        cont = requests_app.get_api(option)
-        continents = streamlit.table(cont)
-        return continents
-    except Exception as e:
-        streamlit.error(f"An error occurred while processing the CSV: {e}")
-
 def display_stats(streamlit,choosen_data):
     clean_choosen_data = choosen_data.replace(" ", "")
     attribute = choose_attribute_to_view(streamlit)