@sprucelabs/sprucebot-llm 15.0.2 → 15.1.0

package/build/.spruce/settings.json

@@ -11,7 +11,7 @@
     "error"
   ],
   "regressionproof": {
-    "enabled": true,
+    "enabled": false,
     "projectName": "sprucebot-llm"
   }
 }

package/build/bots/SprucebotLlmBotImpl.d.ts

@@ -16,7 +16,8 @@ export default class SprucebotLlmBotImpl<StateSchema extends Schema = Schema, St
     markAsDone(): void;
     getIsDone(): boolean;
     serialize(): SerializedBot<StateSchema, State>;
-    sendMessage(message: SendMessage, cb?: MessageResponseCallback): Promise<string>;
+    unserialize(serialized: SerializedBot<StateSchema, State>): void;
+    sendMessage(message: SendMessage, cb?: MessageResponseCallback): Promise<string | null>;
     private optionallyUpdateState;
     private trackMessage;
     updateState(updates: Partial<State>): Promise<void>;

package/build/bots/SprucebotLlmBotImpl.js

@@ -44,6 +44,10 @@ class SprucebotLlmBotImpl extends mercury_event_emitter_1.AbstractEventEmitter {
             skill,
         };
     }
+    unserialize(serialized) {
+        this.state = serialized.state;
+        serialized.skill && this.skill?.unserialize(serialized.skill);
+    }
     async sendMessage(message, cb) {
         (0, schema_1.assertOptions)({ message }, ['message']);
         const llmMessage = {

package/build/bots/SprucebotLlmSkillImpl.d.ts

@@ -12,4 +12,5 @@ export default class SprucebotLlmSkillImpl<StateSchema extends Schema = Schema,
     serialize(): SerializedSkill<StateSchema, State>;
     silentlySetState(state: Partial<State>): void;
     getStateSchema(): StateSchema | undefined;
+    unserialize(serialized: SerializedSkill<StateSchema, State>): void;
 }

package/build/bots/SprucebotLlmSkillImpl.js

@@ -43,5 +43,10 @@ class SprucebotLlmSkillImpl extends mercury_event_emitter_1.AbstractEventEmitter
     getStateSchema() {
         return this.stateSchema;
     }
+    unserialize(serialized) {
+        const { state, ...options } = serialized;
+        this.state = state;
+        this.options = options;
+    }
 }
 exports.default = SprucebotLlmSkillImpl;

package/build/bots/TurnRequest.d.ts

@@ -16,7 +16,7 @@ export default class TurnRequest {
         optionallyUpdateState: (state?: Record<string, any>) => Promise<void>;
     });
     cancel(): void;
-    sendMessage(llmMessage: LlmMessage, cb?: MessageResponseCallback): Promise<string>;
+    sendMessage(llmMessage: LlmMessage, cb?: MessageResponseCallback): Promise<string | null>;
     private sendMessageToAdapter;
     private parseResponse;
 }

package/build/bots/TurnRequest.js

@@ -26,7 +26,7 @@ class TurnRequest {
         if (this.isCancelled) {
             return '';
         }
-        let parsedMessage;
+        let parsedMessage = null;
         let isDone;
         let state;
         let callbackResults;

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

@@ -16,7 +16,8 @@ export default class SprucebotLlmBotImpl<StateSchema extends Schema = Schema, St
     markAsDone(): void;
     getIsDone(): boolean;
     serialize(): SerializedBot<StateSchema, State>;
-    sendMessage(message: SendMessage, cb?: MessageResponseCallback): Promise<string>;
+    unserialize(serialized: SerializedBot<StateSchema, State>): void;
+    sendMessage(message: SendMessage, cb?: MessageResponseCallback): Promise<string | null>;
     private optionallyUpdateState;
     private trackMessage;
     updateState(updates: Partial<State>): Promise<void>;

package/build/esm/bots/SprucebotLlmBotImpl.js

@@ -46,6 +46,11 @@ class SprucebotLlmBotImpl extends AbstractEventEmitter {
             skill,
         };
     }
+    unserialize(serialized) {
+        var _a;
+        this.state = serialized.state;
+        serialized.skill && ((_a = this.skill) === null || _a === void 0 ? void 0 : _a.unserialize(serialized.skill));
+    }
     sendMessage(message, cb) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;

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

