Update app.py

app.py

@@ -1,44 +1,76 @@
 import gradio as gr
 import pandas as pd
-from data_loader import load_data
-from visualizer import create_plot
-from utils import get_numeric_columns, get_all_columns
+import plotly.express as px
+import requests
+import io
 
-df_global = None  # Used to persist the DataFrame
+# Global DataFrame to store loaded data
+df_global = pd.DataFrame()
 
+# Load data from uploaded file
+def load_data(file):
+    if file is None:
+        return pd.DataFrame()
+    ext = file.name.split('.')[-1]
+    if ext == 'csv':
+        return pd.read_csv(file.name)
+    elif ext in ['xls', 'xlsx']:
+        return pd.read_excel(file.name)
+    elif ext == 'json':
+        return pd.read_json(file.name)
+    return pd.DataFrame()
+
+# Load data from URL
+def load_url_data(url):
+    try:
+        response = requests.get(url)
+        response.raise_for_status()
+        if url.endswith(".csv"):
+            return pd.read_csv(io.StringIO(response.text))
+        elif url.endswith(".json"):
+            return pd.read_json(io.StringIO(response.text))
+        elif url.endswith(".xlsx") or url.endswith(".xls"):
+            return pd.read_excel(io.BytesIO(response.content))
+    except Exception as e:
+        print(f"Error loading from URL: {e}")
+    return pd.DataFrame()
+
+# Process the uploaded file or URL
 def process_inputs(file, url):
     global df_global
-    if url:
-        df_global = fetch_file_from_url(url)
-    elif file:
-        df_global = load_data(file)
-    else:
-        # No file or URL: clear everything
-        return (
-            pd.DataFrame(),
-            gr.Dropdown.update(choices=[], value=None),
-            gr.Dropdown.update(choices=[], value=None),
-        )
-
-    all_cols = get_all_columns(df_global)
-    numeric_cols = get_numeric_columns(df_global)
-
-    default_x = all_cols[0] if all_cols else None
-    default_y = numeric_cols[0] if numeric_cols else None
-
-    return (
-        df_global.head(),
-        gr.Dropdown.update(choices=all_cols, value=default_x),
-        gr.Dropdown.update(choices=numeric_cols, value=default_y),
-    )
 
+    try:
+        if url:
+            df = load_url_data(url)
+        elif file:
+            df = load_data(file)
+        else:
+            return pd.DataFrame(), gr.update(choices=[], value=None), gr.update(choices=[], value=None)
+
+        if df.empty:
+            return pd.DataFrame(), gr.update(choices=[], value=None), gr.update(choices=[], value=None)
+
+        df_global = df
+
+        all_cols = list(df.columns)
+        numeric_cols = list(df.select_dtypes(include='number').columns)
+
+        default_x = all_cols[0] if all_cols else None
+        default_y = numeric_cols[0] if numeric_cols else None
+
+        return df.head(), gr.update(choices=all_cols, value=default_x), gr.update(choices=numeric_cols, value=default_y)
+
+    except Exception as e:
+        print("Error processing inputs:", e)
+        return pd.DataFrame(), gr.update(choices=[], value=None), gr.update(choices=[], value=None)
+
+# Create the plot
 def update_plot(chart_type, x_col, y_col):
     global df_global
     if df_global.empty or x_col is None or y_col is None:
         return None
 
     try:
-        import plotly.express as px
         if chart_type == "Bar Chart":
             fig = px.bar(df_global, x=x_col, y=y_col)
         elif chart_type == "Line Chart":
@@ -53,42 +85,45 @@ def update_plot(chart_type, x_col, y_col):
             return None
         return fig
     except Exception as e:
-        print("Error generating plot:", e)
+        print("Plot error:", e)
         return None
-        
 
+# Gradio UI
 with gr.Blocks() as demo:
-    gr.Markdown("# 📊 Thunder BI-Data Visualization App")
+    gr.Markdown("## 📊 Data Visualization App")
 
     with gr.Row():
-        file_input = gr.File(file_types=[".csv", ".xlsx", ".json"], label="Upload file")
+        file_input = gr.File(file_types=[".csv", ".xlsx", ".json"], label="Upload File")
         url_input = gr.Textbox(label="Or paste a file URL")
-        dataframe_output = gr.Dataframe(label="Data Preview", interactive=False)
-
-    with gr.Row():
-        chart_type = gr.Dropdown(["Bar Chart", "Line Chart", "Scatter Plot", "Pie Chart", "Box Plot"], label="Chart Type")
-        x_col = gr.Dropdown(label="X-axis Column")
-        y_col = gr.Dropdown(label="Y-axis Column")
 
     load_button = gr.Button("Load Data")
-    
+
+    dataframe_output = gr.Dataframe(label="Data Preview", interactive=False)
+
+    chart_type = gr.Dropdown(
+        ["Bar Chart", "Line Chart", "Scatter Plot", "Pie Chart", "Box Plot"],
+        label="Chart Type"
+    )
+    x_col = gr.Dropdown(label="X-axis")
+    y_col = gr.Dropdown(label="Y-axis")
+
     generate_button = gr.Button("Generate Chart")
     plot_output = gr.Plot(label="Generated Chart")
 
+    # Button functionality
     load_button.click(
-    fn=process_inputs,                   # The function to call
-    inputs=[file_input, url_input],     # What to pass in
-    outputs=[dataframe_output, x_col, y_col]  # What to update
+        fn=process_inputs,
+        inputs=[file_input, url_input],
+        outputs=[dataframe_output, x_col, y_col]
     )
 
     generate_button.click(
-    fn=update_plot,
-    inputs=[chart_type, x_col, y_col],
-    outputs=plot_output
+        fn=update_plot,
+        inputs=[chart_type, x_col, y_col],
+        outputs=plot_output
     )
-    
-
-    file_input.change(fn=process_inputs, inputs=file_input, outputs=[dataframe_output, x_col, y_col])
-    gr.Button("Generate Chart").click(fn=update_plot, inputs=[chart_type, x_col, y_col], outputs=plot_output)
 
-demo.launch()
+# Run the app
+if __name__ == "__main__":
+    demo.launch()
+