@llumiverse/core 0.9.2 → 0.11.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.
- package/README.md +51 -7
- package/lib/cjs/CompletionStream.js +1 -7
- package/lib/cjs/CompletionStream.js.map +1 -1
- package/lib/cjs/Driver.js +32 -1
- package/lib/cjs/Driver.js.map +1 -1
- package/lib/cjs/formatters/claude.js +5 -7
- package/lib/cjs/formatters/claude.js.map +1 -1
- package/lib/cjs/formatters/commons.js +8 -0
- package/lib/cjs/formatters/commons.js.map +1 -0
- package/lib/cjs/formatters/generic.js +52 -20
- package/lib/cjs/formatters/generic.js.map +1 -1
- package/lib/cjs/formatters/index.js +18 -27
- package/lib/cjs/formatters/index.js.map +1 -1
- package/lib/cjs/formatters/llama2.js +3 -3
- package/lib/cjs/formatters/llama2.js.map +1 -1
- package/lib/cjs/formatters/openai.js +9 -4
- package/lib/cjs/formatters/openai.js.map +1 -1
- package/lib/cjs/formatters.js +117 -0
- package/lib/cjs/formatters.js.map +1 -0
- package/lib/cjs/index.js +0 -1
- package/lib/cjs/index.js.map +1 -1
- package/lib/cjs/test.js +55 -0
- package/lib/cjs/test.js.map +1 -0
- package/lib/cjs/types.js +1 -8
- package/lib/cjs/types.js.map +1 -1
- package/lib/esm/CompletionStream.js +1 -7
- package/lib/esm/CompletionStream.js.map +1 -1
- package/lib/esm/Driver.js +33 -2
- package/lib/esm/Driver.js.map +1 -1
- package/lib/esm/formatters/claude.js +3 -5
- package/lib/esm/formatters/claude.js.map +1 -1
- package/lib/esm/formatters/commons.js +4 -0
- package/lib/esm/formatters/commons.js.map +1 -0
- package/lib/esm/formatters/generic.js +50 -18
- package/lib/esm/formatters/generic.js.map +1 -1
- package/lib/esm/formatters/index.js +5 -26
- package/lib/esm/formatters/index.js.map +1 -1
- package/lib/esm/formatters/llama2.js +1 -1
- package/lib/esm/formatters/llama2.js.map +1 -1
- package/lib/esm/formatters/openai.js +7 -2
- package/lib/esm/formatters/openai.js.map +1 -1
- package/lib/esm/formatters.js +113 -0
- package/lib/esm/formatters.js.map +1 -0
- package/lib/esm/index.js +0 -1
- package/lib/esm/index.js.map +1 -1
- package/lib/esm/test.js +50 -0
- package/lib/esm/test.js.map +1 -0
- package/lib/esm/types.js +0 -7
- package/lib/esm/types.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -0
- package/lib/types/CompletionStream.d.ts +1 -2
- package/lib/types/CompletionStream.d.ts.map +1 -1
- package/lib/types/Driver.d.ts +16 -11
- package/lib/types/Driver.d.ts.map +1 -1
- package/lib/types/formatters/claude.d.ts +1 -1
- package/lib/types/formatters/claude.d.ts.map +1 -1
- package/lib/types/formatters/commons.d.ts +3 -0
- package/lib/types/formatters/commons.d.ts.map +1 -0
- package/lib/types/formatters/generic.d.ts +9 -4
- package/lib/types/formatters/generic.d.ts.map +1 -1
- package/lib/types/formatters/index.d.ts +7 -3
- package/lib/types/formatters/index.d.ts.map +1 -1
- package/lib/types/formatters/llama2.d.ts +1 -1
- package/lib/types/formatters/llama2.d.ts.map +1 -1
- package/lib/types/formatters/openai.d.ts +10 -2
- package/lib/types/formatters/openai.d.ts.map +1 -1
- package/lib/types/formatters.d.ts +5 -0
- package/lib/types/formatters.d.ts.map +1 -0
- package/lib/types/index.d.ts +0 -1
- package/lib/types/index.d.ts.map +1 -1
- package/lib/types/json.d.ts +8 -8
- package/lib/types/json.d.ts.map +1 -1
- package/lib/types/test.d.ts +2 -0
- package/lib/types/test.d.ts.map +1 -0
- package/lib/types/types.d.ts +43 -13
- package/lib/types/types.d.ts.map +1 -1
- package/package.json +15 -5
- package/src/CompletionStream.ts +1 -8
- package/src/Driver.ts +38 -12
- package/src/formatters/claude.ts +3 -6
- package/src/formatters/commons.ts +5 -0
- package/src/formatters/generic.ts +59 -27
- package/src/formatters/index.ts +7 -30
- package/src/formatters/llama2.ts +1 -1
- package/src/formatters/openai.ts +14 -6
- package/src/index.ts +0 -1
- package/src/json.ts +7 -7
- package/src/types.ts +46 -13
package/lib/cjs/test.js
ADDED
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const web_1 = require("stream/web");
|
|
7
|
+
const fs_1 = __importDefault(require("fs"));
|
|
8
|
+
async function* asyncReadableIterator(stream) {
|
|
9
|
+
if (stream.readableEncoding) {
|
|
10
|
+
for await (const chunk of stream.iterator({ destroyOnReturn: true })) {
|
|
11
|
+
yield chunk;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
for await (const chunk of stream.iterator({ destroyOnReturn: true })) {
|
|
16
|
+
yield new Uint8Array(chunk);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
function createReadableStreamFromIterable(iterable) {
|
|
21
|
+
const it = iterable[Symbol.asyncIterator]();
|
|
22
|
+
if (web_1.ReadableStream.from) {
|
|
23
|
+
return web_1.ReadableStream.from();
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
return new web_1.ReadableStream({
|
|
27
|
+
async pull(controller) {
|
|
28
|
+
const { value, done } = await it.next();
|
|
29
|
+
if (done) {
|
|
30
|
+
controller.close();
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
controller.enqueue(value);
|
|
34
|
+
}
|
|
35
|
+
},
|
|
36
|
+
cancel() {
|
|
37
|
+
it.return?.();
|
|
38
|
+
}
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
async function main() {
|
|
43
|
+
const stream = fs_1.default.createReadStream("./test.txt");
|
|
44
|
+
const it = asyncReadableIterator(stream);
|
|
45
|
+
for await (const x of it) {
|
|
46
|
+
console.log('@@', x, typeof x);
|
|
47
|
+
}
|
|
48
|
+
const stream2 = fs_1.default.createReadStream("./test.txt");
|
|
49
|
+
const rs = createReadableStreamFromIterable(asyncReadableIterator(stream2));
|
|
50
|
+
for await (const r of rs) {
|
|
51
|
+
console.log('>>', r, typeof r);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
main();
|
|
55
|
+
//# sourceMappingURL=test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/test.ts"],"names":[],"mappings":";;;;;AACA,oCAA4C;AAC5C,4CAAoB;AAEpB,KAAK,SAAS,CAAC,CAAC,qBAAqB,CAAC,MAAgB;IAClD,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAC1B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;YACnE,MAAM,KAAe,CAAC;QAC1B,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;YACnE,MAAM,IAAI,UAAU,CAAC,KAAe,CAAC,CAAA;QACzC,CAAC;IACL,CAAC;AACL,CAAC;AAED,SAAS,gCAAgC,CAA2B,QAA0B;IAC1F,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;IAC5C,IAAK,oBAAsB,CAAC,IAAI,EAAE,CAAC;QAC/B,OAAQ,oBAAsB,CAAC,IAAI,EAAuB,CAAC;IAC/D,CAAC;SAAM,CAAC;QACJ,OAAO,IAAI,oBAAc,CAAI;YACzB,KAAK,CAAC,IAAI,CAAC,UAAU;gBACjB,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;gBACxC,IAAI,IAAI,EAAE,CAAC;oBACP,UAAU,CAAC,KAAK,EAAE,CAAC;gBACvB,CAAC;qBAAM,CAAC;oBACJ,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC9B,CAAC;YACL,CAAC;YACD,MAAM;gBACF,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC;YAClB,CAAC;SACJ,CAAC,CAAC;IACP,CAAC;AACL,CAAC;AAGD,KAAK,UAAU,IAAI;IAEf,MAAM,MAAM,GAAG,YAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACjD,MAAM,EAAE,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;IACzC,IAAI,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;QACvB,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IACnC,CAAC;IAED,MAAM,OAAO,GAAG,YAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAClD,MAAM,EAAE,GAAG,gCAAgC,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAA;IAC3E,IAAI,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;QACvB,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IACnC,CAAC;AACL,CAAC;AAED,IAAI,EAAE,CAAC"}
|
package/lib/cjs/types.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.TrainingJobStatus = exports.BuiltinProviders = exports.
|
|
3
|
+
exports.TrainingJobStatus = exports.BuiltinProviders = exports.ModelType = exports.AIModelStatus = exports.PromptRole = void 0;
|
|
4
4
|
// ============== Prompts ===============
|
|
5
5
|
var PromptRole;
|
|
6
6
|
(function (PromptRole) {
|
|
@@ -39,13 +39,6 @@ var ModelType;
|
|
|
39
39
|
})(ModelType || (exports.ModelType = ModelType = {}));
|
|
40
40
|
// ============== Built-in formats and drivers =====================
|
|
41
41
|
//TODO
|
|
42
|
-
var PromptFormats;
|
|
43
|
-
(function (PromptFormats) {
|
|
44
|
-
PromptFormats["openai"] = "openai";
|
|
45
|
-
PromptFormats["llama2"] = "llama2";
|
|
46
|
-
PromptFormats["claude"] = "claude";
|
|
47
|
-
PromptFormats["genericTextLLM"] = "genericTextLLM";
|
|
48
|
-
})(PromptFormats || (exports.PromptFormats = PromptFormats = {}));
|
|
49
42
|
var BuiltinProviders;
|
|
50
43
|
(function (BuiltinProviders) {
|
|
51
44
|
BuiltinProviders["openai"] = "openai";
|
package/lib/cjs/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":";;;AA+FA,yCAAyC;AACzC,IAAY,UAKX;AALD,WAAY,UAAU;IAClB,+BAAiB,CAAA;IACjB,+BAAiB,CAAA;IACjB,2BAAa,CAAA;IACb,qCAAuB,CAAA;AAC3B,CAAC,EALW,UAAU,0BAAV,UAAU,QAKrB;AA8BD,IAAY,aAMX;AAND,WAAY,aAAa;IACrB,wCAAuB,CAAA;IACvB,oCAAmB,CAAA;IACnB,oCAAmB,CAAA;IACnB,4CAA2B,CAAA;IAC3B,oCAAmB,CAAA;AACvB,CAAC,EANW,aAAa,6BAAb,aAAa,QAMxB;AAiBD,IAAY,SAkBX;AAlBD,WAAY,SAAS;IACjB,sCAAyB,CAAA;IACzB,oCAAuB,CAAA;IACvB,sCAAyB,CAAA;IACzB,mDAAsC,CAAA;IACtC,uCAA0B,CAAA;IAC1B,0BAAa,CAAA;IACb,4BAAe,CAAA;IACf,4BAAe,CAAA;IACf,4BAAe,CAAA;IACf,oCAAuB,CAAA;IACvB,0BAAa,CAAA;IACb,0BAAa,CAAA;IACb,wBAAW,CAAA;IACX,uCAA0B,CAAA;IAC1B,0BAAa,CAAA;IACb,4BAAe,CAAA;IACf,gCAAmB,CAAA;AACvB,CAAC,EAlBW,SAAS,yBAAT,SAAS,QAkBpB;AAED,oEAAoE;AACpE,MAAM;AAEN,IAAY,gBAUX;AAVD,WAAY,gBAAgB;IACxB,qCAAiB,CAAA;IACjB,qDAAiC,CAAA;IACjC,2CAAuB,CAAA;IACvB,uCAAmB,CAAA;IACnB,yCAAqB,CAAA;IACrB,6CAAyB,CAAA;IACzB,2CAAuB,CAAA;IACvB,0BAA0B;IAC1B,oBAAoB;AACxB,CAAC,EAVW,gBAAgB,gCAAhB,gBAAgB,QAU3B;AAyBD,IAAY,iBAKX;AALD,WAAY,iBAAiB;IACzB,wCAAmB,CAAA;IACnB,4CAAuB,CAAA;IACvB,sCAAiB,CAAA;IACjB,4CAAuB,CAAA;AAC3B,CAAC,EALW,iBAAiB,iCAAjB,iBAAiB,QAK5B"}
|
|
@@ -47,25 +47,19 @@ export class FallbackCompletionStream {
|
|
|
47
47
|
driver;
|
|
48
48
|
options;
|
|
49
49
|
prompt;
|
|
50
|
-
chunks;
|
|
51
50
|
completion;
|
|
52
51
|
constructor(driver, segments, options) {
|
|
53
52
|
this.driver = driver;
|
|
54
53
|
this.options = options;
|
|
55
54
|
this.driver = driver;
|
|
56
55
|
this.prompt = this.driver.createPrompt(segments, options);
|
|
57
|
-
this.chunks = [];
|
|
58
56
|
}
|
|
59
57
|
async *[Symbol.asyncIterator]() {
|
|
60
58
|
// reset state
|
|
61
59
|
this.completion = undefined;
|
|
62
|
-
if (this.chunks.length > 0) {
|
|
63
|
-
this.chunks = [];
|
|
64
|
-
}
|
|
65
60
|
this.driver.logger.debug(`[${this.driver.provider}] Streaming is not supported, falling back to blocking execution`);
|
|
66
61
|
const completion = await this.driver._execute(this.prompt, this.options);
|
|
67
|
-
const content = completion.result === 'string' ? completion.result : JSON.stringify(completion.result);
|
|
68
|
-
this.chunks.push(content);
|
|
62
|
+
const content = typeof completion.result === 'string' ? completion.result : JSON.stringify(completion.result);
|
|
69
63
|
yield content;
|
|
70
64
|
this.completion = completion;
|
|
71
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CompletionStream.js","sourceRoot":"","sources":["../../src/CompletionStream.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,uBAAuB;IAMb;IAER;IANX,MAAM,CAAW;IACjB,MAAM,CAAU;IAChB,UAAU,CAAyC;IAEnD,YAAmB,MAA8C,EAC7D,QAAyB,EAClB,OAAyB;QAFjB,WAAM,GAAN,MAAM,CAAwC;QAEtD,YAAO,GAAP,OAAO,CAAkB;QAChC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC;QACzB,cAAc;QACd,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACrB,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAE3B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CACpB,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,4BAA4B,IAAI,CAAC,OAAO,CAAC,KAAK,cAAc,EAAE,IAAI,CAAC,MAAM,CACpG,CAAC;QAEF,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAEpF,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC/B,IAAI,KAAK,EAAE,CAAC;gBACR,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,MAAM,KAAK,CAAC;YAChB,CAAC;QACL,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,YAAY,GAAG,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QAC/G,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,0BAA0B;QAE/D,IAAI,CAAC,UAAU,GAAG;YACd,MAAM,EAAE,OAAO;YACf,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,cAAc,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;YAClC,WAAW,EAAE;gBACT,MAAM,EAAE,YAAY;gBACpB,MAAM,EAAE,YAAY;gBACpB,KAAK,EAAE,YAAY,GAAG,YAAY;aACrC;SACJ,CAAA;QAED,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9D,CAAC;CAEJ;AAED,MAAM,OAAO,wBAAwB;
|
|
1
|
+
{"version":3,"file":"CompletionStream.js","sourceRoot":"","sources":["../../src/CompletionStream.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/Driver.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* (eg: OpenAI, HuggingFace, etc.)
|
|
5
5
|
*/
|
|
6
6
|
import { DefaultCompletionStream, FallbackCompletionStream } from "./CompletionStream.js";
|
|
7
|
-
import {
|
|
7
|
+
import { formatLlama2Prompt, formatTextPrompt } from "./formatters/index.js";
|
|
8
8
|
import { validateResult } from "./validation.js";
|
|
9
9
|
const ConsoleLogger = {
|
|
10
10
|
debug: console.debug,
|
|
@@ -30,6 +30,13 @@ export function createLogger(logger) {
|
|
|
30
30
|
return NoopLogger;
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
|
+
function applyExecutionDefaults(options) {
|
|
34
|
+
return {
|
|
35
|
+
max_tokens: 4096,
|
|
36
|
+
temperature: 0.7,
|
|
37
|
+
...options
|
|
38
|
+
};
|
|
39
|
+
}
|
|
33
40
|
/**
|
|
34
41
|
* To be implemented by each driver
|
|
35
42
|
*/
|
|
@@ -72,6 +79,7 @@ export class AbstractDriver {
|
|
|
72
79
|
}
|
|
73
80
|
}
|
|
74
81
|
async execute(segments, options) {
|
|
82
|
+
options = applyExecutionDefaults(options);
|
|
75
83
|
const prompt = this.createPrompt(segments, options);
|
|
76
84
|
return this._execute(prompt, options);
|
|
77
85
|
}
|
|
@@ -91,6 +99,7 @@ export class AbstractDriver {
|
|
|
91
99
|
}
|
|
92
100
|
// by default no stream is supported. we block and we return all at once
|
|
93
101
|
async stream(segments, options) {
|
|
102
|
+
options = applyExecutionDefaults(options);
|
|
94
103
|
const canStream = await this.canStream(options);
|
|
95
104
|
if (canStream) {
|
|
96
105
|
return new DefaultCompletionStream(this, segments, options);
|
|
@@ -99,8 +108,22 @@ export class AbstractDriver {
|
|
|
99
108
|
return new FallbackCompletionStream(this, segments, options);
|
|
100
109
|
}
|
|
101
110
|
}
|
|
111
|
+
/**
|
|
112
|
+
* Override this method to provide a custom prompt formatter
|
|
113
|
+
* @param segments
|
|
114
|
+
* @param options
|
|
115
|
+
* @returns
|
|
116
|
+
*/
|
|
117
|
+
formatPrompt(segments, opts) {
|
|
118
|
+
if (/\bllama2?\b/i.test(opts.model)) {
|
|
119
|
+
return formatLlama2Prompt(segments, opts.resultSchema);
|
|
120
|
+
}
|
|
121
|
+
else {
|
|
122
|
+
return formatTextPrompt(segments, opts.resultSchema);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
102
125
|
createPrompt(segments, opts) {
|
|
103
|
-
return
|
|
126
|
+
return opts.format ? opts.format(segments, opts.resultSchema) : this.formatPrompt(segments, opts);
|
|
104
127
|
}
|
|
105
128
|
/**
|
|
106
129
|
* Must be overrided if the implementation cannot stream.
|
|
@@ -114,5 +137,13 @@ export class AbstractDriver {
|
|
|
114
137
|
canStream(_options) {
|
|
115
138
|
return Promise.resolve(true);
|
|
116
139
|
}
|
|
140
|
+
/**
|
|
141
|
+
* Get a list of models that can be trained.
|
|
142
|
+
* The default is to return an empty array
|
|
143
|
+
* @returns
|
|
144
|
+
*/
|
|
145
|
+
async listTrainableModels() {
|
|
146
|
+
return [];
|
|
147
|
+
}
|
|
117
148
|
}
|
|
118
149
|
//# sourceMappingURL=Driver.js.map
|
package/lib/esm/Driver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Driver.js","sourceRoot":"","sources":["../../src/Driver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAC1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"Driver.js","sourceRoot":"","sources":["../../src/Driver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAmB7E,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,aAAa,GAAW;IAC1B,KAAK,EAAE,OAAO,CAAC,KAAK;IACpB,IAAI,EAAE,OAAO,CAAC,IAAI;IAClB,IAAI,EAAE,OAAO,CAAC,IAAI;IAClB,KAAK,EAAE,OAAO,CAAC,KAAK;CACvB,CAAA;AAED,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;AAC1B,MAAM,UAAU,GAAW;IACvB,KAAK,EAAE,IAAI;IACX,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,KAAK,EAAE,IAAI;CACd,CAAA;AAED,MAAM,UAAU,YAAY,CAAC,MAAsC;IAC/D,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,aAAa,CAAC;IACzB,CAAC;SAAM,IAAI,MAAM,EAAE,CAAC;QAChB,OAAO,MAAM,CAAC;IAClB,CAAC;SAAM,CAAC;QACJ,OAAO,UAAU,CAAC;IACtB,CAAC;AACL,CAAC;AAED,SAAS,sBAAsB,CAAC,OAAyB;IACrD,OAAO;QACH,UAAU,EAAE,IAAI;QAChB,WAAW,EAAE,GAAG;QAChB,GAAG,OAAO;KACb,CAAA;AACL,CAAC;AAwCD;;GAEG;AACH,MAAM,OAAgB,cAAc;IAChC,OAAO,CAAW;IAClB,MAAM,CAAS;IAIf,YAAY,IAAc;QACtB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAED,oBAAoB,CAAC,OAA8B;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;QAC1G,OAAO,IAAI,CAAC,SAAS,CAAC;YAClB,MAAM;YACN,UAAU,EAAE,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC;SAC/G,CAAC,CAAC;IACP,CAAC;IAED,aAAa,CAAC,QAAoB,EAAE,QAAyB;QACzD,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAED,cAAc,CAAC,MAAc;QACzB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAED,cAAc,CAAC,MAAc;QACzB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAED,cAAc,CAAC,MAAkB,EAAE,OAAyB;QACxD,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YACxC,IAAI,CAAC;gBACD,MAAM,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;YACxE,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBAClB,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,IAAI,IAAI,CAAC,QAAQ,MAAM,OAAO,CAAC,KAAK,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,4BAA4B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBACvL,MAAM,CAAC,KAAK,GAAG;oBACX,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI;oBAC9B,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,IAAI,EAAE,MAAM,CAAC,MAAM;iBACtB,CAAA;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,QAAyB,EAAE,OAAyB;QAC9D,OAAO,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAe,EAAE,OAAyB;QACrD,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,IAAI,IAAI,CAAC,QAAQ,eAAe,OAAO,CAAC,KAAK,cAAc,EAAE,MAAM,CACtE,CAAC;QACF,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACzB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAC7D,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACrC,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;YAC1C,OAAO,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;QACjD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACZ,KAAa,CAAC,MAAM,GAAG,MAAM,CAAC;YAC/B,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAED,wEAAwE;IACxE,KAAK,CAAC,MAAM,CAAC,QAAyB,EAAE,OAAyB;QAC7D,OAAO,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAChD,IAAI,SAAS,EAAE,CAAC;YACZ,OAAO,IAAI,uBAAuB,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChE,CAAC;aAAM,CAAC;YACJ,OAAO,IAAI,wBAAwB,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QACjE,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACO,YAAY,CAAC,QAAyB,EAAE,IAAmB;QACjE,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,OAAO,kBAAkB,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAY,CAAC;QACtE,CAAC;aAAM,CAAC;YACJ,OAAO,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAY,CAAC;QACpE,CAAC;IACL,CAAC;IAEM,YAAY,CAAC,QAAyB,EAAE,IAAmB;QAC9D,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACtG,CAAC;IAED;;;;;;;;OAQG;IACO,SAAS,CAAC,QAA0B;QAC1C,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,mBAAmB;QACrB,OAAO,EAAE,CAAC;IACd,CAAC;CAeJ"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { PromptRole } from "../index.js";
|
|
2
|
+
import { getJSONSafetyNotice } from "./commons.js";
|
|
2
3
|
/**
|
|
3
4
|
* A formatter user by Bedrock to format prompts for claude related models
|
|
4
5
|
*/
|
|
5
|
-
export function
|
|
6
|
+
export function formatClaudePrompt(segments, schema) {
|
|
6
7
|
const system = [];
|
|
7
8
|
const safety = [];
|
|
8
9
|
const messages = [];
|
|
@@ -18,10 +19,7 @@ export function claudeMessages(segments, schema) {
|
|
|
18
19
|
}
|
|
19
20
|
}
|
|
20
21
|
if (schema) {
|
|
21
|
-
safety.push(
|
|
22
|
-
---
|
|
23
|
-
${JSON.stringify(schema)}
|
|
24
|
-
---`);
|
|
22
|
+
safety.push(getJSONSafetyNotice(schema));
|
|
25
23
|
}
|
|
26
24
|
// messages must contains at least 1 item. If the prompt doesn;t contains a user message (but only system messages)
|
|
27
25
|
// we need to put the system messages in the messages array
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude.js","sourceRoot":"","sources":["../../../src/formatters/claude.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAiB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"claude.js","sourceRoot":"","sources":["../../../src/formatters/claude.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAiB,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAgBnD;;GAEG;AAEH,MAAM,UAAU,kBAAkB,CAAC,QAAyB,EAAE,MAAoB;IAC9E,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,QAAQ,GAAoB,EAAE,CAAC;IAErC,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QACzB,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;YACjC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;YACxC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;aAAM,CAAC;YACJ,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QACtF,CAAC;IACL,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACT,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED,mHAAmH;IACnH,2DAA2D;IAE3D,IAAI,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7C,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,IAAI,CAAC,aAAa,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAChE,CAAC;QACD,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QAClF,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;SAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,aAAa,GAAG,aAAa,GAAG,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1E,CAAC;IAED;;;;;;;;;OASG;IAEH,2CAA2C;IAC3C,OAAO;QACH,MAAM,EAAE,aAAa;QACrB,QAAQ;KACX,CAAA;AACL,CAAC;AAED,4EAA4E;AAC5E,+DAA+D;AAC/D,2BAA2B;AAC3B,oCAAoC;AACpC,6BAA6B;AAC7B,UAAU;AAEV,iDAAiD;AACjD,IAAI"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"commons.js","sourceRoot":"","sources":["../../../src/formatters/commons.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,mBAAmB,CAAC,MAAmB;IACnD,OAAO,qEAAqE,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAC1G,CAAC"}
|
|
@@ -1,23 +1,55 @@
|
|
|
1
|
-
import { PromptRole } from "../
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
import { PromptRole } from "../types.js";
|
|
2
|
+
import { getJSONSafetyNotice } from "./commons.js";
|
|
3
|
+
export function createTextPromptFormatter(labels = {
|
|
4
|
+
user: "USER",
|
|
5
|
+
system: "CONTEXT",
|
|
6
|
+
assistant: "ASSISTANT",
|
|
7
|
+
safety: "IMPORTANT",
|
|
8
|
+
instruction: "INSTRUCTION"
|
|
9
|
+
}) {
|
|
10
|
+
return function genericTextPrompt(segments, schema) {
|
|
11
|
+
const isChat = segments.find(m => m.role === PromptRole.assistant);
|
|
12
|
+
const context = [];
|
|
13
|
+
const content = [];
|
|
14
|
+
const safety = [];
|
|
15
|
+
for (const segment of segments) {
|
|
16
|
+
switch (segment.role) {
|
|
17
|
+
case PromptRole.user:
|
|
18
|
+
if (isChat) {
|
|
19
|
+
content.push(`${labels.user}: ${segment.content}`);
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
content.push(segment.content);
|
|
23
|
+
}
|
|
24
|
+
break;
|
|
25
|
+
case PromptRole.assistant:
|
|
26
|
+
content.push(`${labels.assistant}: ${segment.content}`);
|
|
27
|
+
break;
|
|
28
|
+
case PromptRole.system:
|
|
29
|
+
context.push(segment.content);
|
|
30
|
+
break;
|
|
31
|
+
case PromptRole.safety:
|
|
32
|
+
safety.push(segment.content);
|
|
33
|
+
break;
|
|
34
|
+
}
|
|
7
35
|
}
|
|
8
|
-
if (
|
|
9
|
-
|
|
36
|
+
if (schema) {
|
|
37
|
+
safety.push(getJSONSafetyNotice(schema));
|
|
10
38
|
}
|
|
11
|
-
|
|
12
|
-
|
|
39
|
+
const out = [];
|
|
40
|
+
if (context.length > 0) {
|
|
41
|
+
out.push(`${labels.system}: ${context.join('\n')}`);
|
|
13
42
|
}
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
43
|
+
if (content.length > 0) {
|
|
44
|
+
const prefix = context.length > 0 && !isChat ? `${labels.instruction}: ` : '';
|
|
45
|
+
out.push(prefix + content.join('\n'));
|
|
46
|
+
}
|
|
47
|
+
if (safety.length > 0) {
|
|
48
|
+
out.push(`${labels.safety}: ${safety.join('\n')}`);
|
|
49
|
+
}
|
|
50
|
+
return out.join('\n');
|
|
51
|
+
};
|
|
22
52
|
}
|
|
53
|
+
const formatTextPrompt = createTextPromptFormatter();
|
|
54
|
+
export { formatTextPrompt };
|
|
23
55
|
//# sourceMappingURL=generic.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generic.js","sourceRoot":"","sources":["../../../src/formatters/generic.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAiB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"generic.js","sourceRoot":"","sources":["../../../src/formatters/generic.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAiB,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAUnD,MAAM,UAAU,yBAAyB,CAAC,SAAiB;IACvD,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,SAAS;IACjB,SAAS,EAAE,WAAW;IACtB,MAAM,EAAE,WAAW;IACnB,WAAW,EAAE,aAAa;CAC7B;IACG,OAAO,SAAS,iBAAiB,CAAC,QAAyB,EAAE,MAAoB;QAC7E,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,SAAS,CAAC,CAAC;QACnE,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC7B,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;gBACnB,KAAK,UAAU,CAAC,IAAI;oBAChB,IAAI,MAAM,EAAE,CAAC;wBACT,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;oBACvD,CAAC;yBAAM,CAAC;wBACJ,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAClC,CAAC;oBACD,MAAM;gBACV,KAAK,UAAU,CAAC,SAAS;oBACrB,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,SAAS,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;oBACxD,MAAM;gBACV,KAAK,UAAU,CAAC,MAAM;oBAClB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAC9B,MAAM;gBACV,KAAK,UAAU,CAAC,MAAM;oBAClB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAC7B,MAAM;YACd,CAAC;QACL,CAAC;QAED,IAAI,MAAM,EAAE,CAAC;YACT,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;QAC7C,CAAC;QAED,MAAM,GAAG,GAAG,EAAE,CAAC;QACf,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxD,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9E,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACvD,CAAC;QACD,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC,CAAA;AACL,CAAC;AAED,MAAM,gBAAgB,GAAG,yBAAyB,EAAE,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,CAAC"}
|
|
@@ -1,27 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
export function inferFormatterFromModelName(modelName) {
|
|
7
|
-
const name = modelName.toLowerCase();
|
|
8
|
-
if (name.includes("llama")) {
|
|
9
|
-
return PromptFormats.llama2;
|
|
10
|
-
}
|
|
11
|
-
else if (name.includes("gpt")) {
|
|
12
|
-
return PromptFormats.openai;
|
|
13
|
-
}
|
|
14
|
-
else if (name.includes("claude")) {
|
|
15
|
-
return PromptFormats.claude;
|
|
16
|
-
}
|
|
17
|
-
else {
|
|
18
|
-
return PromptFormats.genericTextLLM;
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
export const PromptFormatters = {
|
|
22
|
-
openai: openAI,
|
|
23
|
-
llama2: llama2,
|
|
24
|
-
claude: claudeMessages,
|
|
25
|
-
genericTextLLM: genericColonSeparator,
|
|
26
|
-
};
|
|
1
|
+
export * from "./commons.js";
|
|
2
|
+
export * from "./generic.js";
|
|
3
|
+
export * from "./llama2.js";
|
|
4
|
+
export * from "./claude.js";
|
|
5
|
+
export * from "./openai.js";
|
|
27
6
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/formatters/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/formatters/index.ts"],"names":[],"mappings":"AAKA,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llama2.js","sourceRoot":"","sources":["../../../src/formatters/llama2.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAiB,MAAM,aAAa,CAAC;AAExD,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"llama2.js","sourceRoot":"","sources":["../../../src/formatters/llama2.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAiB,MAAM,aAAa,CAAC;AAExD,MAAM,UAAU,kBAAkB,CAAC,QAAyB,EAAE,MAAoB;IAC9E,MAAM,GAAG,GAAG,KAAK,CAAC;IAClB,MAAM,GAAG,GAAG,MAAM,CAAC;IACnB,MAAM,IAAI,GAAG,QAAQ,CAAC;IACtB,MAAM,QAAQ,GAAG,SAAS,CAAC;IAC3B,MAAM,GAAG,GAAG,WAAW,CAAC;IACxB,MAAM,OAAO,GAAG,YAAY,CAAC;IAE7B,MAAM,cAAc,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAE/D,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACvB,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;YAC7B,IAAI,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;gBACpC,MAAM,IAAI,KAAK,CACX,4BAA4B,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,kBAAkB,CACjE,CAAC;YACN,CAAC;YACD,cAAc,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,QAAQ,EAAE,CAAC,CAAC;QACnE,CAAC;QACD,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,SAAS,EAAE,CAAC;YAClC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;YAC/B,cAAc,CAAC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;QAC/D,CAAC;IACL,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,QAAQ,IAAI,EAAE,EAAE,CAAC;QAC7B,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;YAC/B,cAAc,CAAC,IAAI,CACf,GAAG,GAAG,mFAAmF,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,OAAO,GAAG,CACzH,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACT,cAAc,CAAC,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEzB,OAAO,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,uBAAuB,CAAC,MAAmB;IAChD,MAAM,kBAAkB,GAAG;;;EAG7B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;;SAEf,CAAC;IAEN,OAAO,kBAAkB,CAAC;AAC9B,CAAC"}
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import { PromptRole } from "../index.js";
|
|
2
|
-
|
|
2
|
+
/**
|
|
3
|
+
* OpenAI text only prompts
|
|
4
|
+
* @param segments
|
|
5
|
+
* @returns
|
|
6
|
+
*/
|
|
7
|
+
export function formatOpenAILikePrompt(segments) {
|
|
3
8
|
const system = [];
|
|
4
9
|
const others = [];
|
|
5
10
|
const safety = [];
|
|
@@ -8,7 +13,7 @@ export function openAI(segments) {
|
|
|
8
13
|
system.push({ content: msg.content, role: "system" });
|
|
9
14
|
}
|
|
10
15
|
else if (msg.role === PromptRole.safety) {
|
|
11
|
-
safety.push({ content: msg.content, role: "system" });
|
|
16
|
+
safety.push({ content: "IMPORTANT: " + msg.content, role: "system" });
|
|
12
17
|
}
|
|
13
18
|
else {
|
|
14
19
|
others.push({ content: msg.content, role: "user" });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../../src/formatters/openai.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../../src/formatters/openai.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAOzC;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAC,QAAyB;IAC5D,MAAM,MAAM,GAAwB,EAAE,CAAC;IACvC,MAAM,MAAM,GAAwB,EAAE,CAAC;IACvC,MAAM,MAAM,GAAwB,EAAE,CAAC;IAEvC,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QACzB,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;YACjC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC1D,CAAC;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;YACxC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,aAAa,GAAG,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC1E,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACxD,CAAC;IACL,CAAC;IAED,2CAA2C;IAC3C,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAChD,CAAC"}
|
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
import { PromptFormats, PromptRole, } from "./types.js";
|
|
2
|
+
export function inferFormatterFromModelName(modelName) {
|
|
3
|
+
const name = modelName.toLowerCase();
|
|
4
|
+
if (name.includes("llama")) {
|
|
5
|
+
return PromptFormats.llama2;
|
|
6
|
+
}
|
|
7
|
+
else if (name.includes("gpt")) {
|
|
8
|
+
return PromptFormats.openai;
|
|
9
|
+
}
|
|
10
|
+
else if (name.includes("claude")) {
|
|
11
|
+
return PromptFormats.claude;
|
|
12
|
+
}
|
|
13
|
+
else {
|
|
14
|
+
return PromptFormats.genericTextLLM;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
export const PromptFormatters = {
|
|
18
|
+
openai: openAI,
|
|
19
|
+
llama2: llama2,
|
|
20
|
+
claude: claude,
|
|
21
|
+
genericTextLLM: genericColonSeparator,
|
|
22
|
+
};
|
|
23
|
+
function openAI(segments) {
|
|
24
|
+
const system = [];
|
|
25
|
+
const others = [];
|
|
26
|
+
const safety = [];
|
|
27
|
+
for (const msg of segments) {
|
|
28
|
+
if (msg.role === PromptRole.system) {
|
|
29
|
+
system.push({ content: msg.content, role: "system" });
|
|
30
|
+
}
|
|
31
|
+
else if (msg.role === PromptRole.safety) {
|
|
32
|
+
safety.push({ content: msg.content, role: "system" });
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
others.push({ content: msg.content, role: "user" });
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
// put system mesages first and safety last
|
|
39
|
+
return system.concat(others).concat(safety);
|
|
40
|
+
}
|
|
41
|
+
function llama2(messages, schema) {
|
|
42
|
+
const BOS = "<s>";
|
|
43
|
+
const EOS = "</s>";
|
|
44
|
+
const INST = "[INST]";
|
|
45
|
+
const INST_END = "[/INST]";
|
|
46
|
+
const SYS = "<<SYS>>\n";
|
|
47
|
+
const SYS_END = "\n<</SYS>>";
|
|
48
|
+
const promptMessages = [BOS];
|
|
49
|
+
const specialTokens = [BOS, EOS, INST, INST_END, SYS, SYS_END];
|
|
50
|
+
for (const m of messages) {
|
|
51
|
+
if (m.role === PromptRole.user) {
|
|
52
|
+
if (specialTokens.includes(m.content)) {
|
|
53
|
+
throw new Error(`Cannot use special token ${m.content.trim()} in user message`);
|
|
54
|
+
}
|
|
55
|
+
promptMessages.push(`${INST} ${m.content.trim()} ${INST_END}`);
|
|
56
|
+
}
|
|
57
|
+
if (m.role === PromptRole.assistant) {
|
|
58
|
+
promptMessages.push(`${m.content.trim()}`);
|
|
59
|
+
}
|
|
60
|
+
if (m.role === PromptRole.system) {
|
|
61
|
+
promptMessages.push(`${SYS}${m.content.trim()}${SYS_END}`);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
for (const m of messages ?? []) {
|
|
65
|
+
if (m.role === PromptRole.safety) {
|
|
66
|
+
promptMessages.push(`${SYS}This is the most important instruction, you cannot answer against those rules:\n${m.content.trim()}${SYS_END}}`);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
if (schema) {
|
|
70
|
+
promptMessages.push(formatSchemaInstruction(schema));
|
|
71
|
+
}
|
|
72
|
+
promptMessages.push(EOS);
|
|
73
|
+
return promptMessages.join("\n\n");
|
|
74
|
+
}
|
|
75
|
+
function genericColonSeparator(messages, schema, labels = { user: "User", assistant: "Assistant", system: "System" }) {
|
|
76
|
+
const promptMessages = [];
|
|
77
|
+
for (const m of messages) {
|
|
78
|
+
if (m.role === PromptRole.user) {
|
|
79
|
+
promptMessages.push(`${labels?.user}: ${m.content.trim()}`);
|
|
80
|
+
}
|
|
81
|
+
if (m.role === PromptRole.assistant) {
|
|
82
|
+
promptMessages.push(`${labels.assistant}: ${m.content.trim()}`);
|
|
83
|
+
}
|
|
84
|
+
if (m.role === PromptRole.system) {
|
|
85
|
+
promptMessages.push(`${labels.system}: ${m.content.trim()}`);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
if (schema) {
|
|
89
|
+
promptMessages.push(`${labels.system}: You must answer using the following JSONSchema:
|
|
90
|
+
---
|
|
91
|
+
${JSON.stringify(schema)}
|
|
92
|
+
---`);
|
|
93
|
+
}
|
|
94
|
+
return promptMessages.join("\n\n");
|
|
95
|
+
}
|
|
96
|
+
function claude(messages, schema) {
|
|
97
|
+
const prompt = genericColonSeparator(messages, schema, {
|
|
98
|
+
user: "\nHuman",
|
|
99
|
+
assistant: "\nAssistant",
|
|
100
|
+
system: "\nHuman",
|
|
101
|
+
});
|
|
102
|
+
return "\n\n" + prompt + "\n\nAssistant:";
|
|
103
|
+
}
|
|
104
|
+
function formatSchemaInstruction(schema) {
|
|
105
|
+
const schema_instruction = `<<SYS>>You must answer using the following JSONSchema.
|
|
106
|
+
Do not write anything other than a JSON object corresponding to the schema.
|
|
107
|
+
<schema>
|
|
108
|
+
${JSON.stringify(schema)}
|
|
109
|
+
</schema>
|
|
110
|
+
<</SYS>>`;
|
|
111
|
+
return schema_instruction;
|
|
112
|
+
}
|
|
113
|
+
//# sourceMappingURL=formatters.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"formatters.js","sourceRoot":"","sources":["../../src/formatters.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/index.js
CHANGED
package/lib/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC"}
|
package/lib/esm/test.js
ADDED
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { ReadableStream } from "stream/web";
|
|
2
|
+
import fs from "fs";
|
|
3
|
+
async function* asyncReadableIterator(stream) {
|
|
4
|
+
if (stream.readableEncoding) {
|
|
5
|
+
for await (const chunk of stream.iterator({ destroyOnReturn: true })) {
|
|
6
|
+
yield chunk;
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
else {
|
|
10
|
+
for await (const chunk of stream.iterator({ destroyOnReturn: true })) {
|
|
11
|
+
yield new Uint8Array(chunk);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
function createReadableStreamFromIterable(iterable) {
|
|
16
|
+
const it = iterable[Symbol.asyncIterator]();
|
|
17
|
+
if (ReadableStream.from) {
|
|
18
|
+
return ReadableStream.from();
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
return new ReadableStream({
|
|
22
|
+
async pull(controller) {
|
|
23
|
+
const { value, done } = await it.next();
|
|
24
|
+
if (done) {
|
|
25
|
+
controller.close();
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
controller.enqueue(value);
|
|
29
|
+
}
|
|
30
|
+
},
|
|
31
|
+
cancel() {
|
|
32
|
+
it.return?.();
|
|
33
|
+
}
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
async function main() {
|
|
38
|
+
const stream = fs.createReadStream("./test.txt");
|
|
39
|
+
const it = asyncReadableIterator(stream);
|
|
40
|
+
for await (const x of it) {
|
|
41
|
+
console.log('@@', x, typeof x);
|
|
42
|
+
}
|
|
43
|
+
const stream2 = fs.createReadStream("./test.txt");
|
|
44
|
+
const rs = createReadableStreamFromIterable(asyncReadableIterator(stream2));
|
|
45
|
+
for await (const r of rs) {
|
|
46
|
+
console.log('>>', r, typeof r);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
main();
|
|
50
|
+
//# sourceMappingURL=test.js.map
|