@@ -12,4 +12,5 @@ export default class SprucebotLlmSkillImpl<StateSchema extends Schema = Schema,
     serialize(): SerializedSkill<StateSchema, State>;
     silentlySetState(state: Partial<State>): void;
     getStateSchema(): StateSchema | undefined;
+    unserialize(serialized: SerializedSkill<StateSchema, State>): void;
 }

package/build/esm/bots/SprucebotLlmSkillImpl.js

@@ -53,4 +53,9 @@ export default class SprucebotLlmSkillImpl extends AbstractEventEmitter {
     getStateSchema() {
         return this.stateSchema;
     }
+    unserialize(serialized) {
+        const { state } = serialized, options = __rest(serialized, ["state"]);
+        this.state = state;
+        this.options = options;
+    }
 }

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

@@ -16,7 +16,7 @@ export default class TurnRequest {
         optionallyUpdateState: (state?: Record<string, any>) => Promise<void>;
     });
     cancel(): void;
-    sendMessage(llmMessage: LlmMessage, cb?: MessageResponseCallback): Promise<string>;
+    sendMessage(llmMessage: LlmMessage, cb?: MessageResponseCallback): Promise<string | null>;
     private sendMessageToAdapter;
     private parseResponse;
 }

package/build/esm/bots/TurnRequest.js

@@ -32,7 +32,7 @@ export default class TurnRequest {
             if (this.isCancelled) {
                 return '';
             }
-            let parsedMessage;
+            let parsedMessage = null;
             let isDone;
             let state;
             let callbackResults;

package/build/esm/llm.types.d.ts

@@ -9,8 +9,9 @@ export interface BotOptions<StateSchema extends Schema = Schema, State extends S
 export interface SprucebotLlmBot<StateSchema extends Schema = Schema, State extends SchemaValues<StateSchema> = SchemaValues<StateSchema>> extends MercuryEventEmitter<LlmEventContract> {
     markAsDone(): void;
     getIsDone(): boolean;
-    sendMessage(message: SendMessage, responseCb?: MessageResponseCallback): Promise<string>;
+    sendMessage(message: SendMessage, responseCb?: MessageResponseCallback): Promise<string | null>;
     serialize(): SerializedBot<StateSchema, State>;
+    unserialize(serialized: SerializedBot<StateSchema, State>): void;
     updateState(state: Partial<State>): Promise<void>;
     setSkill(skill: SprucebotLLmSkill<any>): void;
     clearMessageHistory(): void;
@@ -73,6 +74,7 @@ export interface SkillOptions<StateSchema extends Schema = Schema, State extends
 export interface SprucebotLLmSkill<StateSchema extends Schema = Schema, State extends SchemaValues<StateSchema> = SchemaValues<StateSchema>> extends MercuryEventEmitter<LlmEventContract> {
     getState(): Partial<State> | undefined;
     serialize(): SerializedSkill<StateSchema, State>;
+    unserialize(serialized: SerializedSkill<StateSchema, State>): void;
     updateState(state: Partial<State>): Promise<void>;
     setModel(model: string): void;
 }
@@ -96,7 +98,7 @@ export type LlmCallbackParameter = {
     name: string;
     description?: string;
 });
-export type MessageResponseCallback = (message: string) => void;
+export type MessageResponseCallback = (message: string | null) => void;
 export type SendMessage = string | SendMessageWithImage;
 export interface SendMessageWithImage {
     imageDescription: string;
@@ -111,6 +113,6 @@ export interface ResponseParser {
 export interface ParsedResponse {
     isDone: boolean;
     state?: Record<string, any>;
-    message: string;
+    message: string | null;
     callbackResults?: SendMessage;
 }

package/build/esm/parsingResponses/ResponseParserV2.d.ts

@@ -2,6 +2,7 @@ import { ResponseParser, LlmCallbackMap, ParsedResponse } from '../llm.types';
 export default class ResponseParserV2 implements ResponseParser {
     parse(response: string, callbacks?: LlmCallbackMap): Promise<ParsedResponse>;
     private invokeCallbacks;
+    private renderCallbackResults;
     getStateUpdateInstructions(): string;
     getFunctionCallInstructions(): string;
 }

package/build/esm/parsingResponses/ResponseParserV2.js

@@ -17,13 +17,26 @@ export default class ResponseParserV2 {
             let callbackResults = undefined;
             const hasCallbacks = message.includes('@callback');
             if (hasCallbacks) {
-                callbackResults = yield this.invokeCallbacks(message, callbacks);
+                const { callbackResults: c, message: m } = yield this.invokeCallbacks(message, callbacks);
+                callbackResults = c;
+                message = m;
             }
             const hasState = response.includes('@updateState');
-            if (hasState) {
+            if (hasState && message) {
                 const stateMatch = message.match(/@updateState\s+({[\s\S]*?})\n?/);
                 if (stateMatch && stateMatch[1]) {
-                    state = JSON.parse(stateMatch[1]);
+                    try {
+                        state = JSON.parse(stateMatch[1]);
+                    }
+                    catch (err) {
+                        if (!callbackResults) {
+                            callbackResults = '';
+                        }
+                        callbackResults += this.renderCallbackResults({
+                            error: err,
+                            name: 'updateState',
+                        });
+                    }
                     message = message.replace(stateMatch[0], '').trim();
                 }
             }
@@ -37,37 +50,54 @@ export default class ResponseParserV2 {
     }
     invokeCallbacks(message, callbacks) {
         return __awaiter(this, void 0, void 0, function* () {
+            let callbackStrippedMessage = message;
             let callbackResults = '';
             const matches = [...message.matchAll(/^@callback\s+({.*})$/gm)];
             for (const match of matches) {
                 const callbackData = match && match[1] ? JSON.parse(match[1]) : null;
                 const { name, options } = callbackData || {};
+                debugger;
+                if (match) {
+                    const parts = callbackStrippedMessage.split(match[0]);
+                    callbackStrippedMessage = parts
+                        .map((s) => s.trim())
+                        .join('')
+                        .trim();
+                }
                 try {
                     const callback = callbacks === null || callbacks === void 0 ? void 0 : callbacks[name];
                     if (callback === null || callback === void 0 ? void 0 : callback.parameters) {
                         validateAndNormalizeCallbackOptions(callback.parameters, options);
                     }
                     const results = yield (callback === null || callback === void 0 ? void 0 : callback.cb(options));
-                    callbackResults += `@results ${JSON.stringify({
+                    callbackResults += this.renderCallbackResults({
                         name,
                         results,
-                    })}\n`;
+                    });
                 }
                 catch (err) {
-                    callbackResults += `@results ${JSON.stringify({
+                    callbackResults += this.renderCallbackResults({
                         name,
                         error: err,
-                    })}\n`;
+                    });
                 }
             }
             callbackResults = callbackResults.trim();
-            return callbackResults;
+            return {
+                callbackResults,
+                message: callbackStrippedMessage.length > 0
+                    ? callbackStrippedMessage
+                    : null,
+            };
         });
     }
+    renderCallbackResults(callbackOptions) {
+        return `@results ${JSON.stringify(callbackOptions)}\n`;
+    }
     getStateUpdateInstructions() {
-        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.';
+        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. NOTE: Keep json on a single line to avoid parsing issues.';
     }
     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.`;
+        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. NOTE: Keep json on a single line to avoid parsing issues.`;
     }
 }

