Merge pull request #91 from MakanMatch/joshua

MakanBot API, conversationHistory and enhanced approximate address calculation
MakanMatch · Aug 1, 2024 · 70cde8f · 70cde8f
2 parents 5550ab3 + 22db344
commit 70cde8f
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 6 deletions.
diff --git a/routes/chatbot/MakanBot.js b/routes/chatbot/MakanBot.js
@@ -0,0 +1,27 @@
+const express = require("express");
+const router = express.Router();
+const Logger = require("../../services/Logger")
+const OpenAIChat = require("../../services/OpenAIChat");
+
+router.post("/queryMakanBotWithUserPrompt", async (req, res) => {
+    const { messagePrompt, conversationHistory } = req.body;
+
+    if (!OpenAIChat.checkPermission()) {
+        return res.status(400).send("ERROR: OpenAIChat is not available at this time.");
+    }
+
+    const message = await OpenAIChat.prompt(
+        messagePrompt,
+        true,
+        conversationHistory
+    )
+
+    if (typeof message === "string" && message.startsWith("ERROR:")) {
+        Logger.log(`CHATBOT MAKANBOT QUERYMAKANBOTWITHUSERPROMPT ERROR: Failed to run prompt through OpenAIChat; response: ${message}`)
+        return res.status(400).send("ERROR: Failed to run prompt. Try again later.");
+    } else {
+        return res.status(200).json({ message: message.content });
+    }
+});
+
+module.exports = { router, at: '/makanBot' };
diff --git a/routes/identity/myAccount.js b/routes/identity/myAccount.js
@@ -306,7 +306,9 @@ router.put('/changeAddress', validateToken, async (req, res) => {
             const coordinates = { lat: geoLocation.lat, lng: geoLocation.lng };
             const updatedListings = await FoodListing.update(
                 {
-                    coordinates: `${coordinates.lat},${coordinates.lng}`
+                    coordinates: `${coordinates.lat},${coordinates.lng}`,
+                    address: address,
+                    approxAddress: `${street} ${postalCode}`
                 },
                 {
                     where: { hostID: user.userID }

diff --git a/routes/listings/listings.js b/routes/listings/listings.js
@@ -89,9 +89,17 @@ router.post("/addListing", validateToken, async (req, res) => {
                         state = component.long_name;
                     }
                 });
-                let approximateAddress = `${street}, ${city}`;
+
+                let approximateAddress = '';
+                if (street) {
+                    approximateAddress += street;
+                }
+                if (city) {
+                    if (approximateAddress) approximateAddress += ', ';
+                    approximateAddress += city;
+                }
                 if (state) {
-                    approximateAddress += `, ${state}`;
+                    if (approximateAddress) approximateAddress += `, ${state}`;
                 }
 
                 const listingDetails = {

diff --git a/services/OpenAIChat.js b/services/OpenAIChat.js
@@ -44,7 +44,7 @@ class OpenAIChat {
      */
     static initialised = false;
     static client;
-    static model = "gpt-3.5-turbo";
+    static model = "gpt-4o-mini";
     static maxTokens = 512;
     static temperature = 0.5;
 
@@ -74,10 +74,10 @@ class OpenAIChat {
     }
 
     static checkPermission() {
-        return process.env.OPENAI_API_KEY && process.env.OPENAI_CHAT_ENABLED === 'True';
+        return process.env.OPENAI_API_KEY !== undefined && process.env.OPENAI_CHAT_ENABLED === 'True';
     }
 
-    static initialise(configOptions={ model: "gpt-3.5-turbo", maxTokens: 512, temperature: 0.5 }) {
+    static initialise(configOptions={ model: "gpt-4o-mini", maxTokens: 512, temperature: 0.5 }) {
         if (!this.checkPermission()) {
             return "ERROR: OpenAIChat operation permission denied.";
         }