Update app.py

app.py

@@ -96,9 +96,26 @@ def process_equipment_utilization(equip, proj, use_h, idle_h, move_f, cost_h, la
         else:
             conf, score = 0.9, 85.0
 
-        if last_maint == "N/A":
-            last_maint = None
-
+        for field, value in [("Usage Hours", use_h), ("Idle Hours", idle_h), 
+                            ("Movement Frequency", move_f), ("Cost per Hour", cost_h),
+                            ("Confidence", conf), ("Utilization Score", score)]:
+            if value is None or np.isnan(value):
+                raise ValueError(f"Invalid value for {field}: {value}. Must be a valid number.")
+
+        if last_maint is None or pd.isna(last_maint):
+            last_maint = "N/A"
+
+        summary = {
+            "Equipment Name": equip,
+            "Project": proj,
+            "Usage Hours": use_h,
+            "Idle Hours": idle_h,
+            "Suggestion": ai_sug,
+            "Confidence": conf,
+            "Utilization Score": score,
+            "Cost per Hour": cost_h,
+            "Last Maintenance": last_maint or "N/A"
+        }
         record_data = {
             "Equipment_Name__c": equip,
             "Project_Name__c": proj,
@@ -108,20 +125,56 @@ def process_equipment_utilization(equip, proj, use_h, idle_h, move_f, cost_h, la
             "Suggestion_Confidence__c": float(conf * 100),
             "Utilization_Score__c": float(score),
             "Cost_per_Hour__c": float(cost_h),
-            "Last_Maintenance__c": last_maint,
-            "Dashboard_Flag__c": False,
-            "Report_Link__c": "Pending"
+            "Report_Link__c": "Pending",
+            "Last_Maintenance__c": last_maint if last_maint != "N/A" else None,
+            "Dashboard_Flag__c": False
         }
 
+        for key, value in record_data.items():
+            if isinstance(value, float) and np.isnan(value):
+                raise ValueError(f"Field {key} contains NaN, which is not allowed in Salesforce requests.")
+
+        logger.info(f"Sending record data to Salesforce: {record_data}")
+
         resp = sf.Equipment_Utilization_Record__c.create(record_data)
         if not resp.get("success"):
             raise ValueError(f"Failed to create Salesforce record: {resp}")
-
         rec_id = resp.get("id")
         if not rec_id:
-            raise ValueError("Salesforce record created but no ID was returned.")
-
-        return rec_id, record_data
+            raise ValueError("Salesforce record creation succeeded, but no record ID was returned.")
+
+        uid = uuid.uuid4().hex[:8]
+        pdf_path = Path(f"static/reports/report_{uid}.pdf")
+        pdf_path.parent.mkdir(parents=True, exist_ok=True)
+
+        c = canvas.Canvas(str(pdf_path), pagesize=letter)
+        c.setFont("Helvetica", 12)
+        c.drawString(100, 750, "Equipment Utilization Report")
+        c.drawString(100, 735, f"Record ID: {rec_id}")
+        y = 710
+        for k, v in summary.items():
+            c.drawString(100, y, f"{k}: {v}")
+            y -= 20
+        c.save()
+
+        encoded = base64.b64encode(pdf_path.read_bytes()).decode()
+        cv = sf.ContentVersion.create({
+            "Title": "UtilReport",
+            "PathOnClient": os.path.basename(str(pdf_path)),
+            "VersionData": encoded,
+            "FirstPublishLocationId": rec_id
+        })
+        if not cv.get("success"):
+            raise ValueError(f"Failed to upload PDF to Salesforce: {cv}")
+        pdf_url = f"https://{sf.sf_instance}/sfc/servlet.shepherd/version/download/{cv['id']}"
+        sf.Equipment_Utilization_Record__c.update(rec_id, {"Report_Link__c": pdf_url})
+
+        return {
+            "Salesforce_Record_Id": rec_id,
+            "Summary": summary,
+            "Report_Link": pdf_url,
+            "Report_File_Path": str(pdf_path)
+        }
     except Exception as e:
         logger.error(f"Error in process_equipment_utilization: {e}")
         raise ValueError(f"Processing failed: {str(e)}")
@@ -217,31 +270,27 @@ def generate_batch_pdf(records, batch_uid):
     c.save()
     return str(pdf_path)
 
-def manual_input_fast(equipment, project, usage, idle, freq, cost, last, ai_suggestion):
+def manual_input(equipment, project, usage, idle, freq, cost, last, ai_suggestion):
     try:
         if not equipment or equipment not in equipment_choices:
-            return "Please select a valid Equipment Name.", None
+            raise ValueError("Please select a valid Equipment Name.")
         if not project or project not in project_choices:
-            return "Please select a valid Project Name.", None
+            raise ValueError("Please select a valid Project Name.")
         if usage is None or usage < 0 or np.isnan(usage):
-            return "Usage Hours must be a non-negative number.", None
+            raise ValueError("Usage Hours must be a non-negative number.")
         if idle is None or idle < 0 or np.isnan(idle):
-            return "Idle Hours must be a non-negative number.", None
+            raise ValueError("Idle Hours must be a non-negative number.")
         if freq is None or freq < 0 or np.isnan(freq):
-            return "Movement Frequency must be a non-negative number.", None
+            raise ValueError("Movement Frequency must be a non-negative number.")
         if cost is None or cost < 0 or np.isnan(cost):
-            return "Cost per Hour must be a non-negative number.", None
+            raise ValueError("Cost per Hour must be a non-negative number.")
 
         last_val = last or "N/A"
-
-        rec_id, record_data = process_equipment_utilization(
-            equipment, project, usage, idle, freq, cost, last_val, ai_suggestion
-        )
-
-        # Return immediately with record ID and success message, no PDF generated here
-        return f"Record saved successfully! Salesforce ID: {rec_id}", None
+        res = process_equipment_utilization(equipment, project, usage, idle, freq, cost, last_val, ai_suggestion)
+        formatted = format_output(res)
+        return formatted, res.get("Report_File_Path")  # Only PDF output here now
     except Exception as e:
-        logger.error(f"Error in manual_input_fast: {e}")
+        logger.error(f"Error in manual_input: {e}")
         return f"Error: {str(e)}", None
 
 def batch_upload(csv_file):
@@ -326,7 +375,7 @@ with gr.Blocks() as app:
                 result_txt     = gr.Markdown(elem_id="result-box")
                 report_file    = gr.File(label="📃 Download PDF Report")
                 submit_btn.click(
-                    fn=manual_input_fast,
+                    fn=manual_input,
                     inputs=[equipment_dropdown, project_dropdown, usage, idle, freq, cost, last, ai_dropdown],
                     outputs=[result_txt, report_file]  # Only PDF output here now
                 )
@@ -357,3 +406,6 @@ with gr.Blocks() as app:
 """
 if __name__ == "__main__":
     app.launch()
+
+
+