Update app.py

app.py

@@ -49,6 +49,7 @@ class Order(Base):
     price = Column(String, default="0")
     status = Column(String, default="Pending Payment")
     payment_reference = Column(String, nullable=True)
+    delivery_address = Column(String, default="")  # New field for address
     timestamp = Column(DateTime, default=datetime.utcnow)
 
 class UserProfile(Base):
@@ -212,9 +213,10 @@ def stream_image_completion(image_b64: str):
 def process_order_flow(user_id: str, message: str) -> str:
     """
     Implements an FSM-based order flow that:
-      - In step 1, expects the user to mention a dish name (optionally with quantity)
-      - In step 2, asks for quantity if not provided
-      - In step 3, finalizes the order and creates a payment link
+      - Step 1: Expects the user to mention a dish name (optionally with quantity)
+      - Step 2: Asks for quantity if not provided
+      - Step 3: Requests the delivery address
+      - Step 4: Asks for order confirmation (yes/no) and finalizes the order
     """
     # Retrieve or initialize conversation state
     state = user_state.get(user_id)
@@ -253,7 +255,6 @@ 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:
                 state.data["dish"] = found_dish
@@ -262,9 +263,11 @@ def process_order_flow(user_id: str, message: str) -> str:
                     if quantity <= 0:
                         return "Please enter a valid quantity (e.g., 1, 2, 3)."
                     state.data["quantity"] = quantity
-                    state.step = 3  # ready to finalize the order
+                    state.step = 3  # move directly to address step
+                    return f"You selected {found_dish} with {quantity} serving(s). Please provide your delivery address."
                 else:
                     state.step = 2  # ask for quantity
+                    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."
 
@@ -278,44 +281,59 @@ 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
+            return f"Got it. {quantity} serving(s) of {state.data.get('dish')}. Now, please provide your delivery address."
 
-        # --- Step 3: Finalize Order ---
+        # --- Step 3: Requesting Delivery Address ---
         if state.step == 3:
-            order_id = f"ORD-{int(time.time())}"
-            state.data["order_id"] = order_id
-            price_per_serving = 1500  # fixed price per serving for demonstration
-            quantity = state.data.get("quantity", 1)
-            total_price = quantity * price_per_serving
-            state.data["price"] = str(total_price)
-
-            # Save the order asynchronously
-            async def save_order():
-                async with async_session() as session:
-                    order = Order(
-                        order_id=order_id,
-                        user_id=user_id,
-                        dish=state.data["dish"],
-                        quantity=str(quantity),
-                        price=str(total_price),
-                        status="Pending Payment"
-                    )
-                    session.add(order)
-                    await session.commit()
-            asyncio.create_task(save_order())
-
-            email = "[email protected]"  # Placeholder; retrieve from profile if available
-            payment_data = create_paystack_payment_link(email, total_price * 100, order_id)
-            dish_name = state.data.get("dish", "")
-            state.reset()
-            if user_id in user_state:
-                del user_state[user_id]
-
-            if payment_data.get("status"):
-                payment_link = payment_data["data"]["authorization_url"]
-                return (f"Thank you for your order of {quantity} serving(s) of {dish_name}! "
-                        f"Your Order ID is {order_id}.\nPlease complete payment here: {payment_link}")
+            # Assume any text is a valid address
+            state.data["address"] = message
+            state.step = 4
+            return f"Thanks. Your delivery address is recorded as: {message}. Confirm order? (yes/no)"
+
+        # --- Step 4: Order Confirmation & Finalization ---
+        if state.step == 4:
+            if message.lower() in ["yes", "y"]:
+                order_id = f"ORD-{int(time.time())}"
+                state.data["order_id"] = order_id
+                price_per_serving = 1500  # fixed price per serving for demonstration
+                quantity = state.data.get("quantity", 1)
+                total_price = quantity * price_per_serving
+                state.data["price"] = str(total_price)
+
+                # Save the order asynchronously (including delivery_address)
+                async def save_order():
+                    async with async_session() as session:
+                        order = Order(
+                            order_id=order_id,
+                            user_id=user_id,
+                            dish=state.data["dish"],
+                            quantity=str(quantity),
+                            price=str(total_price),
+                            status="Pending Payment",
+                            delivery_address=state.data.get("address", "")
+                        )
+                        session.add(order)
+                        await session.commit()
+                asyncio.create_task(save_order())
+
+                email = "[email protected]"  # Placeholder; retrieve from profile if available
+                payment_data = create_paystack_payment_link(email, total_price * 100, order_id)
+                dish_name = state.data.get("dish", "")
+                state.reset()
+                if user_id in user_state:
+                    del user_state[user_id]
+                if payment_data.get("status"):
+                    payment_link = payment_data["data"]["authorization_url"]
+                    return (f"Thank you for your order of {quantity} serving(s) of {dish_name}! "
+                            f"Your Order ID is {order_id}.\nPlease complete payment here: {payment_link}\n"
+                            "You can track your order status using your Order ID.")
+                else:
+                    return f"Your order has been placed with Order ID {order_id}, but we could not initialize payment. Please try again later."
             else:
-                return f"Your order has been placed with Order ID {order_id}, but we could not initialize payment. Please try again later."
+                state.reset()
+                if user_id in user_state:
+                    del user_state[user_id]
+                return "Order canceled. Let me know if you'd like to try again."
 
     return ""
 
@@ -508,8 +526,6 @@ async def chatbot_response(request: Request, background_tasks: BackgroundTasks):
     return StreamingResponse(stream_response(), media_type="text/plain")
 
 # --- Other Endpoints (Chat History, Order Details, User Profile, Analytics, Voice, Payment Callback) ---
-# ... (Implement other endpoints as needed) ...
-
 @app.get("/chat_history/{user_id}")
 async def get_chat_history(user_id: str):
     async with async_session() as session: