@sprucelabs/sprucebot-llm 15.1.3 → 15.1.5

package/build/bots/adapters/AnthropicAdapter.js

@@ -66,7 +66,8 @@ class AnthropicAdapter {
                 type: this.isThinkingEnabled ? 'adaptive' : 'disabled',
             },
         }, sendOptions);
-        this.log?.info('Received response from Anthropic', JSON.stringify(response, null, 2));
+        const { usage } = response;
+        this.log?.info(`[TOKEN USAGE] input=${usage.input_tokens} cache_create=${usage.cache_creation_input_tokens ?? 0} cache_read=${usage.cache_read_input_tokens ?? 0} output=${usage.output_tokens}`);
         const text = response.content
             .filter((block) => block.type === 'text')
             ?.map((block) => block.text)

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

@@ -39,7 +39,7 @@ class AnthropicAdapter {
     }
     sendHandler(params, sendOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a, _b, _c, _d;
             const { messages: openAiMessages, model } = params;
             const messages = [];
             const cacheMarkerIdx = openAiMessages.findIndex((msg) => msg.cache_marker);
@@ -71,9 +71,10 @@ class AnthropicAdapter {
                     type: this.isThinkingEnabled ? 'adaptive' : 'disabled',
                 },
             }, sendOptions);
-            (_a = this.log) === null || _a === void 0 ? void 0 : _a.info('Received response from Anthropic', JSON.stringify(response, null, 2));
-            const text = (_b = response.content
-                .filter((block) => block.type === 'text')) === null || _b === void 0 ? void 0 : _b.map((block) => block.text).join('').trim();
+            const { usage } = response;
+            (_a = this.log) === null || _a === void 0 ? void 0 : _a.info(`[TOKEN USAGE] input=${usage.input_tokens} cache_create=${(_b = usage.cache_creation_input_tokens) !== null && _b !== void 0 ? _b : 0} cache_read=${(_c = usage.cache_read_input_tokens) !== null && _c !== void 0 ? _c : 0} output=${usage.output_tokens}`);
+            const text = (_d = response.content
+                .filter((block) => block.type === 'text')) === null || _d === void 0 ? void 0 : _d.map((block) => block.text).join('').trim();
             return text;
         });
     }

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.3",
+  "version": "15.1.5",
   "files": [
     "build"
   ],