@llumiverse/drivers 0.11.0 → 0.12.1
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 +1 -0
- package/lib/cjs/bedrock/index.js +74 -22
- package/lib/cjs/bedrock/index.js.map +1 -1
- package/lib/cjs/groq/index.js +112 -0
- package/lib/cjs/groq/index.js.map +1 -0
- package/lib/cjs/huggingface_ie.js +6 -0
- package/lib/cjs/huggingface_ie.js.map +1 -1
- package/lib/cjs/index.js +1 -0
- package/lib/cjs/index.js.map +1 -1
- package/lib/cjs/mistral/index.js +8 -4
- package/lib/cjs/mistral/index.js.map +1 -1
- package/lib/cjs/openai.js +40 -18
- package/lib/cjs/openai.js.map +1 -1
- package/lib/cjs/replicate.js +1 -0
- package/lib/cjs/replicate.js.map +1 -1
- package/lib/cjs/togetherai/index.js +4 -1
- package/lib/cjs/togetherai/index.js.map +1 -1
- package/lib/cjs/vertexai/models/gemini.js +15 -3
- package/lib/cjs/vertexai/models/gemini.js.map +1 -1
- package/lib/cjs/vertexai/models/palm-model-base.js +3 -1
- package/lib/cjs/vertexai/models/palm-model-base.js.map +1 -1
- package/lib/esm/bedrock/index.js +74 -22
- package/lib/esm/bedrock/index.js.map +1 -1
- package/lib/esm/groq/index.js +105 -0
- package/lib/esm/groq/index.js.map +1 -0
- package/lib/esm/huggingface_ie.js +6 -0
- package/lib/esm/huggingface_ie.js.map +1 -1
- package/lib/esm/index.js +1 -0
- package/lib/esm/index.js.map +1 -1
- package/lib/esm/mistral/index.js +9 -5
- package/lib/esm/mistral/index.js.map +1 -1
- package/lib/esm/openai.js +40 -18
- package/lib/esm/openai.js.map +1 -1
- package/lib/esm/replicate.js +1 -0
- package/lib/esm/replicate.js.map +1 -1
- package/lib/esm/togetherai/index.js +4 -1
- package/lib/esm/togetherai/index.js.map +1 -1
- package/lib/esm/vertexai/models/gemini.js +16 -4
- package/lib/esm/vertexai/models/gemini.js.map +1 -1
- package/lib/esm/vertexai/models/palm-model-base.js +3 -1
- package/lib/esm/vertexai/models/palm-model-base.js.map +1 -1
- package/lib/types/bedrock/index.d.ts.map +1 -1
- package/lib/types/{src/mistral → groq}/index.d.ts +8 -8
- package/lib/types/groq/index.d.ts.map +1 -0
- package/lib/types/huggingface_ie.d.ts +2 -0
- package/lib/types/huggingface_ie.d.ts.map +1 -1
- package/lib/types/index.d.ts +1 -0
- package/lib/types/index.d.ts.map +1 -1
- package/lib/types/mistral/index.d.ts.map +1 -1
- package/lib/types/openai.d.ts.map +1 -1
- package/lib/types/replicate.d.ts +1 -0
- package/lib/types/replicate.d.ts.map +1 -1
- package/lib/types/togetherai/index.d.ts.map +1 -1
- package/lib/types/togetherai/interfaces.d.ts +15 -0
- package/lib/types/togetherai/interfaces.d.ts.map +1 -1
- package/lib/types/vertexai/models/gemini.d.ts.map +1 -1
- package/lib/types/vertexai/models/palm-model-base.d.ts.map +1 -1
- package/package.json +3 -2
- package/src/bedrock/index.ts +69 -21
- package/src/groq/index.ts +134 -0
- package/src/huggingface_ie.ts +6 -0
- package/src/index.ts +1 -1
- package/src/mistral/index.ts +11 -7
- package/src/mistral/types.ts +2 -2
- package/src/openai.ts +43 -20
- package/src/replicate.ts +1 -0
- package/src/togetherai/index.ts +6 -4
- package/src/togetherai/interfaces.ts +16 -0
- package/src/vertexai/models/gemini.ts +13 -5
- package/src/vertexai/models/palm-model-base.ts +3 -1
- package/lib/cjs/vertexai/utils/prompts.js +0 -52
- package/lib/cjs/vertexai/utils/prompts.js.map +0 -1
- package/lib/esm/src/bedrock/index.js +0 -375
- package/lib/esm/src/bedrock/index.js.map +0 -1
- package/lib/esm/src/bedrock/s3.js +0 -53
- package/lib/esm/src/bedrock/s3.js.map +0 -1
- package/lib/esm/src/huggingface_ie.js +0 -173
- package/lib/esm/src/huggingface_ie.js.map +0 -1
- package/lib/esm/src/index.js +0 -9
- package/lib/esm/src/index.js.map +0 -1
- package/lib/esm/src/mistral/index.js +0 -145
- package/lib/esm/src/mistral/index.js.map +0 -1
- package/lib/esm/src/mistral/types.js +0 -80
- package/lib/esm/src/mistral/types.js.map +0 -1
- package/lib/esm/src/openai.js +0 -195
- package/lib/esm/src/openai.js.map +0 -1
- package/lib/esm/src/replicate.js +0 -281
- package/lib/esm/src/replicate.js.map +0 -1
- package/lib/esm/src/test/TestErrorCompletionStream.js +0 -16
- package/lib/esm/src/test/TestErrorCompletionStream.js.map +0 -1
- package/lib/esm/src/test/TestValidationErrorCompletionStream.js +0 -20
- package/lib/esm/src/test/TestValidationErrorCompletionStream.js.map +0 -1
- package/lib/esm/src/test/index.js +0 -91
- package/lib/esm/src/test/index.js.map +0 -1
- package/lib/esm/src/test/utils.js +0 -25
- package/lib/esm/src/test/utils.js.map +0 -1
- package/lib/esm/src/togetherai/index.js +0 -89
- package/lib/esm/src/togetherai/index.js.map +0 -1
- package/lib/esm/src/togetherai/interfaces.js +0 -2
- package/lib/esm/src/togetherai/interfaces.js.map +0 -1
- package/lib/esm/src/vertexai/debug.js +0 -6
- package/lib/esm/src/vertexai/debug.js.map +0 -1
- package/lib/esm/src/vertexai/embeddings/embeddings-text.js +0 -19
- package/lib/esm/src/vertexai/embeddings/embeddings-text.js.map +0 -1
- package/lib/esm/src/vertexai/index.js +0 -73
- package/lib/esm/src/vertexai/index.js.map +0 -1
- package/lib/esm/src/vertexai/models/codey-chat.js +0 -61
- package/lib/esm/src/vertexai/models/codey-chat.js.map +0 -1
- package/lib/esm/src/vertexai/models/codey-text.js +0 -31
- package/lib/esm/src/vertexai/models/codey-text.js.map +0 -1
- package/lib/esm/src/vertexai/models/gemini.js +0 -136
- package/lib/esm/src/vertexai/models/gemini.js.map +0 -1
- package/lib/esm/src/vertexai/models/palm-model-base.js +0 -53
- package/lib/esm/src/vertexai/models/palm-model-base.js.map +0 -1
- package/lib/esm/src/vertexai/models/palm2-chat.js +0 -61
- package/lib/esm/src/vertexai/models/palm2-chat.js.map +0 -1
- package/lib/esm/src/vertexai/models/palm2-text.js +0 -31
- package/lib/esm/src/vertexai/models/palm2-text.js.map +0 -1
- package/lib/esm/src/vertexai/models.js +0 -87
- package/lib/esm/src/vertexai/models.js.map +0 -1
- package/lib/esm/src/vertexai/utils/prompts.js +0 -47
- package/lib/esm/src/vertexai/utils/prompts.js.map +0 -1
- package/lib/esm/src/vertexai/utils/tensor.js +0 -82
- package/lib/esm/src/vertexai/utils/tensor.js.map +0 -1
- package/lib/esm/tsconfig.tsbuildinfo +0 -1
- package/lib/esm/vertexai/utils/prompts.js +0 -47
- package/lib/esm/vertexai/utils/prompts.js.map +0 -1
- package/lib/types/src/bedrock/index.d.ts +0 -94
- package/lib/types/src/bedrock/s3.d.ts +0 -16
- package/lib/types/src/huggingface_ie.d.ts +0 -30
- package/lib/types/src/index.d.ts +0 -8
- package/lib/types/src/mistral/types.d.ts +0 -130
- package/lib/types/src/openai.d.ts +0 -30
- package/lib/types/src/replicate.d.ts +0 -47
- package/lib/types/src/test/TestErrorCompletionStream.d.ts +0 -8
- package/lib/types/src/test/TestValidationErrorCompletionStream.d.ts +0 -8
- package/lib/types/src/test/index.d.ts +0 -23
- package/lib/types/src/test/utils.d.ts +0 -4
- package/lib/types/src/togetherai/index.d.ts +0 -21
- package/lib/types/src/togetherai/interfaces.d.ts +0 -80
- package/lib/types/src/vertexai/debug.d.ts +0 -1
- package/lib/types/src/vertexai/embeddings/embeddings-text.d.ts +0 -9
- package/lib/types/src/vertexai/index.d.ts +0 -21
- package/lib/types/src/vertexai/models/codey-chat.d.ts +0 -50
- package/lib/types/src/vertexai/models/codey-text.d.ts +0 -38
- package/lib/types/src/vertexai/models/gemini.d.ts +0 -10
- package/lib/types/src/vertexai/models/palm-model-base.d.ts +0 -60
- package/lib/types/src/vertexai/models/palm2-chat.d.ts +0 -60
- package/lib/types/src/vertexai/models/palm2-text.d.ts +0 -38
- package/lib/types/src/vertexai/models.d.ts +0 -13
- package/lib/types/src/vertexai/utils/prompts.d.ts +0 -19
- package/lib/types/src/vertexai/utils/tensor.d.ts +0 -5
- package/lib/types/vertexai/utils/prompts.d.ts +0 -20
- package/lib/types/vertexai/utils/prompts.d.ts.map +0 -1
|
@@ -1,52 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getPromptAsText = exports.getJSONSafetyNotice = void 0;
|
|
4
|
-
const core_1 = require("@llumiverse/core");
|
|
5
|
-
function getJSONSafetyNotice(schema) {
|
|
6
|
-
return "The answer must be a JSON object using the following JSON Schema:\n" + JSON.stringify(schema);
|
|
7
|
-
}
|
|
8
|
-
exports.getJSONSafetyNotice = getJSONSafetyNotice;
|
|
9
|
-
function getPromptAsText(segments, options) {
|
|
10
|
-
const isChat = segments.find(m => m.role === core_1.PromptRole.assistant);
|
|
11
|
-
const context = [];
|
|
12
|
-
const content = [];
|
|
13
|
-
const safety = [];
|
|
14
|
-
for (const segment of segments) {
|
|
15
|
-
switch (segment.role) {
|
|
16
|
-
case core_1.PromptRole.user:
|
|
17
|
-
if (isChat) {
|
|
18
|
-
content.push('USER: ' + segment.content);
|
|
19
|
-
}
|
|
20
|
-
else {
|
|
21
|
-
content.push(segment.content);
|
|
22
|
-
}
|
|
23
|
-
break;
|
|
24
|
-
case core_1.PromptRole.assistant:
|
|
25
|
-
content.push('ASSISTANT: ' + segment.content);
|
|
26
|
-
break;
|
|
27
|
-
case core_1.PromptRole.system:
|
|
28
|
-
context.push(segment.content);
|
|
29
|
-
break;
|
|
30
|
-
case core_1.PromptRole.safety:
|
|
31
|
-
safety.push(segment.content);
|
|
32
|
-
break;
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
if (options.resultSchema) {
|
|
36
|
-
safety.push(getJSONSafetyNotice(options.resultSchema));
|
|
37
|
-
}
|
|
38
|
-
const out = [];
|
|
39
|
-
if (context.length > 0) {
|
|
40
|
-
out.push('CONTEXT: ' + context.join('\n'));
|
|
41
|
-
}
|
|
42
|
-
if (content.length > 0) {
|
|
43
|
-
const prefix = context.length > 0 && !isChat ? 'INSTRUCTION: ' : '';
|
|
44
|
-
out.push(prefix + content.join('\n'));
|
|
45
|
-
}
|
|
46
|
-
if (safety.length > 0) {
|
|
47
|
-
out.push('IMPORTANT: ' + safety.join('\n'));
|
|
48
|
-
}
|
|
49
|
-
return out.join('\n');
|
|
50
|
-
}
|
|
51
|
-
exports.getPromptAsText = getPromptAsText;
|
|
52
|
-
//# sourceMappingURL=prompts.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../../src/vertexai/utils/prompts.ts"],"names":[],"mappings":";;;AAAA,2CAA4E;AAmB5E,SAAgB,mBAAmB,CAAC,MAAmB;IACnD,OAAO,qEAAqE,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;AACzG,CAAC;AAFD,kDAEC;AAED,SAAgB,eAAe,CAAC,QAAyB,EAAE,OAAsB;IAC7E,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,iBAAU,CAAC,SAAS,CAAC,CAAC;IACnE,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC7B,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,iBAAU,CAAC,IAAI;gBAChB,IAAI,MAAM,EAAE,CAAC;oBACT,OAAO,CAAC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;gBAC7C,CAAC;qBAAM,CAAC;oBACJ,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAClC,CAAC;gBACD,MAAM;YACV,KAAK,iBAAU,CAAC,SAAS;gBACrB,OAAO,CAAC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;gBAC9C,MAAM;YACV,KAAK,iBAAU,CAAC,MAAM;gBAClB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAC9B,MAAM;YACV,KAAK,iBAAU,CAAC,MAAM;gBAClB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAC7B,MAAM;QACd,CAAC;IACL,CAAC;IAED,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACvB,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,GAAG,GAAG,EAAE,CAAC;IACf,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;QACpE,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,GAAG,CAAC,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AA1CD,0CA0CC"}
|
|
@@ -1,375 +0,0 @@
|
|
|
1
|
-
import { Bedrock, CreateModelCustomizationJobCommand, GetModelCustomizationJobCommand, ModelCustomizationJobStatus, StopModelCustomizationJobCommand } from "@aws-sdk/client-bedrock";
|
|
2
|
-
import { BedrockRuntime } from "@aws-sdk/client-bedrock-runtime";
|
|
3
|
-
import { S3Client } from "@aws-sdk/client-s3";
|
|
4
|
-
import { AbstractDriver, BuiltinProviders, TrainingJobStatus } from "@llumiverse/core";
|
|
5
|
-
import { transformAsyncIterator } from "@llumiverse/core/async";
|
|
6
|
-
import { formatClaudePrompt } from "@llumiverse/core/formatters";
|
|
7
|
-
import mnemonist from "mnemonist";
|
|
8
|
-
import { forceUploadFile } from "./s3.js";
|
|
9
|
-
const { LRUCache } = mnemonist;
|
|
10
|
-
const supportStreamingCache = new LRUCache(4096);
|
|
11
|
-
export class BedrockDriver extends AbstractDriver {
|
|
12
|
-
provider = BuiltinProviders.bedrock;
|
|
13
|
-
_executor;
|
|
14
|
-
_service;
|
|
15
|
-
constructor(options) {
|
|
16
|
-
super(options);
|
|
17
|
-
if (!options.region) {
|
|
18
|
-
throw new Error("No region found. Set the region in the environment's endpoint URL.");
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
getExecutor() {
|
|
22
|
-
if (!this._executor) {
|
|
23
|
-
this._executor = new BedrockRuntime({
|
|
24
|
-
region: this.options.region,
|
|
25
|
-
credentials: this.options.credentials,
|
|
26
|
-
});
|
|
27
|
-
}
|
|
28
|
-
return this._executor;
|
|
29
|
-
}
|
|
30
|
-
getService() {
|
|
31
|
-
if (!this._service) {
|
|
32
|
-
this._service = new Bedrock({
|
|
33
|
-
region: this.options.region,
|
|
34
|
-
credentials: this.options.credentials,
|
|
35
|
-
});
|
|
36
|
-
}
|
|
37
|
-
return this._service;
|
|
38
|
-
}
|
|
39
|
-
formatPrompt(segments, opts) {
|
|
40
|
-
//TODO move the anthropic test in abstract driver?
|
|
41
|
-
if (opts.model.includes('anthropic')) {
|
|
42
|
-
//TODO: need to type better the types aren't checked properly by TS
|
|
43
|
-
return formatClaudePrompt(segments, opts.resultSchema);
|
|
44
|
-
}
|
|
45
|
-
else {
|
|
46
|
-
return super.formatPrompt(segments, opts);
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
extractDataFromResponse(prompt, response) {
|
|
50
|
-
const decoder = new TextDecoder();
|
|
51
|
-
const body = decoder.decode(response.body);
|
|
52
|
-
const result = JSON.parse(body);
|
|
53
|
-
const getText = () => {
|
|
54
|
-
if (result.completion) {
|
|
55
|
-
return result.completion;
|
|
56
|
-
}
|
|
57
|
-
else if (result.generation) {
|
|
58
|
-
return result.generation;
|
|
59
|
-
}
|
|
60
|
-
else if (result.generations) {
|
|
61
|
-
return result.generations[0].text;
|
|
62
|
-
}
|
|
63
|
-
else if (result.completions) {
|
|
64
|
-
//A21
|
|
65
|
-
return result.completions[0].data?.text;
|
|
66
|
-
}
|
|
67
|
-
else if (result.content) { // calude
|
|
68
|
-
return result.content[0]?.text || '';
|
|
69
|
-
//result.stop_reason --> the stop reason
|
|
70
|
-
}
|
|
71
|
-
else if (result.outputs) {
|
|
72
|
-
// mistral
|
|
73
|
-
return result.outputs[0]?.text;
|
|
74
|
-
//result.outputs[0]?.stop_reason --> the stop reason
|
|
75
|
-
}
|
|
76
|
-
else {
|
|
77
|
-
return result.toString();
|
|
78
|
-
}
|
|
79
|
-
};
|
|
80
|
-
const text = getText();
|
|
81
|
-
const promptLength = typeof prompt === 'string' ? prompt.length :
|
|
82
|
-
(prompt.system || '').length + prompt.messages.reduce((acc, m) => acc + m.content.length, 0);
|
|
83
|
-
return {
|
|
84
|
-
result: text,
|
|
85
|
-
token_usage: {
|
|
86
|
-
result: text?.length,
|
|
87
|
-
prompt: promptLength,
|
|
88
|
-
total: text?.length + promptLength,
|
|
89
|
-
}
|
|
90
|
-
};
|
|
91
|
-
}
|
|
92
|
-
async requestCompletion(prompt, options) {
|
|
93
|
-
const payload = this.preparePayload(prompt, options);
|
|
94
|
-
const executor = this.getExecutor();
|
|
95
|
-
const res = await executor.invokeModel({
|
|
96
|
-
modelId: options.model,
|
|
97
|
-
contentType: "application/json",
|
|
98
|
-
body: JSON.stringify(payload),
|
|
99
|
-
});
|
|
100
|
-
return this.extractDataFromResponse(prompt, res);
|
|
101
|
-
}
|
|
102
|
-
async canStream(options) {
|
|
103
|
-
let canStream = supportStreamingCache.get(options.model);
|
|
104
|
-
if (canStream == null) {
|
|
105
|
-
const response = await this.getService().getFoundationModel({
|
|
106
|
-
modelIdentifier: options.model
|
|
107
|
-
});
|
|
108
|
-
canStream = response.modelDetails?.responseStreamingSupported ?? false;
|
|
109
|
-
supportStreamingCache.set(options.model, canStream);
|
|
110
|
-
}
|
|
111
|
-
return canStream;
|
|
112
|
-
}
|
|
113
|
-
async requestCompletionStream(prompt, options) {
|
|
114
|
-
const payload = this.preparePayload(prompt, options);
|
|
115
|
-
const executor = this.getExecutor();
|
|
116
|
-
return executor.invokeModelWithResponseStream({
|
|
117
|
-
modelId: options.model,
|
|
118
|
-
contentType: "application/json",
|
|
119
|
-
body: JSON.stringify(payload),
|
|
120
|
-
}).then((res) => {
|
|
121
|
-
if (!res.body) {
|
|
122
|
-
throw new Error("Body not found");
|
|
123
|
-
}
|
|
124
|
-
const decoder = new TextDecoder();
|
|
125
|
-
return transformAsyncIterator(res.body, (stream) => {
|
|
126
|
-
const segment = JSON.parse(decoder.decode(stream.chunk?.bytes));
|
|
127
|
-
if (segment.delta) {
|
|
128
|
-
return segment.delta.text || '';
|
|
129
|
-
}
|
|
130
|
-
else if (segment.completion) {
|
|
131
|
-
return segment.completion;
|
|
132
|
-
}
|
|
133
|
-
else if (segment.completions) {
|
|
134
|
-
return segment.completions[0].data?.text;
|
|
135
|
-
}
|
|
136
|
-
else if (segment.generation) {
|
|
137
|
-
return segment.generation;
|
|
138
|
-
}
|
|
139
|
-
else if (segment.generations) {
|
|
140
|
-
return segment.generations[0].text;
|
|
141
|
-
}
|
|
142
|
-
else if (segment.outputs) {
|
|
143
|
-
// mistral.mixtral-8x7b-instruct-v0:1
|
|
144
|
-
return segment.outputs[0].text;
|
|
145
|
-
//segment.outputs[0].stop_reason;
|
|
146
|
-
}
|
|
147
|
-
else {
|
|
148
|
-
segment.toString();
|
|
149
|
-
}
|
|
150
|
-
});
|
|
151
|
-
}).catch((err) => {
|
|
152
|
-
this.logger.error("[Bedrock] Failed to stream", err);
|
|
153
|
-
throw err;
|
|
154
|
-
});
|
|
155
|
-
}
|
|
156
|
-
preparePayload(prompt, options) {
|
|
157
|
-
//split arn on / should give provider
|
|
158
|
-
//TODO: check if works with custom models
|
|
159
|
-
//const provider = options.model.split("/")[0];
|
|
160
|
-
const contains = (str, substr) => str.indexOf(substr) !== -1;
|
|
161
|
-
if (contains(options.model, "meta")) {
|
|
162
|
-
return {
|
|
163
|
-
prompt,
|
|
164
|
-
temperature: options.temperature,
|
|
165
|
-
max_gen_len: options.max_tokens,
|
|
166
|
-
};
|
|
167
|
-
}
|
|
168
|
-
else if (contains(options.model, "anthropic")) {
|
|
169
|
-
return {
|
|
170
|
-
anthropic_version: "bedrock-2023-05-31",
|
|
171
|
-
...prompt,
|
|
172
|
-
temperature: options.temperature,
|
|
173
|
-
max_tokens: options.max_tokens,
|
|
174
|
-
};
|
|
175
|
-
}
|
|
176
|
-
else if (contains(options.model, "ai21")) {
|
|
177
|
-
return {
|
|
178
|
-
prompt: prompt,
|
|
179
|
-
temperature: options.temperature,
|
|
180
|
-
maxTokens: options.max_tokens,
|
|
181
|
-
};
|
|
182
|
-
}
|
|
183
|
-
else if (contains(options.model, "cohere")) {
|
|
184
|
-
return {
|
|
185
|
-
prompt: prompt,
|
|
186
|
-
temperature: options.temperature,
|
|
187
|
-
max_tokens: options.max_tokens,
|
|
188
|
-
p: 0.9,
|
|
189
|
-
};
|
|
190
|
-
}
|
|
191
|
-
else if (contains(options.model, "amazon")) {
|
|
192
|
-
return {
|
|
193
|
-
inputText: prompt,
|
|
194
|
-
textGenerationConfig: {
|
|
195
|
-
temperature: options.temperature,
|
|
196
|
-
topP: 0.9,
|
|
197
|
-
maxTokenCount: options.max_tokens,
|
|
198
|
-
stopSequences: ["\n"],
|
|
199
|
-
},
|
|
200
|
-
};
|
|
201
|
-
}
|
|
202
|
-
else if (contains(options.model, "mistral")) {
|
|
203
|
-
return {
|
|
204
|
-
prompt: prompt,
|
|
205
|
-
temperature: options.temperature,
|
|
206
|
-
max_tokens: options.max_tokens,
|
|
207
|
-
};
|
|
208
|
-
}
|
|
209
|
-
else {
|
|
210
|
-
throw new Error("Cannot prepare payload for unknown provider: " + options.model);
|
|
211
|
-
}
|
|
212
|
-
}
|
|
213
|
-
async startTraining(dataset, options) {
|
|
214
|
-
//convert options.params to Record<string, string>
|
|
215
|
-
const params = {};
|
|
216
|
-
for (const [key, value] of Object.entries(options.params || {})) {
|
|
217
|
-
params[key] = String(value);
|
|
218
|
-
}
|
|
219
|
-
if (!this.options.training_bucket) {
|
|
220
|
-
throw new Error("Training cannot nbe used since the 'training_bucket' property was not specified in driver options");
|
|
221
|
-
}
|
|
222
|
-
const s3 = new S3Client({ region: this.options.region, credentials: this.options.credentials });
|
|
223
|
-
const upload = await forceUploadFile(s3, dataset.getStream(), this.options.training_bucket, dataset.name);
|
|
224
|
-
const service = this.getService();
|
|
225
|
-
const response = await service.send(new CreateModelCustomizationJobCommand({
|
|
226
|
-
jobName: options.name + "-job",
|
|
227
|
-
customModelName: options.name,
|
|
228
|
-
roleArn: this.options.training_role_arn || undefined,
|
|
229
|
-
baseModelIdentifier: options.model,
|
|
230
|
-
clientRequestToken: "llumiverse-" + Date.now(),
|
|
231
|
-
trainingDataConfig: {
|
|
232
|
-
s3Uri: `s3://${upload.Bucket}/${upload.Key}`,
|
|
233
|
-
},
|
|
234
|
-
outputDataConfig: undefined,
|
|
235
|
-
hyperParameters: params,
|
|
236
|
-
//TODO not supported?
|
|
237
|
-
//customizationType: "FINE_TUNING",
|
|
238
|
-
}));
|
|
239
|
-
const job = await service.send(new GetModelCustomizationJobCommand({
|
|
240
|
-
jobIdentifier: response.jobArn
|
|
241
|
-
}));
|
|
242
|
-
return jobInfo(job, response.jobArn);
|
|
243
|
-
}
|
|
244
|
-
async cancelTraining(jobId) {
|
|
245
|
-
const service = this.getService();
|
|
246
|
-
await service.send(new StopModelCustomizationJobCommand({
|
|
247
|
-
jobIdentifier: jobId
|
|
248
|
-
}));
|
|
249
|
-
const job = await service.send(new GetModelCustomizationJobCommand({
|
|
250
|
-
jobIdentifier: jobId
|
|
251
|
-
}));
|
|
252
|
-
return jobInfo(job, jobId);
|
|
253
|
-
}
|
|
254
|
-
async getTrainingJob(jobId) {
|
|
255
|
-
const service = this.getService();
|
|
256
|
-
const job = await service.send(new GetModelCustomizationJobCommand({
|
|
257
|
-
jobIdentifier: jobId
|
|
258
|
-
}));
|
|
259
|
-
return jobInfo(job, jobId);
|
|
260
|
-
}
|
|
261
|
-
// ===================== management API ==================
|
|
262
|
-
async validateConnection() {
|
|
263
|
-
const service = this.getService();
|
|
264
|
-
this.logger.debug("[Bedrock] validating connection", service.config.credentials.name);
|
|
265
|
-
//return true as if the client has been initialized, it means the connection is valid
|
|
266
|
-
return true;
|
|
267
|
-
}
|
|
268
|
-
async listTrainableModels() {
|
|
269
|
-
this.logger.debug("[Bedrock] listing trainable models");
|
|
270
|
-
return this._listModels(m => m.customizationsSupported ? m.customizationsSupported.includes("FINE_TUNING") : false);
|
|
271
|
-
}
|
|
272
|
-
async listModels() {
|
|
273
|
-
this.logger.debug("[Bedrock] listing models");
|
|
274
|
-
// exclude trainable models since they are not executable
|
|
275
|
-
const filter = (m) => m.inferenceTypesSupported?.includes("ON_DEMAND") ?? false;
|
|
276
|
-
return this._listModels(filter);
|
|
277
|
-
}
|
|
278
|
-
async _listModels(foundationFilter) {
|
|
279
|
-
const service = this.getService();
|
|
280
|
-
const [foundationals, customs] = await Promise.all([
|
|
281
|
-
service.listFoundationModels({}),
|
|
282
|
-
service.listCustomModels({}),
|
|
283
|
-
]);
|
|
284
|
-
if (!foundationals.modelSummaries) {
|
|
285
|
-
throw new Error("Foundation models not found");
|
|
286
|
-
}
|
|
287
|
-
let fmodels = foundationals.modelSummaries || [];
|
|
288
|
-
if (foundationFilter) {
|
|
289
|
-
fmodels = fmodels.filter(foundationFilter);
|
|
290
|
-
}
|
|
291
|
-
const aimodels = fmodels.map((m) => {
|
|
292
|
-
if (!m.modelId) {
|
|
293
|
-
throw new Error("modelId not found");
|
|
294
|
-
}
|
|
295
|
-
const model = {
|
|
296
|
-
id: m.modelArn ?? m.modelId,
|
|
297
|
-
name: `${m.providerName} ${m.modelName}`,
|
|
298
|
-
provider: this.provider,
|
|
299
|
-
description: `id: ${m.modelId}`,
|
|
300
|
-
owner: m.providerName,
|
|
301
|
-
canStream: m.responseStreamingSupported ?? false,
|
|
302
|
-
tags: m.outputModalities ?? [],
|
|
303
|
-
};
|
|
304
|
-
return model;
|
|
305
|
-
});
|
|
306
|
-
//add custom models
|
|
307
|
-
if (customs.modelSummaries) {
|
|
308
|
-
customs.modelSummaries.forEach((m) => {
|
|
309
|
-
if (!m.modelArn) {
|
|
310
|
-
throw new Error("Model ID not found");
|
|
311
|
-
}
|
|
312
|
-
const model = {
|
|
313
|
-
id: m.modelArn,
|
|
314
|
-
name: m.modelName ?? m.modelArn,
|
|
315
|
-
provider: this.provider,
|
|
316
|
-
description: `Custom model from ${m.baseModelName}`,
|
|
317
|
-
isCustom: true,
|
|
318
|
-
};
|
|
319
|
-
aimodels.push(model);
|
|
320
|
-
this.validateConnection;
|
|
321
|
-
});
|
|
322
|
-
}
|
|
323
|
-
return aimodels;
|
|
324
|
-
}
|
|
325
|
-
async generateEmbeddings({ content, model = "amazon.titan-embed-text-v1" }) {
|
|
326
|
-
this.logger.info("[Bedrock] Generating embeddings with model " + model);
|
|
327
|
-
const invokeBody = {
|
|
328
|
-
inputText: content
|
|
329
|
-
};
|
|
330
|
-
const executor = this.getExecutor();
|
|
331
|
-
const res = await executor.invokeModel({
|
|
332
|
-
modelId: model,
|
|
333
|
-
contentType: "application/json",
|
|
334
|
-
body: JSON.stringify(invokeBody),
|
|
335
|
-
});
|
|
336
|
-
const decoder = new TextDecoder();
|
|
337
|
-
const body = decoder.decode(res.body);
|
|
338
|
-
const result = JSON.parse(body);
|
|
339
|
-
if (!result.embedding) {
|
|
340
|
-
throw new Error("Embeddings not found");
|
|
341
|
-
}
|
|
342
|
-
return {
|
|
343
|
-
values: result.embedding,
|
|
344
|
-
model: model,
|
|
345
|
-
token_count: result.inputTextTokenCount
|
|
346
|
-
};
|
|
347
|
-
}
|
|
348
|
-
}
|
|
349
|
-
function jobInfo(job, jobId) {
|
|
350
|
-
const jobStatus = job.status;
|
|
351
|
-
let status = TrainingJobStatus.running;
|
|
352
|
-
let details;
|
|
353
|
-
if (jobStatus === ModelCustomizationJobStatus.COMPLETED) {
|
|
354
|
-
status = TrainingJobStatus.succeeded;
|
|
355
|
-
}
|
|
356
|
-
else if (jobStatus === ModelCustomizationJobStatus.FAILED) {
|
|
357
|
-
status = TrainingJobStatus.failed;
|
|
358
|
-
details = job.failureMessage || "error";
|
|
359
|
-
}
|
|
360
|
-
else if (jobStatus === ModelCustomizationJobStatus.STOPPED) {
|
|
361
|
-
status = TrainingJobStatus.cancelled;
|
|
362
|
-
}
|
|
363
|
-
else {
|
|
364
|
-
status = TrainingJobStatus.running;
|
|
365
|
-
details = jobStatus;
|
|
366
|
-
}
|
|
367
|
-
job.baseModelArn;
|
|
368
|
-
return {
|
|
369
|
-
id: jobId,
|
|
370
|
-
model: job.outputModelArn,
|
|
371
|
-
status,
|
|
372
|
-
details
|
|
373
|
-
};
|
|
374
|
-
}
|
|
375
|
-
//# sourceMappingURL=index.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/bedrock/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,53 +0,0 @@
|
|
|
1
|
-
import { CreateBucketCommand, HeadBucketCommand } from "@aws-sdk/client-s3";
|
|
2
|
-
import { Upload } from "@aws-sdk/lib-storage";
|
|
3
|
-
export async function doesBucketExist(s3, bucketName) {
|
|
4
|
-
try {
|
|
5
|
-
await s3.send(new HeadBucketCommand({ Bucket: bucketName }));
|
|
6
|
-
return true;
|
|
7
|
-
}
|
|
8
|
-
catch (err) {
|
|
9
|
-
if (err.name === 'NotFound') {
|
|
10
|
-
return false;
|
|
11
|
-
}
|
|
12
|
-
throw err;
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
export function createBucket(s3, bucketName) {
|
|
16
|
-
return s3.send(new CreateBucketCommand({
|
|
17
|
-
Bucket: bucketName
|
|
18
|
-
}));
|
|
19
|
-
}
|
|
20
|
-
export async function tryCreateBucket(s3, bucketName) {
|
|
21
|
-
const exists = await doesBucketExist(s3, bucketName);
|
|
22
|
-
if (!exists) {
|
|
23
|
-
return createBucket(s3, bucketName);
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
export async function uploadFile(s3, source, bucketName, file, onProgress) {
|
|
27
|
-
const upload = new Upload({
|
|
28
|
-
client: s3,
|
|
29
|
-
params: {
|
|
30
|
-
Bucket: bucketName,
|
|
31
|
-
Key: file,
|
|
32
|
-
Body: source,
|
|
33
|
-
}
|
|
34
|
-
});
|
|
35
|
-
onProgress && upload.on("httpUploadProgress", onProgress);
|
|
36
|
-
const result = await upload.done();
|
|
37
|
-
return result;
|
|
38
|
-
}
|
|
39
|
-
/**
|
|
40
|
-
* Create the bucket if not already exists and then upload the file.
|
|
41
|
-
* @param s3
|
|
42
|
-
* @param source
|
|
43
|
-
* @param bucketName
|
|
44
|
-
* @param file
|
|
45
|
-
* @param onProgress
|
|
46
|
-
* @returns
|
|
47
|
-
*/
|
|
48
|
-
export async function forceUploadFile(s3, source, bucketName, file, onProgress) {
|
|
49
|
-
// make sure the bucket exists
|
|
50
|
-
await tryCreateBucket(s3, bucketName);
|
|
51
|
-
return uploadFile(s3, source, bucketName, file, onProgress);
|
|
52
|
-
}
|
|
53
|
-
//# sourceMappingURL=s3.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"s3.js","sourceRoot":"","sources":["../../../../src/bedrock/s3.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAY,MAAM,oBAAoB,CAAC;AACtF,OAAO,EAAY,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAExD,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,EAAY,EAAE,UAAkB;IAClE,IAAI,CAAC;QACD,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,iBAAiB,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC;IAChB,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAChB,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,GAAG,CAAC;IACd,CAAC;AACL,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,EAAY,EAAE,UAAkB;IACzD,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,mBAAmB,CAAC;QACnC,MAAM,EAAE,UAAU;KACrB,CAAC,CAAC,CAAC;AACR,CAAC;AAGD,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,EAAY,EAAE,UAAkB;IAClE,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IACrD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,YAAY,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IACxC,CAAC;AACL,CAAC;AAGD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,EAAY,EAAE,MAAsB,EAAE,UAAkB,EAAE,IAAY,EAAE,UAAyC;IAE9I,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;QACtB,MAAM,EAAE,EAAE;QACV,MAAM,EAAE;YACJ,MAAM,EAAE,UAAU;YAClB,GAAG,EAAE,IAAI;YACT,IAAI,EAAE,MAAM;SACf;KACJ,CAAC,CAAC;IAEH,UAAU,IAAI,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;IAE1D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACnC,OAAO,MAAM,CAAC;AAClB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,EAAY,EAAE,MAAsB,EAAE,UAAkB,EAAE,IAAY,EAAE,UAAyC;IACnJ,8BAA8B;IAC9B,MAAM,eAAe,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IACtC,OAAO,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;AAChE,CAAC"}
|