@sprucelabs/sprucebot-llm 7.0.19 → 8.0.0

package/build/bots/SprucebotLlmFactory.d.ts

@@ -1,13 +1,15 @@
-import { BotOptions, SkillOptions, SprucebotLlmBot, SprucebotLLmSkill } from '../llm.types';
+import { BotOptions, LlmAdapter, SkillOptions, SprucebotLlmBot, SprucebotLLmSkill } from '../llm.types';
 export default class SprucebotLlmFactory {
     private instance?;
+    protected adapter: LlmAdapter;
     static FactoryClass?: typeof SprucebotLlmFactory;
     static BotClass?: new (options: any) => SprucebotLlmBot;
     static SkillClass?: new (options: any) => SprucebotLLmSkill;
-    Bot(options: BotOptions): SprucebotLlmBot;
+    protected constructor(adapter: LlmAdapter);
+    Bot(options: Omit<BotOptions, 'adapter'>): SprucebotLlmBot;
     Skill(options: SkillOptions): SprucebotLLmSkill;
     getBotInstance(): SprucebotLlmBot<import("@sprucelabs/schema").Schema, Pick<import("@sprucelabs/schema").SchemaStaticValues<import("@sprucelabs/schema").Schema, false, never, import("@sprucelabs/schema").StaticSchemaAllValues<import("@sprucelabs/schema").Schema, false>>, never>>;
     setBotInstance(bot: SprucebotLlmBot): void;
-    static Factory(): SprucebotLlmFactory;
+    static Factory(adapter: LlmAdapter): SprucebotLlmFactory;
     static reset(): void;
 }

package/build/bots/SprucebotLlmFactory.js

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

package/build/bots/adapters/OpenAi.d.ts

@@ -3,7 +3,8 @@ import { LlmAdapter, SendMessageOptions, SprucebotLlmBot } from '../../llm.types
 export declare class OpenAiAdapter implements LlmAdapter {
     static OpenAI: typeof OpenAI;
     private api;
-    constructor(apiKey: string);
+    protected constructor(apiKey: string);
+    static Adapter(apiKey: string): OpenAiAdapter;
     sendMessage(bot: SprucebotLlmBot, options?: SendMessageOptions): Promise<string>;
 }
 export declare const MESSAGE_RESPONSE_ERROR_MESSAGE = "Oh no! Something went wrong and I can't talk right now!";

package/build/bots/adapters/OpenAi.js

@@ -12,6 +12,9 @@ class OpenAiAdapter {
         (0, schema_1.assertOptions)({ apiKey }, ['apiKey']);
         this.api = new OpenAiAdapter.OpenAI({ apiKey });
     }
