Update app.py

app.py

@@ -391,29 +391,6 @@ async def process_order_flow(user_id: str, message: str) -> str:
         del user_state[user_id]
         state = None
 
-    # --- Step A: Already expecting quantity details? ---
-    if state and state.flow == "order" and state.step == 2:
-        # Expecting a message like "2 for Jollof Rice and 3 for Fried Rice"
-        pairs = re.findall(r'(\d+)\s*for\s*([a-zA-Z\s]+)', message, flags=re.IGNORECASE)
-        if pairs:
-            order_quantities = {}
-            # Use candidate dishes if available; otherwise, a single selected dish.
-            candidate_dishes = state.data.get("dishes")
-            if not candidate_dishes:
-                candidate_dishes = [state.data.get("dish")]
-            for quantity, dish_text in pairs:
-                dish_text = dish_text.strip().lower()
-                for candidate in candidate_dishes:
-                    if candidate.lower() in dish_text or dish_text in candidate.lower():
-                        order_quantities[candidate] = int(quantity)
-            if order_quantities:
-                state.data["orders"] = order_quantities
-                state.step = 3  # Proceed to collecting contact details
-                order_summary = "\n".join([f"{q} serving(s) of {d}" for d, q in order_quantities.items()])
-                return f"Got it. You have ordered:\n{order_summary}\nPlease provide your phone number and delivery address."
-        return "I'm sorry, I didn't understand the quantity details. Please specify like '2 for Jollof Rice and 3 for Fried Rice'."
-
-    # --- Step B: Trigger initial order flow ---
     if message.lower() in ["order", "menu"]:
         state = ConversationState()
         state.flow = "order"
@@ -432,100 +409,84 @@ async def process_order_flow(user_id: str, message: str) -> str:
         user_state[user_id] = state
         return "Sure! What dish would you like to order?"
 
-    # --- Step C: Identify dish(es) if not already in order flow ---
+    # Use fuzzy matching to detect a dish even with typos
     if not state or state.flow != "order":
-        matched_dishes = match_dishes(message)
-        if matched_dishes:
-            # If multiple dishes are detected, ask for clarification.
-            if len(matched_dishes) > 1:
-                state = ConversationState()
-                state.flow = "order"
-                state.update_last_active()
-                state.data["candidate_dishes"] = matched_dishes
-                user_state[user_id] = state
-                dish_options = ", ".join(matched_dishes)
-                return (f"We found multiple dishes in your request: {dish_options}. "
-                        "Please specify which one you'd like to order or type 'both' if you'd like all.")
+        found_dish = match_dish(message)
+        if found_dish:
+            state = ConversationState()
+            state.flow = "order"
+            state.data["dish"] = found_dish
+            state.update_last_active()
+            user_state[user_id] = state
+            numbers = re.findall(r'\d+', message)
+            if numbers:
+                quantity = int(numbers[0])
+                if quantity <= 0:
+                    return "Please enter a valid quantity (e.g., 1, 2, 3)."
+                state.data["quantity"] = quantity
+                state.step = 3
+                phone_pattern = r'(\+?\d{10,15})'
+                phone_match = re.search(phone_pattern, message)
+                address = None
+                if phone_match:
+                    phone_number = phone_match.group(1)
+                    address_start = phone_match.end()
+                    address = message[address_start:].strip()
+                    address = re.sub(r'^[,\s]+|[,\s]+$', '', address)
+                if phone_match and address:
+                    state.data["phone_number"] = phone_number
+                    state.data["address"] = address
+                    asyncio.create_task(update_user_profile(user_id, phone_number, address))
+                    shipping_cost = calculate_shipping_cost(address)
+                    state.data["shipping_cost"] = shipping_cost
+                    state.step = 5
+                    return (f"Thanks! Your phone number is recorded as: {phone_number}.\n"
+                            f"Your delivery address is: {address}.\n"
+                            f"Your delivery cost is N{shipping_cost}. Would you like extras (yes/no)?")
+                elif phone_match:
+                    state.data["phone_number"] = phone_match.group(1)
+                    asyncio.create_task(update_user_profile(user_id, phone_number))
+                    return "Thank you. Please provide your delivery address."
+                else:
+                    return ("Please provide both your phone number and delivery address. "
+                            "For example: '09162409591, 1, Iyana Isashi, Isashi, Ojo, Lagos'.")
             else:
-                # Single dish case.
-                found_dish = matched_dishes[0]
-                state = ConversationState()
-                state.flow = "order"
+                state.step = 2
+                return f"You selected {found_dish}. How many servings would you like?"
+                
+    # If state exists and we're already in order flow:
+    if state and state.flow == "order":
+        state.update_last_active()
+        if state.step == 1:
+            # Use fuzzy matching on the message in case of typos.
+            found_dish = match_dish(message)
+            numbers = re.findall(r'\d+', message)
+            if found_dish:
                 state.data["dish"] = found_dish
