wingbot 3.70.6 → 3.71.0

package/package.json

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

package/src/ChatGpt.js

@@ -65,6 +65,7 @@ const LLM = require('./LLM');
  * @prop {'stop'|'length'|'tool_calls'|'content_filter'|null} finish_reason
  * @prop {number} index
  * @prop {Message} message
+ * @prop {GptToolCall[]} [tool_calls]
  */
 
 /**
@@ -89,6 +90,15 @@ const LLM = require('./LLM');
  * @prop {Function} error
  */
 
+/**
+ * @typedef {object} GptToolCall
+ * @prop {string} id
+ * @prop {'function'|string} type
+ * @prop {object} function
+ * @prop {string} function.name
+ * @prop {string} function.arguments - JSON string
+ */
+
 /**
  * @typedef {object} SlicedAnnotation
  * @prop {boolean} [sliced]
@@ -246,13 +256,17 @@ class ChatGpt {
      * @returns {Promise<LLMMessage>}
      */
     async requestChat (prompt, options) {
-
         const choice = await this._request(prompt, options);
 
-        const { finish_reason: finishReason, message } = choice;
+        const { finish_reason: finishReason, message, tool_calls: toolCalls = [] } = choice;
 
         return {
             finishReason,
+            toolCalls: toolCalls.map(({ id, function: { name, arguments: args } }) => ({
+                id,
+                name,
+                args
+            })),
             ...message
         };
     }

package/src/LLM.js

@@ -9,6 +9,7 @@ const { PHONE_REGEX, EMAIL_REGEX } = require('./systemEntities/regexps');
 /** @typedef {import('./Responder').Persona} Persona */
 /** @typedef {import('./Router').BaseConfiguration} BaseConfiguration */
 /** @typedef {import('./LLMSession').LLMMessage<any>} LLMMessage */
+/** @typedef {import('./LLMSession').ToolCall} ToolCall */
 /** @typedef {import('./LLMSession').LLMRole} LLMRole */
 /** @typedef {import('./LLMSession')} LLMSession */
 /** @typedef {import('./transcript/transcriptFromHistory').Transcript} Transcript */
@@ -40,6 +41,7 @@ const { PHONE_REGEX, EMAIL_REGEX } = require('./systemEntities/regexps');
  * @prop {'gpt'|string} [transcriptFlag]
  * @prop {boolean} [transcriptAnonymize]
  * @prop {Persona|string|null} [persona]
+ * @prop {LLMLogger} [logger]
  */
 
 /**
@@ -48,6 +50,22 @@ const { PHONE_REGEX, EMAIL_REGEX } = require('./systemEntities/regexps');
  * @prop {RegExp} regex
  */
 
+/**
+ * @typedef {object} PromptInfo
+ * @prop {LLMMessage[]} prompt
+ * @prop {LLMMessage} result
+ */
+
+/**
+ * @callback LogPrompt
+ * @param {PromptInfo} info
+ */
+
+/**
+ * @typedef {object} LLMLogger
+ * @prop {LogPrompt} logPrompt
+ */
+
 /**
  * @class LLM
  */
@@ -81,6 +99,9 @@ class LLM {
             transcriptFlag: 'gpt',
             transcriptLength: 5,
             provider: null,
+            logger: {
+                logPrompt: () => {}
+            },
             ...rest
         };
 
