@llumiverse/drivers 0.16.0 → 0.18.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 +1 -1
- package/lib/cjs/bedrock/converse.js +65 -15
- package/lib/cjs/bedrock/converse.js.map +1 -1
- package/lib/cjs/bedrock/index.js +191 -51
- package/lib/cjs/bedrock/index.js.map +1 -1
- package/lib/cjs/bedrock/nova-image-payload.js.map +1 -1
- package/lib/cjs/bedrock/s3.js +47 -0
- package/lib/cjs/bedrock/s3.js.map +1 -1
- package/lib/cjs/groq/index.js +4 -4
- package/lib/cjs/groq/index.js.map +1 -1
- package/lib/cjs/mistral/index.js +4 -4
- package/lib/cjs/mistral/index.js.map +1 -1
- package/lib/cjs/openai/azure.js +1 -1
- package/lib/cjs/openai/azure.js.map +1 -1
- package/lib/cjs/openai/index.js +218 -83
- package/lib/cjs/openai/index.js.map +1 -1
- package/lib/cjs/replicate.js +4 -17
- package/lib/cjs/replicate.js.map +1 -1
- package/lib/cjs/togetherai/index.js +2 -2
- package/lib/cjs/vertexai/embeddings/embeddings-image.js +2 -1
- package/lib/cjs/vertexai/embeddings/embeddings-image.js.map +1 -1
- package/lib/cjs/vertexai/embeddings/embeddings-text.js +2 -1
- package/lib/cjs/vertexai/embeddings/embeddings-text.js.map +1 -1
- package/lib/cjs/vertexai/index.js +117 -52
- package/lib/cjs/vertexai/index.js.map +1 -1
- package/lib/cjs/vertexai/models/claude.js +51 -17
- package/lib/cjs/vertexai/models/claude.js.map +1 -1
- package/lib/cjs/vertexai/models/gemini.js +42 -20
- package/lib/cjs/vertexai/models/gemini.js.map +1 -1
- package/lib/cjs/vertexai/models/imagen.js.map +1 -1
- package/lib/cjs/watsonx/index.js +12 -6
- package/lib/cjs/watsonx/index.js.map +1 -1
- package/lib/esm/bedrock/converse.js +63 -14
- package/lib/esm/bedrock/converse.js.map +1 -1
- package/lib/esm/bedrock/index.js +193 -50
- package/lib/esm/bedrock/index.js.map +1 -1
- package/lib/esm/bedrock/nova-image-payload.js.map +1 -1
- package/lib/esm/bedrock/s3.js +46 -0
- package/lib/esm/bedrock/s3.js.map +1 -1
- package/lib/esm/groq/index.js +4 -4
- package/lib/esm/groq/index.js.map +1 -1
- package/lib/esm/mistral/index.js +4 -4
- package/lib/esm/mistral/index.js.map +1 -1
- package/lib/esm/openai/azure.js +1 -1
- package/lib/esm/openai/azure.js.map +1 -1
- package/lib/esm/openai/index.js +219 -85
- package/lib/esm/openai/index.js.map +1 -1
- package/lib/esm/replicate.js +3 -16
- package/lib/esm/replicate.js.map +1 -1
- package/lib/esm/togetherai/index.js +2 -2
- package/lib/esm/vertexai/embeddings/embeddings-image.js +2 -1
- package/lib/esm/vertexai/embeddings/embeddings-image.js.map +1 -1
- package/lib/esm/vertexai/embeddings/embeddings-text.js +2 -1
- package/lib/esm/vertexai/embeddings/embeddings-text.js.map +1 -1
- package/lib/esm/vertexai/index.js +120 -55
- package/lib/esm/vertexai/index.js.map +1 -1
- package/lib/esm/vertexai/models/claude.js +52 -18
- package/lib/esm/vertexai/models/claude.js.map +1 -1
- package/lib/esm/vertexai/models/gemini.js +42 -20
- package/lib/esm/vertexai/models/gemini.js.map +1 -1
- package/lib/esm/vertexai/models/imagen.js.map +1 -1
- package/lib/esm/watsonx/index.js +12 -6
- package/lib/esm/watsonx/index.js.map +1 -1
- package/lib/types/bedrock/converse.d.ts +3 -2
- package/lib/types/bedrock/converse.d.ts.map +1 -1
- package/lib/types/bedrock/index.d.ts +5 -16
- package/lib/types/bedrock/index.d.ts.map +1 -1
- package/lib/types/bedrock/nova-image-payload.d.ts.map +1 -1
- package/lib/types/bedrock/s3.d.ts +6 -0
- package/lib/types/bedrock/s3.d.ts.map +1 -1
- package/lib/types/openai/index.d.ts +8 -5
- package/lib/types/openai/index.d.ts.map +1 -1
- package/lib/types/togetherai/interfaces.d.ts +3 -3
- package/lib/types/togetherai/interfaces.d.ts.map +1 -1
- package/lib/types/vertexai/embeddings/embeddings-image.d.ts.map +1 -1
- package/lib/types/vertexai/embeddings/embeddings-text.d.ts.map +1 -1
- package/lib/types/vertexai/index.d.ts +11 -6
- package/lib/types/vertexai/index.d.ts.map +1 -1
- package/lib/types/vertexai/models/claude.d.ts.map +1 -1
- package/lib/types/vertexai/models/gemini.d.ts.map +1 -1
- package/lib/types/vertexai/models/imagen.d.ts.map +1 -1
- package/lib/types/vertexai/models.d.ts +1 -1
- package/lib/types/vertexai/models.d.ts.map +1 -1
- package/lib/types/watsonx/index.d.ts.map +1 -1
- package/lib/types/watsonx/interfaces.d.ts +4 -0
- package/lib/types/watsonx/interfaces.d.ts.map +1 -1
- package/package.json +19 -21
- package/src/bedrock/converse.ts +69 -20
- package/src/bedrock/index.ts +231 -62
- package/src/bedrock/nova-image-payload.ts +1 -2
- package/src/bedrock/s3.ts +48 -0
- package/src/groq/index.ts +4 -4
- package/src/mistral/index.ts +4 -4
- package/src/openai/azure.ts +2 -2
- package/src/openai/index.ts +269 -93
- package/src/openai/openai.ts +1 -1
- package/src/replicate.ts +4 -16
- package/src/togetherai/index.ts +2 -2
- package/src/togetherai/interfaces.ts +3 -3
- package/src/vertexai/embeddings/embeddings-image.ts +5 -3
- package/src/vertexai/embeddings/embeddings-text.ts +5 -3
- package/src/vertexai/index.ts +168 -67
- package/src/vertexai/models/claude.ts +71 -32
- package/src/vertexai/models/gemini.ts +47 -23
- package/src/vertexai/models/imagen.ts +4 -3
- package/src/vertexai/models.ts +1 -1
- package/src/watsonx/index.ts +12 -6
- package/src/watsonx/interfaces.ts +4 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imagen.js","sourceRoot":"","sources":["../../../../src/vertexai/models/imagen.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"imagen.js","sourceRoot":"","sources":["../../../../src/vertexai/models/imagen.ts"],"names":[],"mappings":"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"}
|
package/lib/cjs/watsonx/index.js
CHANGED
|
@@ -30,8 +30,11 @@ class WatsonxDriver extends core_1.AbstractDriver {
|
|
|
30
30
|
model_id: options.model,
|
|
31
31
|
input: prompt + "\n",
|
|
32
32
|
parameters: {
|
|
33
|
-
max_new_tokens: options.model_options.max_tokens
|
|
34
|
-
|
|
33
|
+
max_new_tokens: options.model_options.max_tokens,
|
|
34
|
+
temperature: options.model_options.temperature,
|
|
35
|
+
top_k: options.model_options.top_k,
|
|
36
|
+
top_p: options.model_options.top_p,
|
|
37
|
+
stop_sequences: options.model_options.stop_sequence,
|
|
35
38
|
},
|
|
36
39
|
project_id: this.projectId,
|
|
37
40
|
};
|
|
@@ -57,8 +60,11 @@ class WatsonxDriver extends core_1.AbstractDriver {
|
|
|
57
60
|
model_id: options.model,
|
|
58
61
|
input: prompt + "\n",
|
|
59
62
|
parameters: {
|
|
60
|
-
max_new_tokens: options.model_options.
|
|
61
|
-
|
|
63
|
+
max_new_tokens: options.model_options.max_tokens,
|
|
64
|
+
temperature: options.model_options.temperature,
|
|
65
|
+
top_k: options.model_options.top_k,
|
|
66
|
+
top_p: options.model_options.top_p,
|
|
67
|
+
stop_sequences: options.model_options.stop_sequence,
|
|
62
68
|
},
|
|
63
69
|
project_id: this.projectId,
|
|
64
70
|
};
|
|
@@ -82,7 +88,7 @@ class WatsonxDriver extends core_1.AbstractDriver {
|
|
|
82
88
|
async listModels() {
|
|
83
89
|
const res = await this.fetchClient.get(`/ml/v1/foundation_model_specs?version=${API_VERSION}`)
|
|
84
90
|
.catch(err => this.logger.warn("Can't list models on Watsonx: " + err));
|
|
85
|
-
const
|
|
91
|
+
const aiModels = res.resources.map((m) => {
|
|
86
92
|
return {
|
|
87
93
|
id: m.model_id,
|
|
88
94
|
name: m.label,
|
|
@@ -90,7 +96,7 @@ class WatsonxDriver extends core_1.AbstractDriver {
|
|
|
90
96
|
provider: this.provider,
|
|
91
97
|
};
|
|
92
98
|
});
|
|
93
|
-
return
|
|
99
|
+
return aiModels;
|
|
94
100
|
}
|
|
95
101
|
async getAuthToken() {
|
|
96
102
|
if (this.authToken) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/watsonx/index.ts"],"names":[],"mappings":";;;AAAA,2CAAmL;AACnL,kDAA4D;AAC5D,uDAA+C;AAS/C,MAAM,WAAW,GAAG,YAAY,CAAA;AAEhC,MAAa,aAAc,SAAQ,qBAA4C;IAC3E,MAAM,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC5B,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC;IAClC,MAAM,CAAS;IACf,YAAY,CAAS;IACrB,SAAS,CAAS;IAClB,SAAS,CAAmB;IAC5B,OAAO,CAAe;IACtB,WAAW,CAAa;IAExB,YAAY,OAA6B;QACrC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;QACxC,IAAI,CAAC,WAAW,GAAG,IAAI,8BAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,gBAAgB,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC,CAAC;IAC7I,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,MAAc,EAAE,OAAyB;QACjE,IAAI,OAAO,CAAC,aAAa,EAAE,UAAU,KAAK,eAAe,EAAE,CAAC;YACxD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,EAAC,OAAO,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;QACjF,CAAC;QACD,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,aAAoC,CAAC;QAErE,MAAM,OAAO,GAAiC;YAC1C,QAAQ,EAAE,OAAO,CAAC,KAAK;YACvB,KAAK,EAAE,MAAM,GAAG,IAAI;YACpB,UAAU,EAAE;gBACR,cAAc,EAAE,OAAO,CAAC,aAAa,CAAC,UAAU;gBAChD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/watsonx/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { PromptRole } from "@llumiverse/core";
|
|
2
2
|
import { ConversationRole, } from "@aws-sdk/client-bedrock-runtime";
|
|
3
|
+
import { parseS3UrlToUri } from "./s3.js";
|
|
3
4
|
function getJSONSafetyNotice(schema) {
|
|
4
5
|
return "The answer must be a JSON object using the following JSON Schema:\n" + JSON.stringify(schema, undefined, 2);
|
|
5
6
|
}
|
|
@@ -66,15 +67,40 @@ export function converseRemoveJSONprefill(messages) {
|
|
|
66
67
|
}
|
|
67
68
|
return messages ?? [];
|
|
68
69
|
}
|
|
69
|
-
export
|
|
70
|
+
export function converseJSONprefill(messages) {
|
|
71
|
+
if (!messages) {
|
|
72
|
+
messages = [];
|
|
73
|
+
}
|
|
74
|
+
//prefill the json
|
|
75
|
+
messages.push({
|
|
76
|
+
content: [{ text: "```json" }],
|
|
77
|
+
role: ConversationRole.ASSISTANT,
|
|
78
|
+
});
|
|
79
|
+
return messages;
|
|
80
|
+
}
|
|
81
|
+
export async function formatConversePrompt(segments, schema) {
|
|
70
82
|
//Non-const for concat
|
|
71
83
|
let system = [];
|
|
72
84
|
const safety = [];
|
|
73
85
|
let messages = [];
|
|
74
86
|
for (const segment of segments) {
|
|
75
87
|
const parts = [];
|
|
88
|
+
//Tool response
|
|
89
|
+
if (segment.role === PromptRole.tool) {
|
|
90
|
+
parts.push({
|
|
91
|
+
content: [{
|
|
92
|
+
toolResult: {
|
|
93
|
+
toolUseId: segment.tool_use_id,
|
|
94
|
+
content: [{ text: segment.content }],
|
|
95
|
+
}
|
|
96
|
+
}],
|
|
97
|
+
role: ConversationRole.USER,
|
|
98
|
+
});
|
|
99
|
+
messages = messages.concat(parts);
|
|
100
|
+
continue;
|
|
101
|
+
}
|
|
76
102
|
//File segments
|
|
77
|
-
if (segment.files)
|
|
103
|
+
if (segment.files) {
|
|
78
104
|
for (const f of segment.files) {
|
|
79
105
|
const source = await f.getStream();
|
|
80
106
|
let content;
|
|
@@ -104,14 +130,41 @@ export async function fortmatConversePrompt(segments, schema) {
|
|
|
104
130
|
//Video file - "mov | mkv | mp4 | webm | flv | mpeg | mpg | wmv | three_gp"
|
|
105
131
|
}
|
|
106
132
|
else if (f.mime_type && f.mime_type.startsWith("video")) {
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
133
|
+
let url_string = (await f.getURL()).toLowerCase();
|
|
134
|
+
let url_format = new URL(url_string);
|
|
135
|
+
if (url_format.hostname.endsWith("amazonaws.com") &&
|
|
136
|
+
(url_format.hostname.startsWith("s3.") || url_format.hostname.includes(".s3."))) {
|
|
137
|
+
//Convert to s3:// format
|
|
138
|
+
const parsedUrl = parseS3UrlToUri(new URL(url_string));
|
|
139
|
+
url_string = parsedUrl;
|
|
140
|
+
url_format = new URL(parsedUrl);
|
|
141
|
+
}
|
|
142
|
+
if (url_format.protocol === "s3:") {
|
|
143
|
+
//Use S3 bucket if available
|
|
144
|
+
content = [
|
|
145
|
+
{
|
|
146
|
+
video: {
|
|
147
|
+
format: mimeToVideoType(f.mime_type),
|
|
148
|
+
source: {
|
|
149
|
+
s3Location: {
|
|
150
|
+
uri: url_string, //S3 URL
|
|
151
|
+
//bucketOwner: We don't have this additional information.
|
|
152
|
+
}
|
|
153
|
+
},
|
|
154
|
+
},
|
|
112
155
|
},
|
|
113
|
-
|
|
114
|
-
|
|
156
|
+
];
|
|
157
|
+
}
|
|
158
|
+
else {
|
|
159
|
+
content = [
|
|
160
|
+
{
|
|
161
|
+
video: {
|
|
162
|
+
format: mimeToVideoType(f.mime_type),
|
|
163
|
+
source: { bytes: await readStreamAsUint8Array(source) },
|
|
164
|
+
},
|
|
165
|
+
},
|
|
166
|
+
];
|
|
167
|
+
}
|
|
115
168
|
//Fallback, send string
|
|
116
169
|
}
|
|
117
170
|
else {
|
|
@@ -122,6 +175,7 @@ export async function fortmatConversePrompt(segments, schema) {
|
|
|
122
175
|
role: roleConversion(segment.role),
|
|
123
176
|
});
|
|
124
177
|
}
|
|
178
|
+
}
|
|
125
179
|
//Text segments
|
|
126
180
|
if (segment.content) {
|
|
127
181
|
parts.push({
|
|
@@ -155,11 +209,6 @@ export async function fortmatConversePrompt(segments, schema) {
|
|
|
155
209
|
if (schema) {
|
|
156
210
|
safety.push({ text: "IMPORTANT: " + getJSONSafetyNotice(schema) });
|
|
157
211
|
system = system.concat(safety);
|
|
158
|
-
//prefill the json
|
|
159
|
-
messages.push({
|
|
160
|
-
content: [{ text: "```json" }],
|
|
161
|
-
role: ConversationRole.ASSISTANT,
|
|
162
|
-
});
|
|
163
212
|
}
|
|
164
213
|
messages = converseConcatMessages(messages);
|
|
165
214
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"converse.js","sourceRoot":"","sources":["../../../src/bedrock/converse.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EACH,gBAAgB,GAKnB,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"converse.js","sourceRoot":"","sources":["../../../src/bedrock/converse.ts"],"names":[],"mappings":"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"}
|