package/build/llm.types.d.ts

@@ -9,8 +9,9 @@ export interface BotOptions<StateSchema extends Schema = Schema, State extends S
 export interface SprucebotLlmBot<StateSchema extends Schema = Schema, State extends SchemaValues<StateSchema> = SchemaValues<StateSchema>> extends MercuryEventEmitter<LlmEventContract> {
     markAsDone(): void;
     getIsDone(): boolean;
-    sendMessage(message: SendMessage, responseCb?: MessageResponseCallback): Promise<string>;
+    sendMessage(message: SendMessage, responseCb?: MessageResponseCallback): Promise<string | null>;
     serialize(): SerializedBot<StateSchema, State>;
+    unserialize(serialized: SerializedBot<StateSchema, State>): void;
     updateState(state: Partial<State>): Promise<void>;
     setSkill(skill: SprucebotLLmSkill<any>): void;
     clearMessageHistory(): void;
@@ -73,6 +74,7 @@ export interface SkillOptions<StateSchema extends Schema = Schema, State extends
 export interface SprucebotLLmSkill<StateSchema extends Schema = Schema, State extends SchemaValues<StateSchema> = SchemaValues<StateSchema>> extends MercuryEventEmitter<LlmEventContract> {
     getState(): Partial<State> | undefined;
     serialize(): SerializedSkill<StateSchema, State>;
+    unserialize(serialized: SerializedSkill<StateSchema, State>): void;
     updateState(state: Partial<State>): Promise<void>;
     setModel(model: string): void;
 }
@@ -96,7 +98,7 @@ export type LlmCallbackParameter = {
     name: string;
     description?: string;
 });