@@ -123,7 +144,7 @@ class LLM {
     async generate (session, options = {}) {
         /** @type {LLMProviderOptions} */
         const opts = {
-            model: this._configuration.model,
+            ...(this._configuration.model && { model: this._configuration.model }),
             ...options
         };
 
@@ -133,6 +154,17 @@ class LLM {
         return result;
     }
 
+    /**
+     *
+     * @param {LLMMessage[]} prompt
+     * @param {LLMMessage} result
+     */
+    _logPrompt (prompt, result) {
+        this._configuration.logger.logPrompt({
+            prompt, result
+        });
+    }
+
     /**
      *
      * @param {LLMMessage} result
@@ -141,8 +173,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) {

package/src/LLMSession.js

@@ -6,19 +6,30 @@
 const LLM = require('./LLM');
 
 /** @typedef {import('./Responder').QuickReply} QuickReply */
+/** @typedef {import('./LLM').LLMProviderOptions} LLMProviderOptions */
+
 /** @typedef {'user'|'assistant'} LLMChatRole */
 /** @typedef {'system'} LLMSystemRole */
-/** @typedef {LLMChatRole|LLMSystemRole|string} LLMRole */
-/** @typedef {import('./LLM').LLMProviderOptions} LLMProviderOptions */
+/** @typedef {'tool'} LLMToolRole */
+/** @typedef {LLMChatRole|LLMSystemRole|LLMToolRole|string} LLMRole */
 
 /** @typedef {'stop'|'length'|'tool_calls'|'content_filter'} LLMFinishReason */
 
+/**
+ * @typedef {object} ToolCall
+ * @prop {string} id
+ * @prop {string} name
+ * @prop {string} args - JSON string
+ */
+
 /**
  * @template {LLMRole} [R=LLMRole]
  * @typedef {object} LLMMessage
  * @prop {R} role
  * @prop {string} content
+ * @prop {string} [toolCallId]
  * @prop {LLMFinishReason} [finishReason]
+ * @prop {ToolCall[]} [toolCalls]
  */
 
 /**
@@ -78,7 +89,7 @@ class LLMSession {
             return otherMessages;
         }
 
-        const promptRegex = /\$\{prompt\(\)\}/g;
+        const promptRegex = /\$\{(prompt|last)\(\)\}/g;
 
         const last = sysMessages.length - 1;
 

package/src/ReturnSender.js

@@ -11,7 +11,9 @@ const extractText = require('./transcript/extractText');
 /** @typedef {import('./Request')} Request */
 /** @typedef {import('./Responder')} Responder */
 /** @typedef {import('./Processor').TrackingObject} TrackingObject */
-/** @typedef {import('./LLMContext').LLMMessage} LLMMessage */
+/** @typedef {import('./LLMSession').LLMMessage} LLMMessage */
+/** @typedef {import('./LLM').LLMLogger} LLMLogger */
+/** @typedef {import('./LLM').PromptInfo} PromptInfo */
 
 /**
  * @callback GetInteractions
@@ -68,6 +70,10 @@ const extractText = require('./transcript/extractText');
  * @returns {string} - filtered text
  */
 
+/**
+ * @class ReturnSender
+ * @implements {LLMLogger}
+ */
 class ReturnSender {
 
     /**
@@ -155,6 +161,9 @@ class ReturnSender {
             events: []
         };
 
+        /** @type {PromptInfo[]} */
+        this._prompts = [];
+
         this._responseTexts = [];
 
         this._intentsAndEntities = [];
@@ -185,6 +194,14 @@ class ReturnSender {
         }
     }
 
+    /**
+     *
+     * @param {PromptInfo} promptInfo
+     */
+    logPrompt (promptInfo) {
+        this._prompts.push(promptInfo);
+    }
+
     /**
      *
      * @param {DeferOperation|Promise} operation
@@ -651,7 +668,8 @@ class ReturnSender {
     _createTracking (req = null, res = null) {
         const payload = {};
         const meta = {
-            actions: this._visitedInteractions.slice()
+            actions: this._visitedInteractions.slice(),
+            prompts: this._prompts
         };
 
         if (req) {
@@ -678,7 +696,8 @@ class ReturnSender {
      */
     _createMeta (req = null, res = null) { // eslint-disable-line no-unused-vars
         const meta = {
-            visitedInteractions: this._visitedInteractions.slice()
+            visitedInteractions: this._visitedInteractions.slice(),
+            prompts: this._prompts
         };
 
         if (req) {

package/src/graphApi/schema.gql

@@ -95,6 +95,25 @@ type AiAction {
     winner: Boolean!
 }
 
+type ToolCall {
+    id: String
+    name: String
+    args: String
+}
+
+type LLMMessage {
+    role: String!
+    content: String
+    finishReason: String
+    toolCallId: String
+    toolCalls: [ToolCall!]
+}
+
+type PromptInfo {
+    prompt: [LLMMessage!]!
+    result: LLMMessage!
+}
+
 type UserInteraction {
     senderId: String!
     pageId: String!
@@ -117,6 +136,7 @@ type UserInteraction {
     request: Any!
     responses: [Any]!
     visitedInteractions: [String]
+    prompts: [PromptInfo!]
 
     err: String
 }