Update app.py

app.py

@@ -141,8 +141,7 @@ 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: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)
+        evaluated_at = datetime.now().strftime("%Y-%m-%dT%H:%M:%SZ")  # Salesforce Date/Time format
         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,13 +226,8 @@ def sanitize_input(text):
 # Rule-based completeness engine with weighted scoring
 def evaluate_readiness(logs, qa_report, punch_list_text):
     try:
-        # 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}")
-        logging.info(f"Complete Keywords: {complete_keywords}, Incomplete Keywords: {incomplete_keywords}")
 
         # Initialize score and lists for tracking
         score = 0
@@ -249,22 +243,26 @@ 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)
-        complete_keywords = sanitize_input(complete_keywords)
-        incomplete_keywords = sanitize_input(incomplete_keywords)
 
         # Process Project Logs (30% weight)
-        # 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:
+        log_keywords = r"complete|handover done|finished|closed|successful"
+        negative_keywords = r"issue|pending|incomplete|problem|delay"
+        logs_pass = logs and re.search(log_keywords, logs.lower())
+        logs_negative = logs and re.search(negative_keywords, logs.lower())
+        
+        if logs_pass and not logs_negative:
             score += LOGS_WEIGHT
             checklist_details.append("Logs: Completed")
+            logging.info(f"Logs Check: Pass (positive keywords found, no negative keywords), Score: {score}%")
+        elif logs_pass and logs_negative:
+            score += LOGS_WEIGHT // 2  # Partial score for mixed signals
+            missing_items.append("Issues detected in logs")
+            checklist_details.append("Logs: Partially Completed (issues detected)")
+            logging.info(f"Logs Check: Partial Pass (positive and negative keywords found), Score: {score}%")
         else:
             missing_items.append("Project Logs Incomplete")
             checklist_details.append("Logs: Pending")
-        logging.info(f"Logs Check: {'Pass' if logs_pass else 'Fail'} (Has Complete: {has_complete}, Has Incomplete: {has_incomplete}), Score so far: {score}%")
+            logging.info(f"Logs Check: Fail (no positive keywords or only negative keywords), Score: {score}%")
 
         # Process QA Report (40% weight)
         qa_keywords = r"approved|passed|cleared"
@@ -292,16 +290,11 @@ 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 < 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"
+        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")
         checklist_status = "Escalated" if escalated else ("Completed" if not missing_items else "Pending")  # For UI display
 
         # Build summaries
@@ -324,7 +317,7 @@ def evaluate_readiness(logs, qa_report, punch_list_text):
         logging.error(f"Error in evaluate_readiness: {str(e)}")
         raise
 
-# Generate PDF report with signature slots, including evaluation date and time
+# Generate PDF report with signature slots
 def generate_pdf(score, checklist_summary, missing_summary, checklist_status, logs, qa_report, punch_list_text):
     try:
         # Sanitize inputs
@@ -341,19 +334,15 @@ def generate_pdf(score, checklist_summary, missing_summary, checklist_status, lo
         pdf_path = "readiness_report.pdf"
         logging.info(f"Creating PDF at {pdf_path}")
 
-        # Use the provided date and time for the report
-        evaluation_datetime = "02:37 PM IST, May 24, 2025"
-
         # Create the PDF
         c = canvas.Canvas(pdf_path, pagesize=letter)
         c.setFont("Times-Bold", 16)
         c.drawString(50, 750, "Project Closure Readiness Report")
         c.setFont("Times-Roman", 12)
-        c.drawString(50, 730, f"Evaluated At: {evaluation_datetime}")
-        c.drawString(50, 710, f"Readiness Score: {score}%")
-        c.drawString(50, 690, f"Status: {checklist_status}")
-        c.drawString(50, 670, "Checklist Summary:")
-        y = 650
+        c.drawString(50, 720, f"Readiness Score: {score}%")
+        c.drawString(50, 700, f"Status: {checklist_status}")
+        c.drawString(50, 680, "Checklist Summary:")
+        y = 660
         BOTTOM_MARGIN = 50
         for line in checklist_summary.split("\n"):
             if y < BOTTOM_MARGIN:
@@ -401,7 +390,7 @@ with gr.Blocks(css="""
     )
     with gr.Row():
         with gr.Column(scale=2):
-            logs_input = gr.Textbox(label="Project Logs", lines=5, placeholder="Enter project logs (e.g., 'Project completed successfully')")
+            logs_input = gr.Textbox(label="Project Logs", lines=5, placeholder="Enter project logs (e.g., 'Project complete, handover done')")
             qa_input = gr.Dropdown(
                 label="QA Report",
                 choices=["Approved", "Passed", "Cleared", "Pending", "Not Started"],