Update app.py

app.py

@@ -2,8 +2,7 @@ import gradio as gr
 import math
 import itertools
 
-# Available Capacitor Units (kVAR)
-available_capacitors = [30,25, 20, 15, 10, 5, 2.5, 1.5, 1]
+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:
@@ -14,7 +13,6 @@ def calculate_power_parameters(voltage, current, power_factor):
         except ValueError:
             reactive_power = 0.0
         calculated_pf = real_power * 1000 / apparent_power if apparent_power > 0 else 0
-
         return {
             "apparent_power": round(apparent_power, 2),
             "real_power": round(real_power, 2),
@@ -24,12 +22,21 @@ def calculate_power_parameters(voltage, current, power_factor):
     else:
         return None
 
-def design_capacitor_bank(reactive_power, num_caps):
+
+def design_unique_capacitor_bank(reactive_power, num_caps):
     if reactive_power > 0 and num_caps > 0:
         best_combo = None
-        min_error = float('inf')
+        min_error = float("inf")
+
+        # Try all unique combinations of sizes with up to num_caps elements
+        for combo in itertools.combinations(available_capacitors, min(num_caps, len(available_capacitors))):
+            if len(combo) < num_caps:
+                # Allow repeated use only when needed
+                extended = list(combo)
+                while len(extended) < num_caps:
+                    extended.append(min(combo))  # repeat the smallest one
+                combo = tuple(extended)
 
-        for combo in itertools.combinations_with_replacement(available_capacitors, int(num_caps)):
             total = sum(combo)
             error = abs(total - reactive_power)
 
@@ -45,81 +52,88 @@ def design_capacitor_bank(reactive_power, num_caps):
             total_kvar = sum(best_combo)
             message = f"Total Compensation: {round(total_kvar, 2)} kVAR"
             if abs(total_kvar - reactive_power) > 0.5:
-                message += " (Small mismatch detected)"
+                message += ". Small mismatch detected. Fine-tuning may be required."
+                mismatch = True
+            else:
+                mismatch = False
             return {
                 "suggested_capacitors": suggested_capacitors,
                 "total_kvar": round(total_kvar, 2),
-                "message": message
+                "message": message,
+                "mismatch": mismatch
             }
         else:
-            return {"message": "No suitable combination found."}
-    else:
-        return None
+            return {"message": "Could not find a suitable combination."}
+    return None
+
 
-def step1_calculate_reactive(voltage, current, power_factor, frequency):
+def calculate_and_store_reactive_power(voltage, current, power_factor, frequency):
+    global stored_reactive_power
     power_results = calculate_power_parameters(voltage, current, power_factor)
     if power_results:
+        stored_reactive_power = 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)
+            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']}**"
         )
     else:
-        return ("⚠️ Invalid input", "", "", "", 0.0)
+        return (
+            "⚠️ Please enter valid Voltage and Current!",
+            "", "", ""
+        )
 
-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)
+def design_bank_from_user_input(num_caps):
+    global stored_reactive_power
+    if stored_reactive_power <= 0:
+        return "Please calculate reactive power first.", "", ""
+    cap_bank_design = design_unique_capacitor_bank(stored_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']
+        suggested_caps = "<br>".join(
+            [f"🔹 Capacitor {i+1}: **{c}**" for i, c in enumerate(cap_bank_design["suggested_capacitors"])]
         )
+        return suggested_caps, cap_bank_design["total_kvar"], cap_bank_design["message"]
     else:
-        return ("⚠️ No suitable combination found.", "", "")
+        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")
+stored_reactive_power = 0
 
+with gr.Blocks(title="Capacitor Bank Designer") as app:
+    gr.Markdown("## ⚡ Three-Phase Power & Capacitor Bank Designer")
+    
     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])
+        voltage = gr.Number(label="Voltage (V)", value=415)
+        current = gr.Number(label="Current (A)", value=250)
+        power_factor = gr.Slider(label="Power Factor", minimum=0.0, maximum=1.0, value=0.85, step=0.01)
+        frequency = gr.Radio(label="Frequency", choices=[50, 60], value=50)
+
+    calc_btn = gr.Button("Calculate Reactive Power")
+    
+    app_power = gr.HTML()
+    real_power = gr.HTML()
+    reactive_power = gr.HTML()
+    pf_result = gr.HTML()
+
+    calc_btn.click(
+        fn=calculate_and_store_reactive_power,
+        inputs=[voltage, current, power_factor, frequency],
+        outputs=[app_power, real_power, reactive_power, pf_result]
+    )
+
+    gr.Markdown("---")
+    gr.Markdown("### Enter Number of Capacitors to Suggest a Bank")
+
+    num_caps = gr.Number(label="Number of Capacitors", value=3, precision=0)
+    bank_btn = gr.Button("Design Capacitor Bank")
+
+    cap_result = gr.HTML()
+    cap_total = gr.HTML()
+    cap_message = gr.HTML()
+
+    bank_btn.click(fn=design_bank_from_user_input, inputs=[num_caps], outputs=[cap_result, cap_total, cap_message])
 
 if __name__ == "__main__":
     app.launch()