@sprucelabs/sprucebot-llm 13.1.6 → 13.1.8

package/build/errors/SpruceError.js

@@ -14,7 +14,16 @@ class SpruceError extends error_1.default {
                 message = `You must create a bot and set it using 'SprucebotLlmFactory.setInstance(bot)' before you can get an instance of it.`;
                 break;
             case 'INVALID_CALLBACK':
-                message = `The callback you tried to invoke (${options.matchedCallback}) is not valid. If you are calling a valid callback, make sure the tag is closed correctly with />> or <</{tagname}>> depending on whether you are passing it arguments. Here is a list of valid callbacks for reference:\n${options.validCallbacks.map((name, idx) => `${idx + 1}: ${name}`).join('\n')}`;
+                message = `The callback you tried to invoke (${options.matchedCallback}) failed. Here are common reasons:
+
+1. The callback does not exist (see valid callbacks below).
+2. Syntax error in tags with no arguments. Make sure the callback is in the form of <<callbackName/>> (double << >> and closing forward slash / before the closing >>) and not <<callbackName>>.
+3. Syntax error in tags with arguments. Make sure the callback is in the form of <<callbackName>>{{JSON arguments}}<</callbackName>> and not <<callbackName>>{{JSON arguments}}<</callbackName> (missing closing >> in the opening tag).
+4. Syntax error in the JSON arguments. Make sure the JSON is valid and properly formatted.
+
+Valid callbacks:
+
+${options.validCallbacks.map((name, idx) => `${idx + 1}: ${name}`).join('\n')}`;
                 break;
             case 'CALLBACK_ERROR':
                 message =

package/build/esm/errors/SpruceError.js

@@ -9,7 +9,16 @@ export default class SpruceError extends BaseSpruceError {
                 message = `You must create a bot and set it using 'SprucebotLlmFactory.setInstance(bot)' before you can get an instance of it.`;
                 break;
             case 'INVALID_CALLBACK':
-                message = `The callback you tried to invoke (${options.matchedCallback}) is not valid. If you are calling a valid callback, make sure the tag is closed correctly with />> or <</{tagname}>> depending on whether you are passing it arguments. Here is a list of valid callbacks for reference:\n${options.validCallbacks.map((name, idx) => `${idx + 1}: ${name}`).join('\n')}`;
+                message = `The callback you tried to invoke (${options.matchedCallback}) failed. Here are common reasons:
+
+1. The callback does not exist (see valid callbacks below).
+2. Syntax error in tags with no arguments. Make sure the callback is in the form of <<callbackName/>> (double << >> and closing forward slash / before the closing >>) and not <<callbackName>>.
+3. Syntax error in tags with arguments. Make sure the callback is in the form of <<callbackName>>{{JSON arguments}}<</callbackName>> and not <<callbackName>>{{JSON arguments}}<</callbackName> (missing closing >> in the opening tag).
+4. Syntax error in the JSON arguments. Make sure the JSON is valid and properly formatted.
+
+Valid callbacks:
+
+${options.validCallbacks.map((name, idx) => `${idx + 1}: ${name}`).join('\n')}`;
                 break;
             case 'CALLBACK_ERROR':
                 message =

package/build/esm/parsingResponses/ResponseParser.js

@@ -92,6 +92,11 @@ class ResponseParser {
                     }
                 }
             }
+            const { match, regex } = this.parseState(message);
+            if (match && regex) {
+                message = message.replace(regex, '').trim();
+                state = JSON.parse(match);
+            }
             const matchedCallback = this.findFirstBadCallback(message);
             if (matchedCallback) {
                 throw new SpruceError({
@@ -100,11 +105,6 @@ class ResponseParser {
                     matchedCallback,
                 });
             }
-            const { match, regex } = this.parseState(message);
-            if (match && regex) {
-                message = message.replace(regex, '').trim();
-                state = JSON.parse(match);
-            }
             return {
                 isDone: this.doesIncludeDoneToken(response),
                 state,

package/build/parsingResponses/ResponseParser.js

@@ -75,6 +75,11 @@ class ResponseParser {
                 }
             }
         }
+        const { match, regex } = this.parseState(message);
+        if (match && regex) {
+            message = message.replace(regex, '').trim();
+            state = JSON.parse(match);
+        }
         const matchedCallback = this.findFirstBadCallback(message);
         if (matchedCallback) {
             throw new SpruceError_1.default({
@@ -83,11 +88,6 @@ class ResponseParser {
                 matchedCallback,
             });
         }
-        const { match, regex } = this.parseState(message);
-        if (match && regex) {
-            message = message.replace(regex, '').trim();
-            state = JSON.parse(match);
-        }
         return {
             isDone: this.doesIncludeDoneToken(response),
             state,

package/package.json

@@ -8,7 +8,7 @@
       "eta"
     ]
   },
-  "version": "13.1.6",
+  "version": "13.1.8",
   "files": [
     "build"
   ],