Update app.py

app.py

@@ -6,34 +6,14 @@ import itertools
 available_capacitors = [25, 20, 15, 10, 5, 2.5, 1.5, 1]
 
 def calculate_power_parameters(voltage, current, power_factor):
-    """
-    Calculates power parameters for a three-phase system.
-
-    Args:
-        voltage (float): Voltage in Volts.
-        current (float): Current in Amperes.
-        power_factor (float): Power factor (0.0 to 1.0).
-
-    Returns:
-        dict: A dictionary containing the calculated apparent, real, and reactive power.
-              Returns None if input is invalid.
-    """
     if voltage > 0 and current > 0:
-        # Apparent Power (VA) for Three-Phase
         apparent_power = math.sqrt(3) * voltage * current
-
-        # Real Power (kW)
-        real_power = apparent_power * power_factor / 1000  # W to kW
-
-        # Reactive Power (kVAR)
+        real_power = apparent_power * power_factor / 1000
         try:
             reactive_power = math.sqrt((apparent_power / 1000) ** 2 - real_power ** 2)
         except ValueError:
             reactive_power = 0.0
-
-        # Calculated PF
         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),
@@ -43,136 +23,94 @@ def calculate_power_parameters(voltage, current, power_factor):
     else:
         return None
 
-
-
 def design_capacitor_bank(reactive_power, num_caps):
-    """
-    Designs a capacitor bank to compensate for reactive power.
-
-    Args:
-        reactive_power (float): Reactive power to compensate for (kVAR).
-        num_caps (int): Number of capacitors to use.
-
-    Returns:
-        dict: A dictionary containing the suggested capacitor sizes, total compensation,
-              and a message indicating the result. Returns None if input is invalid.
-    """
     if reactive_power > 0 and num_caps > 0:
-        found = False
         best_combo = None
         min_error = float('inf')
-
-        # Generate combinations with repetition
         for combo in itertools.combinations_with_replacement(available_capacitors, int(num_caps)):
             total = sum(combo)
             error = abs(total - reactive_power)
-
-            # Find the combination closest to the required reactive power
             if error < min_error:
                 min_error = error
                 best_combo = combo
-
             if error == 0:
-                break  # exact match found
-
+                break
         if best_combo:
             suggested_capacitors = [f"{cap} kVAR" for cap in best_combo]
             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. Fine-tuning may be required."
-                mismatch = True
-            else:
-                mismatch = False
             return {
                 "suggested_capacitors": suggested_capacitors,
                 "total_kvar": round(total_kvar, 2),
-                "message": message,
-                "mismatch": mismatch
+                "message": message
             }
-        else:
-            return {"message": "Could not find a suitable combination with the given number of capacitors."}
-    else:
-        return None
-
-
-def three_phase_power_calculator(voltage, current, power_factor, frequency):
-    """
-    Main function to calculate power parameters and design capacitor bank.
-
-    Args:
-        voltage (float): Voltage in Volts.
-        current (float): Current in Amperes.
-        power_factor (float): Power factor (0.0 to 1.0).
-        frequency (int): Selected frequency.
+    return None
 
-    Returns:
-        tuple:  Tuple containing output for the  components
-    """
-    # 1. Perform electrical calculations
+def three_phase_power_calculator(voltage, current, power_factor, frequency, num_caps):
     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']}**"
+        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']
     else:
-        apparent_power_out = "⚠️ Please enter valid Voltage and Current!"
-        real_power_out = ""
-        reactive_power_out = ""
-        calculated_pf_out = ""
-        reactive_power_value = 0
-
-    # 2. Design capacitor bank (if reactive power is available)
-    if reactive_power_value > 0:
-        num_caps = 2  # default value
-        cap_bank_design = design_capacitor_bank(reactive_power_value, num_caps)
-        if cap_bank_design:
-            suggested_capacitors_text = "<br>".join(
-                [f"🔹 Capacitor {idx + 1}: **{cap}**" for idx, cap in enumerate(cap_bank_design['suggested_capacitors'])]
-            )
-            cap_bank_message = cap_bank_design['message']
-            total_kvar_out = f"{cap_bank_design['message']}"
-        else:
-            suggested_capacitors_text = "Could not find a suitable combination."
-            cap_bank_message = ""
-            total_kvar_out = ""
+        return (
+            "⚠️ Please enter valid Voltage and Current!",
+            "", "", "", "", "", ""
+        )
+
+    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['total_kvar']} kVAR"
+        cap_bank_message = cap_bank_design['message']
     else:
-        suggested_capacitors_text = "Please first calculate power parameters."
-        cap_bank_message = ""
+        suggested_capacitors_text = "⚠️ Could not find a suitable capacitor combination."
         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
-
-
-
-# Create Gradio interface
+    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="Enter Voltage (V)", value=400, precision=2),  # Added default value
-        gr.Number(label="Enter Current (A)", value=100, precision=2),  # Added default value
-        gr.Slider(label="Power Factor (optional, default = 1)", minimum=0.0, maximum=1.0, value=1.0, step=0.01),
-        gr.Radio(label="Select Frequency", choices=[50, 60], default=50),
+        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.HTML(label="Apparent Power"),
-        gr.HTML(label="Real Power"),
-        gr.HTML(label="Reactive Power"),
-        gr.HTML(label="Calculated Power Factor"),
-        gr.HTML(label="Suggested Capacitor Sizes"),
-        gr.HTML(label="Total Compensation"),
-        gr.HTML(label="Message")
+        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 Calculator - Reactive Power Compensation Panel",
-    description="Calculate power parameters and design capacitor banks for three-phase systems.",
+    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.",
     allow_flagging=False,
     examples=[
-        [400, 100, 0.8, 50],  # Example 1
-        [220, 50, 0.95, 60],  # Example 2
-        [415, 120, 0.75, 50]
+        [400, 100, 0.8, 50, 2],
+        [220, 50, 0.95, 60, 3],
+        [415, 120, 0.75, 50, 4]
     ]
 )