@sprucelabs/sprucebot-llm 8.3.0 → 8.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/build/bots/SprucebotLlmBotImpl.d.ts +3 -0
  2. package/build/bots/SprucebotLlmBotImpl.js +39 -13
  3. package/build/esm/bots/SprucebotLlmBotImpl.d.ts +3 -0
  4. package/build/esm/bots/SprucebotLlmBotImpl.js +47 -14
  5. package/build/esm/parsingResponses/ResponseParser.d.ts +1 -0
  6. package/build/esm/parsingResponses/ResponseParser.js +10 -5
  7. package/build/parsingResponses/ResponseParser.d.ts +1 -0
  8. package/build/parsingResponses/ResponseParser.js +9 -4
  9. package/package.json +1 -1
package/build/bots/SprucebotLlmBotImpl.d.ts CHANGED
@@ -16,6 +16,9 @@ export default class SprucebotLlmBotImpl<StateSchema extends Schema = Schema, St
16
16
  getIsDone(): boolean;
17
17
  serialize(): SerializedBot<StateSchema, State>;
18
18
  sendMessage(message: string, cb?: MessageResponseCallback): Promise<string>;
19
+ private optionallyUpdateState;
20
+ private parseResponse;
21
+ private sendMessageToAdapter;
19
22
  private trackMessage;
20
23
  updateState(newState: Partial<State>): Promise<void>;
21
24
  setSkill(skill: SprucebotLLmSkill<any>): void;
package/build/bots/SprucebotLlmBotImpl.js CHANGED
@@ -49,28 +49,54 @@ class SprucebotLlmBotImpl extends mercury_event_emitter_1.AbstractEventEmitter {
49
49
  from: 'Me',
50
50
  message,
51
51
  });
