wingbot 3.76.4-alpha.11 → 3.76.4-alpha.13

package/.claude/settings.local.json

@@ -0,0 +1,11 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npx mocha:*)",
+      "Bash(npx tsc *)",
+      "Bash(npm test *)",
+      "Bash(node -e \"const p = require\\('./bot/plugins/BTMLLM'\\); console.log\\('factory type:', typeof p\\); console.log\\('factory name:', p.name\\);\")",
+      "Bash(grep -n \"prompt\\\\`\\\\|tagged\\\\|render\\\\|compile\\\\|hbs\" /Users/ondrejveres/Wingbot/wingbot-llm/src/prompt.js)"
+    ]
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.76.4-alpha.11",
+  "version": "3.76.4-alpha.13",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "type": "commonjs",
@@ -76,4 +76,4 @@
     "axios": "^1.6.4",
     "handlebars": "^4.0.0"
   }
-}
+}

package/src/LLM.js

@@ -107,6 +107,7 @@ const LLMSession = require('./LLMSession');
  * @prop {'low'|'medium'|'high'|string} [verbosity]
  * @prop {'text'|SimpleJsonSchema} [responseFormat]
  * @prop {number} [temperature]
+ * @prop {number} [maxToolCallRounds]
  */
 
 /**
@@ -157,9 +158,12 @@ const LLMSession = require('./LLMSession');
 /**
  * @typedef {object} PromptInfo
  * @prop {LLMMessage[]} prompt
- * @prop {LLMMessage} result
+ * @prop {LLMMessage|null} result
  * @prop {VectorSearchResult} [vectorSearchResult]
  * @prop {ToolFunction[]} [tools]
+ * @prop {number} [durationMs]
+ * @prop {LLMCallOptions} [options]
+ * @prop {string} [error]
  */
 
 /**
@@ -425,22 +429,48 @@ class LLM {
     async generate (session, preset = {}, logOptions = {}) {
         const opts = this.llmOptions(preset);
         const prompt = await session.toArray(true);
-        const result = await this._provider.requestChat(prompt, opts, session.tools);
-        this.logPrompt(prompt, result, logOptions.vectorSearchResult, session.tools);
+        const startTime = Date.now();
+        let result = null;
+        let error = null;
+        try {
+            result = await this._provider.requestChat(prompt, opts, session.tools);
+        } catch (e) {
+            error = e;
+        }
+        const durationMs = Date.now() - startTime;
+        this.logPrompt(
+            prompt,
+            result,
+            logOptions.vectorSearchResult,
+            session.tools,
+            durationMs,
+            opts,
+            error
+        );
+        if (error) throw error;
         return result;
     }
 
     /**
      *
      * @param {LLMMessage[]} prompt
-     * @param {LLMMessage} result
+     * @param {LLMMessage|null} result
      * @param {VectorSearchResult} [vectorSearchResult]
      * @param {ToolFunction[]} [tools]
+     * @param {number} [durationMs]
+     * @param {LLMCallOptions} [options]
+     * @param {Error} [error]
      */
