Update app.py

app.py

@@ -196,10 +196,17 @@ def predict_overrun(planned_cost, actual_spend, category, cement_index, labor_in
         labor_risk = (labor_index - 100) / 100
 
         phase_weight = {"Planning": 0.2, "Execution": 0.5, "Closure": 0.3}
-        category_weight = {"Electrical": 0.4, "Structural": 0.3, "Civil": 0.3}
+        # Updated category weights to match Salesforce picklist values
+        category_weight = {
+            "Civil": 0.2,
+            "Electrical": 0.2,
+            "Plumbing": 0.2,
+            "Finishing": 0.2,
+            "Others": 0.2
+        }
 
         total_risk = base_risk + (cement_risk + labor_risk) * (
-            phase_weight.get(project_phase, 0.3) + category_weight.get(category, 0.3)
+            phase_weight.get(project_phase, 0.3) + category_weight.get(category, 0.2)
         )
         total_risk = min(max(total_risk, 0), 1)
 
@@ -375,44 +382,51 @@ def predict_overrun(planned_cost, actual_spend, category, cement_index, labor_in
     
     return readable_output, chart_image, pdf_path, csv_path
 
-# Gradio Interface
-interface = gr.Interface(
-    fn=predict_overrun,
-    inputs=[
-        gr.Textbox(label="Planned Cost (INR)"),
-        gr.Textbox(label="Actual Spend (INR)"),
-        gr.Dropdown(label="Budget Category", choices=[]),  # Will be populated dynamically
-        gr.Textbox(label="Cement Index", info="Index (base = 100)"),
-        gr.Textbox(label="Labor Index", info="Index (base = 100)"),
-        gr.Dropdown(label="Project Phase", choices=[])  # Will be populated dynamically
-    ],
-    outputs=[
-        gr.Markdown(label="Risk Summary"),
-        gr.Image(type="pil", label="Forecast Chart"),
-        gr.File(label="Download PDF"),
-        gr.File(label="Download CSV")
-    ],
-    title="Budget Overrun Risk Estimator"
-)
-
-# Dynamically update dropdown choices with valid picklist values
-def update_dropdowns():
+# Fetch initial dropdown choices from Salesforce
+def get_initial_dropdown_choices():
     sf = connect_to_salesforce()
     if isinstance(sf, str):
         logger.error("Failed to fetch picklist values: %s", sf)
         logger.warning("Using fallback values for dropdowns due to Salesforce connection failure.")
-        # Updated fallback values to match assumed Salesforce picklist
-        return gr.Dropdown(choices=["Electrical", "Structural", "Civil"]), gr.Dropdown(choices=["Planning", "Execution", "Closure"])
+        return ["Civil", "Electrical", "Plumbing", "Finishing", "Others"], ["Planning", "Execution", "Closure"]
     
     _, _, picklist_values = fetch_salesforce_fields(sf)
-    category_choices = picklist_values.get('Category__c', ["Electrical", "Structural", "Civil"])
+    category_choices = picklist_values.get('Category__c', ["Civil", "Electrical", "Plumbing", "Finishing", "Others"])
     phase_choices = picklist_values.get('Project_Phase__c', ["Planning", "Execution", "Closure"])
-    logger.debug("Fetched category choices: %s", category_choices)
-    logger.debug("Fetched phase choices: %s", phase_choices)
-    return gr.Dropdown(choices=category_choices), gr.Dropdown(choices=phase_choices)
+    logger.debug("Initial category choices: %s", category_choices)
+    logger.debug("Initial phase choices: %s", phase_choices)
+    return category_choices, phase_choices
 
-# Update the Gradio interface inputs dynamically
-interface.inputs[2], interface.inputs[5] = update_dropdowns()
+# Get initial choices
+initial_category_choices, initial_phase_choices = get_initial_dropdown_choices()
+
+# Gradio Interface
+with gr.Blocks() as app:
+    gr.Markdown("# Budget Overrun Risk Estimator")
+    
+    # Inputs
+    planned_cost = gr.Textbox(label="Planned Cost (INR)")
+    actual_spend = gr.Textbox(label="Actual Spend (INR)")
+    category = gr.Dropdown(label="Budget Category", choices=initial_category_choices)
+    cement_index = gr.Textbox(label="Cement Index", info="Index (base = 100)")
+    labor_index = gr.Textbox(label="Labor Index", info="Index (base = 100)")
+    project_phase = gr.Dropdown(label="Project Phase", choices=initial_phase_choices)
+    
+    # Outputs
+    risk_summary = gr.Markdown(label="Risk Summary")
+    forecast_chart = gr.Image(type="pil", label="Forecast Chart")
+    pdf_download = gr.File(label="Download PDF")
+    csv_download = gr.File(label="Download CSV")
+    
+    # Submit Button
+    submit_btn = gr.Button("Submit")
+    
+    # Handle submission
+    submit_btn.click(
+        fn=predict_overrun,
+        inputs=[planned_cost, actual_spend, category, cement_index, labor_index, project_phase],
+        outputs=[risk_summary, forecast_chart, pdf_download, csv_download]
+    )
 
 if __name__ == "__main__":
-    interface.launch()
+    app.launch()