Update app.py

app.py

@@ -512,46 +512,28 @@ async def process_order_flow(user_id: str, message: str) -> str:
     if not state or state.flow != "order":
         matched = match_dishes(message)
         if matched:
-            # 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
+            if len(matched) == 1:
+                # Single dish order
                 found_dish = matched[0]
                 state = ConversationState()
                 state.flow = "order"
                 state.update_last_active()
                 user_state[user_id] = state
                 state.data["dish"] = found_dish
-                # 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"]
+                single_parse = _parse_single_dish_line(message, found_dish)
+                if single_parse["quantity"]:
+                    state.data["quantity"] = single_parse["quantity"]
                     state.step = 3
                 else:
-                    # If no quantity found, we still need quantity
                     state.step = 2
-
-                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 single_parse["phone"]:
+                    state.data["phone_number"] = single_parse["phone"]
+                if single_parse["address"]:
+                    state.data["address"] = single_parse["address"]
                 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
@@ -562,9 +544,42 @@ 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 – store all in candidate_dishes.
+                state = ConversationState()
+                state.flow = "order"
+                state.update_last_active()
+                user_state[user_id] = state
+                state.data["candidate_dishes"] = matched
+                state.step = 2
+                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:
-            # No dish matched
             return "I couldn't identify the dish. Please type the dish name from our menu."
+    
+    # --- Candidate Dishes Clarification Branch ---
+    if state and state.flow == "order" and "candidate_dishes" in state.data:
+        normalized = message.strip().lower()
+        if normalized 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, 3 for Chicken Wings, 1 for Fish')")
+        else:
+            for dish in state.data["candidate_dishes"]:
+                if dish.lower() in normalized:
+                    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).")
+
+
 
     # 3) If state exists and we're at step 2: parse quantity details.
     if state and state.flow == "order" and state.step == 2: