Update app.py

app.py

@@ -391,31 +391,29 @@ 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.
+    # --- Step A: Already expecting quantity details? ---
     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.
+            # Use candidate dishes if available; otherwise, a single selected 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)
+                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'."
 
-    # Trigger initial order flow when user types "order" or "menu"
+    # --- Step B: Trigger initial order flow ---
     if message.lower() in ["order", "menu"]:
         state = ConversationState()
         state.flow = "order"
@@ -434,12 +432,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 not already in order flow, try to detect dish(es) using fuzzy matching.
+    # --- Step C: 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 multiple dishes are detected, ask for clarification.
             if len(matched_dishes) > 1:
-                # Store candidate dishes and ask user to clarify.
                 state = ConversationState()
                 state.flow = "order"
                 state.update_last_active()
@@ -449,14 +447,14 @@ async def process_order_flow(user_id: str, message: str) -> str:
                 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 case.
                 found_dish = matched_dishes[0]
                 state = ConversationState()
                 state.flow = "order"
                 state.data["dish"] = found_dish
                 state.update_last_active()
                 user_state[user_id] = state
-
-                # Extract quantity if provided (e.g. "Jollof of 2 portions")
+                # Attempt to extract quantity (e.g. "Jollof Rice of 2 portions")
                 numbers = re.findall(r'\d+', message)
                 if numbers:
                     quantity = int(numbers[0])
@@ -464,7 +462,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
-                    # Proceed with extracting phone and address (see below)
+                    # Proceed to contact details extraction
                     phone_pattern = r'(\+?\d{10,15})'
                     phone_match = re.search(phone_pattern, message)
                     address = None
@@ -497,10 +495,10 @@ async def process_order_flow(user_id: str, message: str) -> str:
         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.
+    # --- Step D: 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 selects all candidate dishes.
+            # 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.
@@ -513,7 +511,6 @@ async def process_order_flow(user_id: str, message: str) -> str:
                 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])
@@ -526,20 +523,9 @@ async def process_order_flow(user_id: str, message: str) -> str:
                     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:
-                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
-            return f"Got it. {quantity} serving(s) of {state.data.get('dish')}. Please provide your phone number and delivery address."
     
         if state.step == 3:
             phone_pattern = r'(\+?\d{10,15})'