Update app.py

app.py

@@ -384,53 +384,19 @@ def match_dishes(user_input: str, threshold: int = 70) -> list:
                 matched_dishes.append(dish_name)
     return list(set(matched_dishes))
 
+
 async def process_order_flow(user_id: str, message: str) -> str:
+    """
+    A unified approach to parse dish(es), quantity, phone, and address
+    whether the user provides them all at once or in multiple steps.
+    """
     state = user_state.get(user_id)
     if state and state.is_expired():
         state.reset()
         del user_state[user_id]
         state = None
 
-    # --- Handle quantity details if we're at step 2 ---
-    if state and state.flow == "order" and state.step == 2:
-        # If the user selected multiple dishes ("both"), we expect "2 for Jollof Rice and 3 for Fried Rice".
-        if "dishes" in state.data and len(state.data["dishes"]) > 1:
-            # Parse pairs like "(\d+) for ([a-zA-Z\s]+)"
-            pairs = re.findall(r'(\d+)\s*for\s*([a-zA-Z\s]+)', message, flags=re.IGNORECASE)
-            if not pairs:
-                return ("I'm sorry, I didn't understand the quantity details. "
-                        "Please specify like '2 for Jollof Rice and 3 for Fried Rice'.")
-            order_quantities = {}
-            for quantity, dish_text in pairs:
-                dish_text = dish_text.strip().lower()
-                for candidate in state.data["dishes"]:
-                    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
-                summary = "\n".join([f"{q} serving(s) of {d}" for d, q in order_quantities.items()])
-                return (f"Got it. You have ordered:\n{summary}\n"
-                        "Please provide your phone number and delivery address.")
-            else:
-                return ("I'm sorry, I couldn't match those dishes. "
-                        "Please try something like '2 for Jollof Rice and 3 for Fried Rice'.")
-        else:
-            # Single-dish scenario. For example: "2 portions"
-            # Just look for a single number in the user message.
-            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
-            dish = state.data.get("dish", "")
-            return (f"Got it. {quantity} serving(s) of {dish}. "
-                    "Please provide your phone number and delivery address.")
-
-    # --- Trigger initial order flow when user types "order" or "menu" ---
+    # 1) If user says "menu" or "order", initialize the flow
     if message.lower() in ["order", "menu"]:
         state = ConversationState()
         state.flow = "order"
@@ -441,6 +407,7 @@ async def process_order_flow(user_id: str, message: str) -> str:
             return "Sure! What dish would you like to order?"
         return ""
 
+    # If user says "order" but we have no state
     if not state and "order" in message.lower():
         state = ConversationState()
         state.flow = "order"
@@ -449,103 +416,157 @@ 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?"
 
-    # --- Identify dish(es) if not already in order flow ---
+    # 2) If we aren't in the order flow yet, try to detect dish(es)
     if not state or state.flow != "order":
-        matched_dishes = match_dishes(message)
-        if matched_dishes:
-            if len(matched_dishes) > 1:
-                # Multiple dishes found
+        matched = match_dishes(message)
+        if matched:
+            # Multiple candidate dishes
+            if len(matched) > 1:
                 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)
+                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
-                found_dish = matched_dishes[0]
+                # Single dish
+                found_dish = matched[0]
                 state = ConversationState()
                 state.flow = "order"
-                state.data["dish"] = found_dish
                 state.update_last_active()
                 user_state[user_id] = state
-                # Attempt to extract a quantity if present
-                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.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"]
                     state.step = 3
-                    return (f"You selected {found_dish} with {quantity} serving(s). "
-                            "Please provide your phone number and delivery address.")
                 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 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
+                        return (f"Thanks! Your phone number is recorded as: {state.data['phone_number']}.\n"
+                                f"Your delivery address is: {state.data['address']}.\n"
+                                f"Your delivery cost is N{shipping_cost}. Would you like extras (yes/no)?")
+                    elif state.data.get("phone_number") and not state.data.get("address"):
+                        return "Thank you. Please provide your delivery address."
+                    else:
+                        return "Please provide your phone number and address."
         else:
+            # No dish matched
             return "I couldn't identify the dish. Please type the dish name from our menu."
 
-    # --- Clarification for multiple dishes ---
+    # 3) If we have candidate dishes and user needs to clarify
     if state and state.flow == "order" and "candidate_dishes" in state.data:
-        # If user typed "both", they want all candidate dishes
+        # If user typed "both" => they want all candidate dishes
         if message.strip().lower() in ["both", "all"]:
             state.data["dishes"] = state.data["candidate_dishes"]
             del state.data["candidate_dishes"]
-            state.step = 2
+            state.step = 2  # We'll parse "2 for Jollof Rice and 3 for Fried Rice"
             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 and 3 for Fried Rice')")
         else:
-            # Check if user specified a single dish out of the candidates
+            # Maybe the user typed a single dish out of the candidates
             for dish in state.data["candidate_dishes"]:
                 if dish.lower() in message.lower():
                     state.data["dish"] = dish
                     del state.data["candidate_dishes"]
                     state.step = 2
                     return f"You selected {dish}. How many servings would you like?"
+            # If still unclear
             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).")
