Update app.py

app.py

@@ -62,17 +62,18 @@ def extract_text_from_pdf(pdf_file):
 def extract_items(text):
     """Extract items from the invoice table with a simplified approach."""
     items = []
-    # Replace escaped dollar signs
-    text = text.replace(r'\$', '$')
+    # Replace escaped dollar signs and other currency symbols
+    text = text.replace(r'\$', '$').replace('₹', '₹')
     
     # Split text into lines
     lines = text.split('\n')
     print("Text split into lines:", lines)  # Debug
 
-    # Find the table header
+    # Find the table header (more flexible matching)
     table_start = -1
     for i, line in enumerate(lines):
-        if "Item Description" in line and "Quantity" in line and "Unit Price" in line and "Total Price" in line:
+        # Match variations of table headers like "Item Quantity Rate Amount"
+        if re.search(r'Item.*Quantity.*(Rate|Unit\s*Price).*(Amount|Total\s*Price)', line, re.IGNORECASE):
             table_start = i + 1  # Table data starts after the header
             break
     
@@ -80,10 +81,10 @@ def extract_items(text):
         print("Table header not found.")
         return items
 
-    # Find the end of the table (before "Total Amount", "Promo Code", or end of text)
+    # Find the end of the table (before "Subtotal", "Total", "Tax", or end of text)
     table_end = len(lines)
     for i in range(table_start, len(lines)):
-        if "Total Amount" in lines[i] or "Total Due" in lines[i] or "Promo Code" in lines[i]:
+        if any(keyword in lines[i] for keyword in ["Subtotal", "Total", "Tax", "Balance Due", "Promo Code"]):
             table_end = i
             break
     
@@ -92,8 +93,8 @@ def extract_items(text):
     print("Table lines:", table_lines)  # Debug
 
     # Updated pattern to match table rows more accurately
-    # Captures: Description (non-greedy), Quantity (digits), Unit Price (decimal), Total Price (decimal)
-    table_row_pattern = r"^(.*?)\s+(\d+)\s+([\d.]+)\s+([\d.]+)$"
+    # Captures: Description (non-greedy), Quantity (digits), Rate/Unit Price (decimal with optional currency), Amount/Total Price (decimal with optional currency)
+    table_row_pattern = r"^(.*?)\s+(\d+)\s+(?:₹|[$£€]?\s*)([\d,]+\.?\d*)\s+(?:₹|[$£€]?\s*)([\d,]+\.?\d*)$"
 
     for line in table_lines:
         line = line.strip()
@@ -105,14 +106,14 @@ def extract_items(text):
             description = match.group(1).strip()
             # Clean the description to remove any trailing quantity or price data
             description = re.sub(r'\s*\d+\s*$', '', description).strip()  # Remove trailing numbers
-            description = re.sub(r'\s*\$?[\d.]+\s*$', '', description).strip()  # Remove trailing prices
+            description = re.sub(r'\s*(?:₹|[$£€]?)[\d,]+\.?\d*\s*$', '', description).strip()  # Remove trailing prices
             # Skip lines that look like promo codes
             if "Promo Code" in description:
                 print(f"Skipping promo code line: {line}")
                 continue
             quantity = int(match.group(2))
