wingbot 3.57.1 → 3.58.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.57.1",
+  "version": "3.58.1",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {

package/plugins/ai.wingbot.openai/plugin.js

@@ -6,7 +6,13 @@
 const fetch = require('node-fetch').default;
 const compileWithState = require('../../src/utils/compileWithState');
 
-function chatgptPlugin (params) {
+const MSG_REPLACE = '#MSG-REPLACE#';
+
+function chatgptPlugin (params, configuration = {}) {
+    const {
+        openAiEndpoint = null,
+        openAiApiKey = null
+    } = configuration;
 
     async function chatgpt (req, res) {
         const content = req.text();
@@ -31,6 +37,11 @@ function chatgptPlugin (params) {
 
         const systemAfter = compileWithState(req, res, params.systemAfter).trim();
 
+        const replacedAnnotation = `${params.annotation || ''}`.replace(/\{\{message\}\}/g, MSG_REPLACE);
+        const annotation = compileWithState(req, res, replacedAnnotation).trim();
+
+        const persona = compileWithState(req, res, params.persona).trim();
+
         let body;
 
         try {
@@ -58,11 +69,17 @@ function chatgptPlugin (params) {
 
             const useFetch = params.fetch || fetch;
 
-            const response = await useFetch('https://api.openai.com/v1/chat/completions', {
+            const apiUrl = openAiEndpoint
+                ? `${openAiEndpoint}/chat/completions?api-version=2023-03-15-preview`
+                : 'https://api.openai.com/v1/chat/completions';
+
+            const response = await useFetch(`${apiUrl}/chat/completions`, {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
-                    Authorization: `Bearer ${token}`
+                    ...(openAiEndpoint
+                        ? { 'api-key': token || openAiApiKey }
+                        : { Authorization: `Bearer ${token || openAiApiKey}` })
                 },
                 body: JSON.stringify(body)
             });
@@ -73,7 +90,9 @@ function chatgptPlugin (params) {
                 || !Array.isArray(data.choices)) {
                 const { status, statusText } = response;
                 // eslint-disable-next-line no-console
-                console.log('chat gpt error', { status, statusText, data });
+                console.log('chat gpt error', {
+                    status, statusText, data, apiUrl
+                });
                 throw new Error(`Chat GPT ${status}`);
             }
 
@@ -92,8 +111,26 @@ function chatgptPlugin (params) {
                         filtered = filtered.slice(0, filtered.length - 1);
                     }
 
+                    if (persona) {
+                        res.setPersona({ name: persona });
+                    }
+
                     filtered
-                        .forEach((t) => res.text(t.trim()));
+                        .forEach((t) => {
+                            let trim = t.trim();
+
+                            if (annotation && annotation.includes(MSG_REPLACE)) {
+                                trim = annotation.replace(MSG_REPLACE, trim);
+                            } else if (annotation) {
+                                trim = `${annotation} ${trim}`;
+                            }
+
+                            res.text(trim);
+                        });
+
+                    if (persona) {
+                        res.setPersona({ name: null });
+                    }
 
                     return ch;
                 });

package/plugins/plugins.json

@@ -488,7 +488,7 @@
         {
             "id": "ai.wingbot.openai",
             "name": "OpenAI - Chat",
-            "description": "Use within fallback to attach ChatGPT to your chatbot",
+            "description": "Use within fallback to attach ChatGPT to your chatbot\n\nYou can use {{message}} variable in a message annotation.",
             "availableSince": 3.54,
             "editable": false,
             "isFactory": true,
@@ -552,6 +552,16 @@
                         }
                     ]
                 },
+                {
+                    "type": "text",
+                    "name": "persona",
+                    "label": "Message persona name"
+                },
+                {
+                    "type": "text",
+                    "name": "annotation",
+                    "label": "Message annotation"
+                },
                 {
                     "type": "textarea",
                     "name": "systemAfter",

package/src/Tester.js

@@ -378,7 +378,7 @@ class Tester {
      * Assert, that state contains a subset of provided value
      *
      * @param {object} object
-     * @param {boolean} deep
+     * @param {boolean} [deep]
      * @example
      *
      * t.stateContains({ value: true });

package/src/testTools/ResponseAssert.js

@@ -24,7 +24,7 @@ class ResponseAssert {
     /**
      * Checks, that response contains text
      *
-     * @param {string} search
+     * @param {string|object} search
      * @returns {this}
      *
      * @memberOf ResponseAssert