-    logPrompt (prompt, result, vectorSearchResult, tools) {
+    logPrompt (prompt, result, vectorSearchResult, tools, durationMs, options, error) {
         this._lastResult = result;
         this._configuration.logger.logPrompt({
-            prompt, result, vectorSearchResult, tools
+            prompt,
+            result,
+            vectorSearchResult,
+            tools,
+            durationMs,
+            ...(options != null && { options }),
+            ...(error != null && { error: error?.message || String(error) })
         });
     }
 

package/src/LLMSession.js

@@ -93,6 +93,7 @@ const stateData = require('./utils/stateData');
  * @prop {string[]} [enum] - Allowed values for this parameter
  * @prop {number} [minimum] - Minimum value for numeric parameters
  * @prop {number} [maximum] - Maximum value for numeric parameters
+ * @prop {string} [format] - JSON Schema string format, e.g. 'date-time', 'email', 'uuid'
  */
 
 /** @typedef {{ [key: string]: JsonSchemaProp }} SimpleJsonSchema */
@@ -972,12 +973,13 @@ class LLMSession {
      * @returns {Promise<LLMMessage<any>>}
      */
     async _generate (providerOptions = this._preset, logOptions = {}) {
+        const { maxToolCallRounds = MAX_TOOL_CALL_ROUNDS } = this._llm.llmOptions(providerOptions);
         let result = await this._llm.generate(this, providerOptions, logOptions);
 
         // the model may chain several rounds of tool calls before it produces
         // a final text answer - keep resolving them until it stops (bounded)
         let rounds = 0;
-        while (result.toolCalls?.length && rounds < MAX_TOOL_CALL_ROUNDS) {
+        while (result.toolCalls?.length && rounds < maxToolCallRounds) {
             rounds += 1;
             const toolCalls = [];
             const results = await Promise.all(
@@ -1016,7 +1018,7 @@ class LLMSession {
         // a tool-call message (content === null) to the send pipeline
         if (result.toolCalls?.length) {
             this._llm.log.error(
-                `LLMSession: reached MAX_TOOL_CALL_ROUNDS (${MAX_TOOL_CALL_ROUNDS}), `
+                `LLMSession: reached maxToolCallRounds (${maxToolCallRounds}), `
                 + 'dropping pending tool calls and forcing a tool-less final answer',
                 { toolCalls: result.toolCalls }
             );

package/src/LLMType.js

@@ -25,6 +25,7 @@ class LLMType {
         this._name = name;
 
         this._description = null;
+        this._format = null;
         this._min = null;
         this._max = null;
 
@@ -155,6 +156,24 @@ class LLMType {
         return this;
     }
 
+    /**
+     * Sets the JSON Schema `format` for a string property.
+     *
+     * Supported values: `'date-time'`, `'time'`, `'date'`, `'duration'`,
+     * `'email'`, `'hostname'`, `'ipv4'`, `'ipv6'`, `'uuid'`.
+     *
+     * @example
+     * const createdAt = LLMType.string().format('date-time').description('Creation timestamp');
+     *
+     * @param {'date-time'|'time'|'date'|'duration'|'email'|
+     * 'hostname'|'ipv4'|'ipv6'|'uuid'|string} value
+     * @returns {this}
+     */
+    format (value) {
+        this._format = value;
+        return this;
+    }
+
     /**
      * Sets minimum boundary and maps it to a type-specific JSON Schema keyword.
      *
@@ -282,7 +301,8 @@ class LLMType {
     _baseSchema () {
         return /** @type {object} */ ({
             ...(this._description !== null && { description: this._description }),
-            ...(this._name !== null && { name: this._name })
+            ...(this._name !== null && { name: this._name }),
+            ...(this._format !== null && { format: this._format })
         });
     }
 

package/src/graphApi/schema.gql

@@ -123,10 +123,18 @@ type VectorSearchResult {
   resultDocuments: [VectorSearchDocument!]!  
 }
 
+type ToolFunction {
+    name: String!
+    description: String
+    parameters: Any
+}
+
 type PromptInfo {
     prompt: [LLMMessage!]!
     result: LLMMessage!
     vectorSearchResult: VectorSearchResult
+    tools: [ToolFunction!]
+    durationMs: Float
 }
 
 type UserInteraction {

package/src/testTools/PromptAssert.js

@@ -88,7 +88,8 @@ class PromptAssert {
      */
     _flatResults () {
         return this._prompts
-            .map((prompt) => prompt.result);
+            .map((prompt) => prompt.result)
+            .filter(Boolean);
     }
 
     /**
@@ -190,7 +191,7 @@ class PromptAssert {
                 return [
                     `${i + 1}) ${PromptAssert.promptStats(p.prompt)}`,
                     `${prompt.join('\n   ')}`,
-                    `# ${PromptAssert._content(p.result)}`
+                    `# ${p.result ? PromptAssert._content(p.result) : `[ERROR] ${p.error || 'unknown'}`}`
                 ].join('\n   ');
             });
         }