llm-exe 0.0.3 → 0.0.5
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.
- package/dist/embedding/openai.js +2 -1
- package/dist/embedding/openai.js.map +1 -1
- package/dist/executor/_base.d.ts +17 -6
- package/dist/executor/_base.js +68 -26
- package/dist/executor/_base.js.map +1 -1
- package/dist/executor/_functions.d.ts +2 -2
- package/dist/executor/_functions.js.map +1 -1
- package/dist/executor/_metadata.js +1 -11
- package/dist/executor/_metadata.js.map +1 -1
- package/dist/executor/llm.d.ts +3 -3
- package/dist/executor/llm.js.map +1 -1
- package/dist/interfaces/chat.d.ts +7 -0
- package/dist/interfaces/functions.d.ts +14 -24
- package/dist/interfaces/functions.js +1 -0
- package/dist/interfaces/functions.js.map +1 -1
- package/dist/interfaces/parser.d.ts +1 -4
- package/dist/llm/openai.d.ts +3 -3
- package/dist/llm/openai.js +2 -0
- package/dist/llm/openai.js.map +1 -1
- package/dist/parser/_base.js +2 -3
- package/dist/parser/_base.js.map +1 -1
- package/dist/parser/_functions.d.ts +24 -15
- package/dist/parser/_functions.js +3 -0
- package/dist/parser/_functions.js.map +1 -1
- package/dist/parser/parsers/CustomParser.d.ts +7 -6
- package/dist/parser/parsers/CustomParser.js +3 -2
- package/dist/parser/parsers/CustomParser.js.map +1 -1
- package/dist/parser/parsers/ListToJsonParser.js +2 -1
- package/dist/parser/parsers/ListToJsonParser.js.map +1 -1
- package/dist/parser/parsers/StringExtractParser.d.ts +12 -0
- package/dist/parser/parsers/StringExtractParser.js +40 -0
- package/dist/parser/parsers/StringExtractParser.js.map +1 -0
- package/dist/plugins/callable/callable.d.ts +12 -0
- package/dist/plugins/callable/callable.js +19 -0
- package/dist/plugins/callable/callable.js.map +1 -1
- package/dist/plugins/callable/index.d.ts +4 -0
- package/dist/prompt/_base.d.ts +2 -2
- package/dist/prompt/_base.js.map +1 -1
- package/dist/prompt/chat.d.ts +10 -1
- package/dist/prompt/chat.js +77 -13
- package/dist/prompt/chat.js.map +1 -1
- package/dist/state/dialogue.d.ts +1 -0
- package/dist/state/dialogue.js +16 -0
- package/dist/state/dialogue.js.map +1 -1
- package/dist/utils/const.d.ts +3 -0
- package/dist/utils/const.js +7 -0
- package/dist/utils/const.js.map +1 -0
- package/dist/utils/modules/handlebars/helpers/index.d.ts +1 -0
- package/dist/utils/modules/handlebars/helpers/index.js +5 -1
- package/dist/utils/modules/handlebars/helpers/index.js.map +1 -1
- package/dist/utils/modules/handlebars/index.js +7 -6
- package/dist/utils/modules/handlebars/index.js.map +1 -1
- package/dist/utils/modules/handlebars/templates/index.js +4 -4
- package/dist/utils/modules/handlebars/templates/index.js.map +1 -1
- package/dist/utils/modules/index.d.ts +10 -1
- package/dist/utils/modules/index.js +28 -1
- package/dist/utils/modules/index.js.map +1 -1
- package/dist/vector/pinecone.js +3 -2
- package/dist/vector/pinecone.js.map +1 -1
- package/package.json +22 -12
- package/readme.md +2 -0
package/dist/embedding/openai.js
CHANGED
|
@@ -29,8 +29,9 @@ class EmbeddingOpenAI extends base_1.BaseEmbedding {
|
|
|
29
29
|
this.model = options.modelName || "text-embedding-ada-002";
|
|
30
30
|
this.batchSize = options.temperature || 0;
|
|
31
31
|
this.stripNewLines = !!options.stripNewLines;
|
|
32
|
+
const apiKey = options.openAIApiKey || (0, utils_1.getEnvironmentVariable)("OPENAI_API_KEY");
|
|
32
33
|
this.client = new openai_1.OpenAIApi(new openai_1.Configuration({
|
|
33
|
-
apiKey
|
|
34
|
+
apiKey,
|
|
34
35
|
}));
|
|
35
36
|
}
|
|
36
37
|
async embedDocuments(texts) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"src/","sources":["embedding/openai.ts"],"names":[],"mappings":";;;AAAA,mCAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"src/","sources":["embedding/openai.ts"],"names":[],"mappings":"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"}
|
package/dist/executor/_base.d.ts
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
|
-
import { PlainObject, ExecutorMetadata,
|
|
2
|
-
|
|
1
|
+
import { PlainObject, ExecutorMetadata, ListenerFunction, CoreExecutorHookInput, ExecutorExecutionMetadata, CoreExecutorExecuteOptions, BaseExecutorHooks } from "../types";
|
|
2
|
+
/**
|
|
3
|
+
* BaseExecutor
|
|
4
|
+
* @template I - Input type.
|
|
5
|
+
* @template O - Output type.
|
|
6
|
+
* @template H - Hooks type.
|
|
7
|
+
*/
|
|
8
|
+
export declare abstract class BaseExecutor<I extends PlainObject, O = any, H extends BaseExecutorHooks = BaseExecutorHooks> {
|
|
3
9
|
/**
|
|
4
10
|
* @property id - internal id of the executor
|
|
5
11
|
*/
|
|
@@ -23,8 +29,9 @@ export declare abstract class BaseExecutor<I extends PlainObject, O = any> {
|
|
|
23
29
|
/**
|
|
24
30
|
* @property hooks - hooks to be ran during execution
|
|
25
31
|
*/
|
|
26
|
-
hooks:
|
|
27
|
-
|
|
32
|
+
hooks: any;
|
|
33
|
+
allowedHooks: any[];
|
|
34
|
+
constructor(name: string, type: string, options?: CoreExecutorExecuteOptions<H>);
|
|
28
35
|
abstract handler(input: I): Promise<any>;
|
|
29
36
|
/**
|
|
30
37
|
*
|
|
@@ -49,6 +56,10 @@ export declare abstract class BaseExecutor<I extends PlainObject, O = any> {
|
|
|
49
56
|
execute(_input: I): Promise<O>;
|
|
50
57
|
metadata(): Record<string, any>;
|
|
51
58
|
getMetadata(metadata?: Record<string, any>): ExecutorMetadata;
|
|
52
|
-
runHook(hook: keyof
|
|
53
|
-
setHooks(hooks?: CoreExecutorHookInput):
|
|
59
|
+
runHook(hook: keyof H, _metadata: ExecutorExecutionMetadata): void;
|
|
60
|
+
setHooks(hooks?: CoreExecutorHookInput<H>): this;
|
|
61
|
+
removeHook(eventName: keyof H, fn: ListenerFunction): this;
|
|
62
|
+
on(eventName: keyof H, fn: ListenerFunction): this;
|
|
63
|
+
off(eventName: keyof H, fn: ListenerFunction): this;
|
|
64
|
+
once(eventName: keyof H, fn: ListenerFunction): this;
|
|
54
65
|
}
|
package/dist/executor/_base.js
CHANGED
|
@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.BaseExecutor = void 0;
|
|
4
4
|
const utils_1 = require("../utils");
|
|
5
5
|
const _metadata_1 = require("./_metadata");
|
|
6
|
-
const
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
6
|
+
const const_1 = require("../utils/const");
|
|
7
|
+
/**
|
|
8
|
+
* BaseExecutor
|
|
9
|
+
* @template I - Input type.
|
|
10
|
+
* @template O - Output type.
|
|
11
|
+
* @template H - Hooks type.
|
|
12
|
+
*/
|
|
11
13
|
class BaseExecutor {
|
|
12
14
|
constructor(name, type, options) {
|
|
13
15
|
/**
|
|
@@ -64,12 +66,22 @@ class BaseExecutor {
|
|
|
64
66
|
writable: true,
|
|
65
67
|
value: void 0
|
|
66
68
|
});
|
|
69
|
+
Object.defineProperty(this, "allowedHooks", {
|
|
70
|
+
enumerable: true,
|
|
71
|
+
configurable: true,
|
|
72
|
+
writable: true,
|
|
73
|
+
value: [const_1.hookOnComplete, const_1.hookOnError, const_1.hookOnSuccess]
|
|
74
|
+
});
|
|
67
75
|
this.id = (0, utils_1.uuid)();
|
|
68
76
|
this.type = type;
|
|
69
77
|
this.name = name;
|
|
70
78
|
this.created = new Date().getTime();
|
|
71
79
|
this.executions = 0;
|
|
72
|
-
this.hooks = {
|
|
80
|
+
this.hooks = {
|
|
81
|
+
onSuccess: [],
|
|
82
|
+
onError: [],
|
|
83
|
+
onComplete: [],
|
|
84
|
+
};
|
|
73
85
|
if (options?.hooks) {
|
|
74
86
|
this.setHooks(options.hooks);
|
|
75
87
|
}
|
|
@@ -109,17 +121,9 @@ class BaseExecutor {
|
|
|
109
121
|
_metadata.setItem({ handlerInput: input });
|
|
110
122
|
let result = await this.handler(input);
|
|
111
123
|
_metadata.setItem({ handlerOutput: result });
|
|
112
|
-
if (this.hooks.filterResult) {
|
|
113
|
-
for (const filter of this.hooks.filterResult) {
|
|
114
|
-
if (filter) {
|
|
115
|
-
const filterResult = filter(result, _metadata.asPlainObject(), this.getMetadata());
|
|
116
|
-
result = filterResult;
|
|
117
|
-
_metadata.setItem({ handlerOutput: filterResult });
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
|
-
}
|
|
121
124
|
const output = this.getHandlerOutput(result, _metadata.asPlainObject());
|
|
122
125
|
_metadata.setItem({ output });
|
|
126
|
+
this.runHook("onSuccess", _metadata.asPlainObject());
|
|
123
127
|
return output;
|
|
124
128
|
}
|
|
125
129
|
catch (error) {
|
|
@@ -146,27 +150,65 @@ class BaseExecutor {
|
|
|
146
150
|
});
|
|
147
151
|
}
|
|
148
152
|
runHook(hook, _metadata) {
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
153
|
+
/* istanbul ignore next */
|
|
154
|
+
const { [hook]: hooks = [] } = (0, utils_1.pick)(this.hooks, this.allowedHooks);
|
|
155
|
+
for (const hookFn of [...hooks] /** clone hooks */) {
|
|
152
156
|
if (typeof hookFn === "function") {
|
|
153
|
-
|
|
157
|
+
try {
|
|
158
|
+
hookFn(_metadata, this.getMetadata());
|
|
159
|
+
}
|
|
160
|
+
catch (error) {
|
|
161
|
+
/** We should call an error handler */
|
|
162
|
+
}
|
|
154
163
|
}
|
|
155
164
|
}
|
|
156
165
|
}
|
|
157
166
|
setHooks(hooks = {}) {
|
|
158
167
|
const hookKeys = Object.keys(hooks);
|
|
159
|
-
for (const hookKey of hookKeys.filter((k) =>
|
|
168
|
+
for (const hookKey of hookKeys.filter((k) => this.allowedHooks.includes(k))) {
|
|
160
169
|
const hookInput = hooks[hookKey];
|
|
161
170
|
if (hookInput) {
|
|
162
|
-
const
|
|
163
|
-
const
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
171
|
+
const _hooks = Array.isArray(hookInput) ? hookInput : [hookInput];
|
|
172
|
+
for (const hook of _hooks) {
|
|
173
|
+
if (hook &&
|
|
174
|
+
typeof hook === "function" &&
|
|
175
|
+
!this.hooks[hookKey].find((h) => h === hook)) {
|
|
176
|
+
this.hooks[hookKey].push(hook);
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
return this;
|
|
182
|
+
}
|
|
183
|
+
removeHook(eventName, fn) {
|
|
184
|
+
if (typeof fn !== "function")
|
|
185
|
+
return this;
|
|
186
|
+
const lis = this.hooks[eventName];
|
|
187
|
+
if (!lis)
|
|
188
|
+
return this;
|
|
189
|
+
for (let i = lis.length; i >= 0; i--) {
|
|
190
|
+
if (lis[i] === fn) {
|
|
191
|
+
lis.splice(i, 1);
|
|
192
|
+
break;
|
|
168
193
|
}
|
|
169
194
|
}
|
|
195
|
+
return this;
|
|
196
|
+
}
|
|
197
|
+
on(eventName, fn) {
|
|
198
|
+
return this.setHooks({ [eventName]: fn });
|
|
199
|
+
}
|
|
200
|
+
off(eventName, fn) {
|
|
201
|
+
return this.removeHook(eventName, fn);
|
|
202
|
+
}
|
|
203
|
+
once(eventName, fn) {
|
|
204
|
+
if (typeof fn !== "function")
|
|
205
|
+
return this;
|
|
206
|
+
const onceWrapper = (...args) => {
|
|
207
|
+
fn(...args);
|
|
208
|
+
this.off(eventName, onceWrapper);
|
|
209
|
+
};
|
|
210
|
+
this.hooks[eventName].push(onceWrapper);
|
|
211
|
+
return this;
|
|
170
212
|
}
|
|
171
213
|
}
|
|
172
214
|
exports.BaseExecutor = BaseExecutor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_base.js","sourceRoot":"src/","sources":["executor/_base.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"_base.js","sourceRoot":"src/","sources":["executor/_base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PlainObject, ExecutorWithLlmOptions, CoreExecutorExecuteOptions } from "../types";
|
|
1
|
+
import { PlainObject, ExecutorWithLlmOptions, CoreExecutorExecuteOptions, LlmExecutorHooks } from "../types";
|
|
2
2
|
import { BaseLlm } from "../llm";
|
|
3
3
|
import { BaseParser } from "../parser";
|
|
4
4
|
import { BasePrompt } from "../prompt";
|
|
@@ -22,4 +22,4 @@ export declare function createCoreExecutor<I extends PlainObject, O>(handler: (i
|
|
|
22
22
|
* @param options - Options for BaseExecutorV3.
|
|
23
23
|
* @returns - A new LlmExecutor instance.
|
|
24
24
|
*/
|
|
25
|
-
export declare function createLlmExecutor<Llm extends BaseLlm<any>, Prompt extends BasePrompt<any>, Parser extends BaseParser, State extends BaseState>(llmConfiguration: ExecutorWithLlmOptions<Llm, Prompt, Parser, State>, options?: CoreExecutorExecuteOptions): LlmExecutor<Llm, Prompt, Parser, State>;
|
|
25
|
+
export declare function createLlmExecutor<Llm extends BaseLlm<any>, Prompt extends BasePrompt<any>, Parser extends BaseParser, State extends BaseState>(llmConfiguration: ExecutorWithLlmOptions<Llm, Prompt, Parser, State>, options?: CoreExecutorExecuteOptions<LlmExecutorHooks>): LlmExecutor<Llm, Prompt, Parser, State>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_functions.js","sourceRoot":"src/","sources":["executor/_functions.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"_functions.js","sourceRoot":"src/","sources":["executor/_functions.ts"],"names":[],"mappings":";;;AAUA,iCAAsC;AACtC,+BAAoC;AAEpC;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAChC,OAAqC,EACrC,OAAoC;IAEpC,OAAO,IAAI,mBAAY,CAAO,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC;AALD,gDAKC;AAED;;;;;;;;GAQG;AACH,SAAgB,iBAAiB,CAM/B,gBAAoE,EACpE,OAAsD;IAEtD,OAAO,IAAI,iBAAW,CAA6B,gBAAgB,EAAE,OAAO,CAAC,CAAC;AAChF,CAAC;AAVD,8CAUC"}
|
|
@@ -16,8 +16,6 @@ class ExecutorExecutionMetadataState {
|
|
|
16
16
|
handlerInput: undefined,
|
|
17
17
|
handlerOutput: undefined,
|
|
18
18
|
output: undefined,
|
|
19
|
-
_handlerOutput: [],
|
|
20
|
-
_output: [],
|
|
21
19
|
errorMessage: undefined,
|
|
22
20
|
error: undefined,
|
|
23
21
|
metadata: null,
|
|
@@ -34,13 +32,7 @@ class ExecutorExecutionMetadataState {
|
|
|
34
32
|
const keys = Object.keys(items);
|
|
35
33
|
for (const key of keys) {
|
|
36
34
|
const value = items[key];
|
|
37
|
-
|
|
38
|
-
const asArr = Array.isArray(value) ? value : [value];
|
|
39
|
-
__classPrivateFieldGet(this, _ExecutorExecutionMetadataState_state, "f")[key].push(...asArr);
|
|
40
|
-
}
|
|
41
|
-
else {
|
|
42
|
-
__classPrivateFieldGet(this, _ExecutorExecutionMetadataState_state, "f")[key] = value;
|
|
43
|
-
}
|
|
35
|
+
__classPrivateFieldGet(this, _ExecutorExecutionMetadataState_state, "f")[key] = value;
|
|
44
36
|
}
|
|
45
37
|
return this;
|
|
46
38
|
}
|
|
@@ -52,8 +44,6 @@ class ExecutorExecutionMetadataState {
|
|
|
52
44
|
handlerInput: __classPrivateFieldGet(this, _ExecutorExecutionMetadataState_state, "f").handlerInput,
|
|
53
45
|
handlerOutput: __classPrivateFieldGet(this, _ExecutorExecutionMetadataState_state, "f").handlerOutput,
|
|
54
46
|
output: __classPrivateFieldGet(this, _ExecutorExecutionMetadataState_state, "f").output,
|
|
55
|
-
_handlerOutput: __classPrivateFieldGet(this, _ExecutorExecutionMetadataState_state, "f")._handlerOutput,
|
|
56
|
-
_output: __classPrivateFieldGet(this, _ExecutorExecutionMetadataState_state, "f")._output,
|
|
57
47
|
errorMessage: __classPrivateFieldGet(this, _ExecutorExecutionMetadataState_state, "f").errorMessage,
|
|
58
48
|
error: __classPrivateFieldGet(this, _ExecutorExecutionMetadataState_state, "f").error,
|
|
59
49
|
metadata: __classPrivateFieldGet(this, _ExecutorExecutionMetadataState_state, "f").metadata,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_metadata.js","sourceRoot":"src/","sources":["executor/_metadata.ts"],"names":[],"mappings":";;;;;;;;;AAKA,MAAa,8BAA8B;
|
|
1
|
+
{"version":3,"file":"_metadata.js","sourceRoot":"src/","sources":["executor/_metadata.ts"],"names":[],"mappings":";;;;;;;;;AAKA,MAAa,8BAA8B;IAazC,YACE,KAC8C;QAdhD,gDAAoC;YAClC,KAAK,EAAE,IAAI;YACX,GAAG,EAAE,IAAI;YACT,KAAK,EAAE,SAAS;YAChB,YAAY,EAAE,SAAS;YACvB,aAAa,EAAE,SAAS;YACxB,MAAM,EAAE,SAAS;YACjB,YAAY,EAAE,SAAS;YACvB,KAAK,EAAE,SAAS;YAChB,QAAQ,EAAE,IAAI;SACf,EAAC;QAMA,IAAI,KAAK,EAAE;YACT,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SACrB;IACH,CAAC;IAED,OAAO,CAAC,KAAmD;QACzD,yBAAyB;QACzB,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC/D,OAAO,IAAI,CAAC;SACb;QAED,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAA2B,CAAC;QAC1D,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;YACzB,uBAAA,IAAI,6CAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SAC1B;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,aAAa;QACX,OAAO,MAAM,CAAC,MAAM,CAAC;YACnB,KAAK,EAAE,uBAAA,IAAI,6CAAO,CAAC,KAAK;YACxB,GAAG,EAAE,uBAAA,IAAI,6CAAO,CAAC,GAAG;YACpB,KAAK,EAAE,uBAAA,IAAI,6CAAO,CAAC,KAAK;YACxB,YAAY,EAAE,uBAAA,IAAI,6CAAO,CAAC,YAAY;YACtC,aAAa,EAAE,uBAAA,IAAI,6CAAO,CAAC,aAAa;YACxC,MAAM,EAAE,uBAAA,IAAI,6CAAO,CAAC,MAAM;YAC1B,YAAY,EAAE,uBAAA,IAAI,6CAAO,CAAC,YAAY;YACtC,KAAK,EAAE,uBAAA,IAAI,6CAAO,CAAC,KAAK;YACxB,QAAQ,EAAE,uBAAA,IAAI,6CAAO,CAAC,QAAQ;SAC/B,CAAC,CAAC;IACL,CAAC;CACF;AAhDD,wEAgDC;;AAED,SAAgB,mBAAmB,CACjC,KAC8C;IAE9C,OAAO,IAAI,8BAA8B,CAAC,KAAK,CAAC,CAAC;AACnD,CAAC;AALD,kDAKC"}
|
package/dist/executor/llm.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PromptInput, ParserOutput, CoreExecutorExecuteOptions, ExecutorWithLlmOptions, ExecutorExecutionMetadata } from "../types";
|
|
1
|
+
import { PromptInput, ParserOutput, CoreExecutorExecuteOptions, ExecutorWithLlmOptions, ExecutorExecutionMetadata, LlmExecutorHooks } from "../types";
|
|
2
2
|
import { BaseLlm } from "../llm";
|
|
3
3
|
import { BaseParser, StringParser } from "../parser";
|
|
4
4
|
import { BasePrompt } from "../prompt";
|
|
@@ -7,12 +7,12 @@ import { BaseExecutor } from "./_base";
|
|
|
7
7
|
/**
|
|
8
8
|
* Core Executor With LLM
|
|
9
9
|
*/
|
|
10
|
-
export declare class LlmExecutor<Llm extends BaseLlm<any>, Prompt extends BasePrompt<Record<string, any>>, Parser extends BaseParser, State extends BaseState> extends BaseExecutor<PromptInput<Prompt>, ParserOutput<Parser
|
|
10
|
+
export declare class LlmExecutor<Llm extends BaseLlm<any>, Prompt extends BasePrompt<Record<string, any>>, Parser extends BaseParser, State extends BaseState> extends BaseExecutor<PromptInput<Prompt>, ParserOutput<Parser>, LlmExecutorHooks> {
|
|
11
11
|
llm: Llm;
|
|
12
12
|
prompt: Prompt | undefined;
|
|
13
13
|
promptFn: any;
|
|
14
14
|
parser: StringParser | Parser;
|
|
15
|
-
constructor(llmConfiguration: ExecutorWithLlmOptions<Llm, Prompt, Parser, State>, options?: CoreExecutorExecuteOptions);
|
|
15
|
+
constructor(llmConfiguration: ExecutorWithLlmOptions<Llm, Prompt, Parser, State>, options?: CoreExecutorExecuteOptions<LlmExecutorHooks>);
|
|
16
16
|
handler(_input: PromptInput<Prompt>): Promise<any>;
|
|
17
17
|
getHandlerInput(_input: PromptInput<Prompt>): any;
|
|
18
18
|
getHandlerOutput(out: any, _metadata: ExecutorExecutionMetadata<PromptInput<Prompt>, ParserOutput<Parser>>): ParserOutput<Parser>;
|
package/dist/executor/llm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm.js","sourceRoot":"src/","sources":["executor/llm.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"llm.js","sourceRoot":"src/","sources":["executor/llm.ts"],"names":[],"mappings":";;;AASA,qCAAoD;AAGpD,mCAAuC;AAEvC;;GAEG;AACH,MAAa,WAKX,SAAQ,oBAIT;IAMC,YACE,gBAAoE,EACpE,OAAsD;QAEtD,KAAK,CACH,gBAAgB,CAAC,IAAI,IAAI,wBAAwB,EACjD,cAAc,EACd,OAAO,CACR,CAAC;QAbJ;;;;;WAAW;QACX;;;;;WAAc;QACd;;;;;WAAqB;QACrB;;;;;WAAc;QAYZ,IAAI,CAAC,GAAG,GAAG,gBAAgB,CAAC,GAAG,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,gBAAgB,EAAE,MAAM,IAAI,IAAI,qBAAY,EAAE,CAAC;QAE7D,IAAI,OAAO,gBAAgB,CAAC,MAAM,KAAK,UAAU,EAAE;YACjD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;YACxB,IAAI,CAAC,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CAAC;SACzC;aAAM;YACL,IAAI,CAAC,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC;YACtC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;SACtB;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAA2B;QACvC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACvC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,eAAe,CAAC,MAA2B;QACzC,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SACnC;QAED,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACrC,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC9C,OAAO,eAAe,CAAC;SACxB;QACD,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACpC,CAAC;IAED,gBAAgB,CACd,GAAQ,EACR,SAGC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;IAED,QAAQ;QACN,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE;SAC5B,CAAC;IACJ,CAAC;CACF;AAvED,kCAuEC"}
|
|
@@ -16,4 +16,11 @@ export interface IChatSystemMessage extends IChatMessageBase {
|
|
|
16
16
|
role: Extract<IChatMessageRole, "system">;
|
|
17
17
|
content: string;
|
|
18
18
|
}
|
|
19
|
+
export interface IChatMessagesPlaceholder {
|
|
20
|
+
role: "placeholder";
|
|
21
|
+
content: string;
|
|
22
|
+
}
|
|
23
|
+
export type IPromptMessages = (IChatSystemMessage | IChatMessagesPlaceholder)[];
|
|
24
|
+
export type IPromptChatMessages = (IChatUserMessage | IChatAssistantMessage | IChatSystemMessage | IChatMessagesPlaceholder)[];
|
|
19
25
|
export type IChatMessages = (IChatUserMessage | IChatAssistantMessage | IChatSystemMessage)[];
|
|
26
|
+
export type PromptTemplateHistoryToken = `{{>DialogueHistory key='${string}'}}`;
|
|
@@ -2,11 +2,10 @@ import { BaseParser } from "../parser";
|
|
|
2
2
|
import { BasePrompt } from "../prompt";
|
|
3
3
|
import { PlainObject } from "./utils";
|
|
4
4
|
import { BaseExecutor } from "../executor";
|
|
5
|
+
import { hookOnComplete, hookOnError, hookOnSuccess } from "../utils/const";
|
|
6
|
+
export type ListenerFunction = (...args: any[]) => void;
|
|
5
7
|
export type ParserOutput<P> = P extends BaseParser<infer T> ? T : never;
|
|
6
8
|
export type PromptInput<P> = P extends BasePrompt<infer T> ? T : never;
|
|
7
|
-
export interface CoreExecutorExecuteOptions {
|
|
8
|
-
hooks?: CoreExecutorHookInput;
|
|
9
|
-
}
|
|
10
9
|
export interface ExecutorWithLlmOptions<Llm, Prompt, Parser, State> {
|
|
11
10
|
name?: string;
|
|
12
11
|
llm: Llm;
|
|
@@ -32,13 +31,6 @@ export interface ExecutorMetadata {
|
|
|
32
31
|
executions: number;
|
|
33
32
|
metadata?: Record<string, any>;
|
|
34
33
|
}
|
|
35
|
-
export interface Temporary {
|
|
36
|
-
id: string;
|
|
37
|
-
initialInput?: any;
|
|
38
|
-
currentStepNumber: number;
|
|
39
|
-
results: any[];
|
|
40
|
-
attributes: any;
|
|
41
|
-
}
|
|
42
34
|
export interface ExecutorExecutionMetadata<I = any, O = any> {
|
|
43
35
|
start: null | number;
|
|
44
36
|
end: null | number;
|
|
@@ -46,27 +38,25 @@ export interface ExecutorExecutionMetadata<I = any, O = any> {
|
|
|
46
38
|
handlerInput?: any;
|
|
47
39
|
handlerOutput?: any;
|
|
48
40
|
output?: O;
|
|
49
|
-
_handlerOutput: any[];
|
|
50
|
-
_output: O[];
|
|
51
41
|
errorMessage?: string;
|
|
52
42
|
error?: Error;
|
|
53
|
-
metadata?: null | ExecutorMetadata
|
|
43
|
+
metadata?: null | ExecutorMetadata;
|
|
54
44
|
}
|
|
55
|
-
export type ExecutorExecutionMetadataProperties = Pick<ExecutorExecutionMetadata, "start" | "end" | "input" | "handlerInput" | "handlerOutput" | "output" | "
|
|
45
|
+
export type ExecutorExecutionMetadataProperties = Pick<ExecutorExecutionMetadata, "start" | "end" | "input" | "handlerInput" | "handlerOutput" | "output" | "errorMessage" | "error" | "metadata">;
|
|
56
46
|
export interface ExecutorContext<I = any, O = any, A = Record<string, any>> extends ExecutorExecutionMetadata<I, O> {
|
|
57
47
|
metadata: ExecutorMetadata;
|
|
58
48
|
attributes: A;
|
|
59
49
|
}
|
|
60
|
-
export interface
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
50
|
+
export interface BaseExecutorHooks {
|
|
51
|
+
[hookOnError]: ListenerFunction[];
|
|
52
|
+
[hookOnSuccess]: ListenerFunction[];
|
|
53
|
+
[hookOnComplete]: ListenerFunction[];
|
|
54
|
+
}
|
|
55
|
+
export interface LlmExecutorHooks extends BaseExecutorHooks {
|
|
64
56
|
}
|
|
65
|
-
export type
|
|
66
|
-
[
|
|
57
|
+
export type CoreExecutorHookInput<H = BaseExecutorHooks> = {
|
|
58
|
+
[key in keyof H]?: ListenerFunction | ListenerFunction[];
|
|
67
59
|
};
|
|
68
|
-
export interface
|
|
69
|
-
|
|
70
|
-
onComplete?: (execution: ExecutorExecutionMetadata, context?: any) => void | ((execution: ExecutorExecutionMetadata, context?: any) => void)[];
|
|
71
|
-
filterResult?: <O>(output: O, execution: ExecutorExecutionMetadata, context?: any) => O | (<O>(output: O, execution: ExecutorExecutionMetadata, context?: any) => O)[];
|
|
60
|
+
export interface CoreExecutorExecuteOptions<T = BaseExecutorHooks> {
|
|
61
|
+
hooks?: CoreExecutorHookInput<T>;
|
|
72
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"functions.js","sourceRoot":"src/","sources":["interfaces/functions.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"functions.js","sourceRoot":"src/","sources":["interfaces/functions.ts"],"names":[],"mappings":";;AAIA,yCAA2E"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
import { JSONSchema7 } from "json-schema-to-ts";
|
|
2
|
-
export type CreateParserType = "json" | "string" | "boolean" | "number" | "listToArray" | "listToJson" | "listToKeyValue" | "replaceStringTemplate" | "markdownCodeBlocks" | "markdownCodeBlock";
|
|
3
|
-
export interface ParserOptionsWithSchema {
|
|
4
|
-
schema?: JSONSchema7;
|
|
5
|
-
}
|
|
2
|
+
export type CreateParserType = "json" | "string" | "boolean" | "number" | "stringExtract" | "listToArray" | "listToJson" | "listToKeyValue" | "replaceStringTemplate" | "markdownCodeBlocks" | "markdownCodeBlock";
|
|
6
3
|
export interface BaseParserOptions {
|
|
7
4
|
schema?: JSONSchema7;
|
|
8
5
|
}
|
package/dist/llm/openai.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { OpenAIApi } from "openai";
|
|
2
|
-
import { OpenAIModelName, OpenAIOptions } from "../types";
|
|
2
|
+
import { IChatMessages, OpenAIModelName, OpenAIOptions } from "../types";
|
|
3
3
|
import { BaseLlm } from "./_base";
|
|
4
4
|
import { OutputOpenAIChat } from "../llm/output";
|
|
5
5
|
import { OutputOpenAICompletion } from "./output/openai";
|
|
@@ -59,13 +59,13 @@ export declare class OpenAI extends BaseLlm<OpenAIApi> {
|
|
|
59
59
|
* @param input - The input for the chat/completion API.
|
|
60
60
|
* @returns The chat/completion response from the API.
|
|
61
61
|
*/
|
|
62
|
-
_call(input:
|
|
62
|
+
_call(input: string | IChatMessages): Promise<OutputOpenAIChat | OutputOpenAICompletion>;
|
|
63
63
|
/**
|
|
64
64
|
* Communicate with the OpenAI Chat API.
|
|
65
65
|
* @param messages - A list of message objects for the API call.
|
|
66
66
|
* @returns The chat response from the API.
|
|
67
67
|
*/
|
|
68
|
-
chat(messages:
|
|
68
|
+
chat(messages: IChatMessages): Promise<OutputOpenAIChat>;
|
|
69
69
|
/**
|
|
70
70
|
* Communicate with the OpenAI Completion API.
|
|
71
71
|
* @param messages - A list of message objects for the API call.
|
package/dist/llm/openai.js
CHANGED
|
@@ -196,9 +196,11 @@ class OpenAI extends _base_1.BaseLlm {
|
|
|
196
196
|
*/
|
|
197
197
|
async _call(input) {
|
|
198
198
|
if (["gpt-3.5-turbo", "gpt-4"].includes(this.model)) {
|
|
199
|
+
(0, utils_1.assert)(Array.isArray(input), "Invalid prompt.");
|
|
199
200
|
return await this.chat(input);
|
|
200
201
|
}
|
|
201
202
|
else {
|
|
203
|
+
(0, utils_1.assert)(typeof input === "string");
|
|
202
204
|
return await this.completion(input);
|
|
203
205
|
}
|
|
204
206
|
}
|
package/dist/llm/openai.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"src/","sources":["llm/openai.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"src/","sources":["llm/openai.ts"],"names":[],"mappings":"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"}
|
package/dist/parser/_base.js
CHANGED
|
@@ -2,8 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BaseParser = void 0;
|
|
4
4
|
const utils_1 = require("../utils");
|
|
5
|
-
|
|
6
|
-
var v = new Validator();
|
|
5
|
+
const jsonschema_1 = require("jsonschema");
|
|
7
6
|
/**
|
|
8
7
|
* BaseParser is an abstract class for parsing text and enforcing JSON schema on the parsed data.
|
|
9
8
|
*/
|
|
@@ -53,7 +52,7 @@ class BaseParser {
|
|
|
53
52
|
}
|
|
54
53
|
const { schema } = this;
|
|
55
54
|
let results = (0, utils_1.filterObjectOnSchema)(schema, parsed);
|
|
56
|
-
const validate =
|
|
55
|
+
const validate = (0, jsonschema_1.validate)(results, this.schema);
|
|
57
56
|
if (validate.errors.length) {
|
|
58
57
|
throw new Error("schema error");
|
|
59
58
|
}
|
package/dist/parser/_base.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_base.js","sourceRoot":"src/","sources":["parser/_base.ts"],"names":[],"mappings":";;;AAEA,mCAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"_base.js","sourceRoot":"src/","sources":["parser/_base.ts"],"names":[],"mappings":";;;AAEA,mCAA+C;AAC/C,2CAAuD;AAMvD;;GAEG;AACH,MAAsB,UAAU;IAI9B;;;;OAIG;IACH,YAAY,IAAY,EAAE,OAA2B;QARrD;;;;;WAAoB;QACpB;;;;;WAAuC;QACvC;;;;mBAAiB,EAAE;WAAC;QAOlB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,OAAO,EAAE;YACX,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,EAAE,GAAG,OAAO,CAAC;YAC7C,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC;YAE7B,IAAI,MAAM,EAAE;gBACV,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;aACtB;SACF;IACH,CAAC;IAWD;;;;OAIG;IAEH,aAAa,CAAC,MAA2B;QACvC,0BAA0B;QAC1B,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YACzD,OAAO,MAAW,CAAC;SACpB;QAED,MAAM,EAAE,MAAM,EAAE,GAAG,IAAW,CAAC;QAE/B,IAAI,OAAO,GAAG,IAAA,4BAAoB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAEnD,MAAM,QAAQ,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAEtD,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;SACjC;QAED,OAAO,OAAY,CAAC;IACtB,CAAC;CACF;AAtDD,gCAsDC"}
|