Update app.py

app.py

@@ -14,14 +14,13 @@ REQUIRED_COLUMNS = ['DeviceID', 'Lab', 'Type', 'Timestamp', 'Status', 'UsageCoun
 def load_logs(file_obj):
     try:
         if file_obj is not None:
-            # file_obj is a NamedTemporaryFile, get file path to read with pandas directly
             df = pd.read_csv(file_obj.name)
+            df.columns = df.columns.str.strip()  # remove whitespace around column names
             if not all(col in df.columns for col in REQUIRED_COLUMNS):
                 raise ValueError(f"CSV must contain columns: {', '.join(REQUIRED_COLUMNS)}")
             df['Timestamp'] = pd.to_datetime(df['Timestamp'], errors='coerce')
             df.dropna(subset=['Timestamp'], inplace=True)
         else:
-            # Default sample data
             df = pd.DataFrame({
                 'DeviceID': ['D001', 'D002', 'D003'],
                 'Lab': ['Lab A', 'Lab B', 'Lab A'],
@@ -36,36 +35,22 @@ def load_logs(file_obj):
     except Exception as e:
         raise ValueError(f"Failed to load CSV: {e}")
 
-# ----------------------------
-# Filter dataframe by Lab and Type
-# ----------------------------
-def filter_data(df, lab, dev_type):
-    if lab != "All":
-        df = df[df['Lab'] == lab]
-    if dev_type != "All":
-        df = df[df['Type'] == dev_type]
-    return df
-
 # ----------------------------
 # Summarize Log Data
 # ----------------------------
-def summarize_logs(df):
-    if df.empty:
-        return pd.DataFrame(columns=['OK', 'DOWN'])
+def summarize_logs(df, selected_lab, selected_type):
+    if selected_lab != "All":
+        df = df[df['Lab'] == selected_lab]
+    if selected_type != "All":
+        df = df[df['Type'] == selected_type]
     summary = df.groupby(['Lab', 'Type'])['Status'].value_counts().unstack().fillna(0)
     return summary
 
 # ----------------------------
 # Generate Chart
 # ----------------------------
-def generate_chart(df, lab, dev_type):
-    filtered_df = filter_data(df, lab, dev_type)
-    summary = summarize_logs(filtered_df)
-    if summary.empty:
-        fig, ax = plt.subplots()
-        ax.text(0.5, 0.5, "No data for selected filters", ha='center', va='center')
-        ax.axis('off')
-        return fig
+def generate_chart(df, selected_lab, selected_type):
+    summary = summarize_logs(df, selected_lab, selected_type)
     fig, ax = plt.subplots(figsize=(8, 4))
     summary.plot(kind='bar', stacked=True, ax=ax)
     ax.set_title("Device Uptime/Downtime Summary")
@@ -78,9 +63,8 @@ def generate_chart(df, lab, dev_type):
 # ----------------------------
 # Export PDF using ReportLab
 # ----------------------------
-def export_pdf(df, lab, dev_type):
-    filtered_df = filter_data(df, lab, dev_type)
-    summary = summarize_logs(filtered_df)
+def export_pdf(df, selected_lab, selected_type):
+    summary = summarize_logs(df, selected_lab, selected_type)
     buffer = io.BytesIO()
     pdf = canvas.Canvas(buffer, pagesize=letter)
     width, height = letter
@@ -89,9 +73,8 @@ def export_pdf(df, lab, dev_type):
     pdf.drawCentredString(width / 2, height - 40, "LabOps Dashboard Summary Report")
     pdf.setFont("Helvetica", 10)
     pdf.drawCentredString(width / 2, height - 60, f"Generated: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}")
-    pdf.drawCentredString(width / 2, height - 80, f"Filters - Lab: {lab}, Type: {dev_type}")
 
-    y = height - 110
+    y = height - 100
     pdf.setFont("Helvetica-Bold", 10)
     pdf.drawString(50, y, "Lab")
     pdf.drawString(150, y, "Device Type")
@@ -100,9 +83,9 @@ def export_pdf(df, lab, dev_type):
     y -= 20
     pdf.setFont("Helvetica", 10)
 
-    for (lab_name, dev_type_name), row in summary.iterrows():
-        pdf.drawString(50, y, str(lab_name))
-        pdf.drawString(150, y, str(dev_type_name))
+    for (lab, dev_type), row in summary.iterrows():
+        pdf.drawString(50, y, str(lab))
+        pdf.drawString(150, y, str(dev_type))
         pdf.drawString(300, y, str(int(row.get('OK', 0))))
         pdf.drawString(350, y, str(int(row.get('DOWN', 0))))
         y -= 20
@@ -115,61 +98,53 @@ def export_pdf(df, lab, dev_type):
     return ("LabOps_Summary.pdf", buffer.read())
 
 # ----------------------------
-# UI Functions
+# Dashboard Interface Logic
 # ----------------------------
+def update_ui(file_obj):
+    try:
+        df = load_logs(file_obj)
+        labs = ["All"] + sorted(df['Lab'].unique().tolist())
+        types = ["All"] + sorted(df['Type'].unique().tolist())
+        return df, gr.Dropdown.update(choices=labs, value="All"), gr.Dropdown.update(choices=types, value="All"), gr.Textbox.update(visible=False)
+    except Exception as e:
+        return None, gr.Dropdown.update(choices=[], value=None), gr.Dropdown.update(choices=[], value=None), gr.Textbox.update(value=f"❌ Error: {e}", visible=True)
 
-def get_unique_labs_types(df):
-    labs = ["All"] + sorted(df['Lab'].unique().tolist())
-    types = ["All"] + sorted(df['Type'].unique().tolist())
-    return labs, types
-
-def on_file_load(file_obj):
-    df = load_logs(file_obj)
-    labs, types = get_unique_labs_types(df)
-    fig = generate_chart(df, "All", "All")
-    return fig, gr.Dropdown.update(choices=labs, value="All"), gr.Dropdown.update(choices=types, value="All"), ""
-
-def on_filter_change(file_obj, lab, dev_type):
-    df = load_logs(file_obj)
-    fig = generate_chart(df, lab, dev_type)
-    return fig
+def dashboard(df, selected_lab, selected_type):
+    try:
+        return generate_chart(df, selected_lab, selected_type)
+    except Exception as e:
+        return gr.update(visible=True), gr.Textbox.update(value=f"❌ Error: {e}", visible=True)
 
-def on_generate_pdf(file_obj, lab, dev_type):
-    df = load_logs(file_obj)
+def generate_pdf_button(df, selected_lab, selected_type):
     try:
-        filename, pdf_bytes = export_pdf(df, lab, dev_type)
-        return gr.File.update(value=(filename, pdf_bytes), visible=True), ""
+        filename, pdf_bytes = export_pdf(df, selected_lab, selected_type)
+        return gr.File.update(value=(filename, pdf_bytes), visible=True), gr.Textbox.update(visible=False)
     except Exception as e:
-        return gr.File.update(visible=False), f"❌ Error generating PDF: {e}"
+        return gr.File.update(visible=False), gr.Textbox.update(value=f"❌ Error: {e}", visible=True)
 
 # ----------------------------
 # Gradio Interface
 # ----------------------------
 with gr.Blocks() as demo:
-    gr.Markdown("## 🧪 LabOps Dashboard with Filters")
+    gr.Markdown("## 🖊️ LabOps Dashboard with Filters")
     gr.Markdown("Upload lab device logs, filter by Lab and Equipment Type, visualize uptime/downtime & generate PDF reports.")
 
+    df_state = gr.State()
+
     with gr.Row():
         file_input = gr.File(label="Upload Log CSV", file_types=[".csv"])
-    with gr.Row():
-        lab_dropdown = gr.Dropdown(label="Select Lab", choices=["All"], value="All")
-        type_dropdown = gr.Dropdown(label="Select Equipment Type", choices=["All"], value="All")
+        lab_dropdown = gr.Dropdown(label="Select Lab", choices=["All"])
+        type_dropdown = gr.Dropdown(label="Select Equipment Type", choices=["All"])
 
     plot_output = gr.Plot()
-    error_output = gr.Textbox(visible=False, interactive=False, label="Errors", lines=1)
-
-    with gr.Row():
-        download_button = gr.Button("Download PDF Summary")
-        download_file = gr.File(label="Download PDF", visible=False)
-
-    # Load file -> update dropdowns & plot
-    file_input.change(fn=on_file_load, inputs=file_input, outputs=[plot_output, lab_dropdown, type_dropdown, error_output])
-
-    # When filters change -> update plot only
-    lab_dropdown.change(fn=on_filter_change, inputs=[file_input, lab_dropdown, type_dropdown], outputs=plot_output)
-    type_dropdown.change(fn=on_filter_change, inputs=[file_input, lab_dropdown, type_dropdown], outputs=plot_output)
+    error_output = gr.Textbox(visible=False, label="Errors")
+    download_button = gr.Button("Download PDF Summary")
+    download_file = gr.File(label="Download PDF", visible=False)
 
-    # Generate PDF button
-    download_button.click(fn=on_generate_pdf, inputs=[file_input, lab_dropdown, type_dropdown], outputs=[download_file, error_output])
+    file_input.change(fn=update_ui, inputs=file_input, outputs=[df_state, lab_dropdown, type_dropdown, error_output])
+    lab_dropdown.change(fn=dashboard, inputs=[df_state, lab_dropdown, type_dropdown], outputs=plot_output)
+    type_dropdown.change(fn=dashboard, inputs=[df_state, lab_dropdown, type_dropdown], outputs=plot_output)
+    download_button.click(fn=generate_pdf_button, inputs=[df_state, lab_dropdown, type_dropdown], outputs=[download_file, error_output])
 
-demo.launch()
+if __name__ == '__main__':
+    demo.launch()