Update app.py

app.py

@@ -1,5 +1,6 @@
 import gradio as gr
 import pandas as pd
+import plotly.express as px
 from shapely.geometry import Point, Polygon
 
 def load_csv(file):
@@ -11,46 +12,45 @@ def update_dropdowns(df):
 def create_plot(df, x_col, y_col):
     if df is None or x_col is None or y_col is None:
         return None
-    return gr.ScatterPlot(
-        value=pd.DataFrame({x_col: df[x_col], y_col: df[y_col]}),
-        x=x_col,
-        y=y_col,
-        title=f"{x_col} vs {y_col}",
-        interactive=True,
-        tooltip=[x_col, y_col],
-        elem_id="scatter"
-    )
+        
+    fig = px.scatter(df, x=x_col, y=y_col, title=f"{x_col} vs {y_col}")
+    fig.update_layout(dragmode='lasso')
+    return fig
 
 def find_points_in_polygon(selected_data, df, x_col, y_col):
-    if not selected_data or df.empty or not x_col or not y_col:
-        return gr.DataFrame()
+    if not selected_data or not df.empty:
+        return pd.DataFrame()
+    
+    # Get selected points from Plotly's lasso selection
+    selected_points = selected_data['points']
+    if not selected_points:
+        return pd.DataFrame()
+    
+    # Extract coordinates of polygon vertices
+    polygon_points = [(p['x'], p['y']) for p in selected_points]
+    
+    # Create polygon and check containment
+    polygon = Polygon(polygon_points)
+    mask = df.apply(lambda row: polygon.contains(Point(row[x_col], row[y_col])), axis=1)
     
-    try:
-        polygon_points = [(p["x"], p["y"]) for p in selected_data["points"]]
-        if len(polygon_points) < 3:
-            return gr.DataFrame()
-            
-        polygon = Polygon(polygon_points)
-        points = df[[x_col, y_col]].apply(lambda row: Point(row[x_col], row[y_col]), axis=1)
-        mask = points.apply(lambda p: polygon.contains(p))
-        return df[mask]
-    except Exception as e:
-        print(f"Error: {e}")
-        return gr.DataFrame()
+    return df[mask]
 
 with gr.Blocks() as demo:
-    gr.Markdown("## CSV Data Explorer with Polygon Selection")
+    gr.Markdown("## Interactive CSV Explorer with Polygon Selection")
     
     df_state = gr.State(pd.DataFrame())
+    x_col_state = gr.State()
+    y_col_state = gr.State()
     
     with gr.Row():
         csv_upload = gr.File(label="Upload CSV", file_types=[".csv"])
         x_col = gr.Dropdown(label="X Column")
         y_col = gr.Dropdown(label="Y Column")
     
-    plot = gr.ScatterPlot(interactive=True, label="Scatter Plot")
-    results = gr.DataFrame(label="Points in Polygon", render=False)
+    plot = gr.Plot(label="Scatter Plot")
+    results = gr.DataFrame(label="Selected Points")
     
+    # Upload handling
     csv_upload.upload(
         load_csv,
         inputs=csv_upload,
@@ -61,20 +61,31 @@ with gr.Blocks() as demo:
         outputs=[x_col, y_col]
     )
     
+    # Plot updates
     x_col.change(
         create_plot,
         inputs=[df_state, x_col, y_col],
         outputs=plot
+    ).then(
+        lambda x: x,  # Store x_col in state
+        inputs=x_col,
+        outputs=x_col_state
     )
+    
     y_col.change(
         create_plot,
         inputs=[df_state, x_col, y_col],
         outputs=plot
+    ).then(
+        lambda y: y,  # Store y_col in state
+        inputs=y_col,
+        outputs=y_col_state
     )
     
+    # Selection handling
     plot.select(
         find_points_in_polygon,
-        inputs=[df_state, x_col, y_col],
+        inputs=[gr.State(), df_state, x_col_state, y_col_state],
         outputs=results
     )