@sprucelabs/sprucebot-llm 15.1.1 → 15.1.3

package/build/bots/adapters/AnthropicAdapter.js

@@ -37,11 +37,26 @@ class AnthropicAdapter {
     async sendHandler(params, sendOptions) {
         const { messages: openAiMessages, model } = params;
         const messages = [];
+        const cacheMarkerIdx = openAiMessages.findIndex((msg) => msg.cache_marker);
         for (const msg of openAiMessages) {
-            messages.push({
-                role: msg.role === 'assistant' ? 'assistant' : 'user',
-                content: msg.content,
-            });
+            if (!msg.cache_marker) {
+                const m = msg;
+                messages.push({
+                    role: m.role === 'assistant' ? 'assistant' : 'user',
+                    content: m.content,
+                });
+            }
+        }
+        if (cacheMarkerIdx > -1) {
+            messages[cacheMarkerIdx - 1].content = [
+                {
+                    type: 'text',
+                    text: messages[cacheMarkerIdx - 1].content,
+                    cache_control: {
+                        type: 'ephemeral',
+                    },
+                },
+            ];
         }
         const response = await this.api.messages.create({
             max_tokens: this.maxTokens,

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

@@ -6,7 +6,7 @@ export default class MessageBuilder {
     protected constructor(bot: SprucebotLlmBot, options?: BuildMessageOptions);
     static Builder(bot: SprucebotLlmBot, options?: BuildMessageOptions): MessageBuilder;
     private get parser();
-    buildMessages(): ChatCompletionMessageParam[];
+    buildMessages(): MessageBuilderMessage[];
     private buildChatHistoryMessages;
     private mapMessageToCompletion;
     private maxCharsOfPastMessages;
@@ -23,4 +23,8 @@ export default class MessageBuilder {
 interface BuildMessageOptions {
     memoryLimit?: number;
 }
+export interface MessageBuilderCacheMarker {
+    cache_marker: true;
+}
+export type MessageBuilderMessage = ChatCompletionMessageParam | MessageBuilderCacheMarker;
 export {};

package/build/bots/adapters/MessageBuilder.js

@@ -26,6 +26,12 @@ class MessageBuilder {
             ...this.buildSkillMessages(values.skill),
             ...this.buildChatHistoryMessages(values.messages),
         ];
+        if (!values.skill) {
+            const first = allMessages[0];
+            allMessages.shift();
+            allMessages.unshift({ cache_marker: true });
+            allMessages.unshift(first);
+        }
         return allMessages;
     }
     buildChatHistoryMessages(messages) {
@@ -99,9 +105,6 @@ class MessageBuilder {
         if (skill.stateSchema) {
             messages.push(this.buildStateSchemaMessage(skill.stateSchema));
         }
-        if (skill.state) {
-            messages.push(this.buildStateMessage(skill.state));
-        }
         if (skill.weAreDoneWhen) {
             messages.push(this.buildWeAreDoneWhenMessage(skill.weAreDoneWhen));
         }
@@ -111,6 +114,10 @@ class MessageBuilder {
         if (skill.pleaseKeepInMindThat) {
             messages.push(this.buildPleaseKeepInMindMessage(skill.pleaseKeepInMindThat));
         }
+        messages.push({ cache_marker: true });
+        if (skill.state) {
+            messages.push(this.buildStateMessage(skill.state));
+        }
         return messages;
     }
     buildCallbacksMessage(callbacks) {

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

@@ -1,8 +1,8 @@
 import { Log } from '@sprucelabs/spruce-skill-utils';
-import OpenAI from 'openai';
 import { RequestOptions } from 'openai/internal/request-options';
-import { ReasoningEffort, ChatCompletionCreateParamsNonStreaming } from 'openai/resources';
+import { ReasoningEffort } from 'openai/resources';
 import { SprucebotLlmBot, SendMessageOptions } from '../../llm.types';
+import { MessageBuilderMessage } from './MessageBuilder';
 export default class MessageSenderImpl implements MessageSender {
     static AbortController: {
         new (): AbortController;
@@ -18,12 +18,16 @@ export default class MessageSenderImpl implements MessageSender {
     private send;
 }
 export type MessageSenderSendOptions = SendMessageOptions & {
-    messages: OpenAI.Chat.Completions.ChatCompletionMessageParam[];
+    messages: MessageBuilderMessage[];
     reasoningEffort?: ReasoningEffort;
     model: string;
     abortController: AbortController;
 };
-export type MessageSenderSendHandler = (params: ChatCompletionCreateParamsNonStreaming, options: RequestOptions) => Promise<string | undefined>;
+export interface MessageHandlerSendHandlerParams {
+    model: string;
+    messages: MessageBuilderMessage[];
+}
+export type MessageSenderSendHandler = (params: MessageHandlerSendHandlerParams, options: RequestOptions) => Promise<string | undefined>;
 export interface MessageSender {
     sendMessage(bot: SprucebotLlmBot, options: MessageSenderSendMessageOptions): Promise<string>;
 }

package/build/bots/adapters/OpenAiAdapter.js

@@ -30,6 +30,8 @@ class OpenAiAdapter {
         });
     }
     async sendHandler(params, sendOptions) {
+        const { messages } = params;
+        params.messages = messages.filter((msg) => !msg.cache_marker);
         const response = await this.api.chat.completions.create(params, sendOptions);
         const responseMessage = response.choices?.[0]?.message?.content?.trim();
         return responseMessage;

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

@@ -42,11 +42,26 @@ class AnthropicAdapter {
             var _a, _b;
             const { messages: openAiMessages, model } = params;
             const messages = [];
+            const cacheMarkerIdx = openAiMessages.findIndex((msg) => msg.cache_marker);
             for (const msg of openAiMessages) {
-                messages.push({
-                    role: msg.role === 'assistant' ? 'assistant' : 'user',
-                    content: msg.content,
-                });
+                if (!msg.cache_marker) {
+                    const m = msg;
+                    messages.push({
+                        role: m.role === 'assistant' ? 'assistant' : 'user',
+                        content: m.content,
+                    });
+                }
+            }
+            if (cacheMarkerIdx > -1) {
+                messages[cacheMarkerIdx - 1].content = [
+                    {
+                        type: 'text',
+                        text: messages[cacheMarkerIdx - 1].content,
+                        cache_control: {
+                            type: 'ephemeral',
+                        },
+                    },
+                ];
             }
             const response = yield this.api.messages.create({
                 max_tokens: this.maxTokens,

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

@@ -6,7 +6,7 @@ export default class MessageBuilder {
     protected constructor(bot: SprucebotLlmBot, options?: BuildMessageOptions);
     static Builder(bot: SprucebotLlmBot, options?: BuildMessageOptions): MessageBuilder;
     private get parser();
-    buildMessages(): ChatCompletionMessageParam[];
+    buildMessages(): MessageBuilderMessage[];
     private buildChatHistoryMessages;
     private mapMessageToCompletion;
     private maxCharsOfPastMessages;
@@ -23,4 +23,8 @@ export default class MessageBuilder {
 interface BuildMessageOptions {
     memoryLimit?: number;
 }
+export interface MessageBuilderCacheMarker {
+    cache_marker: true;
+}
+export type MessageBuilderMessage = ChatCompletionMessageParam | MessageBuilderCacheMarker;
 export {};

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

@@ -21,6 +21,12 @@ export default class MessageBuilder {
             ...this.buildSkillMessages(values.skill),
             ...this.buildChatHistoryMessages(values.messages),
         ];
+        if (!values.skill) {
+            const first = allMessages[0];
+            allMessages.shift();
+            allMessages.unshift({ cache_marker: true });
+            allMessages.unshift(first);
+        }
         return allMessages;
     }
     buildChatHistoryMessages(messages) {
@@ -95,9 +101,6 @@ export default class MessageBuilder {
         if (skill.stateSchema) {
             messages.push(this.buildStateSchemaMessage(skill.stateSchema));
         }
-        if (skill.state) {
-            messages.push(this.buildStateMessage(skill.state));
-        }
         if (skill.weAreDoneWhen) {
             messages.push(this.buildWeAreDoneWhenMessage(skill.weAreDoneWhen));
         }
@@ -107,6 +110,10 @@ export default class MessageBuilder {
         if (skill.pleaseKeepInMindThat) {
             messages.push(this.buildPleaseKeepInMindMessage(skill.pleaseKeepInMindThat));
         }
+        messages.push({ cache_marker: true });
+        if (skill.state) {
+            messages.push(this.buildStateMessage(skill.state));
+        }
         return messages;
     }
     buildCallbacksMessage(callbacks) {

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

@@ -1,8 +1,8 @@
 import { Log } from '@sprucelabs/spruce-skill-utils';
-import OpenAI from 'openai';
 import { RequestOptions } from 'openai/internal/request-options';
-import { ReasoningEffort, ChatCompletionCreateParamsNonStreaming } from 'openai/resources';
+import { ReasoningEffort } from 'openai/resources';
 import { SprucebotLlmBot, SendMessageOptions } from '../../llm.types';
+import { MessageBuilderMessage } from './MessageBuilder';
 export default class MessageSenderImpl implements MessageSender {
     static AbortController: {
         new (): AbortController;
@@ -18,12 +18,16 @@ export default class MessageSenderImpl implements MessageSender {
     private send;
 }
 export type MessageSenderSendOptions = SendMessageOptions & {
-    messages: OpenAI.Chat.Completions.ChatCompletionMessageParam[];
+    messages: MessageBuilderMessage[];
     reasoningEffort?: ReasoningEffort;
     model: string;
     abortController: AbortController;
 };
-export type MessageSenderSendHandler = (params: ChatCompletionCreateParamsNonStreaming, options: RequestOptions) => Promise<string | undefined>;
+export interface MessageHandlerSendHandlerParams {
+    model: string;
+    messages: MessageBuilderMessage[];
+}
+export type MessageSenderSendHandler = (params: MessageHandlerSendHandlerParams, options: RequestOptions) => Promise<string | undefined>;
 export interface MessageSender {
     sendMessage(bot: SprucebotLlmBot, options: MessageSenderSendMessageOptions): Promise<string>;
 }

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

@@ -33,6 +33,8 @@ class OpenAiAdapter {
     sendHandler(params, sendOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d;
+            const { messages } = params;
+            params.messages = messages.filter((msg) => !msg.cache_marker);
             const response = yield this.api.chat.completions.create(params, sendOptions);
             const responseMessage = (_d = (_c = (_b = (_a = response.choices) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.message) === null || _c === void 0 ? void 0 : _c.content) === null || _d === void 0 ? void 0 : _d.trim();
             return responseMessage;

package/build/esm/parsingResponses/ResponseParserV2.js

@@ -98,6 +98,6 @@ export default class ResponseParserV2 {
         return 'Updating state works similar to all function calls. Use the following syntax:\n@updateState { "updates": "here" }\n. Make sure to json encode only the fields you want to change. You can update state once and do it at the end of any messages you send. IMPORTANT: JSON must be on a single line. Do NOT use multi-line or formatted JSON.';
     }
     getFunctionCallInstructions() {
-        return `A function call is done using the following syntax:\n@callback { "name": "callbackName", "options": {} }\nMake sure to json encode the options and include the name of the callback you want to call. You can call as many callbacks as you want in a single response by including multiple @callback lines. IMPORTANT: JSON must be on a single line. Do NOT use multi-line or formatted JSON.`;
+        return `A function call is done using the following syntax:\n@callback { "name": "callbackName", "options": {} }\nMake sure to json encode the options and include the name of the callback you want to call. You can call as many callbacks as you want in a single response by including multiple @callback lines. IMPORTANT: JSON must be on a single line. Do NOT use multi-line or formatted JSON. Also, do NOT call something like @myCallback. You would call it like this: @callback { "name": "myCallback", "options": {} }`;
     }
 }

package/build/parsingResponses/ResponseParserV2.js

@@ -90,7 +90,7 @@ class ResponseParserV2 {
         return 'Updating state works similar to all function calls. Use the following syntax:\n@updateState { "updates": "here" }\n. Make sure to json encode only the fields you want to change. You can update state once and do it at the end of any messages you send. IMPORTANT: JSON must be on a single line. Do NOT use multi-line or formatted JSON.';
     }
     getFunctionCallInstructions() {
-        return `A function call is done using the following syntax:\n@callback { "name": "callbackName", "options": {} }\nMake sure to json encode the options and include the name of the callback you want to call. You can call as many callbacks as you want in a single response by including multiple @callback lines. IMPORTANT: JSON must be on a single line. Do NOT use multi-line or formatted JSON.`;
+        return `A function call is done using the following syntax:\n@callback { "name": "callbackName", "options": {} }\nMake sure to json encode the options and include the name of the callback you want to call. You can call as many callbacks as you want in a single response by including multiple @callback lines. IMPORTANT: JSON must be on a single line. Do NOT use multi-line or formatted JSON. Also, do NOT call something like @myCallback. You would call it like this: @callback { "name": "myCallback", "options": {} }`;
     }
 }
 exports.default = ResponseParserV2;

package/package.json

@@ -8,7 +8,7 @@
       "eta"
     ]
   },
-  "version": "15.1.1",
+  "version": "15.1.3",
   "files": [
     "build"
   ],