Update app.py

app.py

@@ -508,33 +508,50 @@ 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?"
 
-    # 2) If we are not already in the order flow, detect dish(es) from the message.
+    # 2) If we aren't in the order flow yet, try to detect dish(es)
     if not state or state.flow != "order":
         matched = match_dishes(message)
         if matched:
-            if len(matched) == 1:
-                # Single dish order
+            # Multiple candidate dishes
+            if len(matched) > 1:
+                state = ConversationState()
+                state.flow = "order"
+                state.update_last_active()
+                user_state[user_id] = state
+                state.data["candidate_dishes"] = matched
+                dish_options = ", ".join(matched)
+                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
                 found_dish = matched[0]
                 state = ConversationState()
                 state.flow = "order"
                 state.update_last_active()
                 user_state[user_id] = state
                 state.data["dish"] = found_dish
-                # Try to parse quantity, phone, address from the same message.
-                single_parse = _parse_single_dish_line(message, found_dish)
-                if single_parse["quantity"]:
-                    state.data["quantity"] = single_parse["quantity"]
+                # Attempt to parse quantity, phone, address if user typed them all
+                single_dish_parse = _parse_single_dish_line(message, found_dish)
+                if single_dish_parse["quantity"]:
+                    state.data["quantity"] = single_dish_parse["quantity"]
                     state.step = 3
                 else:
+                    # If no quantity found, we still need quantity
                     state.step = 2
-                if single_parse["phone"]:
-                    state.data["phone_number"] = single_parse["phone"]
-                if single_parse["address"]:
-                    state.data["address"] = single_parse["address"]
+
+                if single_dish_parse["phone"]:
+                    state.data["phone_number"] = single_dish_parse["phone"]
+                if single_dish_parse["address"]:
+                    state.data["address"] = single_dish_parse["address"]
+
+                # Now see how much info we have:
                 if state.step == 2 and not state.data.get("quantity"):
+                    # We must ask for quantity
                     return f"You selected {found_dish}. How many servings would you like?"
                 elif state.step == 3:
+                    # We have a quantity. Check if we also have phone and address
                     if state.data.get("phone_number") and state.data.get("address"):
+                        # We have everything needed to skip to step 5
                         shipping_cost = calculate_shipping_cost(state.data["address"])
                         state.data["shipping_cost"] = shipping_cost
                         state.step = 5
@@ -545,21 +562,9 @@ async def process_order_flow(user_id: str, message: str) -> str:
                         return "Thank you. Please provide your delivery address."
                     else:
                         return "Please provide your phone number and address."
-            else:
-                # Multiple dishes detected – support unlimited dishes.
-                state = ConversationState()
-                state.flow = "order"
-                state.update_last_active()
-                user_state[user_id] = state
-                state.data["dishes"] = matched  # Store all matched dishes
-                state.step = 2
-                dish_options = ", ".join(matched)
-                return (f"You have selected the following dishes: {dish_options}.\n"
-                        "How many servings of each would you like? "
-                        "For example: '2 for Jollof Rice, 3 for Chicken, 1 for Fish'")
-    else:
-        return "I couldn't identify the dish. Please type the dish name from our menu."
-
+        else:
+            # No dish matched
+            return "I couldn't identify the dish. Please type the dish name from our menu."
 
     # 3) If state exists and we're at step 2: parse quantity details.
     if state and state.flow == "order" and state.step == 2: