@sprucelabs/sprucebot-llm 15.1.11 → 15.1.12

package/build/bots/adapters/MessageBuilder.d.ts

@@ -13,6 +13,7 @@ export default class MessageBuilder {
     private shouldRememberImages;
     private buildFirstMessage;
     private buildSkillMessages;
+    private buildFunctionSyntaxMessage;
     private buildCallbacksMessage;
     private buildPleaseKeepInMindMessage;
     private buildStateMessage;

package/build/bots/adapters/MessageBuilder.js

@@ -102,6 +102,9 @@ class MessageBuilder {
         }
         const messages = [];
         messages.push(this.buildYourJobMessage(skill.yourJobIfYouChooseToAcceptItIs));
+        if (skill.callbacks || skill.state || skill.stateSchema) {
+            messages.push(this.buildFunctionSyntaxMessage());
+        }
         if (skill.stateSchema) {
             messages.push(this.buildStateSchemaMessage(skill.stateSchema));
         }
@@ -120,6 +123,12 @@ class MessageBuilder {
         }
         return messages;
     }
+    buildFunctionSyntaxMessage() {
+        return {
+            role: 'system',
+            content: `Throughout this conversation, all function calls and state updates use JavaScript-style syntax: @functionName({ "key": "value" }). The function name follows the @ symbol, and the single argument is a JSON object wrapped in parentheses. All JSON must be on a single line.`,
+        };
+    }
     buildCallbacksMessage(callbacks) {
         const keys = Object.keys(callbacks);
         const descriptions = [];

package/build/esm/bots/adapters/MessageBuilder.d.ts

@@ -13,6 +13,7 @@ export default class MessageBuilder {
     private shouldRememberImages;
     private buildFirstMessage;
     private buildSkillMessages;
+    private buildFunctionSyntaxMessage;
     private buildCallbacksMessage;
     private buildPleaseKeepInMindMessage;
     private buildStateMessage;

package/build/esm/bots/adapters/MessageBuilder.js

@@ -98,6 +98,9 @@ export default class MessageBuilder {
         }
         const messages = [];
         messages.push(this.buildYourJobMessage(skill.yourJobIfYouChooseToAcceptItIs));
+        if (skill.callbacks || skill.state || skill.stateSchema) {
+            messages.push(this.buildFunctionSyntaxMessage());
+        }
         if (skill.stateSchema) {
             messages.push(this.buildStateSchemaMessage(skill.stateSchema));
         }
@@ -116,6 +119,12 @@ export default class MessageBuilder {
         }
         return messages;
     }
+    buildFunctionSyntaxMessage() {
+        return {
+            role: 'system',
+            content: `Throughout this conversation, all function calls and state updates use JavaScript-style syntax: @functionName({ "key": "value" }). The function name follows the @ symbol, and the single argument is a JSON object wrapped in parentheses. All JSON must be on a single line.`,
+        };
+    }
     buildCallbacksMessage(callbacks) {
         const keys = Object.keys(callbacks);
         const descriptions = [];

package/build/esm/parsingResponses/ResponseParserV2.js

@@ -15,9 +15,8 @@ export default class ResponseParserV2 {
             let message = response.replace(DONE_TOKEN, '').trim();
             let state = undefined;
             let callbackResults = undefined;
-            const hasCallbacks = message.includes('@callback') ||
-                (callbacks != null &&
-                    Object.keys(callbacks).some((name) => message.includes(`@${name}`)));
+            const hasCallbacks = callbacks != null &&
+                Object.keys(callbacks).some((name) => message.includes(`@${name}(`));
             if (hasCallbacks) {
                 const { callbackResults: c, message: m } = yield this.invokeCallbacks(message, callbacks);
                 callbackResults = c;
@@ -26,7 +25,7 @@ export default class ResponseParserV2 {
             const hasState = response.includes('@updateState');
             if (hasState && message) {
                 const stateMatches = [
-                    ...message.matchAll(/@updateState\s+({[\s\S]*?})\n?/g),
+                    ...message.matchAll(/@updateState\(({[\s\S]*?})\)\n?/g),
                 ];
                 for (const stateMatch of stateMatches) {
                     try {
@@ -57,17 +56,16 @@ export default class ResponseParserV2 {
             let callbackStrippedMessage = message;
             let callbackResults = '';
             const reserved = new Set(['updateState', 'results']);
-            const matches = [...message.matchAll(/^@(\w+)\s+({.*})$/gm)];
+            const matches = [...message.matchAll(/^@(\w+)\(({.*})\)$/gm)];
             for (const match of matches) {
                 if (reserved.has(match[1])) {
                     continue;
                 }
                 const parsed = JSON.parse(match[2]);
-                const isCanonical = match[1] === 'callback';
-                const name = isCanonical ? parsed.name : match[1];
-                const options = isCanonical ? parsed.options : parsed;
+                const name = match[1];
+                const options = parsed;
                 const callback = callbacks === null || callbacks === void 0 ? void 0 : callbacks[name];
-                if (!isCanonical && !callback) {
+                if (!callback) {
                     continue;
                 }
                 const parts = callbackStrippedMessage.split(match[0]);
@@ -103,32 +101,31 @@ export default class ResponseParserV2 {
     }
     getStateUpdateInstructions() {
         return `Updating state works similar to all function calls. Use the following syntax:
-@updateState { "field1": "value1", "field2": "value2" }
+@updateState({ "field1": "value1", "field2": "value2" })
 Make sure to json encode only the fields you want to change. You can update state once and do it at the end of any messages you send. IMPORTANT: JSON must be on a single line. Do NOT use multi-line or formatted JSON.
 Your user-facing message is always sent to the user, even if @updateState fails. If @updateState fails later, do not repeat the same message. Only send the specific @updateState needed to fix the missing state change.
 Good example:
-@updateState { "favoriteColor": "blue", "firstName": "Taylor" }
+@updateState({ "favoriteColor": "blue", "firstName": "Taylor" })
 Bad examples:
 @updateState
 { "favoriteColor": "blue" }
-@updateState {
+@updateState({
   "favoriteColor": "blue"
-}
-@updateState { favoriteColor: "blue" }`;
+})
+@updateState({ favoriteColor: "blue" })`;
     }
     getFunctionCallInstructions() {
         return `A function call is done using the following syntax:
-@callback { "name": "callbackName", "options": {} }
-Make sure to json encode the options and include the name of the callback you want to call. You can call as many callbacks as you want in a single response by including multiple @callback lines. IMPORTANT: JSON must be on a single line. Do NOT use multi-line or formatted JSON. Also, do NOT call something like @myCallback. You would call it like this: @callback { "name": "myCallback", "options": {} }
+@callbackName({ "key": "value" })
+Make sure to json encode the options. You can call as many callbacks as you want in a single response by including multiple @functionName() lines. IMPORTANT: JSON must be on a single line. Do NOT use multi-line or formatted JSON.
 Your user-facing message is always sent to the user, even if a callback fails. Successful callbacks have already run successfully. If a callback fails later, do not repeat the same message and do not repeat successful callbacks. Only call the specific callback needed to fix the failed gap.
 Good example:
-@callback { "name": "lookupWeather", "options": { "zip": "80524" } }
+@lookupWeather({ "zip": "80524" })
 Bad examples:
 @lookupWeather { "zip": "80524" }
-@callback
-{ "name": "lookupWeather", "options": { "zip": "80524" } }
-@callback { "name": "lookupWeather", "options": {
-  "zip": "80524"
-} }`;
+@lookupWeather(
+{ "zip": "80524" }
+)
+@lookupWeather({ zip: "80524" })`;
     }
 }

package/build/parsingResponses/ResponseParserV2.js

@@ -10,9 +10,8 @@ class ResponseParserV2 {
         let message = response.replace(templates_1.DONE_TOKEN, '').trim();
         let state = undefined;
         let callbackResults = undefined;
-        const hasCallbacks = message.includes('@callback') ||
-            (callbacks != null &&
-                Object.keys(callbacks).some((name) => message.includes(`@${name}`)));
+        const hasCallbacks = callbacks != null &&
+            Object.keys(callbacks).some((name) => message.includes(`@${name}(`));
         if (hasCallbacks) {
             const { callbackResults: c, message: m } = await this.invokeCallbacks(message, callbacks);
             callbackResults = c;
@@ -21,7 +20,7 @@ class ResponseParserV2 {
         const hasState = response.includes('@updateState');
         if (hasState && message) {
             const stateMatches = [
-                ...message.matchAll(/@updateState\s+({[\s\S]*?})\n?/g),
+                ...message.matchAll(/@updateState\(({[\s\S]*?})\)\n?/g),
             ];
             for (const stateMatch of stateMatches) {
                 try {
@@ -50,17 +49,16 @@ class ResponseParserV2 {
         let callbackStrippedMessage = message;
         let callbackResults = '';
         const reserved = new Set(['updateState', 'results']);
-        const matches = [...message.matchAll(/^@(\w+)\s+({.*})$/gm)];
+        const matches = [...message.matchAll(/^@(\w+)\(({.*})\)$/gm)];
         for (const match of matches) {
             if (reserved.has(match[1])) {
                 continue;
             }
             const parsed = JSON.parse(match[2]);
-            const isCanonical = match[1] === 'callback';
-            const name = isCanonical ? parsed.name : match[1];
-            const options = isCanonical ? parsed.options : parsed;
+            const name = match[1];
+            const options = parsed;
             const callback = callbacks?.[name];
-            if (!isCanonical && !callback) {
+            if (!callback) {
                 continue;
             }
             const parts = callbackStrippedMessage.split(match[0]);
@@ -95,33 +93,32 @@ class ResponseParserV2 {
     }
     getStateUpdateInstructions() {
         return `Updating state works similar to all function calls. Use the following syntax:
-@updateState { "field1": "value1", "field2": "value2" }
+@updateState({ "field1": "value1", "field2": "value2" })
 Make sure to json encode only the fields you want to change. You can update state once and do it at the end of any messages you send. IMPORTANT: JSON must be on a single line. Do NOT use multi-line or formatted JSON.
 Your user-facing message is always sent to the user, even if @updateState fails. If @updateState fails later, do not repeat the same message. Only send the specific @updateState needed to fix the missing state change.
 Good example:
-@updateState { "favoriteColor": "blue", "firstName": "Taylor" }
+@updateState({ "favoriteColor": "blue", "firstName": "Taylor" })
 Bad examples:
 @updateState
 { "favoriteColor": "blue" }
-@updateState {
+@updateState({
   "favoriteColor": "blue"
-}
-@updateState { favoriteColor: "blue" }`;
+})
+@updateState({ favoriteColor: "blue" })`;
     }
     getFunctionCallInstructions() {
         return `A function call is done using the following syntax:
-@callback { "name": "callbackName", "options": {} }
-Make sure to json encode the options and include the name of the callback you want to call. You can call as many callbacks as you want in a single response by including multiple @callback lines. IMPORTANT: JSON must be on a single line. Do NOT use multi-line or formatted JSON. Also, do NOT call something like @myCallback. You would call it like this: @callback { "name": "myCallback", "options": {} }
+@callbackName({ "key": "value" })
+Make sure to json encode the options. You can call as many callbacks as you want in a single response by including multiple @functionName() lines. IMPORTANT: JSON must be on a single line. Do NOT use multi-line or formatted JSON.
 Your user-facing message is always sent to the user, even if a callback fails. Successful callbacks have already run successfully. If a callback fails later, do not repeat the same message and do not repeat successful callbacks. Only call the specific callback needed to fix the failed gap.
 Good example:
-@callback { "name": "lookupWeather", "options": { "zip": "80524" } }
+@lookupWeather({ "zip": "80524" })
 Bad examples:
 @lookupWeather { "zip": "80524" }
-@callback
-{ "name": "lookupWeather", "options": { "zip": "80524" } }
-@callback { "name": "lookupWeather", "options": {
-  "zip": "80524"
-} }`;
+@lookupWeather(
+{ "zip": "80524" }
+)
+@lookupWeather({ zip: "80524" })`;
     }
 }
 exports.default = ResponseParserV2;

package/package.json

@@ -8,7 +8,7 @@
       "eta"
     ]
   },
-  "version": "15.1.11",
+  "version": "15.1.12",
   "files": [
     "build"
   ],