@sprucelabs/sprucebot-llm 13.3.0 → 14.0.0

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

@@ -11,6 +11,25 @@ export declare namespace SpruceErrors.SprucebotLlm {
     }
     type NoBotInstanceSetEntity = SchemaEntity<SpruceErrors.SprucebotLlm.NoBotInstanceSetSchema>;
 }
+export declare namespace SpruceErrors.SprucebotLlm {
+    interface InvalidLlmAdapter {
+        'adapter': string;
+    }
+    interface InvalidLlmAdapterSchema extends SpruceSchema.Schema {
+        id: 'invalidLlmAdapter';
+        namespace: 'SprucebotLlm';
+        name: 'Invalid Llm Adapter';
+        fields: {
+            /** . */
+            'adapter': {
+                type: 'text';
+                isRequired: true;
+                options: undefined;
+            };
+        };
+    }
+    type InvalidLlmAdapterEntity = SchemaEntity<SpruceErrors.SprucebotLlm.InvalidLlmAdapterSchema>;
+}
 export declare namespace SpruceErrors.SprucebotLlm {
     interface InvalidCallback {
         'validCallbacks': string[];

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

@@ -3,11 +3,14 @@ import { ErrorOptions as ISpruceErrorOptions } from "@sprucelabs/error";
 export interface NoBotInstanceSetErrorOptions extends SpruceErrors.SprucebotLlm.NoBotInstanceSet, ISpruceErrorOptions {
     code: 'NO_BOT_INSTANCE_SET';
 }
+export interface InvalidLlmAdapterErrorOptions extends SpruceErrors.SprucebotLlm.InvalidLlmAdapter, ISpruceErrorOptions {
+    code: 'INVALID_LLM_ADAPTER';
+}
 export interface InvalidCallbackErrorOptions extends SpruceErrors.SprucebotLlm.InvalidCallback, ISpruceErrorOptions {
     code: 'INVALID_CALLBACK';
 }
 export interface CallbackErrorErrorOptions extends SpruceErrors.SprucebotLlm.CallbackError, ISpruceErrorOptions {
     code: 'CALLBACK_ERROR';
 }
-type ErrorOptions = NoBotInstanceSetErrorOptions | InvalidCallbackErrorOptions | CallbackErrorErrorOptions;
+type ErrorOptions = NoBotInstanceSetErrorOptions | InvalidLlmAdapterErrorOptions | InvalidCallbackErrorOptions | CallbackErrorErrorOptions;
 export default ErrorOptions;

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

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

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

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const schema_1 = require("@sprucelabs/schema");
+const invalidLlmAdapterSchema = {
+    id: 'invalidLlmAdapter',
+    namespace: 'SprucebotLlm',
+    name: 'Invalid Llm Adapter',
+    fields: {
+        /** . */
+        'adapter': {
+            type: 'text',
+            isRequired: true,
+            options: undefined
+        },
+    }
+};
+schema_1.SchemaRegistry.getInstance().trackSchema(invalidLlmAdapterSchema);
+exports.default = invalidLlmAdapterSchema;

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

@@ -3,6 +3,7 @@ import { Log } from '@sprucelabs/spruce-skill-utils';
 import Anthropic from '@anthropic-ai/sdk';
 import { LlmAdapter, SprucebotLlmBot, SendMessageOptions, LllmReasoningEffort } from '../../llm.types';
 export default class AnthropicAdapter implements LlmAdapter {
+    static Class?: new (apiKey: string, options?: AnthropicAdapterOptions) => LlmAdapter;
     static Anthropic: typeof Anthropic;
     private api;
     private model;
@@ -11,7 +12,8 @@ export default class AnthropicAdapter implements LlmAdapter {
     private memoryLimit?;
     private isThinkingEnabled;
     private log?;
-    constructor(apiKey: string, options: AnthropicAdapterOptions);
+    private constructor();
+    static Adapter(apiKey: string, options: AnthropicAdapterOptions): LlmAdapter;
     sendMessage(bot: SprucebotLlmBot<Schema>, options?: SendMessageOptions): Promise<string>;
     private sendHandler;
     setModel(model: string): void;

package/build/bots/adapters/AnthropicAdapter.js

@@ -22,6 +22,9 @@ class AnthropicAdapter {
         this.log = log?.buildLog('AnthropicAdapter');
         this.sender = MessageSender_1.default.Sender(this.sendHandler.bind(this), log);
     }
+    static Adapter(apiKey, options) {
+        return new (this.Class ?? this)(apiKey, options);
+    }
     async sendMessage(bot, options) {
         const text = await this.sender.sendMessage(bot, {
             model: this.model,

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

@@ -0,0 +1,7 @@
+export default class LlmAdapterLoader {
+    static VALID_ADAPTERS: string[];
+    private adapterName;
+    private constructor();
+    static Loader(): LlmAdapterLoader;
+    Adapter(): import("../../llm.types").LlmAdapter;
+}

package/build/bots/adapters/LlmAdapterLoader.js

@@ -0,0 +1,61 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const schema_1 = require("@sprucelabs/schema");
+const SpruceError_1 = __importDefault(require("../../errors/SpruceError"));
+const AnthropicAdapter_1 = __importDefault(require("./AnthropicAdapter"));
+const OllamaAdapter_1 = __importDefault(require("./OllamaAdapter"));
+const OpenAiAdapter_1 = __importDefault(require("./OpenAiAdapter"));
+class LlmAdapterLoader {
+    constructor(adapterName) {
+        this.adapterName = adapterName;
+    }
+    static Loader() {
+        const { env: { SPRUCE_LLM_ADAPTER }, } = (0, schema_1.assertOptions)({
+            env: process.env,
+        }, ['env.SPRUCE_LLM_ADAPTER']);
+        const name = SPRUCE_LLM_ADAPTER.toLowerCase();
+        if (!LlmAdapterLoader.VALID_ADAPTERS.includes(name)) {
+            throw new SpruceError_1.default({
+                code: 'INVALID_LLM_ADAPTER',
+                adapter: SPRUCE_LLM_ADAPTER,
+            });
+        }
+        if (name === 'anthropic') {
+            (0, schema_1.assertOptions)({
+                env: process.env,
+            }, ['env.SPRUCE_LLM_MAX_TOKENS']);
+        }
+        return new this(name);
+    }
+    Adapter() {
+        const key = process.env.SPRUCE_LLM_API_KEY;
+        const options = {
+            memoryLimit: process.env.SPRUCE_LLM_MEMORY_LIMIT
+                ? parseInt(process.env.SPRUCE_LLM_MEMORY_LIMIT, 10)
+                : undefined,
+            model: process.env.SPRUCE_LLM_MODEL,
+            baseUrl: process.env.SPRUCE_LLM_BASE_URL,
+        };
+        const thinking = process.env.SPRUCE_LLM_THINKING === 'true';
+        if (this.adapterName === 'anthropic') {
+            return AnthropicAdapter_1.default.Adapter(key, {
+                ...options,
+                thinking,
+                maxTokens: parseInt(process.env.SPRUCE_LLM_MAX_TOKENS, 10),
+            });
+        }
+        if (this.adapterName === 'ollama') {
+            return OllamaAdapter_1.default.Adapter({ ...options, think: thinking });
+        }
+        return OpenAiAdapter_1.default.Adapter(key, {
+            ...options,
+            reasoningEffort: process.env
+                .SPRUCE_LLM_REASONING_EFFORT,
+        });
+    }
+}
+LlmAdapterLoader.VALID_ADAPTERS = ['openai', 'anthropic', 'ollama'];
+exports.default = LlmAdapterLoader;

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

@@ -1,17 +1,20 @@
 import { Schema } from '@sprucelabs/schema';
+import { Log } from '@sprucelabs/spruce-skill-utils';
 import { LlmAdapter, SprucebotLlmBot, SendMessageOptions, LllmReasoningEffort } from '../../llm.types';
 export default class OllamaAdapter implements LlmAdapter {
+    static Class?: new (apiKey: string, options?: OllamaAdapterOptions) => LlmAdapter;
     private openai;
     private think;
     private constructor();
-    static Adapter(options?: OllamaOptions): OllamaAdapter;
+    static Adapter(options?: OllamaAdapterOptions): LlmAdapter;
     sendMessage(bot: SprucebotLlmBot<Schema>, options?: SendMessageOptions): Promise<string>;
     setModel(model: string): void;
     setReasoningEffort(effort: LllmReasoningEffort): void;
 }
-interface OllamaOptions {
+export interface OllamaAdapterOptions {
+    log?: Log;
     model?: string;
     think?: boolean;
     baseUrl?: string;
+    memoryLimit?: number;
 }
-export {};

package/build/bots/adapters/OllamaAdapter.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const OpenAiAdapter_1 = __importDefault(require("./OpenAiAdapter"));
 class OllamaAdapter {
-    constructor(options) {
+    constructor(_apiKey, options) {
         this.think = options?.think ?? false;
         this.openai = OpenAiAdapter_1.default.Adapter('***', {
             baseUrl: 'http://localhost:11434/v1',
@@ -13,7 +13,7 @@ class OllamaAdapter {
         });
     }
     static Adapter(options) {
-        return new this(options);
+        return new (this.Class ?? this)('***', options);
     }
     async sendMessage(bot, options) {
         //@ts-ignore

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

@@ -3,7 +3,7 @@ import OpenAI from 'openai';
 import { ReasoningEffort } from 'openai/resources';
 import { LlmAdapter, SendMessageOptions, SprucebotLlmBot } from '../../llm.types';
 export default class OpenAiAdapter implements LlmAdapter {
-    static Class: new (apiKey: string, options?: OpenAiAdapterOptions) => OpenAiAdapter;
+    static Class?: new (apiKey: string, options?: OpenAiAdapterOptions) => LlmAdapter;
     static OpenAI: typeof OpenAI;
     private api;
     private model;
@@ -11,7 +11,7 @@ export default class OpenAiAdapter implements LlmAdapter {
     private reasoningEffort?;
     private sender;
     protected constructor(apiKey: string, options?: OpenAiAdapterOptions);
-    static Adapter(apiKey: string, options?: OpenAiAdapterOptions): OpenAiAdapter;
+    static Adapter(apiKey: string, options?: OpenAiAdapterOptions): LlmAdapter;
     sendMessage(bot: SprucebotLlmBot, options?: SendMessageOptions): Promise<string>;
     private sendHandler;
     private getReasoningEffort;

package/build/errors/SpruceError.js

@@ -39,6 +39,9 @@ ${options.validCallbacks.map((name, idx) => `${idx + 1}: ${name}`).join('\n')}`;
                     message += `\n\nOriginal Error: ${options.originalError.message}`;
                 }
                 break;
+            case 'INVALID_LLM_ADAPTER':
+                message = `SPRUCE_LLM_ADAPTER=${options.adapter} is not a valid adapter. Please set SPRUCE_LLM_ADAPTER to a valid adapter (OpenAi, Anthropic, Ollama) and try again.`;
+                break;
             default:
                 message = super.friendlyMessage();
         }

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

@@ -0,0 +1,11 @@
+declare const _default: {
+    id: string;
+    name: string;
+    fields: {
+        adapter: {
+            type: "text";
+            isRequired: true;
+        };
+    };
+};
+export default _default;

package/build/errors/invalidLlmAdapter.builder.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const schema_1 = require("@sprucelabs/schema");
+exports.default = (0, schema_1.buildErrorSchema)({
+    id: 'invalidLlmAdapter',
+    name: 'Invalid Llm Adapter',
+    fields: {
+        adapter: {
+            type: 'text',
+            isRequired: true,
+        },
+    },
+});

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

@@ -11,6 +11,25 @@ export declare namespace SpruceErrors.SprucebotLlm {
     }
     type NoBotInstanceSetEntity = SchemaEntity<SpruceErrors.SprucebotLlm.NoBotInstanceSetSchema>;
 }
+export declare namespace SpruceErrors.SprucebotLlm {
+    interface InvalidLlmAdapter {
+        'adapter': string;
+    }
+    interface InvalidLlmAdapterSchema extends SpruceSchema.Schema {
+        id: 'invalidLlmAdapter';
+        namespace: 'SprucebotLlm';
+        name: 'Invalid Llm Adapter';
+        fields: {
+            /** . */
+            'adapter': {
+                type: 'text';
+                isRequired: true;
+                options: undefined;
+            };
+        };
+    }
+    type InvalidLlmAdapterEntity = SchemaEntity<SpruceErrors.SprucebotLlm.InvalidLlmAdapterSchema>;
+}
 export declare namespace SpruceErrors.SprucebotLlm {
     interface InvalidCallback {
         'validCallbacks': string[];

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

@@ -3,11 +3,14 @@ import { ErrorOptions as ISpruceErrorOptions } from "@sprucelabs/error";
 export interface NoBotInstanceSetErrorOptions extends SpruceErrors.SprucebotLlm.NoBotInstanceSet, ISpruceErrorOptions {
     code: 'NO_BOT_INSTANCE_SET';
 }
+export interface InvalidLlmAdapterErrorOptions extends SpruceErrors.SprucebotLlm.InvalidLlmAdapter, ISpruceErrorOptions {
+    code: 'INVALID_LLM_ADAPTER';
+}
 export interface InvalidCallbackErrorOptions extends SpruceErrors.SprucebotLlm.InvalidCallback, ISpruceErrorOptions {
     code: 'INVALID_CALLBACK';
 }
 export interface CallbackErrorErrorOptions extends SpruceErrors.SprucebotLlm.CallbackError, ISpruceErrorOptions {
     code: 'CALLBACK_ERROR';
 }
-type ErrorOptions = NoBotInstanceSetErrorOptions | InvalidCallbackErrorOptions | CallbackErrorErrorOptions;
+type ErrorOptions = NoBotInstanceSetErrorOptions | InvalidLlmAdapterErrorOptions | InvalidCallbackErrorOptions | CallbackErrorErrorOptions;
 export default ErrorOptions;

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

@@ -3,6 +3,7 @@ import { Log } from '@sprucelabs/spruce-skill-utils';
 import Anthropic from '@anthropic-ai/sdk';
 import { LlmAdapter, SprucebotLlmBot, SendMessageOptions, LllmReasoningEffort } from '../../llm.types';
 export default class AnthropicAdapter implements LlmAdapter {
+    static Class?: new (apiKey: string, options?: AnthropicAdapterOptions) => LlmAdapter;
     static Anthropic: typeof Anthropic;
     private api;
     private model;
@@ -11,7 +12,8 @@ export default class AnthropicAdapter implements LlmAdapter {
     private memoryLimit?;
     private isThinkingEnabled;
     private log?;
-    constructor(apiKey: string, options: AnthropicAdapterOptions);
+    private constructor();
+    static Adapter(apiKey: string, options: AnthropicAdapterOptions): LlmAdapter;
     sendMessage(bot: SprucebotLlmBot<Schema>, options?: SendMessageOptions): Promise<string>;
     private sendHandler;
     setModel(model: string): void;

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

@@ -26,6 +26,10 @@ class AnthropicAdapter {
         this.log = log === null || log === void 0 ? void 0 : log.buildLog('AnthropicAdapter');
         this.sender = MessageSenderImpl.Sender(this.sendHandler.bind(this), log);
     }
+    static Adapter(apiKey, options) {
+        var _a;
+        return new ((_a = this.Class) !== null && _a !== void 0 ? _a : this)(apiKey, options);
+    }
     sendMessage(bot, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const text = yield this.sender.sendMessage(bot, Object.assign({ model: this.model, memoryLimit: this.memoryLimit }, options));

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

@@ -0,0 +1,7 @@
+export default class LlmAdapterLoader {
+    static VALID_ADAPTERS: string[];
+    private adapterName;
+    private constructor();
+    static Loader(): LlmAdapterLoader;
+    Adapter(): import("../../llm.types").LlmAdapter;
+}

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

@@ -0,0 +1,49 @@
+import { assertOptions } from '@sprucelabs/schema';
+import SpruceError from '../../errors/SpruceError.js';
+import AnthropicAdapter from './AnthropicAdapter.js';
+import OllamaAdapter from './OllamaAdapter.js';
+import OpenAiAdapter from './OpenAiAdapter.js';
+class LlmAdapterLoader {
+    constructor(adapterName) {
+        this.adapterName = adapterName;
+    }
+    static Loader() {
+        const { env: { SPRUCE_LLM_ADAPTER }, } = assertOptions({
+            env: process.env,
+        }, ['env.SPRUCE_LLM_ADAPTER']);
+        const name = SPRUCE_LLM_ADAPTER.toLowerCase();
+        if (!LlmAdapterLoader.VALID_ADAPTERS.includes(name)) {
+            throw new SpruceError({
+                code: 'INVALID_LLM_ADAPTER',
+                adapter: SPRUCE_LLM_ADAPTER,
+            });
+        }
+        if (name === 'anthropic') {
+            assertOptions({
+                env: process.env,
+            }, ['env.SPRUCE_LLM_MAX_TOKENS']);
+        }
+        return new this(name);
+    }
+    Adapter() {
+        const key = process.env.SPRUCE_LLM_API_KEY;
+        const options = {
+            memoryLimit: process.env.SPRUCE_LLM_MEMORY_LIMIT
+                ? parseInt(process.env.SPRUCE_LLM_MEMORY_LIMIT, 10)
+                : undefined,
+            model: process.env.SPRUCE_LLM_MODEL,
+            baseUrl: process.env.SPRUCE_LLM_BASE_URL,
+        };
+        const thinking = process.env.SPRUCE_LLM_THINKING === 'true';
+        if (this.adapterName === 'anthropic') {
+            return AnthropicAdapter.Adapter(key, Object.assign(Object.assign({}, options), { thinking, maxTokens: parseInt(process.env.SPRUCE_LLM_MAX_TOKENS, 10) }));
+        }
+        if (this.adapterName === 'ollama') {
+            return OllamaAdapter.Adapter(Object.assign(Object.assign({}, options), { think: thinking }));
+        }
+        return OpenAiAdapter.Adapter(key, Object.assign(Object.assign({}, options), { reasoningEffort: process.env
+                .SPRUCE_LLM_REASONING_EFFORT }));
+    }
+}
+LlmAdapterLoader.VALID_ADAPTERS = ['openai', 'anthropic', 'ollama'];
+export default LlmAdapterLoader;

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

@@ -1,17 +1,20 @@
 import { Schema } from '@sprucelabs/schema';
+import { Log } from '@sprucelabs/spruce-skill-utils';
 import { LlmAdapter, SprucebotLlmBot, SendMessageOptions, LllmReasoningEffort } from '../../llm.types';
 export default class OllamaAdapter implements LlmAdapter {
+    static Class?: new (apiKey: string, options?: OllamaAdapterOptions) => LlmAdapter;
     private openai;
     private think;
     private constructor();
-    static Adapter(options?: OllamaOptions): OllamaAdapter;
+    static Adapter(options?: OllamaAdapterOptions): LlmAdapter;
     sendMessage(bot: SprucebotLlmBot<Schema>, options?: SendMessageOptions): Promise<string>;
     setModel(model: string): void;
     setReasoningEffort(effort: LllmReasoningEffort): void;
 }
-interface OllamaOptions {
+export interface OllamaAdapterOptions {
+    log?: Log;
     model?: string;
     think?: boolean;
     baseUrl?: string;
+    memoryLimit?: number;
 }
-export {};

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

@@ -9,13 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import OpenAiAdapter from './OpenAiAdapter.js';
 export default class OllamaAdapter {
-    constructor(options) {
+    constructor(_apiKey, options) {
         var _a;
         this.think = (_a = options === null || options === void 0 ? void 0 : options.think) !== null && _a !== void 0 ? _a : false;
         this.openai = OpenAiAdapter.Adapter('***', Object.assign({ baseUrl: 'http://localhost:11434/v1' }, options));
     }
     static Adapter(options) {
-        return new this(options);
+        var _a;
+        return new ((_a = this.Class) !== null && _a !== void 0 ? _a : this)('***', options);
     }
     sendMessage(bot, options) {
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -3,7 +3,7 @@ import OpenAI from 'openai';
 import { ReasoningEffort } from 'openai/resources';
 import { LlmAdapter, SendMessageOptions, SprucebotLlmBot } from '../../llm.types';
 export default class OpenAiAdapter implements LlmAdapter {
-    static Class: new (apiKey: string, options?: OpenAiAdapterOptions) => OpenAiAdapter;
+    static Class?: new (apiKey: string, options?: OpenAiAdapterOptions) => LlmAdapter;
     static OpenAI: typeof OpenAI;
     private api;
     private model;
@@ -11,7 +11,7 @@ export default class OpenAiAdapter implements LlmAdapter {
     private reasoningEffort?;
     private sender;
     protected constructor(apiKey: string, options?: OpenAiAdapterOptions);
-    static Adapter(apiKey: string, options?: OpenAiAdapterOptions): OpenAiAdapter;
+    static Adapter(apiKey: string, options?: OpenAiAdapterOptions): LlmAdapter;
     sendMessage(bot: SprucebotLlmBot, options?: SendMessageOptions): Promise<string>;
     private sendHandler;
     private getReasoningEffort;

package/build/esm/errors/SpruceError.js

@@ -34,6 +34,9 @@ ${options.validCallbacks.map((name, idx) => `${idx + 1}: ${name}`).join('\n')}`;
                     message += `\n\nOriginal Error: ${options.originalError.message}`;
                 }
                 break;
+            case 'INVALID_LLM_ADAPTER':
+                message = `SPRUCE_LLM_ADAPTER=${options.adapter} is not a valid adapter. Please set SPRUCE_LLM_ADAPTER to a valid adapter (OpenAi, Anthropic, Ollama) and try again.`;
+                break;
             default:
                 message = super.friendlyMessage();
         }

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

@@ -0,0 +1,11 @@
+declare const _default: {
+    id: string;
+    name: string;
+    fields: {
+        adapter: {
+            type: "text";
+            isRequired: true;
+        };
+    };
+};
+export default _default;

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

@@ -0,0 +1,11 @@
+import { buildErrorSchema } from '@sprucelabs/schema';
+export default buildErrorSchema({
+    id: 'invalidLlmAdapter',
+    name: 'Invalid Llm Adapter',
+    fields: {
+        adapter: {
+            type: 'text',
+            isRequired: true,
+        },
+    },
+});

package/build/esm/index.d.ts

@@ -12,3 +12,4 @@ export { default as OllamaAdapter } from './bots/adapters/OllamaAdapter';
 export * from './bots/adapters/OllamaAdapter';
 export { default as AthropicAdapter } from './bots/adapters/AnthropicAdapter';
 export * from './bots/adapters/AnthropicAdapter';
+export { default as LlmAdapterLoader } from './bots/adapters/LlmAdapterLoader';

package/build/esm/index.js

@@ -12,3 +12,4 @@ export { default as OllamaAdapter } from './bots/adapters/OllamaAdapter.js';
 export * from './bots/adapters/OllamaAdapter.js';
 export { default as AthropicAdapter } from './bots/adapters/AnthropicAdapter.js';
 export * from './bots/adapters/AnthropicAdapter.js';
+export { default as LlmAdapterLoader } from './bots/adapters/LlmAdapterLoader.js';

package/build/esm/tests/SpyAdapter.d.ts

@@ -1,11 +1,18 @@
+import { OpenAiAdapterOptions } from '../bots/adapters/OpenAiAdapter';
 import { LllmReasoningEffort, LlmAdapter, SendMessageOptions, SprucebotLlmBot } from '../llm.types';
 export default class SpyLlmAdapter implements LlmAdapter {
-    lastBot?: SprucebotLlmBot;
+    static instance: SpyLlmAdapter;
+    lastSendMessageBot?: SprucebotLlmBot;
     lastMessage?: string;
-    messageResponse: string;
-    lastSendOptions?: SendMessageOptions;
+    lastSendMessageResponse: string;
+    lastSendMessageOptions?: SendMessageOptions;
     responseDelayMs?: number;
+    manuallySetModel?: string;
+    apiKey: string;
+    constructorOptions?: OpenAiAdapterOptions;
+    shouldRandomizeResponseMessage: boolean;
+    constructor(apiKey: string, options?: OpenAiAdapterOptions);
     sendMessage(bot: SprucebotLlmBot, options?: SendMessageOptions): Promise<string>;
-    setModel(_model: string): void;
+    setModel(model: string): void;
     setReasoningEffort(_effort: LllmReasoningEffort): void;
 }

package/build/esm/tests/SpyAdapter.js

@@ -7,20 +7,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { generateId } from '@sprucelabs/test-utils';
 export default class SpyLlmAdapter {
-    constructor() {
-        this.messageResponse = '';
+    constructor(apiKey, options) {
+        this.lastSendMessageResponse = generateId();
+        this.shouldRandomizeResponseMessage = true;
+        SpyLlmAdapter.instance = this;
+        this.apiKey = apiKey;
+        this.constructorOptions = options;
     }
     sendMessage(bot, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.lastBot = bot;
-            this.lastSendOptions = options;
+            this.lastSendMessageBot = bot;
+            this.lastSendMessageOptions = options;
             if (this.responseDelayMs) {
                 yield new Promise((resolve) => setTimeout(resolve, this.responseDelayMs));
             }
-            return this.messageResponse;
+            if (this.shouldRandomizeResponseMessage) {
+                this.lastSendMessageResponse = generateId();
+            }
+            return this.lastSendMessageResponse;
         });
     }
-    setModel(_model) { }
+    setModel(model) {
+        this.manuallySetModel = model;
+    }
     setReasoningEffort(_effort) { }
 }

package/build/index.d.ts

@@ -12,3 +12,4 @@ export { default as OllamaAdapter } from './bots/adapters/OllamaAdapter';
 export * from './bots/adapters/OllamaAdapter';
 export { default as AthropicAdapter } from './bots/adapters/AnthropicAdapter';
 export * from './bots/adapters/AnthropicAdapter';
+export { default as LlmAdapterLoader } from './bots/adapters/LlmAdapterLoader';

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.AthropicAdapter = exports.OllamaAdapter = exports.SpyOpenAiApi = exports.SpyLlmAdapter = exports.SpyLllmBot = exports.MockLlmSkill = exports.SprucebotLlmError = exports.OpenAiAdapter = exports.SprucebotLlmSkillImpl = exports.SprucebotLlmBotImpl = exports.SprucebotLlmFactory = void 0;
+exports.LlmAdapterLoader = exports.AthropicAdapter = exports.OllamaAdapter = exports.SpyOpenAiApi = exports.SpyLlmAdapter = exports.SpyLllmBot = exports.MockLlmSkill = 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");
@@ -43,3 +43,5 @@ __exportStar(require("./bots/adapters/OllamaAdapter"), exports);
 var AnthropicAdapter_1 = require("./bots/adapters/AnthropicAdapter");
 Object.defineProperty(exports, "AthropicAdapter", { enumerable: true, get: function () { return __importDefault(AnthropicAdapter_1).default; } });
 __exportStar(require("./bots/adapters/AnthropicAdapter"), exports);
+var LlmAdapterLoader_1 = require("./bots/adapters/LlmAdapterLoader");
+Object.defineProperty(exports, "LlmAdapterLoader", { enumerable: true, get: function () { return __importDefault(LlmAdapterLoader_1).default; } });

package/build/tests/SpyAdapter.d.ts

@@ -1,11 +1,18 @@
+import { OpenAiAdapterOptions } from '../bots/adapters/OpenAiAdapter';
 import { LllmReasoningEffort, LlmAdapter, SendMessageOptions, SprucebotLlmBot } from '../llm.types';
 export default class SpyLlmAdapter implements LlmAdapter {
-    lastBot?: SprucebotLlmBot;
+    static instance: SpyLlmAdapter;
+    lastSendMessageBot?: SprucebotLlmBot;
     lastMessage?: string;
-    messageResponse: string;
-    lastSendOptions?: SendMessageOptions;
+    lastSendMessageResponse: string;
+    lastSendMessageOptions?: SendMessageOptions;
     responseDelayMs?: number;
+    manuallySetModel?: string;
+    apiKey: string;
+    constructorOptions?: OpenAiAdapterOptions;
+    shouldRandomizeResponseMessage: boolean;
+    constructor(apiKey: string, options?: OpenAiAdapterOptions);
     sendMessage(bot: SprucebotLlmBot, options?: SendMessageOptions): Promise<string>;
-    setModel(_model: string): void;
+    setModel(model: string): void;
     setReasoningEffort(_effort: LllmReasoningEffort): void;
 }

package/build/tests/SpyAdapter.js

@@ -1,18 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const test_utils_1 = require("@sprucelabs/test-utils");
 class SpyLlmAdapter {
-    constructor() {
-        this.messageResponse = '';
+    constructor(apiKey, options) {
+        this.lastSendMessageResponse = (0, test_utils_1.generateId)();
+        this.shouldRandomizeResponseMessage = true;
+        SpyLlmAdapter.instance = this;
+        this.apiKey = apiKey;
+        this.constructorOptions = options;
     }
     async sendMessage(bot, options) {
-        this.lastBot = bot;
-        this.lastSendOptions = options;
+        this.lastSendMessageBot = bot;
+        this.lastSendMessageOptions = options;
         if (this.responseDelayMs) {
             await new Promise((resolve) => setTimeout(resolve, this.responseDelayMs));
         }
-        return this.messageResponse;
+        if (this.shouldRandomizeResponseMessage) {
+            this.lastSendMessageResponse = (0, test_utils_1.generateId)();
+        }
+        return this.lastSendMessageResponse;
+    }
+    setModel(model) {
+        this.manuallySetModel = model;
     }
-    setModel(_model) { }
     setReasoningEffort(_effort) { }
 }
 exports.default = SpyLlmAdapter;

package/package.json

@@ -8,7 +8,7 @@
       "eta"
     ]
   },
-  "version": "13.3.0",
+  "version": "14.0.0",
   "files": [
     "build"
   ],
@@ -67,10 +67,10 @@
   "dependencies": {
     "@anthropic-ai/sdk": "^0.76.0",
     "@sprucelabs/error": "^8.1.9",
-    "@sprucelabs/mercury-event-emitter": "^46.1.6",
+    "@sprucelabs/mercury-event-emitter": "^46.1.7",
     "@sprucelabs/mercury-types": "^49.1.9",
     "@sprucelabs/schema": "^33.2.6",
-    "@sprucelabs/spruce-skill-utils": "^34.0.13",
+    "@sprucelabs/spruce-skill-utils": "^34.0.14",
     "eta": "3.5.0",
     "openai": "^6.22.0"
   },