Update app.py

app.py

@@ -28,6 +28,7 @@ PAYSTACK_SECRET_KEY = os.getenv("PAYSTACK_SECRET_KEY", "default_fallback_value")
 DATABASE_URL = os.getenv("DATABASE_URL", "default_fallback_value")  # Example using SQLite
 NVIDIA_API_KEY = os.getenv("NVIDIA_API_KEY", "default_fallback_value")
 openai.api_key = os.getenv("OPENAI_API_KEY", "default_fallback_value")
+GOOGLE_MAPS_API_KEY = os.getenv("GOOGLE_MAPS_API_KEY", "default_fallback_value")  # Add Google Maps API key
 
 # WhatsApp Business API credentials (Cloud API)
 WHATSAPP_PHONE_NUMBER_ID = os.getenv("WHATSAPP_PHONE_NUMBER_ID", "default_value")
@@ -77,6 +78,7 @@ class UserProfile(Base):
     email = Column(String, default="unknown@example.com")
     preferences = Column(Text, default="")
     last_interaction = Column(DateTime, default=datetime.utcnow)
+    order_ids = Column(Text, default="")  # Store order IDs as a comma-separated string
 
 class SentimentLog(Base):
     __tablename__ = "sentiment_logs"
@@ -86,7 +88,6 @@ class SentimentLog(Base):
     sentiment_score = Column(Float)
     message = Column(Text)
 
-# --- New Model: Order Tracking ---
 class OrderTracking(Base):
     __tablename__ = "order_tracking"
     id = Column(Integer, primary_key=True, index=True)
@@ -211,48 +212,51 @@ def send_whatsapp_message(recipient: str, message_body: str) -> dict:
     response = requests.post(url, headers=headers, json=payload)
     return response.json()
 
-# --- NVIDIA LLM Streaming Functions ---
 def stream_text_completion(prompt: str):
     from openai import OpenAI
     client = OpenAI(
         base_url="https://integrate.api.nvidia.com/v1",
         api_key=NVIDIA_API_KEY
     )