-                state.update_last_active()
-                user_state[user_id] = state
-                # Attempt to extract quantity (e.g. "Jollof Rice of 2 portions")
-                numbers = re.findall(r'\d+', message)
                 if numbers:
                     quantity = int(numbers[0])
                     if quantity <= 0:
                         return "Please enter a valid quantity (e.g., 1, 2, 3)."
                     state.data["quantity"] = quantity
                     state.step = 3
-                    # Proceed to contact details extraction
-                    phone_pattern = r'(\+?\d{10,15})'
-                    phone_match = re.search(phone_pattern, message)
-                    address = None
-                    if phone_match:
-                        phone_number = phone_match.group(1)
-                        address_start = phone_match.end()
-                        address = message[address_start:].strip()
-                        address = re.sub(r'^[,\s]+|[,\s]+$', '', address)
-                    if phone_match and address:
-                        state.data["phone_number"] = phone_number
-                        state.data["address"] = address
-                        asyncio.create_task(update_user_profile(user_id, phone_number, address))
-                        shipping_cost = calculate_shipping_cost(address)
-                        state.data["shipping_cost"] = shipping_cost
-                        state.step = 5
-                        return (f"Thanks! Your phone number is recorded as: {phone_number}.\n"
-                                f"Your delivery address is: {address}.\n"
-                                f"Your delivery cost is N{shipping_cost}. Would you like extras (yes/no)?")
-                    elif phone_match:
-                        state.data["phone_number"] = phone_match.group(1)
-                        asyncio.create_task(update_user_profile(user_id, phone_match.group(1)))
-                        return "Thank you. Please provide your delivery address."
-                    else:
-                        return (f"You selected {found_dish} with {quantity} serving(s). "
-                                "Please provide both your phone number and delivery address. "
-                                "For example: '09162409591, 1, Iyana Isashi, Isashi, Ojo, Lagos'.")
+                    return (f"You selected {found_dish} with {quantity} serving(s). "
+                            "Please provide your phone number and delivery address.")
                 else:
                     state.step = 2
                     return f"You selected {found_dish}. How many servings would you like?"
-        else:
-            return "I couldn't identify the dish. Please type the dish name from our menu."
-
-    # --- Step D: Clarification if candidate dishes exist (multiple matches) ---
-    if state and state.flow == "order" and "candidate_dishes" in state.data:
-        if message.strip().lower() in ["both", "all"]:
-            # User chooses to order all candidate dishes.
-            state.data["dishes"] = state.data["candidate_dishes"]
-            del state.data["candidate_dishes"]
-            state.step = 2  # Now expect quantity details for each dish.
-            dishes_str = ", ".join(state.data["dishes"])
-            return f"You have selected: {dishes_str}. How many servings of each would you like? " \
-                   f"(For example, '2 for Jollof Rice and 3 for Fried Rice')"
-        else:
-            # Check if the message specifies one of the candidate dishes.
-            for dish in state.data["candidate_dishes"]:
-                if dish.lower() in message.lower():
-                    state.data["dish"] = dish
-                    del state.data["candidate_dishes"]
-                    numbers = re.findall(r'\d+', message)
-                    if numbers:
-                        quantity = int(numbers[0])
-                        if quantity <= 0:
-                            return "Please enter a valid quantity (e.g., 1, 2, 3)."
-                        state.data["quantity"] = quantity
-                        state.step = 3
-                        return (f"You selected {dish} with {quantity} serving(s). "
-                                "Please provide your phone number and delivery address.")
-                    else:
-                        state.step = 2
-                        return f"You selected {dish}. How many servings would you like?"
-            dish_options = ", ".join(state.data["candidate_dishes"])
-            return f"Please specify which one you'd like to order from: {dish_options} " \
-                   f"(or type 'both' if you'd like to order all)."
+            else:
+                return "I couldn't identify the dish. Please type the dish name from our menu."
+    
+        if state.step == 2:
+            numbers = re.findall(r'\d+', message)
+            if not numbers:
+                return "Please enter a valid number for the quantity (e.g., 1, 2, 3)."
+            quantity = int(numbers[0])
+            if quantity <= 0:
+                return "Please enter a valid quantity (e.g., 1, 2, 3)."
+            state.data["quantity"] = quantity
+            state.step = 3
+            return f"Got it. {quantity} serving(s) of {state.data.get('dish')}. Please provide your phone number and delivery address."
     
         if state.step == 3:
             phone_pattern = r'(\+?\d{10,15})'