-    
-        # --- Step 5: Contact details extraction (for single-dish orders) ---
-        if state.step == 3:
-            phone_pattern = r'(\+?\d{10,15})'
-            phone_match = re.search(phone_pattern, message)
-            address = None
-            if phone_match:
-                phone_number = phone_match.group(1)
-                address_start = phone_match.end()
-                address = message[address_start:].strip()
-                address = re.sub(r'^[,\s]+|[,\s]+$', '', address)
-            if phone_match and address:
-                state.data["phone_number"] = phone_number
-                state.data["address"] = address
-                asyncio.create_task(update_user_profile(user_id, phone_number, address))
-                shipping_cost = calculate_shipping_cost(address)
-                state.data["shipping_cost"] = shipping_cost
-                state.step = 5
-                return (f"Thanks! Your phone number is recorded as: {phone_number}.\n"
-                        f"Your delivery address is: {address}.\n"
-                        f"Your delivery cost is N{shipping_cost}. Would you like extras (yes/no)?")
-            elif phone_match:
-                state.data["phone_number"] = phone_match.group(1)
-                asyncio.create_task(update_user_profile(user_id, phone_match.group(1)))
-                return "Thank you. Please provide your delivery address."
+
+    # 4) If step == 2 for multiple dishes => parse "2 for Jollof Rice and 3 for Fried Rice"
+    if state and state.flow == "order" and state.step == 2:
+        if "dishes" in state.data and len(state.data["dishes"]) > 1:
+            pairs = re.findall(r'(\d+)\s*for\s*([a-zA-Z\s]+)', message, flags=re.IGNORECASE)
+            if not pairs:
+                return ("I'm sorry, I didn't understand the quantity details. "
+                        "Please specify like '2 for Jollof Rice and 3 for Fried Rice'.")
+            order_quantities = {}
+            for quantity, dish_text in pairs:
+                dish_text = dish_text.strip().lower()
+                for candidate in state.data["dishes"]:
+                    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
+                summary = "\n".join([f"{q} serving(s) of {d}" for d, q in order_quantities.items()])
+                return (f"Got it. You have ordered:\n{summary}\n"
+                        "Please provide your phone number and delivery address.")
             else:
-                return ("Please provide both your phone number and delivery address. "
-                        "For example: '09162409591, 1, Iyana Isashi, Isashi, Ojo, Lagos'.")
-    
-        # Steps 4, 5, 6, and 7 remain unchanged.
-        if state.step == 4:
-            state.data["address"] = message
-            asyncio.create_task(update_user_profile(user_id, address=message))
-            shipping_cost = calculate_shipping_cost(message)
-            state.data["shipping_cost"] = shipping_cost
-            state.step = 5
-            return (f"Thanks. Your delivery address is recorded as: {message}.\n"
-                    f"Your delivery cost is N{shipping_cost}. Would you like extras (yes/no)?")
+                return ("I'm sorry, I couldn't match those dishes. "
+                        "Please try something like '2 for Jollof Rice and 3 for Fried Rice'.")
+
+        # Single-dish scenario at step 2 => user typed just a quantity
+        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
+        dish = state.data.get("dish", "")
+        return (f"Got it. {quantity} serving(s) of {dish}. "
+                "Please provide your phone number and delivery address.")
+
+    # 5) Step == 3 => parse phone & address for single or multiple dishes
+    if state and state.flow == "order" and state.step == 3:
+        phone_pattern = r'(\+?\d{10,15})'
+        phone_match = re.search(phone_pattern, message)
+        address = None
+        if phone_match:
+            phone_number = phone_match.group(1)
+            address_start = phone_match.end()
+            address = message[address_start:].strip()
+            address = re.sub(r'^[,\s]+|[,\s]+$', '', address)
+            state.data["phone_number"] = phone_number
+            state.data["address"] = address
+            asyncio.create_task(update_user_profile(user_id, phone_number, address))
+        else:
+            # Maybe the user typed an address only, or partial info
+            # If the phone was previously stored, we just store the address
+            if "phone_number" in state.data:
+                state.data["address"] = message.strip()
+            else:
+                # If no phone number found yet, we need it
+                return ("Please provide both your phone number and address. "
+                        "For example: '09162409591, 1, Iyana Isashi, Isashi, Lagos'.")
+
+        if "address" not in state.data:
+            # If we only found phone but no address, ask for address
+            return "Thank you. Please provide your delivery address."
+
+        # If we have phone + address, move to step 5 => ask extras
+        shipping_cost = calculate_shipping_cost(state.data["address"])
+        state.data["shipping_cost"] = shipping_cost
+        state.step = 5
+        return (f"Thanks! Your phone number is recorded as: {state.data['phone_number']}.\n"
+                f"Your delivery address is: {state.data['address']}.\n"
+                f"Your delivery cost is N{shipping_cost}. Would you like extras (yes/no)?")
     
         if state.step == 5:
             if message.lower() in ["yes", "y"]:
@@ -662,6 +683,37 @@ async def process_order_flow(user_id: str, message: str) -> str:
 
         return ""
 
+        
+
+def _parse_single_dish_line(message: str, dish_name: str) -> dict:
+    """
+    Utility: if user typed everything at once for a single dish, 
+    parse quantity, phone, address from the same line.
+    E.g.: "Jollof Rice, 2, 09162409591, Iyana Isashi, Isashi, Lagos"
+    """
+    result = {"quantity": None, "phone": None, "address": None}
+
+    # 1) Parse quantity
+    numbers = re.findall(r'\d+', message)
+    if numbers:
+        # We'll assume the first numeric is quantity if no "for" pattern is used
+        result["quantity"] = int(numbers[0])
+
+    # 2) Parse phone
+    phone_pattern = r'(\+?\d{10,15})'
+    phone_match = re.search(phone_pattern, message)
+    address = None
+    if phone_match:
+        phone_number = phone_match.group(1)
+        address_start = phone_match.end()
+        address = message[address_start:].strip()
+        address = re.sub(r'^[,\s]+|[,\s]+$', '', address)
+        result["phone"] = phone_number
+        if address:
+            result["address"] = address
+
+    return result
+
     
 async def get_or_create_user_profile(user_id: str, phone_number: str = None) -> UserProfile:
     async with async_session() as session: