Update app.py

app.py

@@ -5,8 +5,9 @@ import traceback
 from hardy_cross_solver import hardy_cross_solver
 from hardy_cross_plot import plot_hardy_cross_network
 import os
+import numpy as np
 
-def run_hardy_cross(file, loops_json, max_iterations, tolerance):
+def hardy_cross_tab(file, loops_json, max_iterations, tolerance):
     try:
         df = pd.read_csv(file.name)
         pipes_data = df.to_dict(orient='records')
@@ -17,48 +18,78 @@ def run_hardy_cross(file, loops_json, max_iterations, tolerance):
             max_iterations=int(max_iterations),
             tolerance=float(tolerance)
         )
-
         plot_filename = "hardy_cross_network_result.png"
         plot_path = plot_hardy_cross_network(final_flows, save_path=plot_filename)
 
-        # Debug print statements for clear diagnosis
-        print(f"DEBUG: plot_path returned by plot_hardy_cross_network: {plot_path}")
-        print(f"DEBUG: os.path.exists(plot_path): {os.path.exists(plot_path)}")
-        print(f"DEBUG: os.listdir('.'): {os.listdir('.')}")
-        print(f"DEBUG: Current working directory: {os.getcwd()}")
-
-        # Validate plot_path before returning
+        # Safety check
         if not (os.path.isfile(plot_path) and plot_path.endswith(".png")):
-            print("DEBUG: Invalid plot_path detected, returning empty string for Gradio image output.")
-            plot_path = ""  # Safe fallback to prevent directory error
+            plot_path = ""
 
         return (
-            final_flows.to_markdown(),
-            pd.DataFrame(results).to_markdown(),
+            final_flows.to_markdown(index=False),
+            pd.DataFrame(results).to_markdown(index=False),
             plot_path
         )
     except Exception as e:
         tb = traceback.format_exc()
         error_message = f"❌ **Error:** {str(e)}\n\n```\n{tb}\n```"
-        print(error_message)
         return error_message, "", ""
 
-demo = gr.Interface(
-    fn=run_hardy_cross,
-    inputs=[
-        gr.File(label="Upload Pipe Network CSV"),
-        gr.Textbox(label="Loops JSON (e.g., {\"L1\": [\"P1\", \"P2\"], \"L2\": [\"P3\", \"P4\"]})"),
-        gr.Number(label="Max Iterations", value=10),
-        gr.Number(label="Tolerance", value=0.001)
-    ],
-    outputs=[
-        gr.Markdown(label="Final Pipe Flows or Error Trace"),
-        gr.Markdown(label="Iteration Details"),
-        gr.Image(label="Flow Direction Plot")
-    ],
-    title="Hardy Cross Method Solver with Visualization",
-    description="Upload your pipe network CSV and loops JSON to compute flows and visualize using the Hardy Cross Method."
-)
+def head_loss_tab(file):
+    try:
+        df = pd.read_csv(file.name)
+        g = 9.81
+        df["area_m2"] = np.pi * (df["diameter_m"] / 2) ** 2
+        df["velocity_ms"] = np.abs(df["flow_m3s"]) / df["area_m2"]
+        df["head_loss_m"] = (
+            df["friction_factor"]
+            * df["length_m"]
+            / df["diameter_m"]
+            * df["velocity_ms"] ** 2
+            / (2 * g)
+        )
+        output_csv = "head_loss_results.csv"
+        df.to_csv(output_csv, index=False)
+        return (
+            df[["pipe_id", "velocity_ms", "head_loss_m"]].to_markdown(index=False),
+            output_csv
+        )
+    except Exception as e:
+        tb = traceback.format_exc()
+        error_message = f"❌ **Error:** {str(e)}\n\n```\n{tb}\n```"
+        return error_message, None
+
+with gr.Blocks(title="Hardy Cross Method and Head Loss Calculator") as demo:
+    gr.Markdown("# Hardy Cross Method Solver and Head Loss Calculator")
+    with gr.Tab("Hardy Cross Solver"):
+        gr.Markdown("Upload your pipe network CSV and loops JSON to compute flows and visualize using the Hardy Cross Method.")
+        file_input = gr.File(label="Upload Pipe Network CSV")
+        loops_json_input = gr.Textbox(label="Loops JSON", placeholder='{"L1": ["AB", "BC", "CD"], "L2": ["DE", "EF", "BC"]}')
+        max_iter_input = gr.Number(label="Max Iterations", value=10)
+        tol_input = gr.Number(label="Tolerance", value=0.001)
+        run_button = gr.Button("Run Hardy Cross")
+        flows_output = gr.Markdown(label="Final Pipe Flows")
+        iterations_output = gr.Markdown(label="Iteration Details")
+        plot_output = gr.Image(label="Flow Direction Plot")
+
+        run_button.click(
+            hardy_cross_tab,
+            inputs=[file_input, loops_json_input, max_iter_input, tol_input],
+            outputs=[flows_output, iterations_output, plot_output]
+        )
+
+    with gr.Tab("Head Loss Calculator"):
+        gr.Markdown("Upload your final flows CSV with columns: `pipe_id`, `length_m`, `diameter_m`, `friction_factor`, `flow_m3s` to compute head losses.")
+        file_input_hl = gr.File(label="Upload Final Flows CSV")
+        run_button_hl = gr.Button("Compute Head Losses")
+        head_loss_output = gr.Markdown(label="Head Loss Results")
+        download_output = gr.File(label="Download Computed Head Loss CSV")
+
+        run_button_hl.click(
+            head_loss_tab,
+            inputs=[file_input_hl],
+            outputs=[head_loss_output, download_output]
+        )
 
 if __name__ == "__main__":
     demo.launch()