wingbot 3.76.4-alpha.10 → 3.76.4-alpha.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.76.4-alpha.10",
+  "version": "3.76.4-alpha.11",
   "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/BuildRouter.js

@@ -865,13 +865,20 @@ class BuildRouter extends Router {
     _createBlockLlmRouter (block) {
         const { llmRouting } = block;
 
-        if (!llmRouting || !llmRouting.prompt || !llmRouting.prompt.trim()) {
+        if (!llmRouting) {
             return null;
         }
 
-        const routeResolver = LLMRouter.defaultRoute(
-            async (resolvedData) => compileWithState(null, null, llmRouting.prompt, resolvedData)
-        );
+        const routeResolver = llmRouting.prompt && llmRouting.prompt.trim()
+            ? LLMRouter.defaultRoute(
+                async (resolvedData) => compileWithState(
+                    null,
+                    null,
+                    llmRouting.prompt,
+                    resolvedData
+                )
+            )
+            : null;
         const options = llmRouting.bounce === 'keepAllow'
             ? { keepUserInInteractionsWithBounceAllowed: true }
             : {};

package/src/LLM.js

@@ -107,7 +107,6 @@ const LLMSession = require('./LLMSession');
  * @prop {'low'|'medium'|'high'|string} [verbosity]
  * @prop {'text'|SimpleJsonSchema} [responseFormat]
  * @prop {number} [temperature]
- * @prop {number} [maxToolCallRounds]
  */
 
 /**
@@ -161,8 +160,6 @@ const LLMSession = require('./LLMSession');
  * @prop {LLMMessage} result
  * @prop {VectorSearchResult} [vectorSearchResult]
  * @prop {ToolFunction[]} [tools]
- * @prop {number} [durationMs]
- * @prop {string} [toolChoice]
  */
 
 /**
@@ -428,17 +425,8 @@ class LLM {
     async generate (session, preset = {}, logOptions = {}) {
         const opts = this.llmOptions(preset);
         const prompt = await session.toArray(true);
-        const startTime = Date.now();
         const result = await this._provider.requestChat(prompt, opts, session.tools);
-        const durationMs = Date.now() - startTime;
-        this.logPrompt(
-            prompt,
-            result,
-            logOptions.vectorSearchResult,
-            session.tools,
-            durationMs,
-            opts.toolChoice
-        );
+        this.logPrompt(prompt, result, logOptions.vectorSearchResult, session.tools);
         return result;
     }
 
@@ -448,18 +436,11 @@ class LLM {
      * @param {LLMMessage} result
      * @param {VectorSearchResult} [vectorSearchResult]
      * @param {ToolFunction[]} [tools]
-     * @param {number} [durationMs]
-     * @param {string} [toolChoice]
      */
-    logPrompt (prompt, result, vectorSearchResult, tools, durationMs, toolChoice) {
+    logPrompt (prompt, result, vectorSearchResult, tools) {
         this._lastResult = result;
         this._configuration.logger.logPrompt({
-            prompt,
-            result,
-            vectorSearchResult,
-            tools,
-            durationMs,
-            ...(toolChoice != null && { toolChoice })
+            prompt, result, vectorSearchResult, tools
         });
     }
 

package/src/LLMSession.js

@@ -93,7 +93,6 @@ 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 */
@@ -973,13 +972,12 @@ 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 < maxToolCallRounds) {
+        while (result.toolCalls?.length && rounds < MAX_TOOL_CALL_ROUNDS) {
             rounds += 1;
             const toolCalls = [];
             const results = await Promise.all(
@@ -1018,7 +1016,7 @@ class LLMSession {
         // a tool-call message (content === null) to the send pipeline
         if (result.toolCalls?.length) {
             this._llm.log.error(
-                `LLMSession: reached maxToolCallRounds (${maxToolCallRounds}), `
+                `LLMSession: reached MAX_TOOL_CALL_ROUNDS (${MAX_TOOL_CALL_ROUNDS}), `
                 + 'dropping pending tool calls and forcing a tool-less final answer',
                 { toolCalls: result.toolCalls }
             );

package/src/LLMType.js

@@ -25,7 +25,6 @@ class LLMType {
         this._name = name;
 
         this._description = null;
-        this._format = null;
         this._min = null;
         this._max = null;
 
@@ -156,24 +155,6 @@ 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.
      *
@@ -301,8 +282,7 @@ class LLMType {
     _baseSchema () {
         return /** @type {object} */ ({
             ...(this._description !== null && { description: this._description }),
-            ...(this._name !== null && { name: this._name }),
-            ...(this._format !== null && { format: this._format })
+            ...(this._name !== null && { name: this._name })
         });
     }
 

package/src/graphApi/schema.gql

@@ -123,18 +123,10 @@ 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/.claude/settings.local.json

@@ -1,11 +0,0 @@
-{
-  "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)"
-    ]
-  }
-}