-    completion = client.chat.completions.create(
-        model="meta/llama-3.1-405b-instruct",
-        messages=[{"role": "user", "content": prompt}],
-        temperature=0.2,
-        top_p=0.7,
-        max_tokens=1024,
-        stream=True
+    print(f"Using NVIDIA API Key: {NVIDIA_API_KEY}")  # Debugging
+
+    try:
+        completion = client.chat.completions.create(
+            model="meta/llama-3.1-405b-instruct",
+            messages=[{"role": "user", "content": prompt}],
+            temperature=0.2,
+            top_p=0.7,
+            max_tokens=1024,
+            stream=True
+        )
+        for chunk in completion:
+            if chunk.choices[0].delta.content is not None:
+                yield chunk.choices[0].delta.content
+    except Exception as e:
+        yield f"Error: {str(e)}"  # Handle errors gracefully
+
+def stream_text_completion(prompt: str):
+    from openai import OpenAI
+    client = OpenAI(
+        base_url="https://integrate.api.nvidia.com/v1",
+        api_key=NVIDIA_API_KEY
     )
-    for chunk in completion:
-        if chunk.choices[0].delta.content is not None:
-            yield chunk.choices[0].delta.content
+    print(f"Using NVIDIA API Key: {NVIDIA_API_KEY}")  # Debugging
 
-def stream_image_completion(image_b64: str):
-    invoke_url = "https://ai.api.nvidia.com/v1/gr/meta/llama-3.2-90b-vision-instruct/chat/completions"
-    headers = {
-        "Authorization": f"Bearer {NVIDIA_API_KEY}",
-        "Accept": "text/event-stream"
-    }
-    payload = {
-        "model": "meta/llama-3.2-90b-vision-instruct",
-        "messages": [
-            {
-                "role": "user",
-                "content": f'What is in this image? <img src="data:image/png;base64,{image_b64}" />'
-            }
-        ],
-        "max_tokens": 512,
-        "temperature": 1.00,
-        "top_p": 1.00,
-        "stream": True
-    }
-    response = requests.post(invoke_url, headers=headers, json=payload, stream=True)
-    for line in response.iter_lines():
-        if line:
-            yield line.decode("utf-8") + "\n"
+    try:
+        completion = client.chat.completions.create(
+            model="meta/llama-3.1-405b-instruct",
+            messages=[{"role": "user", "content": prompt}],
+            temperature=0.2,
+            top_p=0.7,
+            max_tokens=1024,
+            stream=True
+        )
+        for chunk in completion:
+            if chunk.choices[0].delta.content is not None:
+                yield chunk.choices[0].delta.content
+    except Exception as e:
+        yield f"Error: {str(e)}"  # Handle errors gracefully
 
 # --- Helper Function for Order Tracking ---
 async def log_order_tracking(order_id: str, status: str, message: str = None):
@@ -276,52 +280,111 @@ def calculate_shipping_cost(address: str) -> int:
             return cost
     return TOWN_SHIPPING_COSTS["default"]  # Default shipping cost for unknown areas
 
-# ... (rest of your imports and setup)
+# --- Google Maps ETA Calculation ---
+def calculate_eta(destination: str) -> str:
+    """
+    Calculate ETA from the restaurant address to the customer's delivery address using Google Maps API.
+    """
+    if not GOOGLE_MAPS_API_KEY:
+        return "ETA unavailable (Google Maps API key missing)."
 
-async def update_user_profile(user_id: str, phone_number: str = None, address: str = None) -> UserProfile:
+    origin = "Plot 13 Isashi Road, Iyana Isashi, Off Lagos - Badagry Expy, Lagos"
+    url = f"https://maps.googleapis.com/maps/api/directions/json?origin={origin}&destination={destination}&key={GOOGLE_MAPS_API_KEY}"
+    
+    try:
+        response = requests.get(url, timeout=10)
+        if response.status_code == 200:
+            data = response.json()
+            if data.get("routes"):
+                duration = data["routes"][0]["legs"][0]["duration"]["text"]
+                return f"Estimated delivery time: {duration}"
+            else:
+                return "ETA unavailable (no route found)."
+        else:
+            return "ETA unavailable (API error)."
+    except Exception as e:
+        return f"ETA unavailable (error: {str(e)})."
+
+# --- Contextual Order Intent Detection ---
+def is_order_intent(message: str) -> bool:
+    """
+    Check if the user's message indicates an intent to place an order.
+    """
+    order_keywords = ["order", "menu", "dish", "food", "deliver", "hungry"]
+    order_phrases = ["I want to order", "Can I order", "I'd like to order", "get food", "place an order"]
+
+    message_lower = message.lower()
+    for phrase in order_phrases:
+        if phrase in message_lower:
+            return True
+    for keyword in order_keywords:
+        if keyword in message_lower:
+            # Ensure the keyword is not part of another word (e.g., "border")
+            if re.search(rf"\b{keyword}\b", message_lower):
+                return True
+    return False
+
+    
+
+# ... (previous code remains unchanged)
+
+async def track_order(user_id: str, order_id: str) -> str:
     """
-    Update or create a user profile with the provided phone number and address.
+    Track an order and return its status and ETA.
     """
     async with async_session() as session:
+        # Fetch order details
+        order_result = await session.execute(
+            select(Order).where(Order.order_id == order_id)
+        )
+        order = order_result.scalars().first()
+        if not order:
+            return "Order not found. Please check your order ID."
+
+        # Fetch tracking updates
+        tracking_result = await session.execute(
+            select(OrderTracking)
+            .where(OrderTracking.order_id == order_id)
+            .order_by(OrderTracking.timestamp)
+        )
+        tracking_updates = tracking_result.scalars().all()
+
+        # Calculate ETA
+        eta = calculate_eta(order.delivery_address)
+
+        # Prepare response
+        response = f"Order ID: {order_id}\nStatus: {order.status}\n"
+        if tracking_updates:
+            response += "Tracking Updates:\n"
+            for update in tracking_updates:
+                response += f"- {update.status} ({update.timestamp}): {update.message or 'No details'}\n"
+        response += f"\n{eta}"
+        return response
+
+# ... (rest of the code remains unchanged)
+
+# --- Update User Profile with Order IDs ---
+async def update_user_profile_with_order(user_id: str, order_id: str):
+    async with async_session() as session:
         result = await session.execute(
             select(UserProfile).where(UserProfile.user_id == user_id)
         )
         profile = result.scalars().first()
-        if profile is None:
-            profile = UserProfile(
-                user_id=user_id,
-                phone_number=phone_number,
-                address=address,
-                last_interaction=datetime.utcnow()
-            )
-        else:
-            if phone_number:
-                profile.phone_number = phone_number
-            if address:
-                profile.address = address
-            profile.last_interaction = datetime.utcnow()
-        session.add(profile)
-        await session.commit()
-        return profile
-
-# ... (rest of your imports and setup)
+        if profile:
+            if profile.order_ids:
+                profile.order_ids += f",{order_id}"
+            else:
+                profile.order_ids = order_id
+            await session.commit()
 
-def process_order_flow(user_id: str, message: str) -> str:
+async def process_order_flow(user_id: str, message: str) -> str:
     """
     Implements an FSM-based order flow with shipping cost calculation.
     """
-            
     # 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
-
-    # Start a new order flow if the user explicitly types "order" or "menu"
-    if message.lower() in ["order", "menu"]:
-        state = ConversationState()
-        state.flow = "order"
         state.step = 1
         state.update_last_active()
         user_state[user_id] = state
@@ -377,7 +440,7 @@ def process_order_flow(user_id: str, message: str) -> str:
                 state.data["phone_number"] = phone_number
                 state.data["address"] = address
                 # Save phone number and address to the user's profile
-                asyncio.create_task(update_user_profile(user_id, phone_number, address))
+                await update_user_profile(user_id, phone_number, address)
                 # Calculate shipping cost based on the address
                 shipping_cost = calculate_shipping_cost(address)
                 state.data["shipping_cost"] = shipping_cost
@@ -388,7 +451,7 @@ def process_order_flow(user_id: str, message: str) -> str:
             elif phone_match:
                 state.data["phone_number"] = phone_match.group(1)
                 # Save phone number to the user's profile
-                asyncio.create_task(update_user_profile(user_id, phone_number))
+                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: '09162409591, 1, Iyana Isashi, Isashi, Ojo, Lagos'."
@@ -451,7 +514,7 @@ def process_order_flow(user_id: str, message: str) -> str:
                 state.data["phone_number"] = phone_number
                 state.data["address"] = address
                 # Save phone number and address to the user's profile
-                asyncio.create_task(update_user_profile(user_id, phone_number, address))
+                await update_user_profile(user_id, phone_number, address)
                 # Calculate shipping cost based on the address
                 shipping_cost = calculate_shipping_cost(address)
                 state.data["shipping_cost"] = shipping_cost
@@ -462,7 +525,7 @@ def process_order_flow(user_id: str, message: str) -> str:
             elif phone_match:
                 state.data["phone_number"] = phone_match.group(1)
                 # Save phone number to the user's profile
-                asyncio.create_task(update_user_profile(user_id, phone_number))
+                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: '09162409591, 1, Iyana Isashi, Isashi, Ojo, Lagos'."
@@ -471,7 +534,7 @@ def process_order_flow(user_id: str, message: str) -> str:
         if state.step == 4:
             state.data["address"] = message
             # Save address to the user's profile
-            asyncio.create_task(update_user_profile(user_id, address=message))
+            await update_user_profile(user_id, address=message)
             # Calculate shipping cost based on the address
             shipping_cost = calculate_shipping_cost(message)
             state.data["shipping_cost"] = shipping_cost
@@ -551,7 +614,7 @@ def process_order_flow(user_id: str, message: str) -> str:
                 asyncio.create_task(save_order())
 
                 # Record the initial tracking update: Order Placed
-                asyncio.create_task(log_order_tracking(order_id, "Order Placed", "Order placed and awaiting payment."))
+                await log_order_tracking(order_id, "Order Placed", "Order placed and awaiting payment.")
 
                 # Notify management of the new order via WhatsApp
                 async def notify_management_order(order_details: dict):
@@ -576,6 +639,10 @@ def process_order_flow(user_id: str, message: str) -> str:
                 }
                 asyncio.create_task(notify_management_order(order_details))
 
