@sprucelabs/sprucebot-llm 15.0.3 → 15.1.1

package/build/bots/SprucebotLlmBotImpl.d.ts

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

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/esm/bots/SprucebotLlmBotImpl.d.ts

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

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/llm.types.d.ts

@@ -11,6 +11,7 @@ export interface SprucebotLlmBot<StateSchema extends Schema = Schema, State exte
     getIsDone(): boolean;
     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;
 }

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

@@ -25,7 +25,18 @@ export default class ResponseParserV2 {
             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();
                 }
             }
@@ -59,16 +70,16 @@ export default class ResponseParserV2 {
                         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();
@@ -80,10 +91,13 @@ export default class ResponseParserV2 {
             };
         });
     }
+    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. 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.`;
+        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.`;
     }
 }

package/build/llm.types.d.ts

@@ -11,6 +11,7 @@ export interface SprucebotLlmBot<StateSchema extends Schema = Schema, State exte
     getIsDone(): boolean;
     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;
 }

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

@@ -20,7 +20,18 @@ class ResponseParserV2 {
         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();
             }
         }
@@ -52,16 +63,16 @@ class ResponseParserV2 {
                     (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();
@@ -72,11 +83,14 @@ class ResponseParserV2 {
                 : 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. 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.`;
+        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.`;
     }
 }
 exports.default = ResponseParserV2;

package/package.json

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