Update app.py

app.py

@@ -48,7 +48,7 @@ def generate_plot(planned_cost, actual_spend, forecast_cost):
     fig, ax = plt.subplots(figsize=(8, 6))
     categories = ['Planned Cost', 'Actual Spend', 'Forecasted Cost']
     values = [planned_cost, actual_spend, forecast_cost]
-    ax.bar(categories, values, color=['#1f77b4', '#ff7f0e', '#2ca02c'])  # Improved colors
+    ax.bar(categories, values, color=['#1f77b4', '#ff7f0e', '#2ca02c'])
     ax.set_title("Budget Overview", fontsize=14, pad=15)
     ax.set_ylabel("Amount ($)", fontsize=12)
     ax.tick_params(axis='x', rotation=45)
@@ -64,7 +64,6 @@ def generate_plot(planned_cost, actual_spend, forecast_cost):
     buf_gradio = io.BytesIO()
     plt.savefig(buf_gradio, format='png', bbox_inches='tight', dpi=100)
     buf_gradio.seek(0)
-    # Convert BytesIO to PIL Image for Gradio
     gradio_image = Image.open(buf_gradio)
     
     # Save plot to a temporary file for PDF generation
@@ -147,7 +146,8 @@ def predict_risk(planned_cost, actual_spend, category, cement_index, labor_index
 
     # Placeholder for risk calculation logic (simplified for demo)
     total_risk = 1 if actual_spend > planned_cost else 0
-    forecast_cost = planned_cost * 2  # Simplified forecast
+    risk_percentage = total_risk * 100  # Convert to percentage (0% or 100%)
+    forecast_cost = planned_cost * 2
     insights = "High risk of overrun" if total_risk == 1 else "Low risk of overrun"
     status = "Critical" if total_risk == 1 else "Healthy"
     top_causes = []
@@ -159,7 +159,7 @@ def predict_risk(planned_cost, actual_spend, category, cement_index, labor_index
         top_causes.append("Labor Index Deviation")
     top_causes = ", ".join(top_causes) if top_causes else "None"
 
-    logger.debug(f"Calculation results: total_risk={total_risk}, forecast_cost={forecast_cost}, "
+    logger.debug(f"Calculation results: total_risk={total_risk}, risk_percentage={risk_percentage}, forecast_cost={forecast_cost}, "
                  f"insights={insights}, status={status}, top_causes={top_causes}")
 
     # Prepare data for Salesforce
@@ -170,7 +170,7 @@ def predict_risk(planned_cost, actual_spend, category, cement_index, labor_index
         "Cement_Index__c": cement_index,
         "Labor_Index__c": labor_index,
         "Project_Phase__c": project_phase,
-        "Risk_Score__c": total_risk * 100,  # Scale to 0-100
+        "Risk_Score__c": total_risk * 100,
         "Forecasted_Cost__c": forecast_cost,
         "Insights__c": insights,
         "Status__c": status
@@ -221,12 +221,13 @@ def predict_risk(planned_cost, actual_spend, category, cement_index, labor_index
     # Generate Excel file
     excel_file = generate_excel(planned_cost, actual_spend, forecast_cost, total_risk, insights, status, top_causes, forecast_cost_eur)
 
-    # Format the output for Gradio
+    # Format the output for Gradio with enhanced summary and risk percentage
     risk_level = "High" if total_risk == 1 else "Low"
     output_text = (
         f"Risk Summary\n"
         f"----------------------------------------\n"
-        f"Risk Level: {risk_level} (Score: {total_risk})\n"
+        f"Risk Level: {risk_level}\n"
+        f"Risk Percentage: {risk_percentage}%\n"
         f"Status: {status}\n"
         f"Insights: {insights} due to {top_causes.lower()}.\n\n"
         f"Forecast Chart\n"
@@ -243,28 +244,46 @@ def predict_risk(planned_cost, actual_spend, category, cement_index, labor_index
     )
     return output_text, chart_image, pdf_file, excel_file
 
-# Gradio interface
-interface = gr.Interface(
-    fn=predict_risk,
-    inputs=[
-        gr.Textbox(label="Planned Cost", placeholder="Enter planned cost (e.g., 1200000)"),
-        gr.Textbox(label="Actual Spend", placeholder="Enter actual spend (e.g., 5000000)"),
-        gr.Dropdown(label="Category", choices=["Civil", "Electrical", "Plumbing", "Finishing", "Others"], value="Plumbing"),
-        gr.Textbox(label="Cement Index", placeholder="Enter cement index (e.g., 120)"),
-        gr.Textbox(label="Labor Index", placeholder="Enter labor index (e.g., 30)"),
-        gr.Dropdown(label="Project Phase", choices=["Planning", "Execution", "Closure"], value="Planning")
-    ],
-    outputs=[
-        gr.Textbox(label="Prediction Results"),
-        gr.Image(label="Forecast Chart"),
-        gr.File(label="Download Local PDF Report"),
-        gr.File(label="Download Excel Report")
-    ],
-    title="Budget Overrun Risk Estimator",
-    description="Enter project details to estimate budget overrun risk. All numeric fields are required.",
-    allow_flagging="never"  # Disable flagging and sharing options
-)
+# Custom Gradio Blocks interface
+with gr.Blocks(title="Budget Overrun Risk Estimator") as demo:
+    gr.Markdown("# Budget Overrun Risk Estimator")
+    gr.Markdown("Enter project details to estimate budget overrun risk. All numeric fields are required.")
+
+    with gr.Row():
+        with gr.Column():
+            planned_cost_input = gr.Textbox(label="Planned Cost", placeholder="Enter planned cost (e.g., 1200000)")
+            actual_spend_input = gr.Textbox(label="Actual Spend", placeholder="Enter actual spend (e.g., 5000000)")
+            category_input = gr.Dropdown(label="Category", choices=["Civil", "Electrical", "Plumbing", "Finishing", "Others"], value="Plumbing")
+            cement_index_input = gr.Textbox(label="Cement Index", placeholder="Enter cement index (e.g., 120)")
+            labor_index_input = gr.Textbox(label="Labor Index", placeholder="Enter labor index (e.g., 30)")
+            project_phase_input = gr.Dropdown(label="Project Phase", choices=["Planning", "Execution", "Closure"], value="Planning")
+
+            with gr.Row():
+                clear_button = gr.Button("Clear")
+                submit_button = gr.Button("Submit", variant="primary")
+
+        with gr.Column():
+            output_text = gr.Textbox(label="Prediction Results")
+            output_chart = gr.Image(label="Forecast Chart")
+            output_pdf = gr.File(label="Download Local PDF Report")
+            output_excel = gr.File(label="Download Excel Report")
+
+    # Clear button functionality
+    clear_button.click(
+        fn=lambda: ("", "", "Plumbing", "", "", "Planning", "", None, None, None),
+        outputs=[
+            planned_cost_input, actual_spend_input, category_input, cement_index_input,
+            labor_index_input, project_phase_input, output_text, output_chart, output_pdf, output_excel
+        ]
+    )
+
+    # Submit button functionality
+    submit_button.click(
+        fn=predict_risk,
+        inputs=[planned_cost_input, actual_spend_input, category_input, cement_index_input, labor_index_input, project_phase_input],
+        outputs=[output_text, output_chart, output_pdf, output_excel]
+    )
 
 # Launch the app
 if __name__ == "__main__":
-    interface.launch(server_name="0.0.0.0", server_port=7860)
+    demo.launch(server_name="0.0.0.0", server_port=7860, share=False)