@sprucelabs/sprucebot-llm 8.1.4 → 8.3.0

package/build/.spruce/errors/errors.types.d.ts

@@ -11,3 +11,31 @@ export declare namespace SpruceErrors.SprucebotLlm {
     }
     type NoBotInstanceSetEntity = SchemaEntity<SpruceErrors.SprucebotLlm.NoBotInstanceSetSchema>;
 }
+export declare namespace SpruceErrors.SprucebotLlm {
+    interface InvalidCallback {
+        'validCallbacks': string[];
+        'matchedCallback': string;
+    }
+    interface InvalidCallbackSchema extends SpruceSchema.Schema {
+        id: 'invalidCallback';
+        namespace: 'SprucebotLlm';
+        name: 'Invalid callback';
+        fields: {
+            /** . */
+            'validCallbacks': {
+                type: 'text';
+                isRequired: true;
+                isArray: true;
+                minArrayLength: 0;
+                options: undefined;
+            };
+            /** . */
+            'matchedCallback': {
+                type: 'text';
+                isRequired: true;
+                options: undefined;
+            };
+        };
+    }
+    type InvalidCallbackEntity = SchemaEntity<SpruceErrors.SprucebotLlm.InvalidCallbackSchema>;
+}

package/build/.spruce/errors/options.types.d.ts

@@ -3,5 +3,8 @@ import { ErrorOptions as ISpruceErrorOptions } from "@sprucelabs/error";
 export interface NoBotInstanceSetErrorOptions extends SpruceErrors.SprucebotLlm.NoBotInstanceSet, ISpruceErrorOptions {
     code: 'NO_BOT_INSTANCE_SET';
 }
-type ErrorOptions = NoBotInstanceSetErrorOptions;
+export interface InvalidCallbackErrorOptions extends SpruceErrors.SprucebotLlm.InvalidCallback, ISpruceErrorOptions {
+    code: 'INVALID_CALLBACK';
+}
+type ErrorOptions = NoBotInstanceSetErrorOptions | InvalidCallbackErrorOptions;
 export default ErrorOptions;

package/build/.spruce/errors/sprucebotLlm/invalidCallback.schema.d.ts

@@ -0,0 +1,3 @@
+import { SpruceErrors } from '../errors.types';
+declare const invalidCallbackSchema: SpruceErrors.SprucebotLlm.InvalidCallbackSchema;
+export default invalidCallbackSchema;

package/build/.spruce/errors/sprucebotLlm/invalidCallback.schema.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const schema_1 = require("@sprucelabs/schema");
+const invalidCallbackSchema = {
+    id: 'invalidCallback',
+    namespace: 'SprucebotLlm',
+    name: 'Invalid callback',
+    fields: {
+        /** . */
+        'validCallbacks': {
+            type: 'text',
+            isRequired: true,
+            isArray: true,
+            minArrayLength: 0,
+            options: undefined
+        },
+        /** . */
+        'matchedCallback': {
+            type: 'text',
+            isRequired: true,
+            options: undefined
+        },
+    }
+};
+schema_1.SchemaRegistry.getInstance().trackSchema(invalidCallbackSchema);
+exports.default = invalidCallbackSchema;

package/build/errors/SpruceError.js

@@ -13,6 +13,9 @@ class SpruceError extends error_1.default {
             case 'NO_BOT_INSTANCE_SET':
                 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. Valid callbacks are:\n${options.validCallbacks.map((name, idx) => `${idx + 1}: ${name}`).join('\n')}`;
+                break;
             default:
                 message = super.friendlyMessage();
         }

package/build/errors/invalidCallback.builder.d.ts

@@ -0,0 +1,17 @@
+declare const _default: {
+    id: string;
+    name: string;
+    fields: {
+        validCallbacks: {
+            type: "text";
+            isRequired: true;
+            isArray: true;
+            minArrayLength: number;
+        };
+        matchedCallback: {
+            type: "text";
+            isRequired: true;
+        };
+    };
+};
+export default _default;

package/build/errors/invalidCallback.builder.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const schema_1 = require("@sprucelabs/schema");
+exports.default = (0, schema_1.buildErrorSchema)({
+    id: 'invalidCallback',
+    name: 'Invalid callback',
+    fields: {
+        validCallbacks: {
+            type: 'text',
+            isRequired: true,
+            isArray: true,
+            minArrayLength: 0,
+        },
+        matchedCallback: {
+            type: 'text',
+            isRequired: true,
+        },
+    },
+});

package/build/esm/.spruce/errors/errors.types.d.ts

@@ -11,3 +11,31 @@ export declare namespace SpruceErrors.SprucebotLlm {
     }
     type NoBotInstanceSetEntity = SchemaEntity<SpruceErrors.SprucebotLlm.NoBotInstanceSetSchema>;
 }
+export declare namespace SpruceErrors.SprucebotLlm {
+    interface InvalidCallback {
+        'validCallbacks': string[];
+        'matchedCallback': string;
+    }
+    interface InvalidCallbackSchema extends SpruceSchema.Schema {
+        id: 'invalidCallback';
+        namespace: 'SprucebotLlm';
+        name: 'Invalid callback';
+        fields: {
+            /** . */
+            'validCallbacks': {
+                type: 'text';
+                isRequired: true;
+                isArray: true;
+                minArrayLength: 0;
+                options: undefined;
+            };
+            /** . */
+            'matchedCallback': {
+                type: 'text';
+                isRequired: true;
+                options: undefined;
+            };
+        };
+    }
+    type InvalidCallbackEntity = SchemaEntity<SpruceErrors.SprucebotLlm.InvalidCallbackSchema>;
+}

package/build/esm/.spruce/errors/options.types.d.ts

@@ -3,5 +3,8 @@ import { ErrorOptions as ISpruceErrorOptions } from "@sprucelabs/error";
 export interface NoBotInstanceSetErrorOptions extends SpruceErrors.SprucebotLlm.NoBotInstanceSet, ISpruceErrorOptions {
     code: 'NO_BOT_INSTANCE_SET';
 }
-type ErrorOptions = NoBotInstanceSetErrorOptions;
+export interface InvalidCallbackErrorOptions extends SpruceErrors.SprucebotLlm.InvalidCallback, ISpruceErrorOptions {
+    code: 'INVALID_CALLBACK';
+}
+type ErrorOptions = NoBotInstanceSetErrorOptions | InvalidCallbackErrorOptions;
 export default ErrorOptions;

package/build/esm/errors/SpruceError.js

@@ -8,6 +8,9 @@ export default class SpruceError extends BaseSpruceError {
             case 'NO_BOT_INSTANCE_SET':
                 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. Valid callbacks are:\n${options.validCallbacks.map((name, idx) => `${idx + 1}: ${name}`).join('\n')}`;
+                break;
             default:
                 message = super.friendlyMessage();
         }

package/build/esm/errors/invalidCallback.builder.d.ts

@@ -0,0 +1,17 @@
+declare const _default: {
+    id: string;
+    name: string;
+    fields: {
+        validCallbacks: {
+            type: "text";
+            isRequired: true;
+            isArray: true;
+            minArrayLength: number;
+        };
+        matchedCallback: {
+            type: "text";
+            isRequired: true;
+        };
+    };
+};
+export default _default;

package/build/esm/errors/invalidCallback.builder.js

@@ -0,0 +1,17 @@
+import { buildErrorSchema } from '@sprucelabs/schema';
+export default buildErrorSchema({
+    id: 'invalidCallback',
+    name: 'Invalid callback',
+    fields: {
+        validCallbacks: {
+            type: 'text',
+            isRequired: true,
+            isArray: true,
+            minArrayLength: 0,
+        },
+        matchedCallback: {
+            type: 'text',
+            isRequired: true,
+        },
+    },
+});

package/build/esm/index.d.ts

@@ -3,3 +3,4 @@ export { default as SprucebotLlmBotImpl } from './bots/SprucebotLlmBotImpl';
 export { default as SprucebotLlmSkillImpl } from './bots/SprucebotLlmSkillImpl';
 export { OpenAiAdapter } from './bots/adapters/OpenAi';
 export * from './llm.types';
+export { default as SprucebotLlmError } from './errors/SpruceError';

package/build/esm/index.js

