@sprucelabs/sprucebot-llm 5.0.6 → 5.0.7

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

@@ -1,5 +1,5 @@
-import { ErrorOptions as ISpruceErrorOptions } from '@sprucelabs/error';
-import { SpruceErrors } from './errors.types';
+import { SpruceErrors } from "./errors.types";
+import { ErrorOptions as ISpruceErrorOptions } from "@sprucelabs/error";
 export interface NoBotInstanceSetErrorOptions extends SpruceErrors.SprucebotLlm.NoBotInstanceSet, ISpruceErrorOptions {
     code: 'NO_BOT_INSTANCE_SET';
 }

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

@@ -5,7 +5,7 @@ const noBotInstanceSetSchema = {
     id: 'noBotInstanceSet',
     namespace: 'SprucebotLlm',
     name: 'No bot instance set',
-    fields: {},
+    fields: {}
 };
 schema_1.SchemaRegistry.getInstance().trackSchema(noBotInstanceSetSchema);
 exports.default = noBotInstanceSetSchema;

package/build/.spruce/schemas/fields/fields.types.d.ts

@@ -1 +1 @@
-export { FieldDefinitions, FieldDefinitionMap, FieldValueTypeGeneratorMap, FieldMap, } from '@sprucelabs/schema';
+export { FieldDefinitions, FieldDefinitionMap, FieldValueTypeGeneratorMap, FieldMap } from '@sprucelabs/schema';

package/build/bots/PromptGenerator.js

