Update app.py

app.py

@@ -1,27 +1,29 @@
 import gradio as gr
 import pandas as pd
 import plotly.express as px
-import requests
 import io
+import requests
 
-# Global DataFrame to store loaded data
 df_global = pd.DataFrame()
 
-# Load data from uploaded file
+# Load from 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)
+    try:
+        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)
+    except Exception as e:
+        print("File load error:", e)
     return pd.DataFrame()
 
-# Load data from URL
-def load_url_data(url):
+# Load from URL
+def load_url(url):
     try:
         response = requests.get(url)
         response.raise_for_status()
@@ -32,98 +34,67 @@ def load_url_data(url):
         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}")
+        print("URL load error:", e)
     return pd.DataFrame()
 
-# Process the uploaded file or URL
+# Process both file and URL
 def process_inputs(file, url):
     global df_global
+    df = load_url(url) if url else load_data(file)
 
-    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)
+    if df.empty:
+        return pd.DataFrame(), gr.update(choices=[], value=None), gr.update(choices=[], value=None)
 
-        default_x = all_cols[0] if all_cols else None
-        default_y = numeric_cols[0] if numeric_cols else None
+    df_global = df
+    all_cols = list(df.columns)
+    num_cols = list(df.select_dtypes(include="number").columns)
 
-        return df.head(), gr.update(choices=all_cols, value=default_x), gr.update(choices=numeric_cols, value=default_y)
+    default_x = all_cols[0] if all_cols else None
+    default_y = num_cols[0] if num_cols else None
 
-    except Exception as e:
-        print("Error processing inputs:", e)
-        return pd.DataFrame(), gr.update(choices=[], value=None), gr.update(choices=[], value=None)
+    return df.head(), gr.update(choices=all_cols, value=default_x), gr.update(choices=num_cols, value=default_y)
 
-# Create the plot
-def update_plot(chart_type, x_col, y_col):
+# Plot
+def update_plot(chart_type, x, y):
     global df_global
-    if df_global.empty or x_col is None or y_col is None:
+    if df_global.empty:
         return None
 
     try:
         if chart_type == "Bar Chart":
-            fig = px.bar(df_global, x=x_col, y=y_col)
+            return px.bar(df_global, x=x, y=y)
         elif chart_type == "Line Chart":
-            fig = px.line(df_global, x=x_col, y=y_col)
+            return px.line(df_global, x=x, y=y)
         elif chart_type == "Scatter Plot":
-            fig = px.scatter(df_global, x=x_col, y=y_col)
+            return px.scatter(df_global, x=x, y=y)
         elif chart_type == "Pie Chart":
-            fig = px.pie(df_global, names=x_col, values=y_col)
+            return px.pie(df_global, names=x, values=y)
         elif chart_type == "Box Plot":
-            fig = px.box(df_global, x=x_col, y=y_col)
-        else:
-            return None
-        return fig
+            return px.box(df_global, x=x, y=y)
     except Exception as e:
         print("Plot error:", e)
         return None
 
-# Gradio UI
 with gr.Blocks() as demo:
-    gr.Markdown("## 📊 Data Visualization App")
+    gr.Markdown("## 📊 Clean Data Visualizer")
 
     with gr.Row():
         file_input = gr.File(file_types=[".csv", ".xlsx", ".json"], label="Upload File")
-        url_input = gr.Textbox(label="Or paste a file URL")
-
-    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")
+        url_input = gr.Textbox(label="Or enter file URL")
 
-    generate_button = gr.Button("Generate Chart")
-    plot_output = gr.Plot(label="Generated Chart")
+    load_button = gr.Button("Load")
 
-    # Button functionality
-    load_button.click(
-        fn=process_inputs,
-        inputs=[file_input, url_input],
-        outputs=[dataframe_output, x_col, y_col]
-    )
+    df_preview = gr.Dataframe(label="Preview", interactive=False)
+    x_dropdown = gr.Dropdown(label="X-axis")
+    y_dropdown = gr.Dropdown(label="Y-axis")
+    chart_type = gr.Dropdown(["Bar Chart", "Line Chart", "Scatter Plot", "Pie Chart", "Box Plot"], label="Chart Type")
+    plot_area = gr.Plot(label="Chart")
+    generate_button = gr.Button("Generate Plot")
 
-    generate_button.click(
-        fn=update_plot,
-        inputs=[chart_type, x_col, y_col],
-        outputs=plot_output
-    )
+    # Event hooks
+    load_button.click(process_inputs, inputs=[file_input, url_input], outputs=[df_preview, x_dropdown, y_dropdown])
+    generate_button.click(update_plot, inputs=[chart_type, x_dropdown, y_dropdown], outputs=plot_area)
 
-# Run the app
 if __name__ == "__main__":
     demo.launch()