@lobu/gateway 3.0.7 → 3.0.8
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/auth/bedrock/models.d.ts +13 -0
- package/dist/auth/bedrock/models.d.ts.map +1 -0
- package/dist/auth/bedrock/models.js +75 -0
- package/dist/auth/bedrock/models.js.map +1 -0
- package/dist/auth/bedrock/provider-module.d.ts +17 -0
- package/dist/auth/bedrock/provider-module.d.ts.map +1 -0
- package/dist/auth/bedrock/provider-module.js +80 -0
- package/dist/auth/bedrock/provider-module.js.map +1 -0
- package/dist/auth/external/device-code-client.d.ts +2 -0
- package/dist/auth/external/device-code-client.d.ts.map +1 -1
- package/dist/auth/external/device-code-client.js +12 -4
- package/dist/auth/external/device-code-client.js.map +1 -1
- package/dist/auth/mcp/config-service.d.ts +3 -4
- package/dist/auth/mcp/config-service.d.ts.map +1 -1
- package/dist/auth/mcp/config-service.js +40 -12
- package/dist/auth/mcp/config-service.js.map +1 -1
- package/dist/auth/mcp/proxy.d.ts +1 -3
- package/dist/auth/mcp/proxy.d.ts.map +1 -1
- package/dist/auth/mcp/proxy.js.map +1 -1
- package/dist/cli/gateway.d.ts.map +1 -1
- package/dist/cli/gateway.js +12 -5
- package/dist/cli/gateway.js.map +1 -1
- package/dist/gateway/index.d.ts.map +1 -1
- package/dist/gateway/index.js +1 -3
- package/dist/gateway/index.js.map +1 -1
- package/dist/routes/internal/device-auth.d.ts +7 -0
- package/dist/routes/internal/device-auth.d.ts.map +1 -1
- package/dist/routes/internal/device-auth.js +101 -48
- package/dist/routes/internal/device-auth.js.map +1 -1
- package/dist/routes/public/cli-auth.d.ts.map +1 -1
- package/dist/routes/public/cli-auth.js +10 -0
- package/dist/routes/public/cli-auth.js.map +1 -1
- package/dist/services/bedrock-anthropic-service.d.ts +87 -0
- package/dist/services/bedrock-anthropic-service.d.ts.map +1 -0
- package/dist/services/bedrock-anthropic-service.js +453 -0
- package/dist/services/bedrock-anthropic-service.js.map +1 -0
- package/dist/services/bedrock-model-catalog.d.ts +28 -0
- package/dist/services/bedrock-model-catalog.d.ts.map +1 -0
- package/dist/services/bedrock-model-catalog.js +160 -0
- package/dist/services/bedrock-model-catalog.js.map +1 -0
- package/dist/services/bedrock-openai-service.d.ts +119 -0
- package/dist/services/bedrock-openai-service.d.ts.map +1 -0
- package/dist/services/bedrock-openai-service.js +412 -0
- package/dist/services/bedrock-openai-service.js.map +1 -0
- package/dist/services/core-services.d.ts +3 -0
- package/dist/services/core-services.d.ts.map +1 -1
- package/dist/services/core-services.js +13 -0
- package/dist/services/core-services.js.map +1 -1
- package/dist/services/system-config-resolver.d.ts.map +1 -1
- package/dist/services/system-config-resolver.js +0 -2
- package/dist/services/system-config-resolver.js.map +1 -1
- package/package.json +3 -1
- package/src/__tests__/bedrock-model-catalog.test.ts +40 -0
- package/src/__tests__/bedrock-openai-service.test.ts +157 -0
- package/src/__tests__/bedrock-provider-module.test.ts +56 -0
- package/src/__tests__/mcp-config-service.test.ts +1 -1
- package/src/__tests__/mcp-proxy.test.ts +1 -3
- package/src/auth/bedrock/provider-module.ts +110 -0
- package/src/auth/external/device-code-client.ts +14 -4
- package/src/auth/mcp/config-service.ts +49 -21
- package/src/auth/mcp/proxy.ts +1 -3
- package/src/cli/gateway.ts +8 -0
- package/src/gateway/index.ts +1 -3
- package/src/routes/internal/device-auth.ts +137 -51
- package/src/routes/public/cli-auth.ts +13 -0
- package/src/services/bedrock-model-catalog.ts +217 -0
- package/src/services/bedrock-openai-service.ts +658 -0
- package/src/services/core-services.ts +19 -0
- package/src/services/system-config-resolver.ts +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bedrock-model-catalog.js","sourceRoot":"","sources":["../../src/services/bedrock-model-catalog.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import { getModel } from "@mariozechner/pi-ai";
|
|
2
|
+
import { streamBedrock } from "@mariozechner/pi-ai/dist/providers/amazon-bedrock.js";
|
|
3
|
+
import { Hono } from "hono";
|
|
4
|
+
import { BedrockModelCatalog } from "./bedrock-model-catalog";
|
|
5
|
+
interface OpenAITextPart {
|
|
6
|
+
type: "text";
|
|
7
|
+
text: string;
|
|
8
|
+
}
|
|
9
|
+
interface OpenAIImagePart {
|
|
10
|
+
type: "image_url";
|
|
11
|
+
image_url?: {
|
|
12
|
+
url?: string;
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
type OpenAIMessageContent = string | Array<OpenAITextPart | OpenAIImagePart>;
|
|
16
|
+
interface OpenAIChatMessage {
|
|
17
|
+
role: "system" | "developer" | "user" | "assistant" | "tool";
|
|
18
|
+
content?: OpenAIMessageContent | null;
|
|
19
|
+
tool_call_id?: string;
|
|
20
|
+
tool_calls?: Array<{
|
|
21
|
+
id?: string;
|
|
22
|
+
type?: "function";
|
|
23
|
+
function?: {
|
|
24
|
+
name?: string;
|
|
25
|
+
arguments?: string;
|
|
26
|
+
};
|
|
27
|
+
}>;
|
|
28
|
+
}
|
|
29
|
+
interface OpenAIChatTool {
|
|
30
|
+
type?: "function";
|
|
31
|
+
function?: {
|
|
32
|
+
name?: string;
|
|
33
|
+
description?: string;
|
|
34
|
+
parameters?: Record<string, unknown>;
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
interface OpenAIChatCompletionRequest {
|
|
38
|
+
model: string;
|
|
39
|
+
messages: OpenAIChatMessage[];
|
|
40
|
+
tools?: OpenAIChatTool[];
|
|
41
|
+
tool_choice?: "none" | "auto" | "required" | {
|
|
42
|
+
type?: "function";
|
|
43
|
+
function?: {
|
|
44
|
+
name?: string;
|
|
45
|
+
};
|
|
46
|
+
};
|
|
47
|
+
max_tokens?: number;
|
|
48
|
+
max_completion_tokens?: number;
|
|
49
|
+
temperature?: number;
|
|
50
|
+
stop?: string | string[];
|
|
51
|
+
stream?: boolean;
|
|
52
|
+
stream_options?: {
|
|
53
|
+
include_usage?: boolean;
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
type PiMessage = {
|
|
57
|
+
role: "user";
|
|
58
|
+
content: Array<{
|
|
59
|
+
type: "text";
|
|
60
|
+
text: string;
|
|
61
|
+
} | {
|
|
62
|
+
type: "image";
|
|
63
|
+
mimeType: string;
|
|
64
|
+
data: string;
|
|
65
|
+
}>;
|
|
66
|
+
} | {
|
|
67
|
+
role: "assistant";
|
|
68
|
+
content: Array<{
|
|
69
|
+
type: "text";
|
|
70
|
+
text: string;
|
|
71
|
+
} | {
|
|
72
|
+
type: "toolCall";
|
|
73
|
+
id: string;
|
|
74
|
+
name: string;
|
|
75
|
+
arguments: Record<string, unknown>;
|
|
76
|
+
}>;
|
|
77
|
+
} | {
|
|
78
|
+
role: "toolResult";
|
|
79
|
+
toolCallId: string;
|
|
80
|
+
content: Array<{
|
|
81
|
+
type: "text";
|
|
82
|
+
text: string;
|
|
83
|
+
} | {
|
|
84
|
+
type: "image";
|
|
85
|
+
mimeType: string;
|
|
86
|
+
data: string;
|
|
87
|
+
}>;
|
|
88
|
+
isError?: boolean;
|
|
89
|
+
};
|
|
90
|
+
interface BedrockContextPayload {
|
|
91
|
+
messages: PiMessage[];
|
|
92
|
+
systemPrompt?: string;
|
|
93
|
+
tools?: Array<{
|
|
94
|
+
name: string;
|
|
95
|
+
description?: string;
|
|
96
|
+
parameters: Record<string, unknown>;
|
|
97
|
+
}>;
|
|
98
|
+
}
|
|
99
|
+
type ModelResolver = typeof getModel;
|
|
100
|
+
type BedrockStreamer = typeof streamBedrock;
|
|
101
|
+
export declare function buildBedrockContext(request: OpenAIChatCompletionRequest): BedrockContextPayload;
|
|
102
|
+
export interface BedrockOpenAIServiceOptions {
|
|
103
|
+
modelCatalog?: BedrockModelCatalog;
|
|
104
|
+
modelResolver?: ModelResolver;
|
|
105
|
+
bedrockStreamer?: BedrockStreamer;
|
|
106
|
+
}
|
|
107
|
+
export declare class BedrockOpenAIService {
|
|
108
|
+
private readonly app;
|
|
109
|
+
private readonly modelCatalog;
|
|
110
|
+
private readonly modelResolver;
|
|
111
|
+
private readonly bedrockStreamer;
|
|
112
|
+
constructor(options?: BedrockOpenAIServiceOptions);
|
|
113
|
+
getApp(): Hono;
|
|
114
|
+
private setupRoutes;
|
|
115
|
+
private resolveRuntimeModel;
|
|
116
|
+
private handleChatCompletions;
|
|
117
|
+
}
|
|
118
|
+
export {};
|
|
119
|
+
//# sourceMappingURL=bedrock-openai-service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bedrock-openai-service.d.ts","sourceRoot":"","sources":["../../src/services/bedrock-openai-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,412 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
3
|
+
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
4
|
+
var m = o[Symbol.asyncIterator], i;
|
|
5
|
+
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
|
6
|
+
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
|
7
|
+
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
8
|
+
};
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.BedrockOpenAIService = void 0;
|
|
11
|
+
exports.buildBedrockContext = buildBedrockContext;
|
|
12
|
+
const pi_ai_1 = require("@mariozechner/pi-ai");
|
|
13
|
+
const amazon_bedrock_js_1 = require("@mariozechner/pi-ai/dist/providers/amazon-bedrock.js");
|
|
14
|
+
const hono_1 = require("hono");
|
|
15
|
+
const core_1 = require("@lobu/core");
|
|
16
|
+
const bedrock_model_catalog_1 = require("./bedrock-model-catalog");
|
|
17
|
+
const logger = (0, core_1.createLogger)("bedrock-openai-service");
|
|
18
|
+
function parseDataUrl(url) {
|
|
19
|
+
if (!url)
|
|
20
|
+
return null;
|
|
21
|
+
const match = url.match(/^data:([^;,]+);base64,(.+)$/);
|
|
22
|
+
if (!match)
|
|
23
|
+
return null;
|
|
24
|
+
return {
|
|
25
|
+
mimeType: match[1],
|
|
26
|
+
data: match[2],
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
function normalizeMessageContent(content) {
|
|
30
|
+
if (typeof content === "string") {
|
|
31
|
+
return content.length > 0 ? [{ type: "text", text: content }] : [];
|
|
32
|
+
}
|
|
33
|
+
return Array.isArray(content) ? content : [];
|
|
34
|
+
}
|
|
35
|
+
function parseToolArguments(raw) {
|
|
36
|
+
if (!(raw === null || raw === void 0 ? void 0 : raw.trim()))
|
|
37
|
+
return {};
|
|
38
|
+
try {
|
|
39
|
+
const parsed = JSON.parse(raw);
|
|
40
|
+
return parsed && typeof parsed === "object" ? parsed : {};
|
|
41
|
+
}
|
|
42
|
+
catch (_a) {
|
|
43
|
+
return {};
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
function buildBedrockContext(request) {
|
|
47
|
+
const messages = [];
|
|
48
|
+
const systemPrompts = [];
|
|
49
|
+
for (const message of request.messages || []) {
|
|
50
|
+
if (message.role === "system" || message.role === "developer") {
|
|
51
|
+
const text = normalizeMessageContent(message.content)
|
|
52
|
+
.filter((part) => part.type === "text")
|
|
53
|
+
.map((part) => part.text)
|
|
54
|
+
.join("\n")
|
|
55
|
+
.trim();
|
|
56
|
+
if (text)
|
|
57
|
+
systemPrompts.push(text);
|
|
58
|
+
continue;
|
|
59
|
+
}
|
|
60
|
+
if (message.role === "tool") {
|
|
61
|
+
if (!message.tool_call_id)
|
|
62
|
+
continue;
|
|
63
|
+
const content = normalizeMessageContent(message.content)
|
|
64
|
+
.map((part) => {
|
|
65
|
+
var _a;
|
|
66
|
+
if (part.type === "text") {
|
|
67
|
+
return { type: "text", text: part.text };
|
|
68
|
+
}
|
|
69
|
+
const image = parseDataUrl((_a = part.image_url) === null || _a === void 0 ? void 0 : _a.url);
|
|
70
|
+
return image
|
|
71
|
+
? {
|
|
72
|
+
type: "image",
|
|
73
|
+
mimeType: image.mimeType,
|
|
74
|
+
data: image.data,
|
|
75
|
+
}
|
|
76
|
+
: null;
|
|
77
|
+
})
|
|
78
|
+
.filter((part) => Boolean(part));
|
|
79
|
+
messages.push({
|
|
80
|
+
role: "toolResult",
|
|
81
|
+
toolCallId: message.tool_call_id,
|
|
82
|
+
content: content.length > 0 ? content : [{ type: "text", text: "" }],
|
|
83
|
+
});
|
|
84
|
+
continue;
|
|
85
|
+
}
|
|
86
|
+
if (message.role === "assistant") {
|
|
87
|
+
const content = normalizeMessageContent(message.content)
|
|
88
|
+
.filter((part) => part.type === "text")
|
|
89
|
+
.map((part) => ({ type: "text", text: part.text }));
|
|
90
|
+
const toolCalls = (message.tool_calls || []).map((toolCall) => {
|
|
91
|
+
var _a, _b;
|
|
92
|
+
return ({
|
|
93
|
+
type: "toolCall",
|
|
94
|
+
id: toolCall.id || crypto.randomUUID(),
|
|
95
|
+
name: ((_a = toolCall.function) === null || _a === void 0 ? void 0 : _a.name) || "",
|
|
96
|
+
arguments: parseToolArguments((_b = toolCall.function) === null || _b === void 0 ? void 0 : _b.arguments),
|
|
97
|
+
});
|
|
98
|
+
});
|
|
99
|
+
const assistantContent = [...content, ...toolCalls];
|
|
100
|
+
if (assistantContent.length > 0) {
|
|
101
|
+
messages.push({
|
|
102
|
+
role: "assistant",
|
|
103
|
+
content: assistantContent,
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
continue;
|
|
107
|
+
}
|
|
108
|
+
const content = normalizeMessageContent(message.content)
|
|
109
|
+
.map((part) => {
|
|
110
|
+
var _a;
|
|
111
|
+
if (part.type === "text") {
|
|
112
|
+
return { type: "text", text: part.text };
|
|
113
|
+
}
|
|
114
|
+
const image = parseDataUrl((_a = part.image_url) === null || _a === void 0 ? void 0 : _a.url);
|
|
115
|
+
return image
|
|
116
|
+
? {
|
|
117
|
+
type: "image",
|
|
118
|
+
mimeType: image.mimeType,
|
|
119
|
+
data: image.data,
|
|
120
|
+
}
|
|
121
|
+
: null;
|
|
122
|
+
})
|
|
123
|
+
.filter((part) => Boolean(part));
|
|
124
|
+
if (content.length > 0) {
|
|
125
|
+
messages.push({
|
|
126
|
+
role: "user",
|
|
127
|
+
content,
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
const tools = (request.tools || [])
|
|
132
|
+
.filter((tool) => { var _a; return tool.type === "function" && ((_a = tool.function) === null || _a === void 0 ? void 0 : _a.name); })
|
|
133
|
+
.map((tool) => {
|
|
134
|
+
var _a, _b;
|
|
135
|
+
return ({
|
|
136
|
+
name: tool.function.name,
|
|
137
|
+
description: (_a = tool.function) === null || _a === void 0 ? void 0 : _a.description,
|
|
138
|
+
parameters: ((_b = tool.function) === null || _b === void 0 ? void 0 : _b.parameters) || {
|
|
139
|
+
type: "object",
|
|
140
|
+
properties: {},
|
|
141
|
+
additionalProperties: true,
|
|
142
|
+
},
|
|
143
|
+
});
|
|
144
|
+
});
|
|
145
|
+
return Object.assign(Object.assign({ messages }, (systemPrompts.length > 0
|
|
146
|
+
? { systemPrompt: systemPrompts.join("\n\n") }
|
|
147
|
+
: {})), (tools.length > 0 ? { tools } : {}));
|
|
148
|
+
}
|
|
149
|
+
function mapToolChoice(choice) {
|
|
150
|
+
var _a, _b;
|
|
151
|
+
if (choice === "none" || choice === "auto")
|
|
152
|
+
return choice;
|
|
153
|
+
if (choice === "required")
|
|
154
|
+
return "any";
|
|
155
|
+
const toolName = (_b = (_a = choice === null || choice === void 0 ? void 0 : choice.function) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.trim();
|
|
156
|
+
return toolName ? { type: "tool", name: toolName } : undefined;
|
|
157
|
+
}
|
|
158
|
+
function mapStopReason(reason) {
|
|
159
|
+
switch (reason) {
|
|
160
|
+
case "length":
|
|
161
|
+
return "length";
|
|
162
|
+
case "toolUse":
|
|
163
|
+
return "tool_calls";
|
|
164
|
+
default:
|
|
165
|
+
return "stop";
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
function createChunk(requestModel, created, chunkId, choices, extra) {
|
|
169
|
+
return Object.assign({ id: chunkId, object: "chat.completion.chunk", created, model: requestModel, choices }, extra);
|
|
170
|
+
}
|
|
171
|
+
function createSseStream(requestModel, stream, includeUsage) {
|
|
172
|
+
const encoder = new TextEncoder();
|
|
173
|
+
const created = Math.floor(Date.now() / 1000);
|
|
174
|
+
const chunkId = `chatcmpl-${crypto.randomUUID().replace(/-/g, "")}`;
|
|
175
|
+
const toolIndexes = new Map();
|
|
176
|
+
let nextToolIndex = 0;
|
|
177
|
+
return new ReadableStream({
|
|
178
|
+
async start(controller) {
|
|
179
|
+
var _a, e_1, _b, _c;
|
|
180
|
+
var _d, _e, _f, _g, _h;
|
|
181
|
+
const writeData = (payload) => {
|
|
182
|
+
controller.enqueue(encoder.encode(`data: ${JSON.stringify(payload)}\n\n`));
|
|
183
|
+
};
|
|
184
|
+
writeData(createChunk(requestModel, created, chunkId, [
|
|
185
|
+
{
|
|
186
|
+
index: 0,
|
|
187
|
+
delta: { role: "assistant" },
|
|
188
|
+
finish_reason: null,
|
|
189
|
+
},
|
|
190
|
+
]));
|
|
191
|
+
try {
|
|
192
|
+
try {
|
|
193
|
+
for (var _j = true, stream_1 = __asyncValues(stream), stream_1_1; stream_1_1 = await stream_1.next(), _a = stream_1_1.done, !_a; _j = true) {
|
|
194
|
+
_c = stream_1_1.value;
|
|
195
|
+
_j = false;
|
|
196
|
+
const event = _c;
|
|
197
|
+
if (event.type === "text_delta" && event.delta) {
|
|
198
|
+
writeData(createChunk(requestModel, created, chunkId, [
|
|
199
|
+
{
|
|
200
|
+
index: 0,
|
|
201
|
+
delta: { content: event.delta },
|
|
202
|
+
finish_reason: null,
|
|
203
|
+
},
|
|
204
|
+
]));
|
|
205
|
+
continue;
|
|
206
|
+
}
|
|
207
|
+
if (event.type === "thinking_delta" && event.delta) {
|
|
208
|
+
writeData(createChunk(requestModel, created, chunkId, [
|
|
209
|
+
{
|
|
210
|
+
index: 0,
|
|
211
|
+
delta: { reasoning_content: event.delta },
|
|
212
|
+
finish_reason: null,
|
|
213
|
+
},
|
|
214
|
+
]));
|
|
215
|
+
continue;
|
|
216
|
+
}
|
|
217
|
+
if (event.type === "toolcall_start" &&
|
|
218
|
+
event.contentIndex !== undefined) {
|
|
219
|
+
const toolIndex = nextToolIndex++;
|
|
220
|
+
toolIndexes.set(event.contentIndex, toolIndex);
|
|
221
|
+
writeData(createChunk(requestModel, created, chunkId, [
|
|
222
|
+
{
|
|
223
|
+
index: 0,
|
|
224
|
+
delta: {
|
|
225
|
+
tool_calls: [
|
|
226
|
+
{
|
|
227
|
+
index: toolIndex,
|
|
228
|
+
id: ((_d = event.toolCall) === null || _d === void 0 ? void 0 : _d.id) || "",
|
|
229
|
+
type: "function",
|
|
230
|
+
function: {
|
|
231
|
+
name: ((_e = event.toolCall) === null || _e === void 0 ? void 0 : _e.name) || "",
|
|
232
|
+
arguments: "",
|
|
233
|
+
},
|
|
234
|
+
},
|
|
235
|
+
],
|
|
236
|
+
},
|
|
237
|
+
finish_reason: null,
|
|
238
|
+
},
|
|
239
|
+
]));
|
|
240
|
+
continue;
|
|
241
|
+
}
|
|
242
|
+
if (event.type === "toolcall_delta" &&
|
|
243
|
+
event.contentIndex !== undefined) {
|
|
244
|
+
const toolIndex = (_f = toolIndexes.get(event.contentIndex)) !== null && _f !== void 0 ? _f : 0;
|
|
245
|
+
writeData(createChunk(requestModel, created, chunkId, [
|
|
246
|
+
{
|
|
247
|
+
index: 0,
|
|
248
|
+
delta: {
|
|
249
|
+
tool_calls: [
|
|
250
|
+
{
|
|
251
|
+
index: toolIndex,
|
|
252
|
+
function: {
|
|
253
|
+
arguments: event.delta || "",
|
|
254
|
+
},
|
|
255
|
+
},
|
|
256
|
+
],
|
|
257
|
+
},
|
|
258
|
+
finish_reason: null,
|
|
259
|
+
},
|
|
260
|
+
]));
|
|
261
|
+
continue;
|
|
262
|
+
}
|
|
263
|
+
if (event.type === "done") {
|
|
264
|
+
writeData(createChunk(requestModel, created, chunkId, [
|
|
265
|
+
{
|
|
266
|
+
index: 0,
|
|
267
|
+
delta: {},
|
|
268
|
+
finish_reason: mapStopReason(event.reason),
|
|
269
|
+
},
|
|
270
|
+
]));
|
|
271
|
+
if (includeUsage) {
|
|
272
|
+
const usage = ((_g = event.message) === null || _g === void 0 ? void 0 : _g.usage) || {};
|
|
273
|
+
const promptTokens = (usage.input || 0) + (usage.cacheRead || 0);
|
|
274
|
+
const completionTokens = usage.output || 0;
|
|
275
|
+
writeData(createChunk(requestModel, created, chunkId, [], {
|
|
276
|
+
usage: {
|
|
277
|
+
prompt_tokens: promptTokens,
|
|
278
|
+
completion_tokens: completionTokens,
|
|
279
|
+
total_tokens: usage.totalTokens || promptTokens + completionTokens,
|
|
280
|
+
prompt_tokens_details: {
|
|
281
|
+
cached_tokens: usage.cacheRead || 0,
|
|
282
|
+
},
|
|
283
|
+
},
|
|
284
|
+
}));
|
|
285
|
+
}
|
|
286
|
+
controller.enqueue(encoder.encode("data: [DONE]\n\n"));
|
|
287
|
+
controller.close();
|
|
288
|
+
return;
|
|
289
|
+
}
|
|
290
|
+
if (event.type === "error") {
|
|
291
|
+
controller.error(new Error(((_h = event.error) === null || _h === void 0 ? void 0 : _h.errorMessage) || "Bedrock request failed"));
|
|
292
|
+
return;
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
297
|
+
finally {
|
|
298
|
+
try {
|
|
299
|
+
if (!_j && !_a && (_b = stream_1.return)) await _b.call(stream_1);
|
|
300
|
+
}
|
|
301
|
+
finally { if (e_1) throw e_1.error; }
|
|
302
|
+
}
|
|
303
|
+
writeData(createChunk(requestModel, created, chunkId, [
|
|
304
|
+
{
|
|
305
|
+
index: 0,
|
|
306
|
+
delta: {},
|
|
307
|
+
finish_reason: "stop",
|
|
308
|
+
},
|
|
309
|
+
]));
|
|
310
|
+
controller.enqueue(encoder.encode("data: [DONE]\n\n"));
|
|
311
|
+
controller.close();
|
|
312
|
+
}
|
|
313
|
+
catch (error) {
|
|
314
|
+
controller.error(error);
|
|
315
|
+
}
|
|
316
|
+
},
|
|
317
|
+
});
|
|
318
|
+
}
|
|
319
|
+
class BedrockOpenAIService {
|
|
320
|
+
constructor(options = {}) {
|
|
321
|
+
this.app = new hono_1.Hono();
|
|
322
|
+
this.modelCatalog = options.modelCatalog || new bedrock_model_catalog_1.BedrockModelCatalog();
|
|
323
|
+
this.modelResolver = options.modelResolver || pi_ai_1.getModel;
|
|
324
|
+
this.bedrockStreamer = options.bedrockStreamer || amazon_bedrock_js_1.streamBedrock;
|
|
325
|
+
this.setupRoutes();
|
|
326
|
+
}
|
|
327
|
+
getApp() {
|
|
328
|
+
return this.app;
|
|
329
|
+
}
|
|
330
|
+
setupRoutes() {
|
|
331
|
+
this.app.get("/health", (c) => c.json({
|
|
332
|
+
service: "bedrock-openai-service",
|
|
333
|
+
status: "enabled",
|
|
334
|
+
region: (0, bedrock_model_catalog_1.resolveAwsRegion)() || null,
|
|
335
|
+
}));
|
|
336
|
+
this.app.get("/openai/a/:agentId/v1/models", async (c) => {
|
|
337
|
+
const models = await this.modelCatalog.listModelOptions();
|
|
338
|
+
return c.json({
|
|
339
|
+
object: "list",
|
|
340
|
+
data: models.map((model) => ({
|
|
341
|
+
id: model.id,
|
|
342
|
+
object: "model",
|
|
343
|
+
created: 0,
|
|
344
|
+
owned_by: "amazon-bedrock",
|
|
345
|
+
})),
|
|
346
|
+
});
|
|
347
|
+
});
|
|
348
|
+
this.app.post("/openai/a/:agentId/v1/chat/completions", async (c) => this.handleChatCompletions(c));
|
|
349
|
+
}
|
|
350
|
+
async resolveRuntimeModel(requestedModel) {
|
|
351
|
+
const staticModel = this.modelResolver("amazon-bedrock", requestedModel);
|
|
352
|
+
if (staticModel)
|
|
353
|
+
return staticModel;
|
|
354
|
+
const discoveredModel = await this.modelCatalog.getModel(requestedModel);
|
|
355
|
+
return (0, bedrock_model_catalog_1.buildDynamicBedrockModel)(requestedModel, discoveredModel);
|
|
356
|
+
}
|
|
357
|
+
async handleChatCompletions(c) {
|
|
358
|
+
var _a, _b, _c;
|
|
359
|
+
const request = (await c.req
|
|
360
|
+
.json()
|
|
361
|
+
.catch(() => null));
|
|
362
|
+
if (!(request === null || request === void 0 ? void 0 : request.model)) {
|
|
363
|
+
return c.json({
|
|
364
|
+
error: {
|
|
365
|
+
type: "invalid_request_error",
|
|
366
|
+
message: "Missing required field: model",
|
|
367
|
+
},
|
|
368
|
+
}, 400);
|
|
369
|
+
}
|
|
370
|
+
if (request.stream === false) {
|
|
371
|
+
return c.json({
|
|
372
|
+
error: {
|
|
373
|
+
type: "invalid_request_error",
|
|
374
|
+
message: "Only stream=true is supported for Amazon Bedrock",
|
|
375
|
+
},
|
|
376
|
+
}, 400);
|
|
377
|
+
}
|
|
378
|
+
const region = (0, bedrock_model_catalog_1.resolveAwsRegion)();
|
|
379
|
+
if (!region) {
|
|
380
|
+
return c.json({
|
|
381
|
+
error: {
|
|
382
|
+
type: "invalid_request_error",
|
|
383
|
+
message: "AWS region is not configured on the gateway",
|
|
384
|
+
},
|
|
385
|
+
}, 503);
|
|
386
|
+
}
|
|
387
|
+
const runtimeModel = await this.resolveRuntimeModel(request.model);
|
|
388
|
+
const context = buildBedrockContext(request);
|
|
389
|
+
const stopSequences = Array.isArray(request.stop)
|
|
390
|
+
? request.stop
|
|
391
|
+
: typeof request.stop === "string"
|
|
392
|
+
? [request.stop]
|
|
393
|
+
: [];
|
|
394
|
+
const toolChoice = mapToolChoice(request.tool_choice);
|
|
395
|
+
logger.info({
|
|
396
|
+
modelId: request.model,
|
|
397
|
+
region,
|
|
398
|
+
toolCount: ((_a = context.tools) === null || _a === void 0 ? void 0 : _a.length) || 0,
|
|
399
|
+
}, "Proxying OpenAI-style Bedrock request");
|
|
400
|
+
const stream = this.bedrockStreamer(runtimeModel, context, Object.assign(Object.assign({ signal: c.req.raw.signal, region, maxTokens: (_b = request.max_completion_tokens) !== null && _b !== void 0 ? _b : request.max_tokens, temperature: request.temperature }, (stopSequences.length > 0 ? { stopSequences } : {})), (toolChoice ? { toolChoice } : {})));
|
|
401
|
+
return new Response(createSseStream(request.model, stream, ((_c = request.stream_options) === null || _c === void 0 ? void 0 : _c.include_usage) === true), {
|
|
402
|
+
headers: {
|
|
403
|
+
"Content-Type": "text/event-stream; charset=utf-8",
|
|
404
|
+
"Cache-Control": "no-cache, no-transform",
|
|
405
|
+
Connection: "keep-alive",
|
|
406
|
+
"X-Accel-Buffering": "no",
|
|
407
|
+
},
|
|
408
|
+
});
|
|
409
|
+
}
|
|
410
|
+
}
|
|
411
|
+
exports.BedrockOpenAIService = BedrockOpenAIService;
|
|
412
|
+
//# sourceMappingURL=bedrock-openai-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bedrock-openai-service.js","sourceRoot":"","sources":["../../src/services/bedrock-openai-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ import { ScheduledWakeupService } from "../orchestration/scheduled-wakeup";
|
|
|
20
20
|
import { GrantStore } from "../permissions/grant-store";
|
|
21
21
|
import { SecretProxy } from "../proxy/secret-proxy";
|
|
22
22
|
import { ImageGenerationService } from "./image-generation-service";
|
|
23
|
+
import { BedrockOpenAIService } from "./bedrock-openai-service";
|
|
23
24
|
import { InstructionService } from "./instruction-service";
|
|
24
25
|
import { SessionManager } from "./session-manager";
|
|
25
26
|
import { SettingsResolver } from "./settings-resolver";
|
|
@@ -51,6 +52,7 @@ export declare class CoreServices {
|
|
|
51
52
|
private channelBindingService?;
|
|
52
53
|
private transcriptionService?;
|
|
53
54
|
private imageGenerationService?;
|
|
55
|
+
private bedrockOpenAIService?;
|
|
54
56
|
private userAgentsStore?;
|
|
55
57
|
private agentMetadataStore?;
|
|
56
58
|
private externalAuthClient?;
|
|
@@ -120,6 +122,7 @@ export declare class CoreServices {
|
|
|
120
122
|
getScheduledWakeupService(): ScheduledWakeupService | undefined;
|
|
121
123
|
getTranscriptionService(): TranscriptionService | undefined;
|
|
122
124
|
getImageGenerationService(): ImageGenerationService | undefined;
|
|
125
|
+
getBedrockOpenAIService(): BedrockOpenAIService | undefined;
|
|
123
126
|
getUserAgentsStore(): UserAgentsStore;
|
|
124
127
|
getAgentMetadataStore(): AgentMetadataStore;
|
|
125
128
|
getCommandRegistry(): CommandRegistry;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-services.d.ts","sourceRoot":"","sources":["../../src/services/core-services.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EACzB,eAAe,EAGf,KAAK,gBAAgB,EACtB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"core-services.d.ts","sourceRoot":"","sources":["../../src/services/core-services.ts"],"names":[],"mappings":"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"}
|