Update app.py

app.py

@@ -335,7 +335,8 @@ async def update_user_profile_with_order(user_id: str, order_id: str):
 
 async def process_order_flow(user_id: str, message: str) -> str:
     state = user_state.get(user_id)
-    
+
+    # Reset state if expired.
     if state and state.is_expired():
         state.reset()
         state.step = 1
@@ -344,7 +345,8 @@ async def process_order_flow(user_id: str, message: str) -> str:
         if message.lower() == "order":
             return "Sure! What dish would you like to order?"
         return ""
-    
+
+    # If no state and the user explicitly types "order", start the order flow.
     if not state and "order" in message.lower():
         state = ConversationState()
         state.flow = "order"
@@ -352,7 +354,9 @@ async def process_order_flow(user_id: str, message: str) -> str:
         state.update_last_active()
         user_state[user_id] = state
         return "Sure! What dish would you like to order?"
-    
+
+    # If there's no state or the current state is not in order flow,
+    # try to detect a dish name from the message.
     if not state or state.flow != "order":
         dish_candidates = [item["name"] for item in menu_items]
         found_dish = None
@@ -360,50 +364,60 @@ async def process_order_flow(user_id: str, message: str) -> str:
             if dish.lower() in message.lower():
                 found_dish = dish
                 break
-        numbers = re.findall(r'\d+', message)
-        if found_dish and numbers:
-            quantity = int(numbers[0])
-            if quantity <= 0:
-                return "Please enter a valid quantity (e.g., 1, 2, 3)."
+
+        if found_dish:
+            # Initialize a new order state.
             state = ConversationState()
             state.flow = "order"
-            state.step = 3
             state.data["dish"] = found_dish
-            state.data["quantity"] = quantity
             state.update_last_active()
             user_state[user_id] = state
 
-            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
-                await 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 to add any extras such as sides or drinks? (yes/no)"
-                )
-            elif phone_match:
-                state.data["phone_number"] = phone_match.group(1)
-                await update_user_profile(user_id, phone_number)
-                return "Thank you. Please provide your delivery address."
+            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
+
+                # Check if phone number and address are provided in the same message.
+                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
+                    await 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 to add any extras such as sides or drinks? (yes/no)"
+                    )
+                elif phone_match:
+                    state.data["phone_number"] = phone_match.group(1)
+                    await update_user_profile(user_id, phone_number)
+                    return "Thank you. Please provide your delivery address."
+                else:
+                    return (
+                        "Please provide both your phone number and delivery address. For example: "
+                        "'08152409591, 1, Iyana Isashi, Isashi, Ojo, Lagos'."
+                    )
             else:
-                return (
-                    "Please provide both your phone number and delivery address. For example: "
-                    "'09162409591, 1, Iyana Isashi, Isashi, Ojo, Lagos'."
-                )
-    
+                # No quantity provided – ask for number of servings.
+                state.step = 2
+                return f"You selected {found_dish}. How many servings would you like?"
+
+    # If state exists and is already in order flow, handle step 1 (dish selection).
     if state and state.flow == "order":
         state.update_last_active()
         if state.step == 1:
@@ -432,8 +446,6 @@ 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 state.step == 2:
             numbers = re.findall(r'\d+', message)
             if not numbers: