Update app.py

app.py

@@ -369,11 +369,13 @@ def match_dish(user_input: str, threshold: int = 70) -> str:
         return best_match
     return None
 
+# Enhanced matching function: returns a list of dish names that match the user input.
 def match_dishes(user_input: str, threshold: int = 70) -> list:
     matched_dishes = []
     user_input_lower = user_input.lower()
     for item in menu_items:
         dish_name = item["name"]
+        # Direct substring check
         if dish_name.lower() in user_input_lower:
             matched_dishes.append(dish_name)
         else:
@@ -389,6 +391,7 @@ async def process_order_flow(user_id: str, message: str) -> str:
         del user_state[user_id]
         state = None
 
+    # Trigger initial order flow when user types "order" or "menu"
     if message.lower() in ["order", "menu"]:
         state = ConversationState()
         state.flow = "order"
@@ -399,6 +402,7 @@ async def process_order_flow(user_id: str, message: str) -> str:
             return "Sure! What dish would you like to order?"
         return ""
 
+    # If no state exists but message contains "order", start a new order flow.
     if not state and "order" in message.lower():
         state = ConversationState()
         state.flow = "order"
@@ -407,13 +411,57 @@ 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?"
 
+    # If we're in order flow and we've already stored candidate dishes,
+    # then check if the user clarified selection.
+    if state and state.flow == "order" and "candidate_dishes" in state.data:
+        # Accept "both" (or "all") as selecting all candidate dishes.
+        if message.strip().lower() in ["both", "all"]:
+            state.data["dishes"] = state.data["candidate_dishes"]
+            # Clear candidate_dishes now that selection is made.
+            del state.data["candidate_dishes"]
+            state.step = 2  # Ask for quantity details.
+            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:
+            # If the user specifies one dish from the candidate list, use that.
+            for dish in state.data["candidate_dishes"]:
+                if dish.lower() in message.lower():
+                    state.data["dish"] = dish
+                    del state.data["candidate_dishes"]
+                    # Proceed to extract quantity
+                    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
+                        # Continue with contact details extraction...
+                        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?"
+            # If no candidate dish is clearly specified, ask for clarification again.
+            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)."
+
+    # When not already in order flow, try to detect dish(es) using fuzzy matching.
     if not state or state.flow != "order":
         matched_dishes = match_dishes(message)
         if matched_dishes:
             if len(matched_dishes) > 1:
+                # Store candidate dishes in state for later clarification.
+                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.")
+                        "Please specify which one you'd like to order or type 'both' if you'd like all.")
             else:
                 found_dish = matched_dishes[0]
                 state = ConversationState()
@@ -422,6 +470,7 @@ async def process_order_flow(user_id: str, message: str) -> str:
                 state.update_last_active()
                 user_state[user_id] = state
 
+                # Extract quantity (e.g. "Jollof of 2 portions")
                 numbers = re.findall(r'\d+', message)
                 if numbers:
                     quantity = int(numbers[0])
@@ -429,6 +478,7 @@ async def process_order_flow(user_id: str, message: str) -> str:
                         return "Please enter a valid quantity (e.g., 1, 2, 3)."
                     state.data["quantity"] = quantity
                     state.step = 3
+                    # Extract phone and address if provided.
                     phone_pattern = r'(\+?\d{10,15})'
                     phone_match = re.search(phone_pattern, message)
                     address = None