+                # Update user profile with the new order ID
+                await update_user_profile_with_order(user_id, order_id)
+
+                # Generate payment link
                 email = "customer@example.com"  # Placeholder; retrieve from profile if available
                 payment_data = create_paystack_payment_link(email, total_price * 100, order_id)
                 dish_name = state.data.get("dish", "")
@@ -638,72 +705,36 @@ app = FastAPI()
 async def on_startup():
     await init_db()
 
+@app.post("/chatbot")
 @app.post("/chatbot")
 async def chatbot_response(request: Request, background_tasks: BackgroundTasks):
     data = await request.json()
     user_id = data.get("user_id")
-    phone_number = data.get("phone_number")
     user_message = data.get("message", "").strip()
-    is_image = data.get("is_image", False)
-    image_b64 = data.get("image_base64", None)
 
-    if not user_id:
-        raise HTTPException(status_code=400, detail="Missing user_id in payload.")
-
-    # Initialize conversation context for the user if not present.
+    # Initialize conversation context for the user if not present
     if user_id not in conversation_context:
         conversation_context[user_id] = []
-    # Append the inbound message to the conversation context.
+
+    # Append the user's message to the conversation context
     conversation_context[user_id].append({
         "timestamp": datetime.utcnow().isoformat(),
         "role": "user",
         "message": user_message
     })
 
