Update app.py

app.py

@@ -57,7 +57,7 @@ project_choices = [
     "Project Alpha", "Project Beta", "Project Gamma", "Project Delta", "Project Epsilon",
     "Project Zeta", "Project Theta", "Project Sigma", "Project Omega", "Project Phoenix"
 ]
-ai_suggestion_choices = ["Move", "Repair", "Replace"]
+ai_suggestion_choices = ["Move", "Repair", "Replace"]  # Removed "Pause Rent"
 
 def validate_date(last_maint):
     try:
@@ -83,6 +83,7 @@ def call_ai_model(usage, idle, freq, cost, last):
         utilization_ratio = usage / total if total > 0 else 0.0
         utilization_percent = utilization_ratio * 100
 
+        # Determine suggestion (no "Pause Rent")
         if utilization_percent < 60:
             sug = "Move"
         elif utilization_percent < 80:
@@ -99,6 +100,7 @@ def call_ai_model(usage, idle, freq, cost, last):
         base_conf *= (0.7 + 0.3 * freq_factor)
         confidence = max(0.05, min(base_conf, 1.0))
 
+        # Round before return
         return sug, round(confidence, 2), round(utilization_percent, 2)
 
     except Exception as e:
@@ -110,10 +112,13 @@ def process_equipment_utilization(equip, proj, use_h, idle_h, move_f, cost_h, la
         if not sf:
             raise ValueError("Salesforce connection is not initialized. Please check credentials and try again.")
 
+        # Validate the Last Maintenance date
         last_maint = validate_date(last_maint)
 
+        # Always run AI model to get suggestion, confidence, score
         ai_sug_generated, conf, score = call_ai_model(use_h, idle_h, move_f, cost_h, last_maint)
 
+        # Use manual suggestion if provided, else AI suggestion
         suggestion_to_use = ai_sug if ai_sug else ai_sug_generated
 
         for field, value in [("Usage Hours", use_h), ("Idle Hours", idle_h), 
@@ -131,7 +136,7 @@ def process_equipment_utilization(equip, proj, use_h, idle_h, move_f, cost_h, la
             "Usage Hours": use_h,
             "Idle Hours": idle_h,
             "Suggestion": suggestion_to_use,
-            "Confidence": conf * 100,    
+            "Confidence": conf * 100,    # Store as percentage (0-100)
             "Utilization Score": score,
             "Cost per Hour": cost_h,
             "Last Maintenance": last_maint or "N/A"
@@ -204,28 +209,49 @@ def process_equipment_utilization(equip, proj, use_h, idle_h, move_f, cost_h, la
         logger.error(f"Error in process_equipment_utilization: {e}")
         raise ValueError(f"Processing failed: {str(e)}")
 
+def format_output(result):
+    summary = result.get("Summary", {})
+    cost_val = summary.get("Cost per Hour", 0)
+    try:
+        cost_str = locale.currency(cost_val, grouping=True)
+    except:
+        cost_str = f"₹{cost_val:,.2f}"
+    conf_pct = summary.get("Confidence", 0)  # Already percentage (0-100)
+    util_score = summary.get("Utilization Score", 0)  # Already percentage (0-100)
+    lines = [
+        f" • AI Suggestion: {summary.get('Suggestion', 'N/A')}",
+        f" • Suggestion Confidence: {conf_pct:.2f}%",
+        f" • Utilization Score: {util_score:.2f}%",
+        f" • Equipment Name: {summary.get('Equipment Name', 'N/A')}",
+        f" • Project: {summary.get('Project', 'N/A')}",
+        f" • Usage Hours: {summary.get('Usage Hours', 0):.2f}",
+        f" • Idle Hours: {summary.get('Idle Hours', 0):.2f}",
+        f" • Cost per Hour: {cost_str}",
+        f" • Last Maintenance: {summary.get('Last Maintenance', 'N/A')}"
+    ]
+    return "\n".join(lines)
+
 def format_batch_output(records):
     lines = []
     for i, rec in enumerate(records, 1):
         summary = rec.get("Summary", {})
         
-        # Start by creating a header for each record
+        # Detailed record output format
         record_details = [
-            f"Record {i}: {summary.get('Equipment Name', 'N/A')}",
-            f"Salesforce Record ID: {rec['Salesforce_Record_Id']}",
-            f"Equipment Name: {summary.get('Equipment Name', 'N/A')}",
-            f"Project: {summary.get('Project', 'N/A')}",
-            f"Usage Hours: {summary.get('Usage Hours', 0):.2f}",
-            f"Idle Hours: {summary.get('Idle Hours', 0):.2f}",
-            f"Suggestion: {summary.get('Suggestion', 'N/A')}",
-            f"Confidence: {summary.get('Confidence', 0):.2f}",
-            f"Utilization Score: {summary.get('Utilization Score', 0):.2f}",
-            f"Cost per Hour: ₹{summary.get('Cost per Hour', 0):,.2f}",
-            f"Last Maintenance: {summary.get('Last Maintenance', 'N/A')}"
+            f"Record {i}:",
+            f" • Record ID: {rec['Salesforce_Record_Id']}",
+            f" • Equipment Name: {summary.get('Equipment Name', 'N/A')}",
+            f" • Project: {summary.get('Project', 'N/A')}",
+            f" • Usage Hours: {summary.get('Usage Hours', 0):.2f}",
+            f" • Idle Hours: {summary.get('Idle Hours', 0):.2f}",
+            f" • Suggestion: {summary.get('Suggestion', 'N/A')}",
+            f" • Suggestion Confidence: {summary.get('Confidence', 0):.2f}%",
+            f" • Utilization Score: {summary.get('Utilization Score', 0):.2f}%",
+            f" • Cost per Hour: ₹{summary.get('Cost per Hour', 0):,.2f}",
+            f" • Last Maintenance: {summary.get('Last Maintenance', 'N/A')}"
         ]
         lines.append("\n".join(record_details))
         lines.append("\n---\n")  # Separator between records
-    
     return "\n".join(lines)
 
 def generate_batch_pdf(records, batch_uid):
@@ -382,7 +408,7 @@ with gr.Blocks() as app:
                 submit_btn.click(
                     fn=manual_input,
                     inputs=[equipment_dropdown, project_dropdown, usage, idle, freq, cost, last, ai_dropdown],
-                    outputs=[result_txt, report_file]  
+                    outputs=[result_txt, report_file]  # Only PDF output here now
                 )
                 clear_btn.click(lambda: ("", None), None, [result_txt, report_file])
         with gr.TabItem("CSV Upload"):
@@ -391,7 +417,7 @@ with gr.Blocks() as app:
                 with gr.Row():
                     upload_btn = gr.Button("🚀 Upload", variant="primary")
                     clear_btn  = gr.Button("🧹 Clear")
-                csv_output = gr.Markdown(label="📄 Batch Upload Results")
+                csv_output = gr.Markdown(label="📄 Batch Upload Results", elem_id="result-box")
                 batch_pdf = gr.File(label="📃 Download Batch PDF Report", file_types=[".pdf"])
                 upload_btn.click(
                     fn=batch_upload,
@@ -399,7 +425,7 @@ with gr.Blocks() as app:
                     outputs=[csv_output, batch_pdf]
                 )
                 clear_btn.click(
-                    lambda: (None, "", None),  
+                    lambda: (None, "", None),  # Reset file input, output markdown, and pdf file output
                     None,
                     [csv_file, csv_output, batch_pdf]
                 )
@@ -410,4 +436,4 @@ with gr.Blocks() as app:
 #result-box { border: 3px solid #d3d3d3 !important; border-radius: 10px; padding: 10px; background: #f9f9f9; white-space: pre-line; }
 """
 if __name__ == "__main__":
-    app.launch()
+    app.launch()