Update app.py

app.py

@@ -3,62 +3,57 @@ import pandas as pd
 import matplotlib.pyplot as plt
 import fcsparser
 
+# Function to parse the FCS file
 def parse_fcs(file):
+    if file is None:
+        return pd.DataFrame()
     try:
-        # Parse the FCS file
         meta, data = fcsparser.parse(file.name)
-        df = pd.DataFrame(data)
-        
-        # Check if the DataFrame is empty
-        if df.empty:
-            raise ValueError("The parsed DataFrame is empty. Please check the .fcs file.")
-        
-        return df
+        return pd.DataFrame(data)
     except Exception as e:
         raise gr.Error(f"Error parsing .fcs file: {str(e)}")
 
-def plot_fcs(data, x_axis, y_axis):
-    try:
-        # Plot the data
-        plt.figure(figsize=(10, 6))
-        plt.scatter(data[x_axis], data[y_axis], alpha=0.5)
-        plt.xlabel(x_axis)
-        plt.ylabel(y_axis)
-        plt.title(f"{x_axis} vs {y_axis}")
-        return plt.gcf()  # Return the current figure
-    except Exception as e:
-        raise gr.Error(f"Error plotting data: {str(e)}")
+# Function to populate the dropdown choices
+def populate_dropdowns(df):
+    if df is None or df.empty:
+        return gr.Dropdown.update(choices=[]), gr.Dropdown.update(choices=[])
+    columns = df.columns.tolist()
+    return gr.Dropdown.update(choices=columns), gr.Dropdown.update(choices=columns)
 
-def process_fcs(file):
+# Function to plot the data
+def plot_fcs(df, x, y):
+    if df is None or df.empty or x not in df.columns or y not in df.columns:
+        fig = plt.figure()
+        plt.text(0.5, 0.5, "Please select valid columns.", ha='center', va='center')
+        plt.axis('off')
+        return fig
     try:
-        # Parse the FCS file and get the DataFrame
-        df = parse_fcs(file)
-        
-        # Get the column names for x and y axis choices
-        columns = df.columns.tolist()
-        
-        # Check if columns are available
-        if not columns:
-            raise ValueError("No columns found in the DataFrame.")
-        
-        # Create a Gradio interface for selecting x and y axis
-        with gr.Blocks() as demo:
-            with gr.Row():
-                x_axis = gr.Dropdown(choices=columns, label="Select X-axis")
-                y_axis = gr.Dropdown(choices=columns, label="Select Y-axis")
-            plot = gr.Plot()
-            
-            # Update the plot when the dropdowns change
-            x_axis.change(lambda x, y, df: plot_fcs(df, x, y), inputs=[x_axis, y_axis, gr.State(df)], outputs=plot)
-            y_axis.change(lambda x, y, df: plot_fcs(df, x, y), inputs=[x_axis, y_axis, gr.State(df)], outputs=plot)
-        
-        return demo
+        fig = plt.figure(figsize=(10, 6))
+        plt.scatter(df[x], df[y], alpha=0.5)
+        plt.xlabel(x)
+        plt.ylabel(y)
+        plt.title(f"{x} vs {y}")
+        return fig
     except Exception as e:
-        raise gr.Error(f"Error processing .fcs file: {str(e)}")
+        raise gr.Error(f"Error plotting data: {str(e)}")
 
-# Gradio interface for uploading the FCS file
+# Build the Gradio app
 with gr.Blocks() as demo:
+    gr.Markdown("<h1>FCS File Uploader and Plotter</h1>")
+    
     file = gr.File(label="Upload FCS File", file_types=[".fcs"])
-    output = gr.Interface(fn=process_fcs, inputs=file, outputs="component", live=True)
+    df_state = gr.State()
+    
+    with gr.Row():
+        x_axis = gr.Dropdown(label="Select X-axis")
+        y_axis = gr.Dropdown(label="Select Y-axis")
+    
+    plot = gr.Plot()
+    
+    # Event handlers
+    file.change(parse_fcs, file, df_state)
+    file.change(populate_dropdowns, df_state, [x_axis, y_axis])
+    x_axis.change(plot_fcs, [df_state, x_axis, y_axis], plot)
+    y_axis.change(plot_fcs, [df_state, x_axis, y_axis], plot)
 
 demo.launch()