Update app.py

app.py

@@ -385,147 +385,129 @@ def match_dishes(user_input: str, threshold: int = 70) -> list:
     return list(set(matched_dishes))
 
 async def process_order_flow(user_id: str, message: str) -> str:
-        state = user_state.get(user_id)
-        if state and state.is_expired():
-            state.reset()
-            del user_state[user_id]
-            state = None
-    
-        # --- Step 1: If we're already expecting quantity details (multiple dish order) ---
-        if state and state.flow == "order" and state.step == 2:
-            # Expecting input like "2 for Jollof Rice and 3 for Fried Rice"
+    state = user_state.get(user_id)
+    if state and state.is_expired():
+        state.reset()
+        del user_state[user_id]
+        state = None
+
+    # --- Handle quantity details if we're at step 2 ---
+    if state and state.flow == "order" and state.step == 2:
+        # If the user selected multiple dishes ("both"), we expect "2 for Jollof Rice and 3 for Fried Rice".
+        if "dishes" in state.data and len(state.data["dishes"]) > 1:
+            # Parse pairs like "(\d+) for ([a-zA-Z\s]+)"
             pairs = re.findall(r'(\d+)\s*for\s*([a-zA-Z\s]+)', message, flags=re.IGNORECASE)
-            if pairs:
-                order_quantities = {}
-                candidate_dishes = state.data.get("dishes")  # This is set if user said "both"
-                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 2: Trigger initial order flow ---
-        if message.lower() in ["order", "menu"]:
-            state = ConversationState()
-            state.flow = "order"
-            state.step = 1
-            state.update_last_active()
-            user_state[user_id] = state
-            if message.lower() == "order":
-                return "Sure! What dish would you like to order?"
-            return ""
-    
-        if not state and "order" in message.lower():
-            state = ConversationState()
-            state.flow = "order"
-            state.step = 1
-            state.update_last_active()
-            user_state[user_id] = state
-            return "Sure! What dish would you like to order?"
-    
-        # --- Step 3: Identify dish(es) if not already in order flow ---
-        # This branch handles when the bot hasn't yet stored a dish.
-        if not state or state.flow != "order":
-            matched_dishes = match_dishes(message)
-            if matched_dishes:
-                if len(matched_dishes) > 1:
-                    # Multiple candidate dishes found.
-                    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.")
-                else:
-                    # Single dish identified.
-                    found_dish = matched_dishes[0]
-                    state = ConversationState()
-                    state.flow = "order"
-                    state.data["dish"] = found_dish
-                    state.update_last_active()
-                    user_state[user_id] = state
-                    # Check if quantity is provided (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 extract phone/address below.
-                        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'.")
-                    else:
-                        state.step = 2
-                        return f"You selected {found_dish}. How many servings would you like?"
+            if not pairs:
+                return ("I'm sorry, I didn't understand the quantity details. "
+                        "Please specify like '2 for Jollof Rice and 3 for Fried Rice'.")
+            order_quantities = {}
+            for quantity, dish_text in pairs:
+                dish_text = dish_text.strip().lower()
+                for candidate in state.data["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
+                summary = "\n".join([f"{q} serving(s) of {d}" for d, q in order_quantities.items()])
+                return (f"Got it. You have ordered:\n{summary}\n"
+                        "Please provide your phone number and delivery address.")
             else:
-                return "I couldn't identify the dish. Please type the dish name from our menu."
-    
-        # --- Step 4: Handle 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? " \
-                       "(For example, '2 for Jollof Rice and 3 for Fried Rice')"
+                return ("I'm sorry, I couldn't match those dishes. "
+                        "Please try something like '2 for Jollof Rice and 3 for Fried Rice'.")
+        else:
+            # Single-dish scenario. For example: "2 portions"
+            # Just look for a single number in the user message.
+            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
+            dish = state.data.get("dish", "")
+            return (f"Got it. {quantity} serving(s) of {dish}. "
+                    "Please provide your phone number and delivery address.")
+
+    # --- Trigger initial order flow when user types "order" or "menu" ---
+    if message.lower() in ["order", "menu"]:
+        state = ConversationState()
+        state.flow = "order"
+        state.step = 1
+        state.update_last_active()
+        user_state[user_id] = state
+        if message.lower() == "order":
+            return "Sure! What dish would you like to order?"
+        return ""
+
+    if not state and "order" in message.lower():
+        state = ConversationState()
+        state.flow = "order"
+        state.step = 1
+        state.update_last_active()
+        user_state[user_id] = state
+        return "Sure! What dish would you like to order?"
+
+    # --- Identify dish(es) if not already in order flow ---
+    if not state or state.flow != "order":
+        matched_dishes = match_dishes(message)
+        if matched_dishes:
+            if len(matched_dishes) > 1:
+                # Multiple dishes found
+                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.")
             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} " \
-                       "(or type 'both' if you'd like to order all)."
+                # Single dish found
+                found_dish = matched_dishes[0]
+                state = ConversationState()
+                state.flow = "order"
+                state.data["dish"] = found_dish
+                state.update_last_active()
+                user_state[user_id] = state
+                # Attempt to extract a quantity if present
+                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 {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."
+
+    # --- Clarification for multiple dishes ---
+    if state and state.flow == "order" and "candidate_dishes" in state.data:
+        # If user typed "both", they want all candidate dishes
+        if message.strip().lower() in ["both", "all"]:
+            state.data["dishes"] = state.data["candidate_dishes"]
+            del state.data["candidate_dishes"]
+            state.step = 2
+            dishes_str = ", ".join(state.data["dishes"])
+            return (f"You have selected: {dishes_str}. How many servings of each would you like? "
+                    "(For example, '2 for Jollof Rice and 3 for Fried Rice')")
+        else:
+            # Check if user specified a single dish out of the candidates
+            for dish in state.data["candidate_dishes"]:
+                if dish.lower() in message.lower():
+                    state.data["dish"] = dish
+                    del state.data["candidate_dishes"]
+                    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} "
+                    "(or type 'both' if you'd like to order all).")
     
         # --- Step 5: Contact details extraction (for single-dish orders) ---
         if state.step == 3: