Update app.py

app.py

@@ -141,8 +141,8 @@ def create_salesforce_record(score, checklist_summary, missing_summary, status,
         punch_list_text = str(punch_list_text) if punch_list_text else ""
         missing_documents = len(missing_summary.split(", ")) if missing_summary and missing_summary != "None" else 0
         open_punch_items = int(open_punch_items) if open_punch_items is not None else 0
-        # Use the provided date and time (02:25 PM IST, May 24, 2025) in UTC for Salesforce
-        evaluated_at = "2025-05-24T08:55:00Z"  # Converted 02:25 PM IST to UTC (IST is UTC+5:30)
+        # Use the provided date and time (02:37 PM IST, May 24, 2025) in UTC for Salesforce
+        evaluated_at = "2025-05-24T09:07:00Z"  # Converted 02:37 PM IST to UTC (IST is UTC+5:30)
         alert_sent = str(bool(escalated)).lower()  # Converts True/False to "true"/"false"
         logging.info(f"Setting Alert_Sent__c to: {alert_sent}")
         escalation_flag = str(bool(escalated)).lower()  # Ensure this is also a proper boolean string
@@ -227,11 +227,13 @@ def sanitize_input(text):
 # Rule-based completeness engine with weighted scoring
 def evaluate_readiness(logs, qa_report, punch_list_text):
     try:
-        # Hardcode log_keywords to check for incomplete status with multiple variations
-        log_keywords = r"project is not completed|not completed|incomplete|pending|not finished|not done|still in progress|delayed|on hold|issues remaining"
+        # Define keywords for completed and incomplete statuses
+        complete_keywords = r"completed|handover done|finished|closed|successful|done"
+        incomplete_keywords = r"not completed|incomplete|pending|not finished|not done|still in progress|delayed|on hold|issues remaining"
         
         # Log inputs for debugging
-        logging.info(f"Inputs - Logs: {logs}, QA Report: {qa_report}, Punch List: {punch_list_text}, Log Keywords: {log_keywords}")
+        logging.info(f"Inputs - Logs: {logs}, QA Report: {qa_report}, Punch List: {punch_list_text}")
+        logging.info(f"Complete Keywords: {complete_keywords}, Incomplete Keywords: {incomplete_keywords}")
 
         # Initialize score and lists for tracking
         score = 0
@@ -247,18 +249,22 @@ def evaluate_readiness(logs, qa_report, punch_list_text):
         logs = sanitize_input(logs)
         qa_report = sanitize_input(qa_report)
         punch_list_text = sanitize_input(punch_list_text)
-        log_keywords = sanitize_input(log_keywords)
+        complete_keywords = sanitize_input(complete_keywords)
+        incomplete_keywords = sanitize_input(incomplete_keywords)
 
         # Process Project Logs (30% weight)
-        # Check should fail if log_keywords match (indicating incomplete)
-        logs_pass = logs and log_keywords and not re.search(log_keywords, logs.lower())
+        # Check passes if complete_keywords match AND incomplete_keywords do not match
+        logs_lower = logs.lower()
+        has_complete = complete_keywords and re.search(complete_keywords, logs_lower)
+        has_incomplete = incomplete_keywords and re.search(incomplete_keywords, logs_lower)
+        logs_pass = logs and has_complete and not has_incomplete
         if logs_pass:
             score += LOGS_WEIGHT
             checklist_details.append("Logs: Completed")
         else:
             missing_items.append("Project Logs Incomplete")
             checklist_details.append("Logs: Pending")
-        logging.info(f"Logs Check: {'Pass' if logs_pass else 'Fail'}, Score so far: {score}%")
+        logging.info(f"Logs Check: {'Pass' if logs_pass else 'Fail'} (Has Complete: {has_complete}, Has Incomplete: {has_incomplete}), Score so far: {score}%")
 
         # Process QA Report (40% weight)
         qa_keywords = r"approved|passed|cleared"
@@ -286,11 +292,16 @@ def evaluate_readiness(logs, qa_report, punch_list_text):
         open_punch_items = 0 if punch_pass else 1  # Simplified for dropdown input
 
         # Enhanced escalation logic
-        escalated = score < 70 or open_punch_items > 2
-        logging.info(f"Escalation Check: Score < 70 ({score < 70}), Open Punch Items > 2 ({open_punch_items > 2}), Escalated: {escalated}")
-
-        # Map "Pending" to "In Progress" for Salesforce Status__c picklist
-        status = "Escalated" if escalated else ("Completed" if not missing_items else "In Progress")
+        escalated = score < 50 or open_punch_items > 2  # Lowered escalation threshold to 50%
+        logging.info(f"Escalation Check: Score < 50 ({score < 50}), Open Punch Items > 2 ({open_punch_items > 2}), Escalated: {escalated}")
+
+        # Map status for Salesforce Status__c picklist
+        if escalated:
+            status = "Escalated"
+        elif "Logs: Pending" in checklist_details:
+            status = "In Progress"  # If logs are pending, status should be "In Progress"
+        else:
+            status = "Completed" if not missing_items else "In Progress"
         checklist_status = "Escalated" if escalated else ("Completed" if not missing_items else "Pending")  # For UI display
 
         # Build summaries
@@ -331,7 +342,7 @@ def generate_pdf(score, checklist_summary, missing_summary, checklist_status, lo
         logging.info(f"Creating PDF at {pdf_path}")
 
         # Use the provided date and time for the report
-        evaluation_datetime = "02:25 PM IST, May 24, 2025"
+        evaluation_datetime = "02:37 PM IST, May 24, 2025"
 
         # Create the PDF
         c = canvas.Canvas(pdf_path, pagesize=letter)