52
- const serializedSkill = this.skill?.serialize();
53
- const response = await this.adapter.sendMessage(this, {
54
- model: serializedSkill?.model,
55
- });
56
- const parser = ResponseParser_1.default.getInstance();
57
- const { isDone, message: parsedResponse, state, callbackResults, } = await parser.parse(response, serializedSkill?.callbacks);
58
- this.isDone = isDone;
59
- if (this.stateSchema && state) {
60
- await this.updateState(state);
52
+ const { model, callbacks } = this.skill?.serialize() ?? {};
53
+ const response = await this.sendMessageToAdapter(model);
54
+ let parsedMessage;
55
+ let isDone;
56
+ let state;
57
+ let callbackResults;
58
+ try {
59
+ const parsed = await this.parseResponse(response, callbacks);
60
+ parsedMessage = parsed.message;
61
+ isDone = parsed.isDone;
62
+ state = parsed.state;
63
+ callbackResults = parsed.callbackResults;
61
64
  }
62
- else if (state) {
63
- await this.skill?.updateState(state);
65
+ catch (err) {
66
+ if (err.options?.code === 'INVALID_CALLBACK') {
67
+ return this.sendMessage(`Error: ${err.message}`, cb);
68
+ }
69
+ throw err;
64
70
  }
71
+ this.isDone = isDone;
72
+ await this.optionallyUpdateState(state);
65
73
  this.trackMessage({
66
74
  from: 'You',
67
75
  message: response,
68
76
  });
69
- cb?.(parsedResponse);
77
+ cb?.(parsedMessage);
70
78
  if (callbackResults) {
71
79
  await this.sendMessage(`API Results: ${callbackResults}`, cb);
72
80
  }
73
- return parsedResponse;
81
+ return parsedMessage;
82
+ }
83
+ async optionallyUpdateState(state) {
84
+ if (this.stateSchema && state) {
85
+ await this.updateState(state);
86
+ }
87
+ else if (state) {
88
+ await this.skill?.updateState(state);
89
+ }
90
+ }
91
+ async parseResponse(response, callbacks) {
92
+ const parser = ResponseParser_1.default.getInstance();
93
+ const parsed = await parser.parse(response, callbacks);
94
+ return parsed;
95
+ }
96
+ async sendMessageToAdapter(model) {
97
+ return await this.adapter.sendMessage(this, {
98
+ model,
99
+ });
74
100
  }
75
101
  trackMessage(m) {
76
102
  if (this.messages.length === SprucebotLlmBotImpl.messageMemoryLimit) {
package/build/esm/bots/SprucebotLlmBotImpl.d.ts CHANGED
@@ -16,6 +16,9 @@ export default class SprucebotLlmBotImpl<StateSchema extends Schema = Schema, St
16
16
  getIsDone(): boolean;
17
17
  serialize(): SerializedBot<StateSchema, State>;
18
18
  sendMessage(message: string, cb?: MessageResponseCallback): Promise<string>;
19
+ private optionallyUpdateState;
20
+ private parseResponse;
21
+ private sendMessageToAdapter;
19
22
  private trackMessage;
20
23
  updateState(newState: Partial<State>): Promise<void>;
21
24
  setSkill(skill: SprucebotLLmSkill<any>): void;
package/build/esm/bots/SprucebotLlmBotImpl.js CHANGED
@@ -47,34 +47,67 @@ class SprucebotLlmBotImpl extends AbstractEventEmitter {
47
47
  }
48
48
  sendMessage(message, cb) {
49
49
  return __awaiter(this, void 0, void 0, function* () {
50
- var _a, _b;
50
+ var _a, _b, _c;
51
51
  assertOptions({ message }, ['message']);
52
52
  this.trackMessage({
53
53
  from: 'Me',
54
54
  message,
55
55
  });
56
- const serializedSkill = (_a = this.skill) === null || _a === void 0 ? void 0 : _a.serialize();
57
- const response = yield this.adapter.sendMessage(this, {
58
- model: serializedSkill === null || serializedSkill === void 0 ? void 0 : serializedSkill.model,
59
- });
60
- const parser = ResponseParser.getInstance();
61
- const { isDone, message: parsedResponse, state, callbackResults, } = yield parser.parse(response, serializedSkill === null || serializedSkill === void 0 ? void 0 : serializedSkill.callbacks);
62
- this.isDone = isDone;
63
- if (this.stateSchema && state) {
64
- yield this.updateState(state);
56
+ const { model, callbacks } = (_b = (_a = this.skill) === null || _a === void 0 ? void 0 : _a.serialize()) !== null && _b !== void 0 ? _b : {};
57
+ const response = yield this.sendMessageToAdapter(model);
58
+ let parsedMessage;
59
+ let isDone;
60
+ let state;
61
+ let callbackResults;
62
+ try {
63
+ const parsed = yield this.parseResponse(response, callbacks);
64
+ parsedMessage = parsed.message;
65
+ isDone = parsed.isDone;
66
+ state = parsed.state;
67
+ callbackResults = parsed.callbackResults;
65
68
  }
66
- else if (state) {
67
- yield ((_b = this.skill) === null || _b === void 0 ? void 0 : _b.updateState(state));
69
+ catch (err) {
70
+ if (((_c = err.options) === null || _c === void 0 ? void 0 : _c.code) === 'INVALID_CALLBACK') {
71
+ return this.sendMessage(`Error: ${err.message}`, cb);
72
+ }
73
+ throw err;
68
74
  }
75
+ this.isDone = isDone;
76
+ yield this.optionallyUpdateState(state);
69
77
  this.trackMessage({
70
78
  from: 'You',
71
79
  message: response,
72
80
  });
73
- cb === null || cb === void 0 ? void 0 : cb(parsedResponse);
81
+ cb === null || cb === void 0 ? void 0 : cb(parsedMessage);
74
82
  if (callbackResults) {
75
83
  yield this.sendMessage(`API Results: ${callbackResults}`, cb);
76
84
  }
77
- return parsedResponse;
85
+ return parsedMessage;
86
+ });
87
+ }
88
+ optionallyUpdateState(state) {
89
+ return __awaiter(this, void 0, void 0, function* () {
90
+ var _a;
91
+ if (this.stateSchema && state) {
92
+ yield this.updateState(state);
93
+ }
94
+ else if (state) {
95
+ yield ((_a = this.skill) === null || _a === void 0 ? void 0 : _a.updateState(state));
96
+ }
97
+ });
98
+ }
99
+ parseResponse(response, callbacks) {
100
+ return __awaiter(this, void 0, void 0, function* () {
101
+ const parser = ResponseParser.getInstance();
102
+ const parsed = yield parser.parse(response, callbacks);
103
+ return parsed;
104
+ });
105
+ }
106
+ sendMessageToAdapter(model) {
107
+ return __awaiter(this, void 0, void 0, function* () {
108
+ return yield this.adapter.sendMessage(this, {
109
+ model,
110
+ });
78
111
  });
79
112
  }
80
113
  trackMessage(m) {
package/build/esm/parsingResponses/ResponseParser.d.ts CHANGED
@@ -4,6 +4,7 @@ export default class ResponseParser {
4
4
  static setInstance(parser: ResponseParser): void;
5
5
  static getInstance(): ResponseParser;
6
6
  parse(response: string, callbacks?: LlmCallbackMap): Promise<ParsedResponse>;
7
+ private findFirstBadCallback;
7
8
  private invokeCallbackAndDropInLegacyResults;
8
9
  private doesIncludeDoneToken;
9
10
  private parseState;
package/build/esm/parsingResponses/ResponseParser.js CHANGED
@@ -19,7 +19,7 @@ class ResponseParser {
19
19
  }
20
20
  parse(response, callbacks) {
21
21
  return __awaiter(this, void 0, void 0, function* () {
22
- var _a, _b;
22
+ var _a;
23
23
  let message = response.replace(DONE_TOKEN, '').trim();
24
24
  let state;
25
25
  let callbackResults;
@@ -44,13 +44,12 @@ class ResponseParser {
44
44
  message = message.replace(simpleMatches[0], '').trim();
45
45
  }
46
46
  }
47
- let extraMatches = message.match(new RegExp(`<<(.*)\/>>`, 'g'));
48
- if (extraMatches && ((_b = extraMatches === null || extraMatches === void 0 ? void 0 : extraMatches.length) !== null && _b !== void 0 ? _b : 0) > 0) {
49
- debugger;
47
+ const matchedCallback = this.findFirstBadCallback(message);
48
+ if (matchedCallback) {
50
49
  throw new SpruceError({
51
50
  code: 'INVALID_CALLBACK',
52
51
  validCallbacks: Object.keys(callbacks !== null && callbacks !== void 0 ? callbacks : {}),
53
- matchedCallback: extraMatches[0],
52
+ matchedCallback,
54
53
  });
55
54
  }
56
55
  const { match, fullMatch } = this.parseState(message);
@@ -66,6 +65,12 @@ class ResponseParser {
66
65
  };
67
66
  });
68
67
  }
68
+ findFirstBadCallback(message) {
69
+ const simpleMatches = message.match(new RegExp(`<<(.*)\/>>`, 'g'));
70
+ const extraJsonMatches = message.match(new RegExp(`<<.*?>>(.*?)<<\/.*?>>`, 'gs'));
71
+ const matchedCallback = (extraJsonMatches === null || extraJsonMatches === void 0 ? void 0 : extraJsonMatches[0]) || (simpleMatches === null || simpleMatches === void 0 ? void 0 : simpleMatches[0]);
72
+ return matchedCallback;
73
+ }
69
74
  invokeCallbackAndDropInLegacyResults(callbacks, key, message) {
70
75
  return __awaiter(this, void 0, void 0, function* () {
71
76
  var _a;
package/build/parsingResponses/ResponseParser.d.ts CHANGED
@@ -4,6 +4,7 @@ export default class ResponseParser {
4
4
  static setInstance(parser: ResponseParser): void;
5
5
  static getInstance(): ResponseParser;
6
6
  parse(response: string, callbacks?: LlmCallbackMap): Promise<ParsedResponse>;
7
+ private findFirstBadCallback;
7
8
  private invokeCallbackAndDropInLegacyResults;
8
9
  private doesIncludeDoneToken;
9
10
  private parseState;
package/build/parsingResponses/ResponseParser.js CHANGED
@@ -38,13 +38,12 @@ class ResponseParser {
38
38
  message = message.replace(simpleMatches[0], '').trim();
39
39
  }
40
40
  }
41
- let extraMatches = message.match(new RegExp(`<<(.*)\/>>`, 'g'));
42
- if (extraMatches && (extraMatches?.length ?? 0) > 0) {
43
- debugger;
41
+ const matchedCallback = this.findFirstBadCallback(message);
42
+ if (matchedCallback) {
44
43
  throw new SpruceError_1.default({
45
44
  code: 'INVALID_CALLBACK',
46
45
  validCallbacks: Object.keys(callbacks ?? {}),
47
- matchedCallback: extraMatches[0],
46
+ matchedCallback,
48
47
  });
49
48
  }
50
49
  const { match, fullMatch } = this.parseState(message);
@@ -59,6 +58,12 @@ class ResponseParser {
59
58
  callbackResults,
60
59
  };
61
60
  }
61
+ findFirstBadCallback(message) {
62
+ const simpleMatches = message.match(new RegExp(`<<(.*)\/>>`, 'g'));
63
+ const extraJsonMatches = message.match(new RegExp(`<<.*?>>(.*?)<<\/.*?>>`, 'gs'));
64
+ const matchedCallback = extraJsonMatches?.[0] || simpleMatches?.[0];
65
+ return matchedCallback;
66
+ }
62
67
  async invokeCallbackAndDropInLegacyResults(callbacks, key, message) {
63
68
  const v = await callbacks?.[key]?.cb();
64
69
  message = message.replace((0, renderPlaceholder_1.default)(key), v ?? '').trim();
package/package.json CHANGED
@@ -9,7 +9,7 @@
9
9
  "@sprucelabs/spruce-test-fixtures"
10
10
  ]
11
11
  },
12
- "version": "8.3.0",
12
+ "version": "8.4.0",
13
13
  "files": [
14
14
  "build"
15
15
  ],