+    # Log the user's message
     background_tasks.add_task(log_chat_to_db, user_id, "inbound", user_message)
-    await update_user_last_interaction(user_id)
-    await get_or_create_user_profile(user_id, phone_number)
-
-    # Handle image queries
-    if is_image and image_b64:
-        if len(image_b64) >= 180_000:
-            raise HTTPException(status_code=400, detail="Image too large.")
-        return StreamingResponse(stream_image_completion(image_b64), media_type="text/plain")
 
+    # Analyze sentiment
     sentiment_score = analyze_sentiment(user_message)
     background_tasks.add_task(log_sentiment, user_id, user_message, sentiment_score)
-    sentiment_modifier = ""
-    if sentiment_score < -0.3:
-        sentiment_modifier = "I'm sorry if you're having a tough time. "
-    elif sentiment_score > 0.3:
-        sentiment_modifier = "Great to hear from you! "
-
-          # --- Order Tracking Handling ---
-    order_id_match = re.search(r"ord-\d+", user_message.lower())
-    if order_id_match:
-        order_id = order_id_match.group(0)
-        try:
-            # Call the /track_order endpoint
-            tracking_response = await track_order(order_id)
-            return JSONResponse(content={"response": tracking_response})
-        except HTTPException as e:
-            return JSONResponse(content={"response": f" {e.detail}"})
-
-    # --- Order Flow Handling ---
-    order_response = process_order_flow(user_id, user_message)
-    if order_response:
-        background_tasks.add_task(log_chat_to_db, user_id, "outbound", order_response)
-        conversation_context[user_id].append({
-            "timestamp": datetime.utcnow().isoformat(),
-            "role": "bot",
-            "message": order_response
-        })
-        return JSONResponse(content={"response": sentiment_modifier + order_response})
+    sentiment_modifier = "Great to hear from you! " if sentiment_score > 0.3 else ""
 
-    # --- Menu Display ---
-    if "menu" in user_message.lower():
+    # --- Handle Menu Selection ---
+    if user_message.strip() == "1" or "menu" in user_message.lower():
         if user_id in user_state:
-            del user_state[user_id]
+            del user_state[user_id]  # Clear any existing state
         menu_with_images = []
         for index, item in enumerate(menu_items, start=1):
             image_url = google_image_scrape(item["name"])
@@ -731,71 +762,34 @@ async def chatbot_response(request: Request, background_tasks: BackgroundTasks):
         })
         return JSONResponse(content=response_payload)
 
-    # --- Dish Selection via Menu ---
-    if any(item["name"].lower() in user_message.lower() for item in menu_items) or \
-       any(str(index) == user_message.strip() for index, item in enumerate(menu_items, start=1)):
-        selected_dish = None
-        if user_message.strip().isdigit():
-            dish_number = int(user_message.strip())
-            if 1 <= dish_number <= len(menu_items):
-                selected_dish = menu_items[dish_number - 1]["name"]
-        else:
-            for item in menu_items:
-                if item["name"].lower() in user_message.lower():
-                    selected_dish = item["name"]
-                    break
-        if selected_dish:
-            state = ConversationState()
-            state.flow = "order"
-            # Set step to 2 since the dish is already selected
-            state.step = 2  
-            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)
-            conversation_context[user_id].append({
-                "timestamp": datetime.utcnow().isoformat(),
-                "role": "bot",
-                "message": response_text
-            })
-            return JSONResponse(content={"response": sentiment_modifier + response_text})
-        else:
-            response_text = "Sorry, I couldn't find that dish in the menu. Please try again."
-            background_tasks.add_task(log_chat_to_db, user_id, "outbound", response_text)
+    # --- Order Flow Handling ---
+    if is_order_intent(user_message) or (user_id in user_state and user_state[user_id].flow == "order"):
+        order_response = await process_order_flow(user_id, user_message)
+        if order_response:
+            background_tasks.add_task(log_chat_to_db, user_id, "outbound", order_response)
             conversation_context[user_id].append({
                 "timestamp": datetime.utcnow().isoformat(),
                 "role": "bot",
-                "message": response_text
+                "message": order_response
             })
