Update webhook.js

webhook.js

@@ -1,9 +1,8 @@
-// restaurantBot.js
-
-const express = require("express");
-const axios = require("axios");
-const { Configuration, OpenAI } = require("openai");
-require("dotenv").config();
+import express from "express";
+import axios from "axios";
+import OpenAI from "openai";
+import dotenv from "dotenv";
+dotenv.config();
 
 const router = express.Router();
 
@@ -17,7 +16,6 @@ const {
   NVIDIA_API_KEY,      // Your NVIDIA secret key for LLM fallback
 } = process.env;
 
-// Validate Environment Variables
 if (
   !META_ACCESS_TOKEN ||
   !META_PHONE_NUMBER_ID ||
@@ -31,57 +29,42 @@ if (
 }
 
 // -----------------------------------------------------------------------------
-// Set up the OpenAI client for NVIDIA LLM fallback (if needed)
+// Set up the OpenAI client for NVIDIA LLM fallback using the new format
 // -----------------------------------------------------------------------------
-const llmConfig = new Configuration({
+const openaiLLM = new OpenAI({
   apiKey: NVIDIA_API_KEY,
-  // Use NVIDIA's integration endpoint:
-  basePath: "https://integrate.api.nvidia.com/v1",
+  baseURL: "https://integrate.api.nvidia.com/v1",
 });
-const llmOpenai = new OpenAIApi(llmConfig);
 
 /**
- * Call the LLM fallback directly using the OpenAI API configured for NVIDIA.
- * This function returns a Promise that resolves to the complete streamed response.
+ * Call the LLM fallback using the new syntax.
+ * This function streams the response and returns the full text.
  */
 async function callLLMFallback(message) {
-  return new Promise(async (resolve, reject) => {
-    try {
-      const response = await llmOpenai.createChatCompletion(
-        {
-          model: "meta/llama-3.1-405b-instruct",
-          messages: [{ role: "user", content: message }],
-          temperature: 0.2,
-          top_p: 0.7,
-          max_tokens: 1024,
-          stream: true,
-        },
-        { responseType: "stream" }
-      );
-
-      let fullText = "";
-      response.data.on("data", (chunk) => {
-        fullText += chunk.toString();
-      });
-      response.data.on("end", () => {
-        resolve(fullText);
-      });
-      response.data.on("error", (err) => {
-        console.error("Error in LLM fallback stream:", err);
-        reject(err);
-      });
-    } catch (error) {
-      console.error("Error calling LLM fallback:", error);
-      reject(error);
+  try {
+    const completion = await openaiLLM.chat.completions.create({
+      model: "meta/llama-3.1-405b-instruct",
+      messages: [{ role: "user", content: message }],
+      temperature: 0.2,
+      top_p: 0.7,
+      max_tokens: 1024,
+      stream: true,
+    });
+    
+    let fullText = "";
+    for await (const chunk of completion) {
+      fullText += chunk.choices[0]?.delta?.content || "";
     }
-  });
+    return fullText;
+  } catch (err) {
+    console.error("LLM fallback error:", err);
+    throw err;
+  }
 }
 
 // -----------------------------------------------------------------------------
 // Helper Functions for calling Python API endpoints
 // -----------------------------------------------------------------------------
-
-// Forward a generic chat request to the Python chatbot endpoint and format response.
 async function getPythonChatResponse(userId, message) {
   try {
     console.log("Forwarding chat request to Python API...");
@@ -90,19 +73,14 @@ async function getPythonChatResponse(userId, message) {
       message: message,
     });
 
-    // If the response data is an object, format it into a friendly string.
     if (typeof response.data === "object" && response.data !== null) {
       let result = response.data.response || "";
-
-      // If there's a menu array, format it nicely.
       if (Array.isArray(response.data.menu)) {
         result += "\n\n*Menu:*\n";
         response.data.menu.forEach((item) => {
           result += `• *${item.name}* - ${item.description} - ₦${item.price}\n`;
         });
       }
-
-      // Append any follow-up text.
       if (response.data.follow_up) {
         result += "\n" + response.data.follow_up;
       }
@@ -115,7 +93,6 @@ async function getPythonChatResponse(userId, message) {
   }
 }
 
-// Retrieve the chat history for the given user from the Python API.
 async function getPythonChatHistory(userId) {
   try {
     console.log("Requesting chat history from Python API...");
@@ -127,7 +104,6 @@ async function getPythonChatHistory(userId) {
   }
 }
 
-// Retrieve order details from the Python API.
 async function getPythonOrderDetails(orderId) {
   try {
     console.log("Requesting order details from Python API...");
@@ -139,7 +115,6 @@ async function getPythonOrderDetails(orderId) {
   }
 }
 
-// Retrieve user profile from the Python API.
 async function getPythonUserProfile(userId) {
   try {
     console.log("Requesting user profile from Python API...");
@@ -151,7 +126,6 @@ async function getPythonUserProfile(userId) {
   }
 }
 
-// Retrieve analytics from the Python API.
 async function getPythonAnalytics() {
   try {
     console.log("Requesting analytics from Python API...");
@@ -166,7 +140,7 @@ async function getPythonAnalytics() {
 // -----------------------------------------------------------------------------
 // Utility: Log chat history locally (for debugging purposes)
 // -----------------------------------------------------------------------------
-const chatHistories = {}; // For debugging: { userId: [ {timestamp, direction, message}, ... ] }
+const chatHistories = {};
 function logChat(userId, direction, message) {
   if (!chatHistories[userId]) {
     chatHistories[userId] = [];
@@ -205,34 +179,27 @@ router.post("/", async (req, res) => {
 
     if (body.object === "whatsapp_business_account") {
       const changes = body.entry[0]?.changes[0]?.value;
-
-      // Handle incoming messages
       if (changes?.messages) {
         const messageObj = changes.messages[0];
         const { from, text } = messageObj;
         const userMessage = text?.body;
         console.log(`Message from ${from}: ${userMessage}`);
-
-        // Log the incoming message locally for debugging
         logChat(from, "inbound", userMessage);
-
-        // Generate a response based on the user's message
+        
+        // Generate response
         const botResponse = await generateResponse(userMessage, from);
         console.log("Bot response:", botResponse);
         logChat(from, "outbound", botResponse);
-
-        // Send the response back to the user via WhatsApp API.
+        
+        // Send the response via WhatsApp API.
         await sendMessage(from, botResponse);
         return res.status(200).send("EVENT_RECEIVED");
       }
-
-      // Handle status updates (e.g., delivery receipts)
       if (changes?.statuses) {
         console.log("Status update received:", JSON.stringify(changes.statuses, null, 2));
         return res.status(200).send("EVENT_RECEIVED");
       }
     }
-
     console.log("No valid content found in webhook.");
     res.sendStatus(404);
   } catch (error) {
@@ -241,53 +208,54 @@ router.post("/", async (req, res) => {
   }
 });
 
+// -----------------------------------------------------------------------------
+// Order Flow is delegated to the Python API entirely, so no local order flow
+// -----------------------------------------------------------------------------
+
 // -----------------------------------------------------------------------------
 // Enhanced Response Generator
 // -----------------------------------------------------------------------------
 async function generateResponse(message, from) {
   const lowerMessage = message.toLowerCase();
 
-  // 1. Welcome and Main Menu
+  // 1. Welcome/Main Menu
   if (lowerMessage === "hi" || lowerMessage === "hello" || lowerMessage.includes("welcome")) {
-    return `👋 Hi there! Welcome to *Angelo Foods*! 🍔🍕\nPlease choose an option:\n1️⃣ *View Menu*\n2️⃣ *Place an Order*\n3️⃣ *Payment Status*\n4️⃣ *My Profile*\n5️⃣ *Chat History*\n6️⃣ *Help & Support*\nSimply type the number or the option name.`;
+    return `👋 Hi there! Welcome to *FoodieBot*! 🍔🍕\nPlease choose an option:\n1️⃣ *View Menu*\n2️⃣ *Place an Order*\n3️⃣ *Payment Status*\n4️⃣ *My Profile*\n5️⃣ *Chat History*\n6️⃣ *Help & Support*\nSimply type the number or the option name.`;
   }
 
-  // 2. Menu Display
+  // 2. Menu Display – Option "1" or any message that includes "menu" (but not "order")
   if (lowerMessage === "1" || (lowerMessage.includes("menu") && !lowerMessage.includes("order"))) {
-    // Display the menu (with images and details)
-    const menuResponse = await getPythonChatResponse(from, "menu");
-    return menuResponse;
+    return await getPythonChatResponse(from, "menu");
   }
 
-  // 3. Order Flow – Triggered by multiple keywords
+  // 3. Order Flow – Trigger on multiple keywords: "2", "order", "buy", "food"
   if (
     lowerMessage === "2" ||
     lowerMessage.includes("order") ||
     lowerMessage.includes("buy") ||
     lowerMessage.includes("food")
   ) {
-    // Check if the message exactly matches one of the dish names from the menu.
+    // Check if the user's message includes a dish name from the menu.
     let selectedDish = null;
-    for (let item of menu_items) {
+    for (let item of menu_items) { // Assumes menu_items is defined as an array of dish objects.
       if (lowerMessage.includes(item.name.toLowerCase())) {
         selectedDish = item.name;
         break;
       }
     }
-    // If a dish is selected, pass it along as part of the order command.
     if (selectedDish) {
+      // Prepend the dish name to the order command so the Python API can handle it.
       return await getPythonChatResponse(from, `order: ${selectedDish}`);
     }
-    // Otherwise, if user simply says "order", "buy", or "food", delegate to the order flow in Python API.
     return await getPythonChatResponse(from, "order");
   }
 
-  // 4. Payment Status
+  // 4. Payment Status – Option "3" or keyword "payment"
   if (lowerMessage === "3" || lowerMessage.includes("payment")) {
     return await getPythonChatResponse(from, "payment");
   }
 
-  // 5. User Profile
+  // 5. User Profile – Option "4" or keyword "profile"
   if (lowerMessage === "4" || lowerMessage.includes("profile")) {
     const profile = await getPythonUserProfile(from);
     if (profile) {
@@ -297,7 +265,7 @@ async function generateResponse(message, from) {
     }
   }
 
-  // 6. Chat History
+  // 6. Chat History – Option "5" or keyword "chat history"
   if (lowerMessage === "5" || lowerMessage.includes("chat history")) {
     const history = await getPythonChatHistory(from);
     if (history && history.length > 0) {
@@ -311,7 +279,7 @@ async function generateResponse(message, from) {
     }
   }
 
-  // 7. Help & Support
+  // 7. Help & Support – Option "6" or keyword "help" / "support"
   if (lowerMessage === "6" || lowerMessage.includes("help") || lowerMessage.includes("support")) {
     return `❓ *How can I help you?*\nType one of the following:\n- *Order Status* (e.g., "order tracking ORD-123456789")\n- *Contact Support*\n- *Main Menu* to see all options again.`;
   }
@@ -383,4 +351,4 @@ async function sendProactiveGreeting(userId) {
   return greeting;
 }
 
-module.exports = router;
+export default router;