-            unit_price = float(match.group(3))
-            total_price = float(match.group(4))
+            unit_price = float(match.group(3).replace(",", ""))
+            total_price = float(match.group(4).replace(",", ""))
             items.append({
                 "description": description,
                 "quantity": quantity,
@@ -130,7 +131,7 @@ def extract_entities(text):
     invoice_number = "Unknown"
     vendor_name = "Unknown"
     invoice_date = datetime.now().date()
-    due_date = None  # Default to None instead of today's date
+    due_date = None  # Default to None
     total_amount = 0.0
 
     # Extract items first to use as a filter for NER
@@ -138,16 +139,16 @@ def extract_entities(text):
     item_descriptions = [item["description"].lower() for item in items]
 
     # Flexible regex patterns to handle various invoice formats
-    invoice_num_pattern = r"(?:Invoice\s*(?:Number|No\.?|#)|Order\s*(?:Number|No\.?))\s*[:\-\s#]*([\w-]+)|(?:INV-|ORD-)([\w-]+)"
+    invoice_num_pattern = r"(?:Invoice\s*(?:Number|No\.?|#)|Order\s*(?:Number|No\.?))\s*[:\-\s#]*([\w-]+)|(?:INV-|ORD-)([\w-]+)|#?\s*(\d+)"
     vendor_pattern = r"(?:Vendor\s*(?:Name|Company)?|Supplier|Company\s*Name|From|Sold\s*By)\s*[:\-\s]*([A-Za-z\s&\.\-]+)(?=\s*(?:Address|Invoice\s*(?:No|Number)|Date|Phone|Email|\n|$))"
-    invoice_date_pattern = r"(?:Invoice\s*Date|Date|Issue\s*Date)\s*[:\-\s]*(\d{4}-\d{2}-\d{2}|\d{2}/\d{2}/\d{4}|\d{2}-\d{2}-\d{4}|[A-Za-z]+\s*\d{1,2},\s*\d{4})"
-    due_date_pattern = r"(?:Due\s*Date|Payment\s*Due\s*Date|Due\s*By)\s*[:\-\s]*(\d{4}-\d{2}-\d{2}|\d{2}/\d{2}/\d{4}|\d{2}-\d{2}-\d{4}|[A-Za-z]+\s*\d{1,2},\s*\d{4})"
-    total_amount_pattern = r"(?:Total\s*(?:Amount|Due)?|Amount\s*Due|Total)\s*[:\-\s]*[$£€]?\s*([\d,]+\.?\d*)\s*(?:USD|GBP|EUR)?"
+    invoice_date_pattern = r"(?:Invoice\s*Date|Date|Issue\s*Date)\s*[:\-\s]*((\d{4}-\d{2}-\d{2}|\d{2}/\d{2}/\d{4}|\d{2}-\d{2}-\d{4}|[A-Za-z]+\s*\d{1,2},\s*\d{4}|[A-Za-z]+\s*\d{1,2}\s*\d{4}))"
+    due_date_pattern = r"(?:Due\s*Date|Payment\s*Due\s*Date|Due\s*By)\s*[:\-\s]*((\d{4}-\d{2}-\d{2}|\d{2}/\d{2}/\d{4}|\d{2}-\d{2}-\d{4}|[A-Za-z]+\s*\d{1,2},\s*\d{4}|[A-Za-z]+\s*\d{1,2}\s*\d{4}))"
+    total_amount_pattern = r"(?:Total\s*(?:Amount|Due)?|Amount\s*Due|Total|Balance\s*Due)\s*[:\-\s]*(?:₹|[$£€])?\s*([\d,]+\.?\d*)\s*(?:USD|GBP|EUR|INR)?"
 
     # Invoice Number
     invoice_num_match = re.search(invoice_num_pattern, text, re.IGNORECASE)
     if invoice_num_match:
-        invoice_number = invoice_num_match.group(1) if invoice_num_match.group(1) else invoice_num_match.group(2)
+        invoice_number = invoice_num_match.group(1) if invoice_num_match.group(1) else (invoice_num_match.group(2) if invoice_num_match.group(2) else invoice_num_match.group(3))
         print(f"Matched Invoice Number: {invoice_number}")  # Debug
 
     # Vendor Name
@@ -184,6 +185,8 @@ def extract_entities(text):
                     invoice_date = datetime.strptime(date_str, "%Y-%m-%d").date()
                 except ValueError:
                     invoice_date = datetime.strptime(date_str, "%d-%m-%Y").date()
+            elif re.match(r"[A-Za-z]+\s*\d{1,2}\s*\d{4}", date_str):
+                invoice_date = datetime.strptime(date_str, "%B %d %Y").date()
             print(f"Matched Invoice Date: {invoice_date}")  # Debug
         except ValueError as e:
             print(f"Failed to parse Invoice Date '{date_str}': {str(e)}")  # Debug
@@ -201,7 +204,9 @@ def extract_entities(text):
                 try:
                     due_date = datetime.strptime(date_str, "%Y-%m-%d").date()
                 except ValueError:
-                    due_date = datetime.strptime(date_str, "%d-%m-%Y").date()
+                    invoice_date = datetime.strptime(date_str, "%d-%m-%Y").date()
+            elif re.match(r"[A-Za-z]+\s*\d{1,2}\s*\d{4}", date_str):
+                due_date = datetime.strptime(date_str, "%B %d %Y").date()
             print(f"Matched Due Date: {due_date}")  # Debug
         except ValueError as e:
             print(f"Failed to parse Due Date '{date_str}': {str(e)}")  # Debug
@@ -401,8 +406,8 @@ def process_invoice(file_path):
         desc = item['description']
         # Additional cleaning to ensure no quantity or price data
         desc = re.sub(r'\s*Quantity\s*\d+', '', desc, flags=re.IGNORECASE).strip()
-        desc = re.sub(r'\s*Unit\s*Price\s*\$\d+\.\d+', '', desc, flags=re.IGNORECASE).strip()
-        desc = re.sub(r'\s*Total\s*Price\s*\$\d+\.\d+', '', desc, flags=re.IGNORECASE).strip()
+        desc = re.sub(r'\s*(?:Rate|Unit\s*Price)\s*(?:₹|[$£€])\d+\.\d+', '', desc, flags=re.IGNORECASE).strip()
+        desc = re.sub(r'\s*(?:Amount|Total\s*Price)\s*(?:₹|[$£€])\d+\.\d+', '', desc, flags=re.IGNORECASE).strip()
         cleaned_items.append(desc)
     items_str = "; ".join(cleaned_items) if cleaned_items else "No items found"
     print(f"Items string for Salesforce (after cleaning): {items_str}")  # Debug
@@ -427,7 +432,7 @@ def process_invoice(file_path):
         output.append(f"- **Due Date**: Not specified")
 
     output.extend([
-        f"- **Invoice Amount**: ${total_amount:,.2f}",
+        f"- **Invoice Amount**: ₹{total_amount:,.2f}",
         "- **Items Selected**:",
     ])