@tiledesk/tiledesk-server 2.4.100 → 2.4.102

package/routes/kbsettings.js

@@ -1,6 +1,6 @@
 var express = require('express');
 var { KBSettings } = require('../models/kb_setting');
-var { KB } = require('../models/kb_setting');
+// var { KB } = require('../models/kb_setting');
 // var KB = require('../models/kb_setting')
 var router = express.Router();
 var winston = require('../config/winston');
@@ -99,75 +99,11 @@ router.delete('/:settings_id/:kb_id', async (req, res) => {
 
 })
 
-// PROXY PUGLIA AI V2 - START
-router.post('/scrape/single', async (req, res) => {
-
-    let data = req.body;
-    winston.debug("/scrape/single data: ", data);
-
-    let gptkey = process.env.GPTKEY;
-    if (!gptkey) {
-        return res.status(403).send({ success: false, error: "GPT apikey undefined"})
-    }
-
-    data.gptkey = gptkey;
-    
-    openaiService.singleScrape(data).then((resp) => {
-        winston.debug("singleScrape resp: ", resp.data);
-        return res.status(200).send(resp.data);
-    }).catch((err) => {
-        winston.error("singleScrape err: ", err);
-        let status = err.response.status;
-        return res.status(status).send({ statusText: err.response.statusText, detail: err.response.data.detail });
-    })
-})
-
-router.post('/scrape/status', async (req, res) => {
-
-    let data = req.body;
-    winston.debug("/scrapeStatus req.body: ", req.body);
-
-    openaiService.scrapeStatus(data).then((response) => {
-
-        winston.debug("scrapeStatus response.data: ", response.data);
-        res.status(200).send(response.data);
-    }).catch((err) => {
-        winston.error("scrapeStatus err: ", err);
-        let status = err.response.status;
-        res.status(status).send({ statusText: err.response.statusText, detail: err.response.data.detail });
-    })
-})
-
-router.post('/ask', async (req, res) => {
-    let data = req.body;
-    winston.debug("/qa data: ", data);
-
-    if (!data.gptkey) {
-        let gptkey = process.env.GPTKEY;
-        if (!gptkey) {
-            return res.status(403).send({ success: false, error: "GPT apikey undefined"})
-        }
-        data.gptkey = gptkey;
-    }
-
-    openaiService.askNamespace(data).then((resp) => {
-        winston.debug("qa resp: ", resp.data);
-        res.status(200).send(resp.data);
-    }).catch((err) => {
-        winston.error("qa err: ", err);
-        let status = err.response.status;
-        res.status(status).send({ statusText: err.response.statusText, detail: err.response.data.detail });
-    })
-})
-
-// PROXY PUGLIA AI V2 - END
-
 
 // PROXY PUGLIA AI - START
 router.post('/qa', async (req, res) => {
     let data = req.body;
     winston.debug("/qa data: ", data);
-    winston.info("/qa data: ", data);
 
     openaiService.ask(data).then((resp) => {
         winston.debug("qa resp: ", resp.data);
@@ -175,7 +111,6 @@ router.post('/qa', async (req, res) => {
     }).catch((err) => {
         winston.error("qa err: ", err);
         let status = err.response.status;
-        winston.info("status on error: ", status)
         res.status(status).send({ statusText: err.response.statusText, detail: err.response.data.detail });
     })
 })
@@ -234,9 +169,9 @@ router.post('/checkstatus', async (req, res) => {
         }
 
         
-        res.status(200).send(resp);
+        res.status(200).send(return_data);
     }).catch((err) => {
-        winston.error("checkstatus err: ", err);
+        //winston.error("checkstatus err: ", err);
         let status = err.response.status;
         res.status(status).send({ statusText: err.response.statusText, detail: err.response.data.detail });
     })
@@ -254,14 +189,10 @@ router.post('/:settings_id', async (req, res) => {
             return res.status(500).send({ success: false, error: err});
         } else {
 
-            let new_kb = new KB({
+            let new_kb = {
                 name: body.name,
-                url: body.url,
-                source: body.source,
-                type: body.type,
-                content: body.content,
-                namespace: body.namespace
-            })
+                url: body.url
+            }
             settings.kbs.push(new_kb);
 
             KBSettings.findByIdAndUpdate( settings_id, settings, { new: true }, (err, savedSettings) => {
@@ -269,11 +200,12 @@ router.post('/:settings_id', async (req, res) => {
                     winston.err("findByIdAndUpdate error: ", err);
                     res.status(500).send({ success: false, error: err });
                 } else {
-                    res.status(200).send(new_kb);
+                    res.status(200).send(savedSettings);
                 }
             })
         }
     })
 })
 
+
 module.exports = router;

package/routes/openai.js

@@ -3,28 +3,44 @@ var router = express.Router();
 var { KBSettings } = require('../models/kb_setting');
 var openaiService = require('../services/openaiService');
 var winston = require('../config/winston');
