Update app.py

app.py

@@ -1,67 +1,97 @@
-# app.py
 import gradio as gr
 import wntr
+import tempfile
 import pandas as pd
 import plotly.graph_objects as go
-import tempfile
-import shutil
 import os
+import shutil
 
 def run_simulation(inp_file):
     try:
-        # Save uploaded file to temp dir
-        temp_dir = tempfile.mkdtemp()
-        inp_path = os.path.join(temp_dir, "network.inp")
-        shutil.copy(inp_file, inp_path)
+        # Create temporary working directory
+        work_dir = tempfile.mkdtemp()
+        inp_path = os.path.join(work_dir, "network.inp")
 
+        # Save uploaded file to temp path
+        shutil.copy(inp_file.name, inp_path)
+
+        # Load and simulate the EPANET model
         wn = wntr.network.WaterNetworkModel(inp_path)
         sim = wntr.sim.EpanetSimulator(wn)
         results = sim.run_sim()
 
-        # Collect outputs
-        outputs = []
-        metrics = {
-            "Node Pressure": (results.node["pressure"], "Pressure (m)"),
-            "Tank Levels": (results.node["head"].loc[:, list(wn.tanks()):], "Level (m)"),
-            "Node Demand": (results.node["demand"], "Demand (m3/s)"),
-            "Link Flowrate": (results.link["flowrate"], "Flowrate (m3/s)")
+        output_list = []
+
+        # Simulation result groups
+        simulation_groups = {
+            "Node Pressures": {
+                "data": results.node["pressure"],
+                "ylabel": "Pressure (m)"
+            },
+            "Tank Levels": {
+                "data": results.node["head"][[name for name, _ in wn.tanks()]],
+                "ylabel": "Tank Head (m)"
+            },
+            "Demands": {
+                "data": results.node["demand"],
+                "ylabel": "Demand (m³/s)"
+            }
         }
 
-        for title, (df, ylabel) in metrics.items():
-            csv_path = os.path.join(temp_dir, f"{title.replace(' ', '_')}.csv")
+        # Append simulation group results
+        for title, group in simulation_groups.items():
+            df = group["data"]
+            csv_path = os.path.join(work_dir, f"{title.replace(' ', '_')}.csv")
             df.to_csv(csv_path)
 
             fig = go.Figure()
-            for col in df.columns[:5]:  # Plot first 5 only for brevity
-                fig.add_trace(go.Scatter(x=df.index/60, y=df[col], mode="lines", name=col))
-            fig.update_layout(title=title, xaxis_title="Time (min)", yaxis_title=ylabel)
+            for col in df.columns:
+                fig.add_trace(go.Scatter(
+                    x=df.index / 60,  # seconds → minutes
+                    y=df[col],
+                    mode="lines",
+                    name=str(col)
+                ))
+            fig.update_layout(
+                title=title,
+                xaxis_title="Time (min)",
+                yaxis_title=group["ylabel"],
+                height=400
+            )
+
+            output_list.extend([csv_path, df.reset_index(), fig])
 
-            outputs.extend([csv_path, df.head(), fig])
+        # Tank metadata
+        tank_data = [(name, tank.elevation, tank.min_level, tank.max_level, tank.diameter)
+                     for name, tank in wn.tanks()]
+        df_tanks = pd.DataFrame(tank_data, columns=["Tank ID", "Elevation", "Min Level", "Max Level", "Diameter"])
+        output_list.append(df_tanks)
 
-        return outputs
+        return tuple(output_list)
 
     except Exception as e:
-        return [str(e)] * 12
+        return [f"❌ ERROR: {str(e)}"] + [None] * 9
 
-# Input
-file_input = gr.File(label="Upload .inp file", file_types=[".inp"])
+# Gradio interface
+input_file = gr.File(label="📁 Upload .inp File", file_types=[".inp"])
 
-# Outputs (4 metrics x [csv, table, plot])
-output_components = []
-for label in ["Node Pressure", "Tank Levels", "Node Demand", "Link Flowrate"]:
-    output_components += [
-        gr.File(label=f"{label} CSV"),
-        gr.Dataframe(label=f"{label} Table (preview)"),
-        gr.Plot(label=f"{label} Plot")
-    ]
+outputs = [
+    # Node Pressures
+    gr.File(label="📥 Pressure CSV"), gr.Dataframe(label="Pressure Table"), gr.Plot(label="Pressure Plot"),
+    # Tank Levels
+    gr.File(label="📥 Tank Level CSV"), gr.Dataframe(label="Tank Level Table"), gr.Plot(label="Tank Level Plot"),
+    # Demands
+    gr.File(label="📥 Demand CSV"), gr.Dataframe(label="Demand Table"), gr.Plot(label="Demand Plot"),
+    # Tank metadata table
+    gr.Dataframe(label="📊 Tank Metadata")
+]
 
-# Interface
 demo = gr.Interface(
     fn=run_simulation,
-    inputs=file_input,
-    outputs=output_components,
-    title="💧 EPANET WNTR Simulator",
-    description="Upload a valid EPANET .inp file to simulate with WNTR and view results.",
+    inputs=input_file,
+    outputs=outputs,
+    title="💧 EPANET Simulation Viewer (Gradio)",
+    description="Upload a valid EPANET `.inp` file. This app runs hydraulic simulation using WNTR and returns pressure, tank levels, demands, and tank properties.",
     allow_flagging="never"
 )