+    static Adapter(apiKey) {
+        return new this(apiKey);
+    }
     async sendMessage(bot, options) {
         const messageBuilder = OpenAiMessageBuilder_1.default.Builder(bot);
         const messages = messageBuilder.buildMessages();

package/build/chat.js

@@ -50,8 +50,8 @@ dotenv_1.default.config();
 const rl = readline.createInterface({ input: node_process_1.stdin, output: node_process_1.stdout });
 void (async () => {
     console.clear();
-    const adapter = new OpenAi_1.OpenAiAdapter(process.env.OPEN_AI_API_KEY);
-    const bots = SprucebotLlmFactory_1.default.Factory();
+    const adapter = OpenAi_1.OpenAiAdapter.Adapter(process.env.OPEN_AI_API_KEY);
+    const bots = SprucebotLlmFactory_1.default.Factory(adapter);
     const skills = {
         jokes: (0, buildJokeSkill_1.default)(bots),
         profile: (0, buildProfileSkill_1.default)(bots),
@@ -60,7 +60,6 @@ void (async () => {
         receptionist: (0, buildReceptionistSkill_1.default)(bots),
     };
     const bot = bots.Bot({
-        adapter,
         skill: skills.callbacks,
         youAre: "a bot named Sprucebot that is in test mode. At the start of every conversation, you introduce yourself and announce that you are in test mode so I don't get confused! You are both hip and adorable. You say things like, 'Jeepers' and 'Golly' or even 'Jeezey peezy'!",
     });

package/build/esm/bots/SprucebotLlmFactory.d.ts

@@ -1,13 +1,15 @@
-import { BotOptions, SkillOptions, SprucebotLlmBot, SprucebotLLmSkill } from '../llm.types';
+import { BotOptions, LlmAdapter, SkillOptions, SprucebotLlmBot, SprucebotLLmSkill } from '../llm.types';
 export default class SprucebotLlmFactory {
     private instance?;
+    protected adapter: LlmAdapter;
     static FactoryClass?: typeof SprucebotLlmFactory;
     static BotClass?: new (options: any) => SprucebotLlmBot;
     static SkillClass?: new (options: any) => SprucebotLLmSkill;
-    Bot(options: BotOptions): SprucebotLlmBot;
+    protected constructor(adapter: LlmAdapter);
+    Bot(options: Omit<BotOptions, 'adapter'>): SprucebotLlmBot;
     Skill(options: SkillOptions): SprucebotLLmSkill;
     getBotInstance(): SprucebotLlmBot<import("@sprucelabs/schema").Schema, Pick<import("@sprucelabs/schema").SchemaStaticValues<import("@sprucelabs/schema").Schema, false, never, import("@sprucelabs/schema").StaticSchemaAllValues<import("@sprucelabs/schema").Schema, false>>, never>>;
     setBotInstance(bot: SprucebotLlmBot): void;
-    static Factory(): SprucebotLlmFactory;
+    static Factory(adapter: LlmAdapter): SprucebotLlmFactory;
     static reset(): void;
 }

package/build/esm/bots/SprucebotLlmFactory.js

@@ -3,16 +3,19 @@ import SpruceError from '../errors/SpruceError.js';
 import SprucebotLlmBotImpl from './SprucebotLlmBotImpl.js';
 import SprucebotLlmSkillImpl from './SprucebotLlmSkillImpl.js';
 export default class SprucebotLlmFactory {
+    constructor(adapter) {
+        this.adapter = adapter;
+    }
     Bot(options) {
         var _a;
-        assertOptions(options, ['youAre', 'adapter']);
+        assertOptions(options, ['youAre']);
         const { Class } = options;
-        return new ((_a = Class !== null && Class !== void 0 ? Class : SprucebotLlmFactory.BotClass) !== null && _a !== void 0 ? _a : SprucebotLlmBotImpl)(options);
+        return new ((_a = Class !== null && Class !== void 0 ? Class : SprucebotLlmFactory.BotClass) !== null && _a !== void 0 ? _a : SprucebotLlmBotImpl)(Object.assign(Object.assign({}, options), { adapter: this.adapter }));
     }
     Skill(options) {
         var _a;
         assertOptions(options, ['yourJobIfYouChooseToAcceptItIs']);
-        return new ((_a = SprucebotLlmFactory.SkillClass) !== null && _a !== void 0 ? _a : SprucebotLlmSkillImpl)(options);
+        return new ((_a = SprucebotLlmFactory.SkillClass) !== null && _a !== void 0 ? _a : SprucebotLlmSkillImpl)(Object.assign({}, options));
     }
     getBotInstance() {
         if (!this.instance) {
@@ -25,9 +28,10 @@ export default class SprucebotLlmFactory {
     setBotInstance(bot) {
         this.instance = bot;
     }
-    static Factory() {
+    static Factory(adapter) {
         var _a;
-        return new ((_a = this.FactoryClass) !== null && _a !== void 0 ? _a : this)();
+        assertOptions({ adapter }, ['adapter']);
+        return new ((_a = this.FactoryClass) !== null && _a !== void 0 ? _a : this)(adapter);
     }
     static reset() {
         this.BotClass = undefined;

package/build/esm/bots/adapters/OpenAi.d.ts

@@ -3,7 +3,8 @@ import { LlmAdapter, SendMessageOptions, SprucebotLlmBot } from '../../llm.types
 export declare class OpenAiAdapter implements LlmAdapter {
     static OpenAI: typeof OpenAI;
     private api;
-    constructor(apiKey: string);
+    protected constructor(apiKey: string);
+    static Adapter(apiKey: string): OpenAiAdapter;
     sendMessage(bot: SprucebotLlmBot, options?: SendMessageOptions): Promise<string>;
 }
 export declare const MESSAGE_RESPONSE_ERROR_MESSAGE = "Oh no! Something went wrong and I can't talk right now!";

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

@@ -15,6 +15,9 @@ export class OpenAiAdapter {
         assertOptions({ apiKey }, ['apiKey']);
         this.api = new OpenAiAdapter.OpenAI({ apiKey });
     }
+    static Adapter(apiKey) {
+        return new this(apiKey);
+    }
     sendMessage(bot, options) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f;

package/build/esm/chat.js

@@ -21,8 +21,8 @@ dotenv.config();
 const rl = readline.createInterface({ input, output });
 void (() => __awaiter(void 0, void 0, void 0, function* () {
     console.clear();
-    const adapter = new OpenAiAdapter(process.env.OPEN_AI_API_KEY);
-    const bots = SprucebotLlmFactory.Factory();
+    const adapter = OpenAiAdapter.Adapter(process.env.OPEN_AI_API_KEY);
+    const bots = SprucebotLlmFactory.Factory(adapter);
     const skills = {
         jokes: buildJokeSkill(bots),
         profile: buildProfileSkill(bots),
@@ -31,7 +31,6 @@ void (() => __awaiter(void 0, void 0, void 0, function* () {
         receptionist: buildReceptionistSkill(bots),
     };
     const bot = bots.Bot({
-        adapter,
         skill: skills.callbacks,
         youAre: "a bot named Sprucebot that is in test mode. At the start of every conversation, you introduce yourself and announce that you are in test mode so I don't get confused! You are both hip and adorable. You say things like, 'Jeepers' and 'Golly' or even 'Jeezey peezy'!",
     });

package/package.json

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