-            return JSONResponse(content={"response": sentiment_modifier + response_text})
-
-    # --- Nutritional Facts ---
-    if "nutritional facts for" in user_message.lower():
-        dish_name = user_message.lower().replace("nutritional facts for", "").strip().title()
-        dish = next((item for item in menu_items if item["name"].lower() == dish_name.lower()), None)
-        if dish:
-            response_text = f"Nutritional facts for {dish['name']}:\n{dish['nutrition']}"
-        else:
-            response_text = f"Sorry, I couldn't find nutritional facts for {dish_name}."
-        background_tasks.add_task(log_chat_to_db, user_id, "outbound", response_text)
-        conversation_context[user_id].append({
-            "timestamp": datetime.utcnow().isoformat(),
-            "role": "bot",
-            "message": response_text
-        })
-        return JSONResponse(content={"response": sentiment_modifier + response_text})
+            return JSONResponse(content={"response": sentiment_modifier + order_response})
 
-    # --- Fallback: LLM Response Streaming with Conversation Context ---
-    recent_context = conversation_context.get(user_id, [])[-5:]
+    # --- Fallback to NVIDIA LLM ---
+    recent_context = conversation_context.get(user_id, [])[-5:]  # Get the last 5 messages
     context_str = "\n".join([f"{entry['role'].capitalize()}: {entry['message']}" for entry in recent_context])
     prompt = f"Conversation context:\n{context_str}\nUser query: {user_message}\nGenerate a helpful, personalized response for a restaurant chatbot."
-    def stream_response():
-        for chunk in stream_text_completion(prompt):
-            yield chunk
-    fallback_log = f"LLM fallback response for prompt: {prompt}"
-    background_tasks.add_task(log_chat_to_db, user_id, "outbound", fallback_log)
-    return StreamingResponse(stream_response(), media_type="text/plain")
+    response_stream = stream_text_completion(prompt)  # Pass only the prompt
+    fallback_response = "".join([chunk for chunk in response_stream])
+
+    # Log the bot's response
+    background_tasks.add_task(log_chat_to_db, user_id, "outbound", fallback_response)
+    conversation_context[user_id].append({
+        "timestamp": datetime.utcnow().isoformat(),
+        "role": "bot",
+        "message": fallback_response
+    })
+
+    return JSONResponse(content={"response": sentiment_modifier + fallback_response})
 
 # --- Other Endpoints (Chat History, Order Details, User Profile, Analytics, Voice, Payment Callback) ---
 @app.get("/chat_history/{user_id}")
@@ -828,7 +822,8 @@ async def get_user_profile(user_id: str):
         "name": profile.name,
         "email": profile.email,
         "preferences": profile.preferences,
-        "last_interaction": profile.last_interaction.isoformat()
+        "last_interaction": profile.last_interaction.isoformat(),
+        "order_ids": profile.order_ids
     }
 
 @app.get("/analytics")
@@ -897,7 +892,6 @@ async def process_voice(file: UploadFile = File(...)):
 
 # --- Payment Callback Endpoint with Payment Tracking and Redirection ---
 @app.api_route("/payment_callback", methods=["GET", "POST"])
-
 async def payment_callback(request: Request):
     # GET: User redirection after payment
     if request.method == "GET":
@@ -947,7 +941,7 @@ async def payment_callback(request: Request):
                 return JSONResponse(content={"message": "Order updated successfully."})
             else:
                 raise HTTPException(status_code=404, detail="Order not found.")
-                
+
 @app.get("/track_order/{order_id}")
 async def track_order(order_id: str):
     """