wingbot 3.70.1 → 3.70.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.70.1",
+  "version": "3.70.3",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "type": "commonjs",

package/src/BuildRouter.js

@@ -138,6 +138,11 @@ const DUMMY_ROUTE = { id: 0, path: null, resolvers: [] };
  * @prop {C} [configuration] - context data
  */
 
+/**
+ * @callback NestedLinksMapFactory
+ * @returns {LinksMap}
+ */
+
 /**
  * @typedef {object} BotContextExtention
  * @prop {BlockMap} [nestedBlocksByStaticId]
@@ -155,6 +160,7 @@ const DUMMY_ROUTE = { id: 0, path: null, resolvers: [] };
  * @prop {boolean} [isRoot]
  * @prop {string} [staticBlockId]
  * @prop {Block[]} [blocks]
+ * @prop {NestedLinksMapFactory} [nestedLinksMapFactory]
  * @prop {object} [BuildRouter]
  * @prop {string|number} [resolverId] - only for text messages with random characters
  */
@@ -226,6 +232,9 @@ class BuildRouter extends Router {
         /** @type {LinksMap} */
         this._linksMap = new Map();
 
+        /** @type {LinksMap} */
+        this._nestedLinksMap = null;
+
         this._loadBotUrl = null;
 
         this._loadBotAuthorization = null;
@@ -512,7 +521,10 @@ class BuildRouter extends Router {
     buildWithSnapshot (blocks, setConfigTimestamp = Number.MAX_SAFE_INTEGER, lastmod = '-') {
         this._validateBlocks(blocks);
 
-        Object.assign(this._resolvedContext, { blocks });
+        Object.assign(this._resolvedContext, {
+            blocks,
+            nestedBlocksByStaticId: null
+        });
 
         const rootBlock = blocks.find((block) => block.isRoot);
 
@@ -573,6 +585,7 @@ class BuildRouter extends Router {
         const [linksMap, nestedBlocksByStaticId] = this._createLinksMap(block);
         // @ts-ignore
         this._linksMap = linksMap;
+        this._nestedLinksMap = null;
 
         // @ts-ignore
         this._buildRoutes(block.routes, nestedBlocksByStaticId);
@@ -583,6 +596,20 @@ class BuildRouter extends Router {
         this.emit('rebuild');
     }
 
+    _getNestedLinksMap () {
+        if (!this._nestedLinksMap) {
+            /** @type {LinksMap} */
+            const linksMap = new Map();
+
+            for (const [from, to] of this._linksMap.entries()) {
+                linksMap.set(from, `../${to}`); //  this._joinPaths('..', to)
+            }
+
+            this._nestedLinksMap = linksMap;
+        }
+        return this._nestedLinksMap;
+    }
+
     /**
      *
      * returns {[LinksMap, BlockMap]}
@@ -590,12 +617,18 @@ class BuildRouter extends Router {
      * @param {Block} block
      */
     _createLinksMap (block) {
-        const { linksMap: prevLinksMap, blocks = [] } = this._resolvedContext;
+        const {
+            linksMap: prevLinksMap,
+            blocks = [],
+            nestedLinksMapFactory
+        } = this._resolvedContext;
 
         /** @type {LinksMap} */
-        const linksMap = new Map();
+        const linksMap = nestedLinksMapFactory
+            ? new Map(nestedLinksMapFactory())
+            : new Map();
 
-        if (prevLinksMap) {
+        if (prevLinksMap && !nestedLinksMapFactory) {
             for (const [from, to] of prevLinksMap.entries()) {
                 linksMap.set(from, `../${to}`); //  this._joinPaths('..', to)
             }
@@ -900,6 +933,7 @@ class BuildRouter extends Router {
                 isLastMessage: lastMessageIndex === i && !buildInfo.notLastMessage,
                 router: this,
                 linksMap: this._linksMap,
+                nestedLinksMapFactory: this._getNestedLinksMap.bind(this),
                 path: ctxPath,
                 isFallback,
                 isResponder,

package/src/ChatGpt.js

@@ -180,10 +180,10 @@ class ChatGpt {
         /** @type {Required<DefaultRequestOptions>} */
         this._options = {
             requestTokens: 256,
-            tokensLimit: 4096,
+            tokensLimit: 128000,
             presencePenalty: 0.0, // -2.0-2.0
             temperature: 1.0,
-            model: 'gpt-3.5-turbo',
+            model: 'gpt-4o-mini',
             transcriptLength: -5,
             ...rest
         };
@@ -278,7 +278,6 @@ class ChatGpt {
         };
 
         let messages = chat;
-        const maxTokens = Math.min(requestTokens, tokensLimit);
 
         let body;
         try {
@@ -309,7 +308,7 @@ class ChatGpt {
                 model,
                 frequency_penalty: 0,
                 presence_penalty: presencePenalty,
-                max_tokens: maxTokens,
+                max_tokens: requestTokens,
                 temperature,
                 messages
             };

package/src/LLM.js

@@ -141,8 +141,9 @@ class LLM {
     static toMessages (result) {
         let filtered = result.content
             .replace(/\n\n+/g, '\n')
-            .split(/\n+(?!-)/g)
-            .map((t) => t.trim())
+            .split(/\n+(?!\s*-)/g)
+            .map((t) => t.replace(/\n\s+/g, '\n')
+                .trim())
             .filter((t) => !!t);
 
         if (result.finishReason === 'length' && filtered.length <= 0) {