Update app.py

app.py

@@ -3,6 +3,7 @@ import os
 import time
 import requests
 import base64
+import asyncio
 from datetime import datetime, timedelta
 from bs4 import BeautifulSoup
 from sqlalchemy import select
@@ -76,7 +77,8 @@ async def init_db():
         await conn.run_sync(Base.metadata.create_all)
 
 # --- Global In-Memory Stores ---
-user_state = {}       # e.g., { user_id: { "flow": str, "step": int, "data": dict, "last_active": datetime } }
+# Instead of a plain dict for conversation context, we use a dedicated class below.
+user_state = {}       # e.g., { user_id: ConversationState }
 conversation_context = {}  
 proactive_timer = {}   
 
@@ -87,6 +89,28 @@ menu_items = [
     {"name": "Egusi Soup", "description": "A rich and hearty soup made with melon seeds", "price": 1000, "nutrition": "Calories: 250 kcal, Carbs: 15g, Protein: 8g, Fat: 10g"}
 ]
 
+# --- Conversation State Management ---
+SESSION_TIMEOUT = timedelta(minutes=5)
+
+class ConversationState:
+    def __init__(self):
+        self.flow = None  # e.g., "order"
+        self.step = 0
+        self.data = {}
+        self.last_active = datetime.utcnow()
+
+    def update_last_active(self):
+        self.last_active = datetime.utcnow()
+
+    def is_expired(self):
+        return datetime.utcnow() - self.last_active > SESSION_TIMEOUT
+
+    def reset(self):
+        self.flow = None
+        self.step = 0
+        self.data = {}
+        self.last_active = datetime.utcnow()
+
 # --- Utility Functions ---
 async def log_chat_to_db(user_id: str, direction: str, message: str):
     async with async_session() as session:
@@ -186,79 +210,121 @@ def stream_image_completion(image_b64: str):
 
 # --- Advanced Internal Flow: Order Processing & Payment Integration ---
 def process_order_flow(user_id: str, message: str) -> str:
-    # If user types a command that should override any active order flow:
+    """
+    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 it was not provided
+      - In step 3, finalizes the order and creates a payment link
+    """
+    # Retrieve or initialize conversation state
+    state = user_state.get(user_id)
+    if state and state.is_expired():
+        state.reset()
+        del user_state[user_id]
+        state = None
+
+    # If the user explicitly types "order" or "menu", (re)start the order flow.
     if message.lower() in ["order", "menu"]:
-        if user_id in user_state:
-            del user_state[user_id]
+        state = ConversationState()
+        state.flow = "order"
+        state.step = 1
+        state.update_last_active()
+        user_state[user_id] = state
         if message.lower() == "order":
-            user_state[user_id] = {"flow": "order", "step": 1, "data": {}, "last_active": datetime.utcnow()}
             return "Sure! What dish would you like to order?"
-        # For "menu", we return empty to allow the menu-handling code to run.
+        # For "menu", let the menu handler run by returning empty.
         return ""
 
-    if user_id in user_state:
-        state = user_state[user_id]
-        flow = state.get("flow")
-        step = state.get("step")
-        data = state.get("data", {})
-        if flow == "order":
-            if step == 1:
-                # Validate dish name (exact match is used)
-                dish_name = message.title()
-                dish = next((item for item in menu_items if item["name"].lower() == dish_name.lower()), None)
-                if dish:
-                    data["dish"] = dish_name
-                    state["step"] = 2
-                    return f"You selected {data['dish']}. How many servings would you like?"
+    # If no state exists but the message includes "order", start the order flow.
+    if not state and "order" in message.lower():
+        state = ConversationState()
+        state.flow = "order"
+        state.step = 1
+        state.update_last_active()
+        user_state[user_id] = state
+        return "Sure! What dish would you like to order?"
+
+    if state and state.flow == "order":
+        state.update_last_active()
+        # --- Step 1: Expecting Dish Selection (and optionally quantity) ---
+        if state.step == 1:
+            # Look for a dish name in the message
+            dish_candidates = [item["name"] for item in menu_items]
+            found_dish = None
+            for dish in dish_candidates:
+                if dish.lower() in message.lower():
+                    found_dish = dish
+                    break
+
+            numbers = re.findall(r'\d+', message)
+            if found_dish:
+                state.data["dish"] = found_dish
+                # If a quantity is provided, move to finalizing the order directly.
+                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  # ready to finalize the order
                 else:
-                    return f"Sorry, we don't have {dish_name} on the menu. Please choose another dish."
-            elif step == 2:
-                # Extract the first number from the message (e.g., '1 servings' becomes 1)
-                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)."
-                data["quantity"] = quantity
-                order_id = f"ORD-{int(time.time())}"
-                data["order_id"] = order_id
-                price_per_serving = 1500  # ₦1500 per serving
-                total_price = quantity * price_per_serving
-                data["price"] = str(total_price)
-
-                # Save order asynchronously
-                import asyncio
-                async def save_order():
-                    async with async_session() as session:
-                        order = Order(
-                            order_id=order_id,
-                            user_id=user_id,
-                            dish=data["dish"],
-                            quantity=str(quantity),
-                            price=str(total_price),
-                            status="Pending Payment"
-                        )
-                        session.add(order)
-                        await session.commit()
-                asyncio.create_task(save_order())
-
-                # Clear conversation state for order flow.
+                    state.step = 2  # ask for quantity
+            else:
+                return "I couldn't identify the dish. Please type the dish name from our menu."
+
+        # --- Step 2: Asking for Quantity ---
+        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
+
+        # --- Step 3: Finalize Order ---
+        if state.step == 3:
+            order_id = f"ORD-{int(time.time())}"
+            state.data["order_id"] = order_id
+            # Use a fixed price per serving for demonstration purposes.
+            price_per_serving = 1500
+            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())
+
+            # Retrieve email from user profile if available (placeholder used here)
+            email = "customer@example.com"
+            payment_data = create_paystack_payment_link(email, total_price * 100, order_id)
+
+            # Before returning, capture the dish name for the response
+            dish_name = state.data.get("dish", "")
+            # Clear the conversation state after finalizing the order.
+            state.reset()
+            if user_id in user_state:
                 del user_state[user_id]
 
-                # Retrieve email from user profile if available (using a placeholder here)
-                email = "customer@example.com"
-                payment_data = create_paystack_payment_link(email, total_price * 100, order_id)
-                if payment_data.get("status"):
-                    payment_link = payment_data["data"]["authorization_url"]
-                    return (f"Thank you for your order of {data['quantity']} serving(s) of {data['dish']}! "
-                            f"Your Order ID is {order_id}.\nPlease complete payment here: {payment_link}")
-                else:
-                    return f"Your order has been placed with Order ID {order_id}, but we could not initialize payment. Please try again later."
-    else:
-        if "order" in message.lower():
-            user_state[user_id] = {"flow": "order", "step": 1, "data": {}, "last_active": datetime.utcnow()}
-            return "Sure! What dish would you like to order?"
+            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}")
+            else:
+                return f"Your order has been placed with Order ID {order_id}, but we could not initialize payment. Please try again later."
+
     return ""
 
 # --- User Profile Functions ---
@@ -339,7 +405,7 @@ async def chatbot_response(request: Request, background_tasks: BackgroundTasks):
 
     # --- Menu Display ---
     if "menu" in user_message.lower():
-        # Clear any active order flow if user explicitly asks for menu.
+        # Clear any active order flow if user explicitly asks for the menu.
         if user_id in user_state:
             del user_state[user_id]
         menu_with_images = []
@@ -378,8 +444,13 @@ async def chatbot_response(request: Request, background_tasks: BackgroundTasks):
                     selected_dish = item["name"]
                     break
         if selected_dish:
-            # Trigger a new order flow
-            user_state[user_id] = {"flow": "order", "step": 1, "data": {"dish": selected_dish}, "last_active": datetime.utcnow()}
+            # Start a new order flow with the selected dish.
+            state = ConversationState()
+            state.flow = "order"
+            state.step = 1
+            state.data["dish"] = selected_dish
+            state.update_last_active()
+            user_state[user_id] = state
             response_text = f"You selected {selected_dish}. How many servings would you like?"
             background_tasks.add_task(log_chat_to_db, user_id, "outbound", response_text)
             return JSONResponse(content={"response": sentiment_modifier + response_text})
@@ -406,9 +477,9 @@ async def chatbot_response(request: Request, background_tasks: BackgroundTasks):
             yield chunk
     background_tasks.add_task(log_chat_to_db, user_id, "outbound", f"LLM fallback response for prompt: {prompt}")
     return StreamingResponse(stream_response(), media_type="text/plain")
-    
+
 # --- Other Endpoints (Chat History, Order Details, User Profile, Analytics, Voice, Payment Callback) ---
-# ... (unchanged for brevity) ...
+# ... (Implement other endpoints as needed) ...
 
 if __name__ == "__main__":
     import uvicorn