Update app.py

app.py

@@ -391,6 +391,30 @@ async def process_order_flow(user_id: str, message: str) -> str:
         del user_state[user_id]
         state = None
 
+    # If we're already expecting quantity details (step 2), parse that.
+    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 = {}
+            # Get candidate dishes from either multiple selection or a single dish.
+            candidate_dishes = state.data.get("dishes")
+            if not candidate_dishes:
+                # If only one dish was selected, candidate_dishes is the single dish.
+                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 matches the text (case-insensitive substring match)
+                    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  # Move to next step (e.g. 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'."
+
     # Trigger initial order flow when user types "order" or "menu"
     if message.lower() in ["order", "menu"]:
         state = ConversationState()
@@ -402,7 +426,6 @@ 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"
@@ -411,49 +434,12 @@ 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 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.
+                # Store candidate dishes and ask user to clarify.
                 state = ConversationState()
                 state.flow = "order"
                 state.update_last_active()
@@ -470,7 +456,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")
+                # Extract quantity if provided (e.g. "Jollof of 2 portions")
                 numbers = re.findall(r'\d+', message)
                 if numbers:
                     quantity = int(numbers[0])
@@ -478,7 +464,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.
+                    # Proceed with extracting phone and address (see below)
                     phone_pattern = r'(\+?\d{10,15})'
                     phone_match = re.search(phone_pattern, message)
                     address = None
@@ -510,6 +496,40 @@ async def process_order_flow(user_id: str, message: str) -> str:
                     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."
+
+    # If we already have candidate dishes (from a multiple match), check the user clarification.
+    if state and state.flow == "order" and "candidate_dishes" in state.data:
+        if message.strip().lower() in ["both", "all"]:
+            # User selects 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"]
+                    # Try 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
+                        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 still unclear, 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)."
         if state.step == 2:
             numbers = re.findall(r'\d+', message)
             if not numbers: