@sprucelabs/sprucebot-llm 15.1.4 → 15.1.6

package/README.md

@@ -362,16 +362,21 @@ const skill = bots.Skill({
 ```
 
 #### Callback invocation format
-When using the `OpenAiAdapter`, the model is instructed to call callbacks using one of these formats:
+The model is instructed to invoke callbacks using the following syntax (V2 format):
 
 ```text
-<<functionName/>>
-<<functionName>>{"param":"value"}<</functionName>>
+@callback { "name": "callbackName", "options": {} }
 ```
 
-Only one callback invocation per model response is supported. Callbacks can return either a `string` or an image message shaped like `{ imageBase64, imageDescription }` (see the "Sending images" section below).
+Multiple callbacks can be included in a single response, one per line. JSON must be on a single line — do not use multi-line or formatted JSON.
 
-Legacy placeholder format (`xxxxx callbackName xxxxx`) is still supported by the response parser for older prompt templates.
+As a shorthand, you can also invoke a named callback directly:
+
+```text
+@myCallback { "param": "value" }
+```
+
+Callbacks can return either a `string` or an image message shaped like `{ imageBase64, imageDescription }` (see the "Sending images" section below).
 
 Callback parameters can include basic types (e.g. `text`, `number`, `boolean`, `dateMs`, `dateTimeMs`) and `select` fields with choices from `@sprucelabs/schema`.
 

package/build/esm/parsingResponses/ResponseParserV2.d.ts

@@ -6,3 +6,4 @@ export default class ResponseParserV2 implements ResponseParser {
     getStateUpdateInstructions(): string;
     getFunctionCallInstructions(): string;
 }
+export type ParserCallbackStyle = '@callback' | '@functionCall';

package/build/esm/parsingResponses/ResponseParserV2.js

@@ -15,7 +15,9 @@ export default class ResponseParserV2 {
             let message = response.replace(DONE_TOKEN, '').trim();
             let state = undefined;
             let callbackResults = undefined;
-            const hasCallbacks = message.includes('@callback');
+            const hasCallbacks = message.includes('@callback') ||
+                (callbacks != null &&
+                    Object.keys(callbacks).some((name) => message.includes(`@${name}`)));
             if (hasCallbacks) {
                 const { callbackResults: c, message: m } = yield this.invokeCallbacks(message, callbacks);
                 callbackResults = c;
@@ -52,28 +54,31 @@ export default class ResponseParserV2 {
         return __awaiter(this, void 0, void 0, function* () {
             let callbackStrippedMessage = message;
             let callbackResults = '';
-            const matches = [...message.matchAll(/^@callback\s+({.*})$/gm)];
+            const reserved = new Set(['updateState', 'results']);
+            const matches = [...message.matchAll(/^@(\w+)\s+({.*})$/gm)];
             for (const match of matches) {
-                const callbackData = match && match[1] ? JSON.parse(match[1]) : null;
-                const { name, options } = callbackData || {};
-                debugger;
-                if (match) {
-                    const parts = callbackStrippedMessage.split(match[0]);
-                    callbackStrippedMessage = parts
-                        .map((s) => s.trim())
-                        .join('')
-                        .trim();
+                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 callback = callbacks === null || callbacks === void 0 ? void 0 : callbacks[name];
+                if (!isCanonical && !callback) {
+                    continue;
+                }
+                const parts = callbackStrippedMessage.split(match[0]);
+                callbackStrippedMessage = parts
+                    .map((s) => s.trim())
+                    .join('')
+                    .trim();
                 try {
-                    const callback = callbacks === null || callbacks === void 0 ? void 0 : callbacks[name];
                     if (callback === null || callback === void 0 ? void 0 : callback.parameters) {
                         validateAndNormalizeCallbackOptions(callback.parameters, options);
                     }
                     const results = yield (callback === null || callback === void 0 ? void 0 : callback.cb(options));
-                    callbackResults += this.renderCallbackResults({
-                        name,
-                        results,
-                    });
+                    callbackResults += this.renderCallbackResults({ name, results });
                 }
                 catch (err) {
                     callbackResults += this.renderCallbackResults({

package/build/parsingResponses/ResponseParserV2.d.ts

@@ -6,3 +6,4 @@ export default class ResponseParserV2 implements ResponseParser {
     getStateUpdateInstructions(): string;
     getFunctionCallInstructions(): string;
 }
+export type ParserCallbackStyle = '@callback' | '@functionCall';

package/build/parsingResponses/ResponseParserV2.js

@@ -10,7 +10,9 @@ class ResponseParserV2 {
         let message = response.replace(templates_1.DONE_TOKEN, '').trim();
         let state = undefined;
         let callbackResults = undefined;
-        const hasCallbacks = message.includes('@callback');
+        const hasCallbacks = message.includes('@callback') ||
+            (callbacks != null &&
+                Object.keys(callbacks).some((name) => message.includes(`@${name}`)));
         if (hasCallbacks) {
             const { callbackResults: c, message: m } = await this.invokeCallbacks(message, callbacks);
             callbackResults = c;
@@ -45,28 +47,31 @@ class ResponseParserV2 {
     async invokeCallbacks(message, callbacks) {
         let callbackStrippedMessage = message;
         let callbackResults = '';
-        const matches = [...message.matchAll(/^@callback\s+({.*})$/gm)];
+        const reserved = new Set(['updateState', 'results']);
+        const matches = [...message.matchAll(/^@(\w+)\s+({.*})$/gm)];
         for (const match of matches) {
-            const callbackData = match && match[1] ? JSON.parse(match[1]) : null;
-            const { name, options } = callbackData || {};
-            debugger;
-            if (match) {
-                const parts = callbackStrippedMessage.split(match[0]);
-                callbackStrippedMessage = parts
-                    .map((s) => s.trim())
-                    .join('')
-                    .trim();
+            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 callback = callbacks?.[name];
+            if (!isCanonical && !callback) {
+                continue;
+            }
+            const parts = callbackStrippedMessage.split(match[0]);
+            callbackStrippedMessage = parts
+                .map((s) => s.trim())
+                .join('')
+                .trim();
             try {
-                const callback = callbacks?.[name];
                 if (callback?.parameters) {
                     (0, validateAndNormalizeCallbackOptions_1.default)(callback.parameters, options);
                 }
                 const results = await callback?.cb(options);
-                callbackResults += this.renderCallbackResults({
-                    name,
-                    results,
-                });
+                callbackResults += this.renderCallbackResults({ name, results });
             }
             catch (err) {
                 callbackResults += this.renderCallbackResults({

package/package.json

@@ -8,7 +8,7 @@
       "eta"
     ]
   },
-  "version": "15.1.4",
+  "version": "15.1.6",
   "files": [
     "build"
   ],