Update app.py

app.py

@@ -19,7 +19,7 @@ model = joblib.load("model.joblib")
 class EmailInput(BaseModel):
     input_email_body: str
 
-# Updated PII Masking Function (fixes Aadhaar vs Card and name misclassifications)
+# PII Masking Function
 def mask_and_store_all_pii(text):
     text = str(text)
     pii_map = {}
@@ -27,29 +27,35 @@ def mask_and_store_all_pii(text):
 
     patterns = {
         "email": r"\b[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+\b",
-        "phone_number": r"\+?\d[\d\s\-]{7,14}\d",
+        "phone_number": r"(?<!\d)(\+?\d[\d\s\-]{7,14}\d)(?!\d)",
         "dob": r"\b\d{1,2}[\/\-\.\s]\d{1,2}[\/\-\.\s]\d{2,4}\b",
-        "aadhar_num": r"\b\d{4}[ -]?\d{4}[ -]?\d{4}\b(?!\d)",
+        "aadhar_num": r"\b\d{4}[ -]?\d{4}[ -]?\d{4}\b(?![\d])",
         "credit_debit_no": r"\b(?:\d[ -]*?){13,19}\b",
-        "cvv_no": r"(?i)\b(?:cvv[:\s\-]*)?(\d{3,4})\b",
+        "cvv_no": r"(?i)\b(?:CVV[:\s]*)?(\d{3,4})\b",
         "expiry_no": r"\b(0[1-9]|1[0-2])[\/\-]\d{2,4}\b",
-        # Avoid naive full name pattern to prevent false positives like 'Dear Sir'
     }
 
+    # Track masked spans to prevent overlapping matches
+    masked_spans = []
+
+    def is_overlapping(start, end):
+        return any(s <= start < e or s < end <= e for s, e in masked_spans)
+
     for label, pattern in patterns.items():
         for match in re.finditer(pattern, text):
             original = match.group()
             start, end = match.start(), match.end()
-            placeholder = f"[{label}_{len(pii_map):03d}]"
-            if original not in text:
+            if is_overlapping(start, end):
                 continue
+            placeholder = f"[{label}_{len(pii_map):03d}]"
             pii_map[placeholder] = original
             entity_list.append({
                 "position": [start, end],
                 "classification": label,
                 "entity": original
             })
-            text = text.replace(original, placeholder, 1)
+            text = text[:start] + placeholder + text[end:]
+            masked_spans.append((start, start + len(placeholder)))
 
     return text, pii_map, entity_list