-export type MessageResponseCallback = (message: string) => void;
+export type MessageResponseCallback = (message: string | null) => void;
 export type SendMessage = string | SendMessageWithImage;
 export interface SendMessageWithImage {
     imageDescription: string;
@@ -111,6 +113,6 @@ export interface ResponseParser {
 export interface ParsedResponse {
     isDone: boolean;
     state?: Record<string, any>;
-    message: string;
+    message: string | null;
     callbackResults?: SendMessage;
 }

package/build/parsingResponses/ResponseParserV2.d.ts

@@ -2,6 +2,7 @@ import { ResponseParser, LlmCallbackMap, ParsedResponse } from '../llm.types';
 export default class ResponseParserV2 implements ResponseParser {
     parse(response: string, callbacks?: LlmCallbackMap): Promise<ParsedResponse>;
     private invokeCallbacks;
+    private renderCallbackResults;
     getStateUpdateInstructions(): string;
     getFunctionCallInstructions(): string;
 }

package/build/parsingResponses/ResponseParserV2.js

@@ -12,13 +12,26 @@ class ResponseParserV2 {
         let callbackResults = undefined;
         const hasCallbacks = message.includes('@callback');
         if (hasCallbacks) {
-            callbackResults = await this.invokeCallbacks(message, callbacks);
+            const { callbackResults: c, message: m } = await this.invokeCallbacks(message, callbacks);
+            callbackResults = c;
+            message = m;
         }
         const hasState = response.includes('@updateState');
-        if (hasState) {
+        if (hasState && message) {
             const stateMatch = message.match(/@updateState\s+({[\s\S]*?})\n?/);
             if (stateMatch && stateMatch[1]) {
-                state = JSON.parse(stateMatch[1]);
+                try {
+                    state = JSON.parse(stateMatch[1]);
+                }
+                catch (err) {
+                    if (!callbackResults) {
+                        callbackResults = '';
+                    }
+                    callbackResults += this.renderCallbackResults({
+                        error: err,
+                        name: 'updateState',
+                    });
+                }
                 message = message.replace(stateMatch[0], '').trim();
             }
         }
@@ -30,37 +43,54 @@ class ResponseParserV2 {
         };
     }
     async invokeCallbacks(message, callbacks) {
+        let callbackStrippedMessage = message;
         let callbackResults = '';
         const matches = [...message.matchAll(/^@callback\s+({.*})$/gm)];
         for (const match of matches) {
             const callbackData = match && match[1] ? JSON.parse(match[1]) : null;
             const { name, options } = callbackData || {};
+            debugger;
+            if (match) {
+                const parts = callbackStrippedMessage.split(match[0]);
+                callbackStrippedMessage = parts
+                    .map((s) => s.trim())
+                    .join('')
+                    .trim();
+            }
             try {
                 const callback = callbacks?.[name];
                 if (callback?.parameters) {
                     (0, validateAndNormalizeCallbackOptions_1.default)(callback.parameters, options);
                 }
                 const results = await callback?.cb(options);
-                callbackResults += `@results ${JSON.stringify({
+                callbackResults += this.renderCallbackResults({
                     name,
                     results,
-                })}\n`;
+                });
             }
             catch (err) {
-                callbackResults += `@results ${JSON.stringify({
+                callbackResults += this.renderCallbackResults({
                     name,
                     error: err,
-                })}\n`;
+                });
             }
         }
         callbackResults = callbackResults.trim();
-        return callbackResults;
+        return {
+            callbackResults,
+            message: callbackStrippedMessage.length > 0
+                ? callbackStrippedMessage
+                : null,
+        };
+    }
+    renderCallbackResults(callbackOptions) {
+        return `@results ${JSON.stringify(callbackOptions)}\n`;
     }
     getStateUpdateInstructions() {
-        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.';
+        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. NOTE: Keep json on a single line to avoid parsing issues.';
     }
     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.`;
+        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. NOTE: Keep json on a single line to avoid parsing issues.`;
     }
 }
 exports.default = ResponseParserV2;

package/package.json

@@ -8,7 +8,7 @@
       "eta"
     ]
   },
-  "version": "15.0.2",
+  "version": "15.1.0",
   "files": [
     "build"
   ],