@@ -5,20 +5,19 @@ const schema_1 = require("@sprucelabs/schema");
 const eta_1 = require("eta");
 const templates_1 = require("./templates");
 class PromptGenerator {
-    bot;
-    eta = new eta_1.Eta();
-    log = process.env.SHOULD_LOG_GENERATED_PROMPTS === 'true'
-        ? console.info
-        : () => { };
-    static Class;
-    promptTemplate;
     constructor(bot, options) {
+        var _a;
+        this.eta = new eta_1.Eta();
+        this.log = process.env.SHOULD_LOG_GENERATED_PROMPTS === 'true'
+            ? console.info
+            : () => { };
         (0, schema_1.assertOptions)({ bot }, ['bot']);
         this.bot = bot;
-        this.promptTemplate = options?.promptTemplate ?? templates_1.PROMPT_TEMPLATE;
+        this.promptTemplate = (_a = options === null || options === void 0 ? void 0 : options.promptTemplate) !== null && _a !== void 0 ? _a : templates_1.PROMPT_TEMPLATE;
     }
     static Generator(bot, options) {
-        return new (this.Class ?? PromptGenerator)(bot, options);
+        var _a;
+        return new ((_a = this.Class) !== null && _a !== void 0 ? _a : PromptGenerator)(bot, options);
     }
     async generate() {
         const { stateSchema, state, ...rest } = this.bot.serialize();
@@ -38,7 +37,7 @@ class PromptGenerator {
                 stateJson: null,
             };
         }
-        const normalizedState = (0, schema_1.normalizeSchemaValues)(stateSchema, state ?? {}, {});
+        const normalizedState = (0, schema_1.normalizeSchemaValues)(stateSchema, state !== null && state !== void 0 ? state : {}, {});
         setUndefinedToNull(normalizedState);
         const stateSchemaJson = JSON.stringify(stateSchema);
         const stateJson = JSON.stringify(normalizedState);

package/build/bots/SprucebotLlmBotImpl.js

@@ -8,17 +8,11 @@ const schema_1 = require("@sprucelabs/schema");
 const llm_types_1 = require("../llm.types");
 const ResponseParser_1 = __importDefault(require("../parsingResponses/ResponseParser"));
 class SprucebotLlmBotImpl extends mercury_event_emitter_1.AbstractEventEmitter {
-    static messageMemoryLimit = 10;
-    adapter;
-    youAre;
-    stateSchema;
-    state;
-    isDone = false;
-    messages = [];
-    skill;
     constructor(options) {
         const { adapter, youAre, stateSchema, state, skill } = options;
         super(llm_types_1.llmEventContract);
+        this.isDone = false;
+        this.messages = [];
         this.adapter = adapter;
         this.youAre = youAre;
         this.stateSchema = stateSchema;
@@ -40,34 +34,36 @@ class SprucebotLlmBotImpl extends mercury_event_emitter_1.AbstractEventEmitter {
         return this.isDone;
     }
     serialize() {
-        const skill = this.skill?.serialize();
+        var _a, _b, _c;
+        const skill = (_a = this.skill) === null || _a === void 0 ? void 0 : _a.serialize();
         return {
             youAre: this.youAre,
-            stateSchema: this.stateSchema ?? skill?.stateSchema,
-            state: this.state ?? skill?.state,
+            stateSchema: (_b = this.stateSchema) !== null && _b !== void 0 ? _b : skill === null || skill === void 0 ? void 0 : skill.stateSchema,
+            state: (_c = this.state) !== null && _c !== void 0 ? _c : skill === null || skill === void 0 ? void 0 : skill.state,
             messages: this.messages,
             skill,
         };
     }
     async sendMessage(message) {
+        var _a, _b;
         (0, schema_1.assertOptions)({ message }, ['message']);
         this.trackMessage({
             from: 'Me',
             message,
         });
-        const serializedSkill = this.skill?.serialize();
+        const serializedSkill = (_a = this.skill) === null || _a === void 0 ? void 0 : _a.serialize();
         const response = await this.adapter.sendMessage(this, {
-            model: serializedSkill?.model,
-            promptTemplate: serializedSkill?.promptTemplate,
+            model: serializedSkill === null || serializedSkill === void 0 ? void 0 : serializedSkill.model,
+            promptTemplate: serializedSkill === null || serializedSkill === void 0 ? void 0 : serializedSkill.promptTemplate,
         });
         const parser = ResponseParser_1.default.getInstance();
-        const { isDone, message: parsedResponse, state, } = await parser.parse(response, serializedSkill?.callbacks);
+        const { isDone, message: parsedResponse, state, } = await parser.parse(response, serializedSkill === null || serializedSkill === void 0 ? void 0 : serializedSkill.callbacks);
         this.isDone = isDone;
         if (this.stateSchema && state) {
             await this.updateState(state);
         }
         else if (state) {
-            await this.skill?.updateState(state);
+            await ((_b = this.skill) === null || _b === void 0 ? void 0 : _b.updateState(state));
         }
         this.trackMessage({
             from: 'You',
@@ -90,4 +86,5 @@ class SprucebotLlmBotImpl extends mercury_event_emitter_1.AbstractEventEmitter {
         this.isDone = false;
     }
 }
+SprucebotLlmBotImpl.messageMemoryLimit = 10;
 exports.default = SprucebotLlmBotImpl;

package/build/bots/SprucebotLlmFactory.js

@@ -8,20 +8,16 @@ const SpruceError_1 = __importDefault(require("../errors/SpruceError"));
 const SprucebotLlmBotImpl_1 = __importDefault(require("./SprucebotLlmBotImpl"));
 const SprucebotLlmSkillImpl_1 = __importDefault(require("./SprucebotLlmSkillImpl"));
 class SprucebotLlmFactory {
-    instance;
-    static FactoryClass;
-    static BotClass;
-    static SkillClass;
     Bot(options) {
+        var _a;
         (0, schema_1.assertOptions)(options, ['youAre', 'adapter']);
         const { Class } = options;
-        return new (Class ??
-            SprucebotLlmFactory.BotClass ??
-            SprucebotLlmBotImpl_1.default)(options);
+        return new ((_a = Class !== null && Class !== void 0 ? Class : SprucebotLlmFactory.BotClass) !== null && _a !== void 0 ? _a : SprucebotLlmBotImpl_1.default)(options);
     }
     Skill(options) {
+        var _a;
         (0, schema_1.assertOptions)(options, ['yourJobIfYouChooseToAcceptItIs']);
-        return new (SprucebotLlmFactory.SkillClass ?? SprucebotLlmSkillImpl_1.default)(options);
+        return new ((_a = SprucebotLlmFactory.SkillClass) !== null && _a !== void 0 ? _a : SprucebotLlmSkillImpl_1.default)(options);
     }
     getBotInstance() {
         if (!this.instance) {
@@ -35,7 +31,8 @@ class SprucebotLlmFactory {
         this.instance = bot;
     }
     static Factory() {
-        return new (this.FactoryClass ?? this)();
+        var _a;
+        return new ((_a = this.FactoryClass) !== null && _a !== void 0 ? _a : this)();
     }
     static reset() {
         this.BotClass = undefined;

package/build/bots/SprucebotLlmSkillImpl.js

@@ -4,11 +4,9 @@ const mercury_event_emitter_1 = require("@sprucelabs/mercury-event-emitter");
 const schema_1 = require("@sprucelabs/schema");
 const llm_types_1 = require("../llm.types");
 class SprucebotLlmSkillImpl extends mercury_event_emitter_1.AbstractEventEmitter {
-    options;
-    state = {};
-    stateSchema;
     constructor(options) {
         super(llm_types_1.llmEventContract);
+        this.state = {};
         const { state, stateSchema, ...rest } = options;
         this.options = { ...rest, stateSchema };
         this.stateSchema = stateSchema;

package/build/bots/adapters/OpenAi.js

@@ -8,28 +8,27 @@ const schema_1 = require("@sprucelabs/schema");
 const openai_1 = require("openai");
 const PromptGenerator_1 = __importDefault(require("../PromptGenerator"));
 class OpenAiAdapter {
-    static Configuration = openai_1.Configuration;
-    static OpenAIApi = openai_1.OpenAIApi;
-    api;
     constructor(apiKey) {
         (0, schema_1.assertOptions)({ apiKey }, ['apiKey']);
         const config = new OpenAiAdapter.Configuration({ apiKey });
         this.api = new OpenAiAdapter.OpenAIApi(config);
     }
     async sendMessage(bot, options) {
+        var _a, _b, _c, _d;
         const generator = PromptGenerator_1.default.Generator(bot, {
-            promptTemplate: options?.promptTemplate,
+            promptTemplate: options === null || options === void 0 ? void 0 : options.promptTemplate,
         });
         const prompt = await generator.generate();
         const response = await this.api.createCompletion({
             prompt,
-            model: options?.model ?? 'text-davinci-003',
+            model: (_a = options === null || options === void 0 ? void 0 : options.model) !== null && _a !== void 0 ? _a : 'text-davinci-003',
             max_tokens: 250,
             stop: ['__Me__:'],
         });
-        return (response.data.choices[0]?.text?.trim() ??
-            exports.MESSAGE_RESPONSE_ERROR_MESSAGE);
+        return ((_d = (_c = (_b = response.data.choices[0]) === null || _b === void 0 ? void 0 : _b.text) === null || _c === void 0 ? void 0 : _c.trim()) !== null && _d !== void 0 ? _d : exports.MESSAGE_RESPONSE_ERROR_MESSAGE);
     }
 }
 exports.OpenAiAdapter = OpenAiAdapter;
+OpenAiAdapter.Configuration = openai_1.Configuration;
+OpenAiAdapter.OpenAIApi = openai_1.OpenAIApi;
 exports.MESSAGE_RESPONSE_ERROR_MESSAGE = "Oh no! Something went wrong and I can't talk right now!";

package/build/bots/adapters/SpyOpenAiApi.js

@@ -2,10 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const openai_1 = require("openai");
 class SpyOpenAiApi extends openai_1.OpenAIApi {
-    static config;
-    static lastMessage;
-    static lastModel;
-    static responseMessage = 'hello!';
     constructor(config) {
         super(config);
         SpyOpenAiApi.config = config;
@@ -34,4 +30,5 @@ class SpyOpenAiApi extends openai_1.OpenAIApi {
         };
     }
 }
+SpyOpenAiApi.responseMessage = 'hello!';
 exports.default = SpyOpenAiApi;

package/build/errors/SpruceError.js

@@ -9,7 +9,7 @@ class SpruceError extends error_1.default {
     friendlyMessage() {
         const { options } = this;
         let message;
-        switch (options?.code) {
+        switch (options === null || options === void 0 ? void 0 : options.code) {
             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;

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

@@ -1,5 +1,5 @@
-import { ErrorOptions as ISpruceErrorOptions } from '@sprucelabs/error';
-import { SpruceErrors } from './errors.types';
+import { SpruceErrors } from "./errors.types";
+import { ErrorOptions as ISpruceErrorOptions } from "@sprucelabs/error";
 export interface NoBotInstanceSetErrorOptions extends SpruceErrors.SprucebotLlm.NoBotInstanceSet, ISpruceErrorOptions {
     code: 'NO_BOT_INSTANCE_SET';
 }

package/build/parsingResponses/ResponseParser.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const templates_1 = require("../bots/templates");
 const renderPlaceholder_1 = __importDefault(require("./renderPlaceholder"));
 class ResponseParser {
-    static instance = new ResponseParser();
     static setInstance(parser) {
         this.instance = parser;
     }
@@ -34,8 +33,9 @@ class ResponseParser {
         };
     }
     async invokeCallback(callbacks, key, message) {
-        const v = await callbacks?.[key]?.cb();
-        message = message.replace((0, renderPlaceholder_1.default)(key), v ?? '').trim();
+        var _a;
+        const v = await ((_a = callbacks === null || callbacks === void 0 ? void 0 : callbacks[key]) === null || _a === void 0 ? void 0 : _a.cb());
+        message = message.replace((0, renderPlaceholder_1.default)(key), v !== null && v !== void 0 ? v : '').trim();
         return message;
     }
     doesIncludeDoneToken(response) {
@@ -45,8 +45,9 @@ class ResponseParser {
         const ESCAPED_BOUNDARY = templates_1.STATE_BOUNDARY.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
         const searchRegex = new RegExp(`${ESCAPED_BOUNDARY}(.*?)${ESCAPED_BOUNDARY}`);
         const stateMatches = message.match(searchRegex);
-        const match = stateMatches?.[1];
-        return { match, fullMatch: stateMatches?.[0] };
+        const match = stateMatches === null || stateMatches === void 0 ? void 0 : stateMatches[1];
+        return { match, fullMatch: stateMatches === null || stateMatches === void 0 ? void 0 : stateMatches[0] };
     }
 }
+ResponseParser.instance = new ResponseParser();
 exports.default = ResponseParser;

package/package.json

@@ -10,7 +10,7 @@
       "openai"
     ]
   },
-  "version": "5.0.6",
+  "version": "5.0.7",
   "files": [
     "build"
   ],
@@ -49,32 +49,30 @@
     "test": "jest",
     "update.dependencies": "yarn run clean.dependencies && yarn",
     "watch.build.dev": "tsc-watch --sourceMap --onCompilationComplete 'yarn run post.watch.build'",
-    "watch.lint": "concurrently 'yarn run lint' \"chokidar 'src/**/*' -c 'yarn run lint.tsc'\"",
     "watch.rebuild": "yarn run clean.all && yarn install && yarn run watch.build.dev",
     "watch.tsc": "tsc -w",
     "chat": "node ./build/chat.js"
   },
   "dependencies": {
-    "@sprucelabs/error": "^6.0.9",
-    "@sprucelabs/mercury-event-emitter": "^42.0.9",
-    "@sprucelabs/mercury-types": "^47.0.8",
-    "@sprucelabs/schema": "^30.0.13",
+    "@sprucelabs/error": "^6.0.11",
+    "@sprucelabs/mercury-event-emitter": "^42.0.11",
+    "@sprucelabs/mercury-types": "^47.0.11",
+    "@sprucelabs/schema": "^30.0.15",
     "eta": "^3.4.0",
     "openai": "^3.3.0"
   },
   "devDependencies": {
-    "@sprucelabs/esm-postbuild": "^6.0.9",
-    "@sprucelabs/jest-json-reporter": "^8.0.8",
-    "@sprucelabs/resolve-path-aliases": "^2.0.11",
+    "@sprucelabs/esm-postbuild": "^6.0.11",
+    "@sprucelabs/jest-json-reporter": "^8.0.11",
+    "@sprucelabs/resolve-path-aliases": "^2.0.13",
     "@sprucelabs/semantic-release": "^5.0.1",
-    "@sprucelabs/test": "^9.0.7",
+    "@sprucelabs/test": "^9.0.9",
     "@sprucelabs/test-utils": "^5.0.10",
     "@types/node": "^20.12.7",
     "chokidar-cli": "^3.0.0",
-    "concurrently": "^8.2.2",
     "dotenv": "^16.4.5",
     "eslint": "^9.1.1",
-    "eslint-config-spruce": "^11.2.12",
+    "eslint-config-spruce": "^11.2.13",
     "jest": "^29.7.0",
     "jest-circus": "^29.7.0",
     "prettier": "^3.2.5",