@holokai/holo-provider-bedrock 1.5.2 → 1.6.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/dist/bedrock.auditor.d.ts.map +1 -1
- package/dist/bedrock.auditor.js +17 -0
- package/dist/bedrock.auditor.js.map +1 -1
- package/dist/bedrock.provider.d.ts +4 -1
- package/dist/bedrock.provider.d.ts.map +1 -1
- package/dist/bedrock.provider.js +37 -6
- package/dist/bedrock.provider.js.map +1 -1
- package/dist/plugin.d.ts +2 -2
- package/dist/plugin.d.ts.map +1 -1
- package/dist/plugin.js +10 -4
- package/dist/plugin.js.map +1 -1
- package/dist/translators/bedrock.message.translator.d.ts.map +1 -1
- package/dist/translators/bedrock.message.translator.js +80 -0
- package/dist/translators/bedrock.message.translator.js.map +1 -1
- package/dist/types/request.types.d.ts +6 -1
- package/dist/types/request.types.d.ts.map +1 -1
- package/dist/types/request.types.js +6 -0
- package/dist/types/request.types.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +6 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bedrock.auditor.d.ts","sourceRoot":"","sources":["../src/bedrock.auditor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAiE,MAAM,4BAA4B,CAAC;AAEvH,OAAO,KAAK,EAAC,iBAAiB,EAAE,sBAAsB,EAAC,MAAM,4BAA4B,CAAC;AAC1F,OAAO,KAAK,EAAC,iBAAiB,EAAE,aAAa,EAAC,MAAM,8BAA8B,CAAC;AACnF,OAAO,KAAK,EAAC,gBAAgB,EAAE,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AAC5F,OAAO,EAAC,YAAY,EAAC,MAAM,8BAA8B,CAAC;AAC1D,OAAO,KAAK,EAAC,gBAAgB,EAAE,SAAS,EAAC,MAAM,0BAA0B,CAAC;AAK1E,qBAAa,cAAe,SAAQ,WAAW;IAC3C,QAAQ,CAAC,QAAQ,aAAa;IAErB,eAAe,CAAC,cAAc,EAAE,GAAG,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,gBAAgB;IAK9E,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS;cAMzD,0BAA0B,CACtC,aAAa,EAAE,iBAAiB,EAChC,aAAa,EAAE,MAAM,GACtB,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;cAa5B,qBAAqB,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"bedrock.auditor.d.ts","sourceRoot":"","sources":["../src/bedrock.auditor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAiE,MAAM,4BAA4B,CAAC;AAEvH,OAAO,KAAK,EAAC,iBAAiB,EAAE,sBAAsB,EAAC,MAAM,4BAA4B,CAAC;AAC1F,OAAO,KAAK,EAAC,iBAAiB,EAAE,aAAa,EAAC,MAAM,8BAA8B,CAAC;AACnF,OAAO,KAAK,EAAC,gBAAgB,EAAE,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AAC5F,OAAO,EAAC,YAAY,EAAC,MAAM,8BAA8B,CAAC;AAC1D,OAAO,KAAK,EAAC,gBAAgB,EAAE,SAAS,EAAC,MAAM,0BAA0B,CAAC;AAK1E,qBAAa,cAAe,SAAQ,WAAW;IAC3C,QAAQ,CAAC,QAAQ,aAAa;IAErB,eAAe,CAAC,cAAc,EAAE,GAAG,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,gBAAgB;IAK9E,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS;cAMzD,0BAA0B,CACtC,aAAa,EAAE,iBAAiB,EAChC,aAAa,EAAE,MAAM,GACtB,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;cAa5B,qBAAqB,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;cAcrF,mBAAmB,CAC/B,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,sBAAsB,GAClC,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;cAMpB,sBAAsB,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;CA0BtG"}
|
package/dist/bedrock.auditor.js
CHANGED
|
@@ -28,6 +28,13 @@ export class BedrockAuditor extends BaseAuditor {
|
|
|
28
28
|
});
|
|
29
29
|
}
|
|
30
30
|
async extractRequestOptions(workerRequest) {
|
|
31
|
+
if (workerRequest.protocol.name === 'bedrock.images') {
|
|
32
|
+
const body = workerRequest.payload?.body ?? {};
|
|
33
|
+
return pickDefined({
|
|
34
|
+
taskType: body.taskType,
|
|
35
|
+
...(body.imageGenerationConfig ?? {}),
|
|
36
|
+
});
|
|
37
|
+
}
|
|
31
38
|
const payload = workerRequest.payload;
|
|
32
39
|
return pickDefined({
|
|
33
40
|
...payload?.inferenceConfig,
|
|
@@ -41,6 +48,16 @@ export class BedrockAuditor extends BaseAuditor {
|
|
|
41
48
|
return this.mapFinishReason(providerEvent.message);
|
|
42
49
|
}
|
|
43
50
|
async createProviderEnvelope(workerRequest) {
|
|
51
|
+
if (workerRequest.protocol.name === 'bedrock.images') {
|
|
52
|
+
const imagesPayload = workerRequest.payload;
|
|
53
|
+
const body = imagesPayload?.body ?? {};
|
|
54
|
+
const prompt = body.textToImageParams?.text ?? body.prompt ?? body.text_prompts?.[0]?.text;
|
|
55
|
+
return pickDefined({
|
|
56
|
+
access_model: imagesPayload?.modelId,
|
|
57
|
+
last_user_prompt: typeof prompt === 'string' ? prompt : null,
|
|
58
|
+
system_prompt: workerRequest.systemPrompt?.system_prompt ?? null,
|
|
59
|
+
});
|
|
60
|
+
}
|
|
44
61
|
const payload = workerRequest.payload;
|
|
45
62
|
const system_prompt = extractTopLevelPrompt(payload?.system);
|
|
46
63
|
const last_user_prompt = extractPromptByRole(payload?.messages, 'user', 'last', msg => extractTextContent(msg.content));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bedrock.auditor.js","sourceRoot":"","sources":["../src/bedrock.auditor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,qBAAqB,EAAC,MAAM,4BAA4B,CAAC;AACvH,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAI9C,OAAO,EAAC,YAAY,EAAC,MAAM,8BAA8B,CAAC;AAE1D,OAAO,EAAC,kBAAkB,EAAC,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAC,aAAa,EAAC,MAAM,qCAAqC,CAAC;AAGlE,MAAM,OAAO,cAAe,SAAQ,WAAW;IAClC,QAAQ,GAAG,SAAS,CAAC;IAErB,eAAe,CAAC,cAAmB,EAAE,aAAsB;QAChE,MAAM,MAAM,GAAG,cAAc,EAAE,UAAU,IAAI,cAAc,EAAE,WAAW,CAAC;QACzE,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAEQ,QAAQ,CAAC,cAAmB,EAAE,aAAsB;QACzD,MAAM,KAAK,GAAG,cAAc,EAAE,KAAK,CAAC;QACpC,IAAI,CAAC,KAAK;YAAE,OAAO,EAAE,CAAC;QACtB,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAES,KAAK,CAAC,0BAA0B,CACtC,aAAgC,EAChC,aAAqB;QAErB,MAAM,QAAQ,GAAG,aAAa,CAAC,OAAkC,CAAC;QAClE,IAAI,CAAC,QAAQ,EAAE,KAAK;YAAE,OAAO,EAAE,CAAC;QAEhC,MAAM,SAAS,GAAG,kBAAkB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACrD,OAAO,WAAW,CAAC;YACf,YAAY,EAAE,SAAS,CAAC,YAAY;YACpC,aAAa,EAAE,SAAS,CAAC,aAAa;YACtC,YAAY,EAAE,SAAS,CAAC,YAAY;YACpC,SAAS,EAAE,QAAQ,CAAC,KAAK;SAC5B,CAAqC,CAAC;IAC3C,CAAC;IAES,KAAK,CAAC,qBAAqB,CAAC,aAAgC;QAClE,MAAM,OAAO,GAAG,aAAa,CAAC,OAAiC,CAAC;QAChE,OAAO,WAAW,CAAC;YACf,GAAG,OAAO,EAAE,eAAe;SAC9B,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,mBAAmB,CAC/B,aAA4B,EAC5B,SAAiC;QAEjC,IAAI,aAAa,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO,YAAY,CAAC,KAAK,CAAC;QAC9D,IAAI,aAAa,CAAC,IAAI,KAAK,MAAM;YAAE,OAAO,SAAS,CAAC;QACpD,OAAO,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,OAAO,CAAiB,CAAC;IACvE,CAAC;IAES,KAAK,CAAC,sBAAsB,CAAC,aAAgC;QACnE,MAAM,OAAO,GAAG,aAAa,CAAC,OAAiC,CAAC;QAEhE,MAAM,aAAa,GAAG,qBAAqB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAE7D,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,OAAO,EAAE,QAAiB,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAC3F,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,CAClC,CAAC;QAEF,OAAO,WAAW,CAAC;YACf,YAAY,EAAE,OAAO,EAAE,OAAO;YAC9B,aAAa;YACb,gBAAgB;SACnB,CAAqB,CAAC;IAC3B,CAAC;CACJ"}
|
|
1
|
+
{"version":3,"file":"bedrock.auditor.js","sourceRoot":"","sources":["../src/bedrock.auditor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { BedrockRuntimeClient } from '@aws-sdk/client-bedrock-runtime';
|
|
2
2
|
import { BaseProvider } from '@holokai/holo-sdk/provider';
|
|
3
3
|
import type { DiscoveredModel, IAuditor, IProviderTranslator, IResponseFactory, ProviderContext, RunHandle } from '@holokai/holo-types/provider';
|
|
4
|
-
import type
|
|
4
|
+
import { type BedrockRequest } from './types/index.js';
|
|
5
|
+
import { ProtocolCapability } from '@holokai/holo-types/entities';
|
|
5
6
|
export declare class BedrockProvider extends BaseProvider<BedrockRuntimeClient, BedrockRequest> {
|
|
6
7
|
private bedrockClient?;
|
|
7
8
|
discoverModels(): Promise<DiscoveredModel[]>;
|
|
@@ -13,10 +14,12 @@ export declare class BedrockProvider extends BaseProvider<BedrockRuntimeClient,
|
|
|
13
14
|
protected createTranslator(): IProviderTranslator;
|
|
14
15
|
protected createResponseFactory(): IResponseFactory;
|
|
15
16
|
protected handleError(error: any): Promise<any>;
|
|
17
|
+
protected translatePayload(capability: ProtocolCapability | undefined, payload: any, protocolName?: string): Promise<any>;
|
|
16
18
|
protected createRequestRunner(payload: BedrockRequest, ctx: ProviderContext): Promise<RunHandle<any>>;
|
|
17
19
|
private bedrockConverse;
|
|
18
20
|
private bedrockConverseStream;
|
|
19
21
|
private bedrockEmbed;
|
|
22
|
+
private bedrockImages;
|
|
20
23
|
private getBedrockClient;
|
|
21
24
|
private buildAwsConfig;
|
|
22
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bedrock.provider.d.ts","sourceRoot":"","sources":["../src/bedrock.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,oBAAoB,EAIvB,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAExD,OAAO,KAAK,EACR,eAAe,EACf,QAAQ,EACR,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EACf,SAAS,EAEZ,MAAM,8BAA8B,CAAC;AAKtC,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"bedrock.provider.d.ts","sourceRoot":"","sources":["../src/bedrock.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,oBAAoB,EAIvB,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAExD,OAAO,KAAK,EACR,eAAe,EACf,QAAQ,EACR,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EACf,SAAS,EAEZ,MAAM,8BAA8B,CAAC;AAKtC,OAAO,EAKH,KAAK,cAAc,EAEtB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,kBAAkB,EAAC,MAAM,8BAA8B,CAAC;AAEhE,qBAAa,eAAgB,SAAQ,YAAY,CAAC,oBAAoB,EAAE,cAAc,CAAC;IACnF,OAAO,CAAC,aAAa,CAAC,CAAgB;IAEhC,cAAc,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAoB5C,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC;QAAC,MAAM,EAAE,eAAe,EAAE,CAAA;KAAC,CAAC;IAMrF,SAAS,CAAC,YAAY,IAAI,oBAAoB;IAI9C,SAAS,CAAC,aAAa,IAAI,QAAQ;IAInC,SAAS,CAAC,gBAAgB,IAAI,mBAAmB;IAIjD,SAAS,CAAC,qBAAqB,IAAI,gBAAgB;cAInC,WAAW,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;cAIrC,gBAAgB,CAC5B,UAAU,EAAE,kBAAkB,GAAG,SAAS,EAC1C,OAAO,EAAE,GAAG,EACZ,YAAY,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,GAAG,CAAC;cAQC,mBAAmB,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAe7F,eAAe;YA8Bf,qBAAqB;YAiDrB,YAAY;YAoBZ,aAAa;IA2B3B,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,cAAc;CAgBzB"}
|
package/dist/bedrock.provider.js
CHANGED
|
@@ -2,11 +2,13 @@ import { BedrockRuntimeClient, ConverseCommand, ConverseStreamCommand, InvokeMod
|
|
|
2
2
|
import { BedrockClient, ListFoundationModelsCommand } from '@aws-sdk/client-bedrock';
|
|
3
3
|
import { NodeHttpHandler } from '@smithy/node-http-handler';
|
|
4
4
|
import { BaseProvider } from '@holokai/holo-sdk/provider';
|
|
5
|
-
import { pickDefined } from '@holokai/holo-sdk';
|
|
5
|
+
import { HoloError, pickDefined } from '@holokai/holo-sdk';
|
|
6
6
|
import { BedrockAuditor } from './bedrock.auditor.js';
|
|
7
7
|
import { BedrockTranslator } from './bedrock.translator.js';
|
|
8
8
|
import { BedrockResponseFactory } from './bedrock.response.factory.js';
|
|
9
9
|
import { BedrockProtocols } from './plugin.js';
|
|
10
|
+
import { isImageGenerationModel, } from './types/index.js';
|
|
11
|
+
import { ProtocolCapability } from '@holokai/holo-types/entities';
|
|
10
12
|
export class BedrockProvider extends BaseProvider {
|
|
11
13
|
bedrockClient;
|
|
12
14
|
async discoverModels() {
|
|
@@ -49,6 +51,13 @@ export class BedrockProvider extends BaseProvider {
|
|
|
49
51
|
async handleError(error) {
|
|
50
52
|
return this.responseFactory.createError(error.message ?? 'Unknown Bedrock error', error.name ?? error.Code);
|
|
51
53
|
}
|
|
54
|
+
async translatePayload(capability, payload, protocolName) {
|
|
55
|
+
// Images have no Holo canonical shape yet — the payload is already native.
|
|
56
|
+
if (protocolName === BedrockProtocols.IMAGES || capability === ProtocolCapability.IMAGE) {
|
|
57
|
+
return payload;
|
|
58
|
+
}
|
|
59
|
+
return super.translatePayload(capability, payload, protocolName);
|
|
60
|
+
}
|
|
52
61
|
async createRequestRunner(payload, ctx) {
|
|
53
62
|
switch (ctx.protocol.name) {
|
|
54
63
|
case BedrockProtocols.CONVERSE:
|
|
@@ -56,7 +65,9 @@ export class BedrockProvider extends BaseProvider {
|
|
|
56
65
|
? this.bedrockConverseStream(payload, ctx)
|
|
57
66
|
: this.bedrockConverse(payload, ctx);
|
|
58
67
|
case BedrockProtocols.EMBED:
|
|
59
|
-
return this.bedrockEmbed(payload);
|
|
68
|
+
return this.bedrockEmbed(payload, ctx);
|
|
69
|
+
case BedrockProtocols.IMAGES:
|
|
70
|
+
return this.bedrockImages(payload, ctx);
|
|
60
71
|
default:
|
|
61
72
|
throw new Error(`Unsupported protocol: ${ctx.protocol.name}`);
|
|
62
73
|
}
|
|
@@ -64,7 +75,7 @@ export class BedrockProvider extends BaseProvider {
|
|
|
64
75
|
async bedrockConverse(params, ctx) {
|
|
65
76
|
return {
|
|
66
77
|
start: async () => {
|
|
67
|
-
const response = await this.client.send(new ConverseCommand(params));
|
|
78
|
+
const response = await this.client.send(new ConverseCommand(params), ctx.signal ? { abortSignal: ctx.signal } : undefined);
|
|
68
79
|
const contentBlocks = response.output?.message?.content ?? [];
|
|
69
80
|
const textContent = contentBlocks
|
|
70
81
|
.filter((b) => b.text)
|
|
@@ -90,7 +101,7 @@ export class BedrockProvider extends BaseProvider {
|
|
|
90
101
|
async bedrockConverseStream(params, ctx) {
|
|
91
102
|
return {
|
|
92
103
|
start: async () => {
|
|
93
|
-
const response = await this.client.send(new ConverseStreamCommand(params));
|
|
104
|
+
const response = await this.client.send(new ConverseStreamCommand(params), ctx.signal ? { abortSignal: ctx.signal } : undefined);
|
|
94
105
|
if (!response.stream)
|
|
95
106
|
throw new Error('No stream returned from Bedrock');
|
|
96
107
|
let metadataEvent;
|
|
@@ -136,7 +147,27 @@ export class BedrockProvider extends BaseProvider {
|
|
|
136
147
|
},
|
|
137
148
|
};
|
|
138
149
|
}
|
|
139
|
-
async bedrockEmbed(params) {
|
|
150
|
+
async bedrockEmbed(params, ctx) {
|
|
151
|
+
return {
|
|
152
|
+
start: async () => {
|
|
153
|
+
const response = await this.client.send(new InvokeModelCommand({
|
|
154
|
+
modelId: params.modelId,
|
|
155
|
+
body: JSON.stringify(params.body),
|
|
156
|
+
contentType: 'application/json',
|
|
157
|
+
accept: 'application/json',
|
|
158
|
+
}), ctx.signal ? { abortSignal: ctx.signal } : undefined);
|
|
159
|
+
const bodyStr = new TextDecoder().decode(response.body);
|
|
160
|
+
const parsed = JSON.parse(bodyStr);
|
|
161
|
+
return { modelId: params.modelId, body: parsed };
|
|
162
|
+
},
|
|
163
|
+
};
|
|
164
|
+
}
|
|
165
|
+
async bedrockImages(params, ctx) {
|
|
166
|
+
// InvokeModel is scoped to image-generation model families so it cannot become
|
|
167
|
+
// a generic bypass around the protocol-appropriate audit paths.
|
|
168
|
+
if (!params.modelId || !isImageGenerationModel(params.modelId)) {
|
|
169
|
+
throw HoloError.badRequest('bedrock.images only accepts image-generation models (amazon.nova-canvas, amazon.titan-image-generator, stability.*).');
|
|
170
|
+
}
|
|
140
171
|
return {
|
|
141
172
|
start: async () => {
|
|
142
173
|
const response = await this.client.send(new InvokeModelCommand({
|
|
@@ -144,7 +175,7 @@ export class BedrockProvider extends BaseProvider {
|
|
|
144
175
|
body: JSON.stringify(params.body),
|
|
145
176
|
contentType: 'application/json',
|
|
146
177
|
accept: 'application/json',
|
|
147
|
-
}));
|
|
178
|
+
}), ctx.signal ? { abortSignal: ctx.signal } : undefined);
|
|
148
179
|
const bodyStr = new TextDecoder().decode(response.body);
|
|
149
180
|
const parsed = JSON.parse(bodyStr);
|
|
150
181
|
return { modelId: params.modelId, body: parsed };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bedrock.provider.js","sourceRoot":"","sources":["../src/bedrock.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,oBAAoB,EACpB,eAAe,EACf,qBAAqB,EACrB,kBAAkB,GACrB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAC,aAAa,EAAE,2BAA2B,EAAC,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"bedrock.provider.js","sourceRoot":"","sources":["../src/bedrock.provider.ts"],"names":[],"mappings":"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"}
|
package/dist/plugin.d.ts
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { BasePlugin } from '@holokai/holo-sdk/plugin';
|
|
2
2
|
import type { IProviderPlugin, PluginContext, PluginPricingSheet, PluginSchema } from '@holokai/holo-types/plugin';
|
|
3
3
|
import type { PricingSheetModel } from '@holokai/holo-types/entities';
|
|
4
|
-
import { ProtocolCapability } from '@holokai/holo-types/entities';
|
|
5
4
|
import type { DiscoveredModel, IProvider, IWireAdapter, ProviderCapabilities, WireAdapterParams } from '@holokai/holo-types/provider';
|
|
6
5
|
import type { RouteDefinition } from '@holokai/holo-types/routing';
|
|
7
6
|
export declare const BedrockProtocols: {
|
|
8
7
|
readonly CONVERSE: "bedrock.converse";
|
|
9
8
|
readonly EMBED: "bedrock.embed";
|
|
10
9
|
readonly MODELS: "bedrock.models";
|
|
10
|
+
readonly IMAGES: "bedrock.images";
|
|
11
11
|
};
|
|
12
12
|
export type BedrockProtocols = (typeof BedrockProtocols)[keyof typeof BedrockProtocols];
|
|
13
13
|
export declare class BedrockProviderPlugin extends BasePlugin implements IProviderPlugin {
|
|
@@ -18,11 +18,11 @@ export declare class BedrockProviderPlugin extends BasePlugin implements IProvid
|
|
|
18
18
|
readonly CONVERSE: "bedrock.converse";
|
|
19
19
|
readonly EMBED: "bedrock.embed";
|
|
20
20
|
readonly MODELS: "bedrock.models";
|
|
21
|
+
readonly IMAGES: "bedrock.images";
|
|
21
22
|
};
|
|
22
23
|
defaultProtocol: "bedrock.converse";
|
|
23
24
|
createProvider(id: string, name: string, config: any): Promise<IProvider>;
|
|
24
25
|
createWireAdapter(params: WireAdapterParams): Promise<IWireAdapter>;
|
|
25
|
-
getProtocolByCapability(capability: ProtocolCapability): string | undefined;
|
|
26
26
|
getModelNameFromRequest(payload: any): string | undefined;
|
|
27
27
|
setModelNameInRequest(payload: any, model: string): void;
|
|
28
28
|
mergeParametersIntoRequest(payload: any, parameters: Record<string, any>): void;
|
package/dist/plugin.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAA0B,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EAAC,eAAe,EAAE,aAAa,EAAE,kBAAkB,EAAE,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACjH,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAA0B,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EAAC,eAAe,EAAE,aAAa,EAAE,kBAAkB,EAAE,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACjH,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,8BAA8B,CAAC;AAGpE,OAAO,KAAK,EACR,eAAe,EACf,SAAS,EACT,YAAY,EACZ,oBAAoB,EACpB,iBAAiB,EACpB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,6BAA6B,CAAC;AAKjE,eAAO,MAAM,gBAAgB;;;;;CAKnB,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,OAAO,gBAAgB,CAAC,CAAC;AAExF,qBAAa,qBAAsB,SAAQ,UAAW,YAAW,eAAe;IAC5E,QAAQ,+CAAY;IACpB,UAAU,oDAAgC;IAC1C,mBAAmB,YAAwB;IAC3C,SAAS;;;;;MAAoB;IAC7B,eAAe,qBAA6B;IAEtC,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC;IAIzE,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,CAAC;IAIzE,uBAAuB,CAAC,OAAO,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS;IAIzD,qBAAqB,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAIxD,0BAA0B,CAAC,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAI/E,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI;IAKlE,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO;IAWxD,SAAS,IAAI,YAAY;IAsCzB,aAAa;;;;IAIb,eAAe,IAAI,oBAAoB;IAUvC,SAAS,IAAI,eAAe,EAAE;IA6C9B,gBAAgB,IAAI,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAInD,kBAAkB;IAIlB,iBAAiB,IAAI,kBAAkB;IAMvC,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,iBAAiB;;;;;;;;;;;;;IAcxF,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9D,SAAS,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAGvC"}
|
package/dist/plugin.js
CHANGED
|
@@ -10,6 +10,7 @@ export const BedrockProtocols = {
|
|
|
10
10
|
CONVERSE: 'bedrock.converse',
|
|
11
11
|
EMBED: 'bedrock.embed',
|
|
12
12
|
MODELS: 'bedrock.models',
|
|
13
|
+
IMAGES: 'bedrock.images',
|
|
13
14
|
};
|
|
14
15
|
export class BedrockProviderPlugin extends BasePlugin {
|
|
15
16
|
manifest = manifest;
|
|
@@ -23,10 +24,6 @@ export class BedrockProviderPlugin extends BasePlugin {
|
|
|
23
24
|
async createWireAdapter(params) {
|
|
24
25
|
return new BedrockWireAdapter(params.requestId, params.isStreaming);
|
|
25
26
|
}
|
|
26
|
-
getProtocolByCapability(capability) {
|
|
27
|
-
const route = this.getRoutes().find(r => r.protocol.capability === capability);
|
|
28
|
-
return route?.protocol.name;
|
|
29
|
-
}
|
|
30
27
|
getModelNameFromRequest(payload) {
|
|
31
28
|
return payload?.modelId;
|
|
32
29
|
}
|
|
@@ -133,6 +130,15 @@ export class BedrockProviderPlugin extends BasePlugin {
|
|
|
133
130
|
capability: ProtocolCapability.MODELS,
|
|
134
131
|
},
|
|
135
132
|
},
|
|
133
|
+
{
|
|
134
|
+
paths: ['/images'],
|
|
135
|
+
method: 'POST',
|
|
136
|
+
handler: RouteHandler.REQUEST,
|
|
137
|
+
protocol: {
|
|
138
|
+
name: BedrockProtocols.IMAGES,
|
|
139
|
+
capability: ProtocolCapability.IMAGE,
|
|
140
|
+
},
|
|
141
|
+
},
|
|
136
142
|
];
|
|
137
143
|
}
|
|
138
144
|
getPricingSheets() {
|
package/dist/plugin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,uBAAuB,EAAC,MAAM,0BAA0B,CAAC;AAG7E,OAAO,EAAC,kBAAkB,EAAC,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAQpC,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAC,kBAAkB,EAAC,MAAM,wBAAwB,CAAC;AAE1D,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAC,iBAAiB,EAAC,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAC,uBAAuB,EAAC,MAAM,mBAAmB,CAAC;AAE1D,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC5B,QAAQ,EAAE,kBAAkB;IAC5B,KAAK,EAAE,eAAe;IACtB,MAAM,EAAE,gBAAgB;CAClB,CAAC;AAIX,MAAM,OAAO,qBAAsB,SAAQ,UAAU;IACjD,QAAQ,GAAG,QAAQ,CAAC;IACpB,UAAU,GAAG,iBAAiB,CAAC,QAAQ,EAAE,CAAC;IAC1C,mBAAmB,GAAG,YAAY,CAAC,OAAO,CAAC;IAC3C,SAAS,GAAG,gBAAgB,CAAC;IAC7B,eAAe,GAAG,gBAAgB,CAAC,QAAQ,CAAC;IAE5C,KAAK,CAAC,cAAc,CAAC,EAAU,EAAE,IAAY,EAAE,MAAW;QACtD,OAAO,IAAI,eAAe,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,MAAyB;QAC7C,OAAO,IAAI,kBAAkB,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IACxE,CAAC;IAED,uBAAuB,CAAC,
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bedrock.message.translator.d.ts","sourceRoot":"","sources":["../../src/translators/bedrock.message.translator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAgC,WAAW,EAAC,MAAM,0BAA0B,CAAC;AACzF,OAAO,EAAC,cAAc,EAAC,MAAM,4BAA4B,CAAC;AAC1D,OAAO,KAAK,EAAe,OAAO,EAAC,MAAM,iCAAiC,CAAC;AAG3E,qBAAa,wBAAyB,SAAQ,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9E,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,CAAM;IAClD,SAAS,CAAC,gBAAgB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAM;cAElC,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"bedrock.message.translator.d.ts","sourceRoot":"","sources":["../../src/translators/bedrock.message.translator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAgC,WAAW,EAAC,MAAM,0BAA0B,CAAC;AACzF,OAAO,EAAC,cAAc,EAAC,MAAM,4BAA4B,CAAC;AAC1D,OAAO,KAAK,EAAe,OAAO,EAAC,MAAM,iCAAiC,CAAC;AAG3E,qBAAa,wBAAyB,SAAQ,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9E,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,CAAM;IAClD,SAAS,CAAC,gBAAgB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAM;cAElC,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;cAmG5D,UAAU,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;CA0E7E"}
|
|
@@ -6,6 +6,8 @@ export class BedrockMessageTranslator extends BaseTranslator {
|
|
|
6
6
|
providerDefaults = {};
|
|
7
7
|
async fromHoloImpl(source) {
|
|
8
8
|
const content = [];
|
|
9
|
+
// Converse requires document names to be unique within a request.
|
|
10
|
+
const usedDocNames = new Set();
|
|
9
11
|
if (typeof source.content === 'string' && source.content !== '') {
|
|
10
12
|
content.push({ text: source.content });
|
|
11
13
|
}
|
|
@@ -28,6 +30,27 @@ export class BedrockMessageTranslator extends BaseTranslator {
|
|
|
28
30
|
throw HoloError.badRequest('Bedrock Converse requires base64 image data; received URL-only image. Pre-fetch the image before routing to Bedrock.');
|
|
29
31
|
}
|
|
30
32
|
break;
|
|
33
|
+
case 'file': {
|
|
34
|
+
const parsed = block.url ? parseFileDataUrl(block.url) : undefined;
|
|
35
|
+
const data = block.data ?? parsed?.data;
|
|
36
|
+
if (!data) {
|
|
37
|
+
throw HoloError.badRequest('Bedrock Converse requires base64 document data; received URL-only file. Pre-fetch the document before routing to Bedrock.');
|
|
38
|
+
}
|
|
39
|
+
const mime = (block.mime ?? parsed?.mime)?.toLowerCase();
|
|
40
|
+
let name = sanitizeDocName(block.filename) ?? 'document';
|
|
41
|
+
for (let i = 2; usedDocNames.has(name); i++) {
|
|
42
|
+
name = `${sanitizeDocName(block.filename) ?? 'document'} (${i})`;
|
|
43
|
+
}
|
|
44
|
+
usedDocNames.add(name);
|
|
45
|
+
content.push({
|
|
46
|
+
document: {
|
|
47
|
+
format: mimeToDocFormat(mime, block.filename),
|
|
48
|
+
name,
|
|
49
|
+
source: { bytes: Buffer.from(data, 'base64') },
|
|
50
|
+
},
|
|
51
|
+
});
|
|
52
|
+
break;
|
|
53
|
+
}
|
|
31
54
|
case 'tool_call':
|
|
32
55
|
if (block.kind === 'custom')
|
|
33
56
|
break; // Bedrock has no custom-tool wire shape
|
|
@@ -116,6 +139,17 @@ export class BedrockMessageTranslator extends BaseTranslator {
|
|
|
116
139
|
imgBlock.mime = mime;
|
|
117
140
|
holoContent.push(imgBlock);
|
|
118
141
|
}
|
|
142
|
+
else if (block.document) {
|
|
143
|
+
const doc = block.document;
|
|
144
|
+
holoContent.push(pickDefined({
|
|
145
|
+
type: 'file',
|
|
146
|
+
data: doc.source && 'bytes' in doc.source && doc.source.bytes
|
|
147
|
+
? Buffer.from(doc.source.bytes).toString('base64')
|
|
148
|
+
: undefined,
|
|
149
|
+
mime: docFormatToMime(doc.format),
|
|
150
|
+
filename: doc.name,
|
|
151
|
+
}));
|
|
152
|
+
}
|
|
119
153
|
}
|
|
120
154
|
let content;
|
|
121
155
|
if (holoContent.length === 1 && holoContent[0].type === 'text') {
|
|
@@ -150,4 +184,50 @@ function formatToMime(format) {
|
|
|
150
184
|
return undefined;
|
|
151
185
|
return `image/${format}`;
|
|
152
186
|
}
|
|
187
|
+
const MIME_TO_DOC_FORMAT = {
|
|
188
|
+
'application/pdf': 'pdf',
|
|
189
|
+
'text/csv': 'csv',
|
|
190
|
+
'application/msword': 'doc',
|
|
191
|
+
'application/vnd.openxmlformats-officedocument.wordprocessingml.document': 'docx',
|
|
192
|
+
'application/vnd.ms-excel': 'xls',
|
|
193
|
+
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': 'xlsx',
|
|
194
|
+
'text/html': 'html',
|
|
195
|
+
'text/plain': 'txt',
|
|
196
|
+
'text/markdown': 'md',
|
|
197
|
+
};
|
|
198
|
+
const DOC_FORMAT_TO_MIME = Object.fromEntries(Object.entries(MIME_TO_DOC_FORMAT).map(([mime, format]) => [format, mime]));
|
|
199
|
+
function mimeToDocFormat(mime, filename) {
|
|
200
|
+
if (mime && MIME_TO_DOC_FORMAT[mime])
|
|
201
|
+
return MIME_TO_DOC_FORMAT[mime];
|
|
202
|
+
const ext = filename?.match(/\.([a-z0-9]+)$/i)?.[1]?.toLowerCase();
|
|
203
|
+
if (ext && ext in DOC_FORMAT_TO_MIME)
|
|
204
|
+
return ext;
|
|
205
|
+
throw HoloError.badRequest(`Bedrock Converse documents support pdf/csv/doc/docx/xls/xlsx/html/txt/md; received ${mime ?? 'no mime and no recognizable filename extension'}.`);
|
|
206
|
+
}
|
|
207
|
+
// Bedrock's DocumentBlock.name only allows alphanumerics, single spaces, hyphens,
|
|
208
|
+
// parentheses, and square brackets — a dotted filename is rejected by the live API.
|
|
209
|
+
function sanitizeDocName(filename) {
|
|
210
|
+
if (!filename)
|
|
211
|
+
return undefined;
|
|
212
|
+
const cleaned = filename
|
|
213
|
+
.replace(/\.[a-z0-9]+$/i, '')
|
|
214
|
+
.replace(/[^a-zA-Z0-9\s\-()[\]]/g, '-')
|
|
215
|
+
.replace(/\s+/g, ' ')
|
|
216
|
+
.trim();
|
|
217
|
+
return cleaned || undefined;
|
|
218
|
+
}
|
|
219
|
+
function docFormatToMime(format) {
|
|
220
|
+
if (!format)
|
|
221
|
+
return undefined;
|
|
222
|
+
return DOC_FORMAT_TO_MIME[format] ?? undefined;
|
|
223
|
+
}
|
|
224
|
+
function parseFileDataUrl(u) {
|
|
225
|
+
if (!u.startsWith('data:'))
|
|
226
|
+
return undefined;
|
|
227
|
+
const comma = u.indexOf(',');
|
|
228
|
+
if (comma < 0)
|
|
229
|
+
return undefined;
|
|
230
|
+
const mime = u.slice('data:'.length, comma).split(';', 1)[0].toLowerCase();
|
|
231
|
+
return { mime: mime || undefined, data: u.slice(comma + 1) };
|
|
232
|
+
}
|
|
153
233
|
//# sourceMappingURL=bedrock.message.translator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bedrock.message.translator.js","sourceRoot":"","sources":["../../src/translators/bedrock.message.translator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAEzD,OAAO,EAAC,cAAc,EAAC,MAAM,4BAA4B,CAAC;AAG1D,wGAAwG;AACxG,MAAM,OAAO,wBAAyB,SAAQ,cAAoC;IACpE,YAAY,GAAyB,EAAE,CAAC;IACxC,gBAAgB,GAAqB,EAAE,CAAC;IAExC,KAAK,CAAC,YAAY,CAAC,MAAmB;QAC5C,MAAM,OAAO,GAAmB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"bedrock.message.translator.js","sourceRoot":"","sources":["../../src/translators/bedrock.message.translator.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,12 @@ export interface BedrockEmbedRequest {
|
|
|
4
4
|
modelId: string;
|
|
5
5
|
body: Record<string, unknown>;
|
|
6
6
|
}
|
|
7
|
-
export
|
|
7
|
+
export interface BedrockImagesRequest {
|
|
8
|
+
modelId: string;
|
|
9
|
+
body: Record<string, unknown>;
|
|
10
|
+
}
|
|
11
|
+
export type BedrockRequest = BedrockConverseRequest | BedrockEmbedRequest | BedrockImagesRequest;
|
|
12
|
+
export declare function isImageGenerationModel(modelId: string): boolean;
|
|
8
13
|
export declare function isTitanEmbed(modelId: string): boolean;
|
|
9
14
|
export declare function isCohereEmbed(modelId: string): boolean;
|
|
10
15
|
//# sourceMappingURL=request.types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.types.d.ts","sourceRoot":"","sources":["../../src/types/request.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,iCAAiC,CAAC;AAE1E,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,CAAC;AAE1D,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,MAAM,MAAM,cAAc,GAAG,sBAAsB,GAAG,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"request.types.d.ts","sourceRoot":"","sources":["../../src/types/request.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,iCAAiC,CAAC;AAE1E,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,CAAC;AAE1D,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,oBAAoB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,MAAM,MAAM,cAAc,GAAG,sBAAsB,GAAG,mBAAmB,GAAG,oBAAoB,CAAC;AAIjG,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAI/D;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAErD;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEtD"}
|
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
const IMAGE_MODEL_PREFIXES = ['amazon.nova-canvas', 'amazon.titan-image-generator', 'stability.'];
|
|
2
|
+
export function isImageGenerationModel(modelId) {
|
|
3
|
+
// Cross-region inference profiles prefix the bare model id (us.amazon.nova-canvas-v1:0).
|
|
4
|
+
const bare = modelId.replace(/^[a-z]{2,5}\./, '');
|
|
5
|
+
return IMAGE_MODEL_PREFIXES.some(p => modelId.startsWith(p) || bare.startsWith(p));
|
|
6
|
+
}
|
|
1
7
|
export function isTitanEmbed(modelId) {
|
|
2
8
|
return modelId.startsWith('amazon.titan-embed');
|
|
3
9
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.types.js","sourceRoot":"","sources":["../../src/types/request.types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"request.types.js","sourceRoot":"","sources":["../../src/types/request.types.ts"],"names":[],"mappings":"AAgBA,MAAM,oBAAoB,GAAG,CAAC,oBAAoB,EAAE,8BAA8B,EAAE,YAAY,CAAC,CAAC;AAElG,MAAM,UAAU,sBAAsB,CAAC,OAAe;IAClD,yFAAyF;IACzF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;IAClD,OAAO,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AACvF,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,OAAe;IACxC,OAAO,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAe;IACzC,OAAO,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;AAC9C,CAAC"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const VERSION = "1.
|
|
1
|
+
export declare const VERSION = "1.6.0";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/dist/version.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@holokai/holo-provider-bedrock",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.6.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Amazon Bedrock provider plugin for Holo LLM Gateway",
|
|
6
6
|
"author": "Holokai",
|
|
@@ -48,17 +48,17 @@
|
|
|
48
48
|
],
|
|
49
49
|
"sideEffects": false,
|
|
50
50
|
"peerDependencies": {
|
|
51
|
-
"@holokai/holo-sdk": "^1.
|
|
51
|
+
"@holokai/holo-sdk": "^1.6.0"
|
|
52
52
|
},
|
|
53
53
|
"dependencies": {
|
|
54
|
-
"@aws-sdk/client-bedrock": "^3.
|
|
55
|
-
"@aws-sdk/client-bedrock-runtime": "^3.
|
|
54
|
+
"@aws-sdk/client-bedrock": "^3.1088.0",
|
|
55
|
+
"@aws-sdk/client-bedrock-runtime": "^3.1088.0",
|
|
56
56
|
"@smithy/node-http-handler": "^4.7.6"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
|
-
"@types/node": "^
|
|
59
|
+
"@types/node": "^26.1.1",
|
|
60
60
|
"typescript": "^6.0.3",
|
|
61
|
-
"@holokai/holo-test": "1.5.
|
|
61
|
+
"@holokai/holo-test": "1.5.3"
|
|
62
62
|
},
|
|
63
63
|
"holoPlugin": {
|
|
64
64
|
"type": "PROVIDER"
|