Update app.py

app.py

@@ -398,27 +398,32 @@ def match_dish(user_input: str, threshold: int = 70) -> str:
 
 def match_dishes(user_input: str, threshold: int = 70) -> list:
     """
-    First, try to find an exact (whole word) match for dish names.
-    If found, return those matches; otherwise, fall back to fuzzy matching.
+    Returns a list of dish names that appear as whole words in the input.
+    First, normalize the input to collapse multiple spaces.
+    Then, try an exact whole-word match using a regex with word boundaries.
+    If no exact match is found, fall back to fuzzy matching.
     """
+    # Normalize input: lowercase, strip, and collapse spaces
+    normalized_input = re.sub(r'\s+', ' ', user_input.lower().strip())
     matched_dishes = []
-    user_input_lower = user_input.lower().strip()
-
-    # Check for exact whole-word matches
+    
+    # Try exact matching with word boundaries.
     for item in menu_items:
         dish_name = item["name"]
-        # Use word boundaries so that 'fried rice' only matches 'Fried Rice'
+        # Create a pattern with word boundaries; e.g., for "fried rice":
+        # pattern becomes: r'\bfried rice\b'
         pattern = r'\b' + re.escape(dish_name.lower()) + r'\b'
-        if re.search(pattern, user_input_lower):
+        if re.search(pattern, normalized_input):
             matched_dishes.append(dish_name)
     
+    # If we found any exact matches, return them.
     if matched_dishes:
         return list(set(matched_dishes))
     
-    # If no exact match, use fuzzy matching as fallback.
+    # If no exact match, fall back to fuzzy matching.
     for item in menu_items:
         dish_name = item["name"]
-        score = fuzz.token_sort_ratio(user_input_lower, dish_name.lower())
+        score = fuzz.token_sort_ratio(normalized_input, dish_name.lower())
         if score >= threshold:
             matched_dishes.append(dish_name)
     
@@ -763,10 +768,7 @@ async def process_order_flow(user_id: str, message: str) -> str:
             asyncio.create_task(save_order())
             asyncio.create_task(log_order_tracking(order_id, "Order Placed", "Order placed and awaiting payment."))
     
-            # Email notification to admin (using your SMTP integration)
-            admin_emails = os.getenv("ADMIN_EMAILS", "admin@example.com").split(",")
-            email_subject = f"New Order Received: {order_id}"
-            email_body = (
+            order_details = (
                 f"New Order Received:\n"
                 f"Order ID: {order_id}\n"
                 f"Dish(es): {dish_summary}\n"
@@ -777,7 +779,7 @@ async def process_order_flow(user_id: str, message: str) -> str:
                 f"Extras: {state.data.get('extras', 'None')}\n"
                 f"Status: Pending Payment"
             )
-            email_sent = send_email_notification(admin_emails, email_subject, email_body)
+            email_sent = send_email_notification(order_details)
             if email_sent:
                 print("Email notification sent successfully.")
             else:
@@ -811,7 +813,6 @@ async def process_order_flow(user_id: str, message: str) -> str:
             # Instead of immediately canceling, re-prompt for confirmation.
             return "Please confirm your order by typing 'yes' to confirm or 'no' to cancel."
 
-    # Final fallback
     return ""