Update app.py

app.py

@@ -8,7 +8,7 @@ available_capacitors = [25, 20, 15, 10, 5, 2.5, 1.5, 1]
 def calculate_power_parameters(voltage, current, power_factor):
     if voltage > 0 and current > 0:
         apparent_power = math.sqrt(3) * voltage * current
-        real_power = apparent_power * power_factor / 1000  # W to kW
+        real_power = apparent_power * power_factor / 1000
         try:
             reactive_power = math.sqrt((apparent_power / 1000) ** 2 - real_power ** 2)
         except ValueError:
@@ -44,87 +44,82 @@ def design_capacitor_bank(reactive_power, num_caps):
             suggested_capacitors = [f"{cap} kVAR" for cap in best_combo]
             total_kvar = sum(best_combo)
             message = f"Total Compensation: {round(total_kvar, 2)} kVAR"
-            mismatch = abs(total_kvar - reactive_power) > 0.5
-            if mismatch:
-                message += ". Small mismatch detected."
+            if abs(total_kvar - reactive_power) > 0.5:
+                message += " (Small mismatch detected)"
             return {
                 "suggested_capacitors": suggested_capacitors,
                 "total_kvar": round(total_kvar, 2),
-                "message": message,
-                "mismatch": mismatch
+                "message": message
             }
         else:
             return {"message": "No suitable combination found."}
     else:
         return None
 
-def three_phase_power_calculator(voltage, current, power_factor, frequency, num_caps):
+def step1_calculate_reactive(voltage, current, power_factor, frequency):
     power_results = calculate_power_parameters(voltage, current, power_factor)
-
     if power_results:
-        apparent_power_out = f"**Apparent Power:** {power_results['apparent_power']} VA"
-        real_power_out = f"**Real Power:** {power_results['real_power']} kW"
-        reactive_power_out = f"**Reactive Power:** {power_results['reactive_power']} kVAR"
-        calculated_pf_out = f"**Calculated Power Factor:** {power_results['calculated_pf']}"
-        reactive_power_value = power_results['reactive_power']
+        return (
+            f"**Apparent Power:** {power_results['apparent_power']} VA",
+            f"**Real Power:** {power_results['real_power']} kW",
+            f"**Reactive Power:** {power_results['reactive_power']} kVAR",
+            f"**Calculated Power Factor:** {power_results['calculated_pf']}",
+            round(power_results['reactive_power'], 2)
+        )
     else:
-        return ("⚠️ Please enter valid Voltage and Current!", "", "", "", "", "", "")
-
-    if reactive_power_value > 0:
-        cap_bank_design = design_capacitor_bank(reactive_power_value, num_caps)
-        if cap_bank_design:
-            suggested_capacitors_text = "<br>".join(
-                [f"🔹 Capacitor {i+1}: {cap}" for i, cap in enumerate(cap_bank_design['suggested_capacitors'])]
-            )
-            total_kvar_out = f"{cap_bank_design['message']}"
-            cap_bank_message = cap_bank_design['message']
-        else:
-            suggested_capacitors_text = "⚠️ Could not find a suitable combination."
-            total_kvar_out = ""
-            cap_bank_message = ""
+        return ("⚠️ Invalid input", "", "", "", 0.0)
+
+def step2_design_bank(reactive_power, num_caps):
+    try:
+        num_caps = int(num_caps)
+    except ValueError:
+        return "⚠️ Please enter a valid number.", "", ""
+
+    cap_bank_design = design_capacitor_bank(reactive_power, num_caps)
+    if cap_bank_design:
+        suggested_capacitors = "<br>".join(
+            [f"🔹 Capacitor {i+1}: {cap}" for i, cap in enumerate(cap_bank_design['suggested_capacitors'])]
+        )
+        return (
+            suggested_capacitors,
+            f"{cap_bank_design['total_kvar']} kVAR",
+            cap_bank_design['message']
+        )
     else:
-        suggested_capacitors_text = "Please first calculate power parameters."
-        total_kvar_out = ""
-        cap_bank_message = ""
-
-    return (
-        apparent_power_out,
-        real_power_out,
-        reactive_power_out,
-        calculated_pf_out,
-        suggested_capacitors_text,
-        total_kvar_out,
-        cap_bank_message
-    )
-
-# Gradio Interface
-iface = gr.Interface(
-    fn=three_phase_power_calculator,
-    inputs=[
-        gr.Number(label="🔌 Voltage (V)", value=400),
-        gr.Number(label="⚡ Current (A)", value=100),
-        gr.Slider(label="💡 Power Factor", minimum=0.0, maximum=1.0, value=1.0, step=0.01),
-        gr.Radio(label="🔁 Frequency (Hz)", choices=[50, 60], value=50),
-        gr.Slider(label="🔢 Number of Capacitors", minimum=1, maximum=6, step=1, value=2)
-    ],
-    outputs=[
-        gr.Markdown(label="Apparent Power"),
-        gr.Markdown(label="Real Power"),
-        gr.Markdown(label="Reactive Power"),
-        gr.Markdown(label="Calculated Power Factor"),
-        gr.Markdown(label="Suggested Capacitor Sizes"),
-        gr.Markdown(label="Total Compensation"),
-        gr.Markdown(label="Message")
-    ],
-    title="⚙️ Three-Phase Power & Capacitor Bank Calculator",
-    description="Enter voltage, current, and power factor to calculate three-phase power parameters and design a capacitor bank.",
-    flagging_mode="never",
-    examples=[
-        [400, 100, 0.8, 50, 2],
-        [220, 50, 0.95, 60, 3],
-        [415, 120, 0.75, 50, 4]
-    ]
-)
+        return ("⚠️ No suitable combination found.", "", "")
+
+with gr.Blocks(title="Three-Phase Power & Capacitor Bank Calculator") as app:
+    gr.Markdown("## ⚡ Three-Phase Power Calculator with Capacitor Bank Design")
+
+    with gr.Row():
+        voltage = gr.Number(label="🔌 Voltage (V)", value=400)
+        current = gr.Number(label="⚡ Current (A)", value=100)
+        pf = gr.Slider(label="💡 Power Factor", minimum=0.0, maximum=1.0, value=0.9, step=0.01)
+        freq = gr.Radio(label="🔁 Frequency (Hz)", choices=[50, 60], value=50)
+
+    calc_btn = gr.Button("Step 1️⃣: Calculate Power Parameters")
+
+    apparent = gr.Markdown()
+    real = gr.Markdown()
+    reactive = gr.Markdown()
+    calc_pf = gr.Markdown()
+    reactive_hidden = gr.Number(visible=False)
+
+    calc_btn.click(fn=step1_calculate_reactive, 
+                   inputs=[voltage, current, pf, freq],
+                   outputs=[apparent, real, reactive, calc_pf, reactive_hidden])
+
+    gr.Markdown("## ➕ Step 2️⃣: Enter Number of Capacitors for Bank Design")
+    cap_input = gr.Textbox(label="Enter number of capacitors (e.g., 3)", placeholder="e.g. 3")
+    design_btn = gr.Button("Design Capacitor Bank")
+
+    cap_list = gr.Markdown()
+    total_comp = gr.Markdown()
+    msg = gr.Markdown()
+
+    design_btn.click(fn=step2_design_bank,
+                     inputs=[reactive_hidden, cap_input],
+                     outputs=[cap_list, total_comp, msg])
 
 if __name__ == "__main__":
-    iface.launch()
+    app.launch()