wingbot 3.67.0 → 3.67.2

package/package.json

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

package/src/Ai.js

@@ -51,9 +51,15 @@ let uq = 1;
 // eslint-disable-next-line max-len
 /** @typedef {import('./wingbot/CustomEntityDetectionModel').WordEntityDetector} WordEntityDetector */
 
+/**
+ * @typedef {object} WordDetectorData
+ * @prop {WordEntityDetector} detector
+ * @prop {number} [maxWordCount]
+ */
+
 /**
  * @callback WordEntityDetectorFactory
- * @returns {Promise<WordEntityDetector>}
+ * @returns {Promise<WordEntityDetector|WordDetectorData>}
  */
 
 /** @typedef {[string,EntityDetector|RegExp,DetectorOptions]} DetectorArgs */
@@ -90,6 +96,8 @@ class Ai {
          */
         this._wordEntityDetector = null;
 
+        this._wordEntityDetectorMaxWordCount = 0;
+
         /**
          * Upper threshold - for match method and for navigate method
          *
@@ -289,19 +297,33 @@ class Ai {
 
     /**
      *
-     * @param {WordEntityDetector|WordEntityDetectorFactory} wordEntityDetector
+     * @param {WordEntityDetector|WordEntityDetectorFactory|WordDetectorData} wordEntityDetector
      */
     setWordEntityDetector (wordEntityDetector) {
-        if (wordEntityDetector.length === 0) {
+        if (typeof wordEntityDetector === 'function' && wordEntityDetector.length === 0) {
             // @ts-ignore
             this._wordEntityDetectorFactory = wordEntityDetector;
             return this;
         }
 
-        this._wordEntityDetector = wordEntityDetector;
+        let detector;
+        if (typeof wordEntityDetector === 'object') {
+            ({ detector } = wordEntityDetector);
+            this._wordEntityDetectorMaxWordCount = Math.max(
+                this._wordEntityDetectorMaxWordCount,
+                wordEntityDetector.maxWordCount || 0
+            );
+        } else {
+            detector = wordEntityDetector;
+        }
+
+        // @ts-ignore
+        this._wordEntityDetector = detector;
 
         for (const model of this._keyworders.values()) {
-            model.wordEntityDetector = wordEntityDetector;
+            // @ts-ignore
+            model.wordEntityDetector = detector;
+            model.maxWordCount = Math.max(model.maxWordCount, this._wordEntityDetectorMaxWordCount);
         }
         return this;
     }
@@ -684,15 +706,12 @@ class Ai {
      */
     preloadDetectors () {
         if (this._wordEntityDetectorFactory === null || this._wordEntityDetector) {
-            return Promise.resolve();
+            return Promise.resolve(this._wordEntityDetector);
         }
 
         const promise = this._wordEntityDetectorFactory()
             .then((detector) => {
-                this._wordEntityDetector = detector;
-                for (const model of this._keyworders.values()) {
-                    model.wordEntityDetector = detector;
-                }
+                this.setWordEntityDetector(detector);
                 return detector;
             })
             .catch((e) => {

package/src/ChatGpt.js

@@ -4,6 +4,7 @@
 'use strict';
 
 const nodeFetch = require('node-fetch').default;
+const util = require('util');
 const { PHONE_REGEX, EMAIL_REGEX } = require('./systemEntities/regexps');
 
 /** @typedef {import('node-fetch').default} Fetch */
@@ -30,7 +31,7 @@ const { PHONE_REGEX, EMAIL_REGEX } = require('./systemEntities/regexps');
 /** @typedef {'gpt-3.5-turbo'|'gpt-4'|'gpt-4-32k'|'gpt-3.5-turbo-16k'|string} ChatGPTModel */
 
 /**
- * @typedef {object} RequestOptions
+ * @typedef {object} DefaultRequestOptions
  * @prop {ChatGPTModel} [model]
  * @prop {number} [presencePenalty=0.0]
  * @prop {number} [requestTokens=256]
@@ -40,7 +41,14 @@ const { PHONE_REGEX, EMAIL_REGEX } = require('./systemEntities/regexps');
  */
 
 /**
- * @typedef {GeneralOptions & RequestOptions} ChatGptOptions
+ * @typedef {object} OptionsExtension
+ * @prop {FNAnnotation[]} [functions]
+ *
+ * @typedef {OptionsExtension & DefaultRequestOptions} RequestOptions
+ */
+
+/**
+ * @typedef {GeneralOptions & DefaultRequestOptions} ChatGptOptions
  */
 
 /**
@@ -106,6 +114,37 @@ const { PHONE_REGEX, EMAIL_REGEX } = require('./systemEntities/regexps');
  * @prop {boolean} [anonymize=true]
  */
 
+/**
+ * @typedef {object} FNScalarParam
+ * @prop {'string'|'number'|'boolean'} type
+ * @prop {string[]} [enum]
+ * @prop {string} [description]
+ */
+
+/**
+ * @typedef {object} FNArrayParam
+ * @prop {'array'} type
+ * @prop {string} [description]
+ * @prop {FNParam} items
+ */
+
+/**
+ * @typedef {object} FNObjectParam
+ * @prop {'object'} type
+ * @prop {{ [key: string]: FNParam }} properties
+ * @prop {string[]} [required]
+ * @prop {string} [description]
+ */
+
+/** @typedef {FNScalarParam|FNObjectParam|FNArrayParam} FNParam */
+
+/**
+ * @typedef {object} FNAnnotation
+ * @prop {string} name
+ * @prop {string} description
+ * @prop {FNParam} parameters
+ */
+
 /**
  * @class ChatGpt
  */
@@ -135,7 +174,7 @@ class ChatGpt {
 
         this._defaultUser = defaultUser;
 
-        /** @type {Required<RequestOptions>} */
+        /** @type {Required<DefaultRequestOptions>} */
         this._options = {
             requestTokens: 256,
             tokensLimit: 4096,
@@ -146,7 +185,7 @@ class ChatGpt {
             ...rest
         };
 
-        this._log = log;
+        this._logger = log;
 
         this.MSG_REPLACE = '#MSG-REPLACE#';
 
@@ -158,6 +197,17 @@ class ChatGpt {
         ];
     }
 
+    _log (msg, ...args) {
+        if (this._logger === console) {
+
+            this._logger.log(msg, ...args.map((arg) => util.inspect(arg, {
+                showHidden: false, depth: null, colors: true
+            })));
+        } else {
+            this._logger.log(msg, ...args);
+        }
+    }
+
     /**
      *
      * @param {Responder} res
@@ -202,7 +252,8 @@ class ChatGpt {
             tokensLimit,
             model,
             presencePenalty,
-            temperature
+            temperature,
+            functions = []
         } = {
             ...this._options,
             ...requestOptions
@@ -218,7 +269,8 @@ class ChatGpt {
                 frequency_penalty: 0,
                 presence_penalty: presencePenalty,
                 max_tokens: maxTokens,
-                temperature
+                temperature,
+                functions
             };
 
             if (typeof user === 'string') {
@@ -253,7 +305,7 @@ class ChatGpt {
 
             const apiUrl = `${this._openAiEndpoint}/chat/completions${this._apiKey ? '?api-version=2023-03-15-preview' : ''}`;
 
-            this._log.log('#GPT request', body);
+            this._log('#GPT request', body);
 
             const response = await this._fetch(apiUrl, {
                 method: 'POST',
@@ -273,7 +325,7 @@ class ChatGpt {
                 || !Array.isArray(data.choices)) {
                 const { status, statusText } = response;
 
-                this._log.error('#GPT failed', {
+                this._logger.error('#GPT failed', {
                     status, statusText, data, body
                 });
                 throw new Error(`Chat GPT ${status}`);
@@ -281,11 +333,11 @@ class ChatGpt {
 
             const [choice] = data.choices;
 
-            this._log.log('#GPT response', { choice, data });
+            this._log('#GPT response', { choice, data });
 
             return choice;
         } catch (e) {
-            this._log.error('#GPT failed', e, body);
+            this._logger.error('#GPT failed', e, body);
             throw e;
         }
     }
@@ -412,7 +464,7 @@ class ChatGpt {
 
         if (messages.length === 0) {
             const err = new Error('#GPT nothing to send');
-            this._log.error('#GPT nothing to send', err, { choice, content });
+            this._logger.error('#GPT nothing to send', err, { choice, content });
             throw err;
         }
 

package/src/wingbot/CustomEntityDetectionModel.js

@@ -68,6 +68,7 @@ const { iterateThroughWords } = require('../utils/ai');
  * @param {DetectedEntity[]} entities
  * @param {number} startIndex
  * @param {string} prefix
+ * @returns {DetectedEntity[]}
  */
 
 /**
@@ -403,7 +404,8 @@ class CustomEntityDetectionModel {
         let entities = prevEnts.slice();
         if (this.wordEntityDetector) {
             for (const [s, startIndex] of iterateThroughWords(text, this.maxWordCount)) {
-                this.wordEntityDetector(s, entities, startIndex, this.prefix);
+                const ents = this.wordEntityDetector(s, prevEnts, startIndex, this.prefix);
+                entities.push(...ents);
             }
         }
 
@@ -496,6 +498,7 @@ class CustomEntityDetectionModel {
         // filter the text
         for (let i = entities.length - 1; i >= 0; i--) {
             const entity = entities[i];
+            if (!this._entityDetectors.has(entity.entity)) continue;
             const { anonymize } = this._entityDetectors.get(entity.entity);
 
             if (anonymize) {