@sprucelabs/sprucebot-llm 8.3.0 → 8.3.1

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

@@ -4,6 +4,7 @@ export default class ResponseParser {
     static setInstance(parser: ResponseParser): void;
     static getInstance(): ResponseParser;
     parse(response: string, callbacks?: LlmCallbackMap): Promise<ParsedResponse>;
+    private findFirstBadCallback;
     private invokeCallbackAndDropInLegacyResults;
     private doesIncludeDoneToken;
     private parseState;

package/build/esm/parsingResponses/ResponseParser.js

@@ -19,7 +19,7 @@ class ResponseParser {
     }
     parse(response, callbacks) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a;
             let message = response.replace(DONE_TOKEN, '').trim();
             let state;
             let callbackResults;
@@ -44,13 +44,12 @@ class ResponseParser {
                     message = message.replace(simpleMatches[0], '').trim();
                 }
             }
-            let extraMatches = message.match(new RegExp(`<<(.*)\/>>`, 'g'));
-            if (extraMatches && ((_b = extraMatches === null || extraMatches === void 0 ? void 0 : extraMatches.length) !== null && _b !== void 0 ? _b : 0) > 0) {
-                debugger;
+            const matchedCallback = this.findFirstBadCallback(message);
+            if (matchedCallback) {
                 throw new SpruceError({
                     code: 'INVALID_CALLBACK',
                     validCallbacks: Object.keys(callbacks !== null && callbacks !== void 0 ? callbacks : {}),
-                    matchedCallback: extraMatches[0],
+                    matchedCallback,
                 });
             }
             const { match, fullMatch } = this.parseState(message);
@@ -66,6 +65,12 @@ class ResponseParser {
             };
         });
     }
+    findFirstBadCallback(message) {
+        const simpleMatches = message.match(new RegExp(`<<(.*)\/>>`, 'g'));
+        const extraJsonMatches = message.match(new RegExp(`<<.*?>>(.*?)<<\/.*?>>`, 'gs'));
+        const matchedCallback = (extraJsonMatches === null || extraJsonMatches === void 0 ? void 0 : extraJsonMatches[0]) || (simpleMatches === null || simpleMatches === void 0 ? void 0 : simpleMatches[0]);
+        return matchedCallback;
+    }
     invokeCallbackAndDropInLegacyResults(callbacks, key, message) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;

package/build/parsingResponses/ResponseParser.d.ts

@@ -4,6 +4,7 @@ export default class ResponseParser {
     static setInstance(parser: ResponseParser): void;
     static getInstance(): ResponseParser;
     parse(response: string, callbacks?: LlmCallbackMap): Promise<ParsedResponse>;
+    private findFirstBadCallback;
     private invokeCallbackAndDropInLegacyResults;
     private doesIncludeDoneToken;
     private parseState;

package/build/parsingResponses/ResponseParser.js

@@ -38,13 +38,12 @@ class ResponseParser {
                 message = message.replace(simpleMatches[0], '').trim();
             }
         }
-        let extraMatches = message.match(new RegExp(`<<(.*)\/>>`, 'g'));
-        if (extraMatches && (extraMatches?.length ?? 0) > 0) {
-            debugger;
+        const matchedCallback = this.findFirstBadCallback(message);
+        if (matchedCallback) {
             throw new SpruceError_1.default({
                 code: 'INVALID_CALLBACK',
                 validCallbacks: Object.keys(callbacks ?? {}),
-                matchedCallback: extraMatches[0],
+                matchedCallback,
             });
         }
         const { match, fullMatch } = this.parseState(message);
@@ -59,6 +58,12 @@ class ResponseParser {
             callbackResults,
         };
     }
+    findFirstBadCallback(message) {
+        const simpleMatches = message.match(new RegExp(`<<(.*)\/>>`, 'g'));
+        const extraJsonMatches = message.match(new RegExp(`<<.*?>>(.*?)<<\/.*?>>`, 'gs'));
+        const matchedCallback = extraJsonMatches?.[0] || simpleMatches?.[0];
+        return matchedCallback;
+    }
     async invokeCallbackAndDropInLegacyResults(callbacks, key, message) {
         const v = await callbacks?.[key]?.cb();
         message = message.replace((0, renderPlaceholder_1.default)(key), v ?? '').trim();

package/package.json

@@ -9,7 +9,7 @@
       "@sprucelabs/spruce-test-fixtures"
     ]
   },
-  "version": "8.3.0",
+  "version": "8.3.1",
   "files": [
     "build"
   ],