+const { QuoteManager } = require('../services/QuoteManager');
 
 router.post('/', async (req, res) => {
 
     let project_id = req.projectid;
     let body = req.body;
+    let usePublicKey = false;
+    let publicKey = process.env.GPTKEY;
+    let gptkey = null;
+    let obj = { createdAt: new Date() };
+    let quoteManager = req.app.get('quote_manager');
 
-    console.log("### --> body: ", body);
+    KBSettings.findOne({ id_project: project_id }, async (err, kbSettings) => {
 
-    KBSettings.findOne({ id_project: project_id }, (err, kbSettings) => {
-        console.log("kbSettings: ", kbSettings);
-
-        if (!kbSettings) {
-            return res.status(400).send({ success: false, message: "Missing gptkey parameter (settings not exist)" })
+        if (err) {
+            usePublicKey = true;
+            gptkey = publicKey;
         }
 
-        let gptkey = kbSettings.gptkey;
+        if (kbSettings && kbSettings.gptkey) {
+            gptkey = kbSettings.gptkey;
+        } else {
+            usePublicKey = true;
+            gptkey = publicKey;
+        }
 
         if (!gptkey) {
-            return res.status(400).send({ success: false, message: "Missing gptkey parameter" })
+            return res.status(400).send({ success: false, message: "Missing gptkey parameter" });
+        }
+
+        if (usePublicKey === true) {
+            let isAvailable = await quoteManager.checkQuote(req.project, obj, 'tokens');
+            if (isAvailable === false) {
+                return res.status(403).send("Tokens quota exceeded")
+            }
         }
+        
 
-        // attua modifiche
         let json = {
             "model": body.model,
             "messages": [
@@ -43,20 +59,42 @@ router.post('/', async (req, res) => {
             message.content = body.context;
             json.messages.unshift(message);
         }
-        console.log("openai preview --> json: ", json);
 
-        openaiService.completions(json, gptkey).then((response) => {
-            // winston.debug("completions response: ", response);
+        openaiService.completions(json, gptkey).then(async (response) => {
+            let data = { createdAt: new Date(), tokens: response.data.usage.total_tokens }
+            if (usePublicKey === true) {
+                let incremented_key = await quoteManager.incrementTokenCount(req.project, data);
+                winston.verbose("Tokens quota incremented for key " + incremented_key);
+            }
             res.status(200).send(response.data);
+
         }).catch((err) => {
-            console.log("err: ", err);
             // winston.error("completions error: ", err);
             res.status(500).send(err)
         })
-
     })
 })
 
+router.post('/quotes', async (req, res) => {
+
+    let project = req.project;
+
+    let body = req.body;
+    body.createdAt = new Date(body.createdAt);
+
+    let redis_client = req.app.get('redis_client');
+    if (!redis_client) {
+        return res.status(400).send({ error: "Redis not ready"});
+    }
+
+    let quoteManager = req.app.get('quote_manager');
+
+    let incremented_key = await quoteManager.incrementTokenCount(req.project, req.body);
+    let quote = await quoteManager.getCurrentQuote(req.project, req.body, 'tokens');
+    
+    res.status(200).send({ message: "value incremented for key " + incremented_key, key: incremented_key, currentQuote: quote });
+})
+
 // router.get('/', async (req, res) => {
 
 //     let project_id = req.projectid;

package/routes/project.js

@@ -233,10 +233,9 @@ router.put('/:projectid', [passport.authenticate(['basic', 'jwt'], { session: fa
     update.bannedUsers = req.body.bannedUsers;
   }
 
-  
-
-  
-  
+  if (req.body.profile != undefined) {
+    update.profile = req.body.profile;
+  }
   
   // if (req.body.defaultLanguage!=undefined) {
   //   update.defaultLanguage = req.body.defaultLanguage; 

package/routes/quotes.js

@@ -0,0 +1,52 @@
+var express = require('express');
+var router = express.Router();
+const { QuoteManager } = require('../services/QuoteManager');
+let winston = require('../config/winston');
+
+
+router.post('/', async (req, res) => {
+
+    let date = req.body.date;
+
+    let obj = { createdAt: new Date() };
+    if (date) {
+        obj.createdAt = new Date(date)
+    }
+
+    let quoteManager = req.app.get('quote_manager');
+
+    // check if project is not null/undefined
+    let quotes = await quoteManager.getAllQuotes(req.project, obj);
+
+    winston.debug("quotes: ", quotes);
+    res.status(200).send({ message: 'ok', quotes: quotes });
+
+})
+
+router.get('/:type', async (req, res) => {
+
+    let type = req.params.type;
+    let obj = { createdAt: new Date() };
+
+    let quoteManager = req.app.get('quote_manager');
+    let isAvailable = await quoteManager.checkQuote(req.project, obj, type);
+
+    winston.debug("is " + type + " available: ", isAvailable);
+    res.status(200).send({ isAvailable: isAvailable })
+
+})
+
+router.post('/incr/:type', async (req, res) => {
+
+    let type = req.params.type;
+    let body = req.body;
+    body.createdAt = new Date();
+
+    let quoteManager = req.app.get('quote_manager');
+    let incremented_key = await quoteManager.incrementTokenCount(req.project, req.body);
+    let quote = await quoteManager.getCurrentQuote(req.project, req.body, type);
+
+    res.status(200).send({ message: "value incremented for key " + incremented_key, key: incremented_key, currentQuote: quote });
+})
+
+module.exports = router;