@@ -3,3 +3,4 @@ export { default as SprucebotLlmBotImpl } from './bots/SprucebotLlmBotImpl.js';
 export { default as SprucebotLlmSkillImpl } from './bots/SprucebotLlmSkillImpl.js';
 export { OpenAiAdapter } from './bots/adapters/OpenAi.js';
 export * from './llm.types.js';
+export { default as SprucebotLlmError } from './errors/SpruceError.js';

package/build/esm/parsingResponses/ResponseParser.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { DONE_TOKEN, STATE_BOUNDARY } from '../bots/templates.js';
+import SpruceError from '../errors/SpruceError.js';
 import renderLegacyPlaceholder from './renderPlaceholder.js';
 class ResponseParser {
     static setInstance(parser) {
@@ -18,7 +19,7 @@ class ResponseParser {
     }
     parse(response, callbacks) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b;
             let message = response.replace(DONE_TOKEN, '').trim();
             let state;
             let callbackResults;
@@ -43,6 +44,15 @@ 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;
+                throw new SpruceError({
+                    code: 'INVALID_CALLBACK',
+                    validCallbacks: Object.keys(callbacks !== null && callbacks !== void 0 ? callbacks : {}),
+                    matchedCallback: extraMatches[0],
+                });
+            }
             const { match, fullMatch } = this.parseState(message);
             if (match && fullMatch) {
                 message = message.replace(fullMatch, '').trim();

package/build/index.d.ts

@@ -3,3 +3,4 @@ export { default as SprucebotLlmBotImpl } from './bots/SprucebotLlmBotImpl';
 export { default as SprucebotLlmSkillImpl } from './bots/SprucebotLlmSkillImpl';
 export { OpenAiAdapter } from './bots/adapters/OpenAi';
 export * from './llm.types';
+export { default as SprucebotLlmError } from './errors/SpruceError';

package/build/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpenAiAdapter = exports.SprucebotLlmSkillImpl = exports.SprucebotLlmBotImpl = exports.SprucebotLlmFactory = void 0;
+exports.SprucebotLlmError = exports.OpenAiAdapter = exports.SprucebotLlmSkillImpl = exports.SprucebotLlmBotImpl = exports.SprucebotLlmFactory = void 0;
 var SprucebotLlmFactory_1 = require("./bots/SprucebotLlmFactory");
 Object.defineProperty(exports, "SprucebotLlmFactory", { enumerable: true, get: function () { return __importDefault(SprucebotLlmFactory_1).default; } });
 var SprucebotLlmBotImpl_1 = require("./bots/SprucebotLlmBotImpl");
@@ -27,3 +27,5 @@ Object.defineProperty(exports, "SprucebotLlmSkillImpl", { enumerable: true, get:
 var OpenAi_1 = require("./bots/adapters/OpenAi");
 Object.defineProperty(exports, "OpenAiAdapter", { enumerable: true, get: function () { return OpenAi_1.OpenAiAdapter; } });
 __exportStar(require("./llm.types"), exports);
+var SpruceError_1 = require("./errors/SpruceError");
+Object.defineProperty(exports, "SprucebotLlmError", { enumerable: true, get: function () { return __importDefault(SpruceError_1).default; } });

package/build/parsingResponses/ResponseParser.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const templates_1 = require("../bots/templates");
+const SpruceError_1 = __importDefault(require("../errors/SpruceError"));
 const renderPlaceholder_1 = __importDefault(require("./renderPlaceholder"));
 class ResponseParser {
     static setInstance(parser) {
@@ -37,6 +38,15 @@ class ResponseParser {
                 message = message.replace(simpleMatches[0], '').trim();
             }
         }
+        let extraMatches = message.match(new RegExp(`<<(.*)\/>>`, 'g'));
+        if (extraMatches && (extraMatches?.length ?? 0) > 0) {
+            debugger;
+            throw new SpruceError_1.default({
+                code: 'INVALID_CALLBACK',
+                validCallbacks: Object.keys(callbacks ?? {}),
+                matchedCallback: extraMatches[0],
+            });
+        }
         const { match, fullMatch } = this.parseState(message);
         if (match && fullMatch) {
             message = message.replace(fullMatch, '').trim();

package/package.json

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