@lobu/gateway 3.0.8 → 3.0.12
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/api/platform.d.ts.map +1 -1
- package/dist/api/platform.js +8 -26
- package/dist/api/platform.js.map +1 -1
- package/dist/auth/mcp/proxy.d.ts +14 -0
- package/dist/auth/mcp/proxy.d.ts.map +1 -1
- package/dist/auth/mcp/proxy.js +149 -13
- package/dist/auth/mcp/proxy.js.map +1 -1
- package/dist/cli/gateway.d.ts.map +1 -1
- package/dist/cli/gateway.js +29 -0
- package/dist/cli/gateway.js.map +1 -1
- package/dist/cli/index.js +2 -2
- package/dist/cli/index.js.map +1 -1
- package/dist/connections/chat-instance-manager.d.ts.map +1 -1
- package/dist/connections/chat-instance-manager.js +2 -1
- package/dist/connections/chat-instance-manager.js.map +1 -1
- package/dist/connections/interaction-bridge.d.ts +9 -2
- package/dist/connections/interaction-bridge.d.ts.map +1 -1
- package/dist/connections/interaction-bridge.js +132 -230
- package/dist/connections/interaction-bridge.js.map +1 -1
- package/dist/connections/message-handler-bridge.d.ts.map +1 -1
- package/dist/connections/message-handler-bridge.js +44 -26
- package/dist/connections/message-handler-bridge.js.map +1 -1
- package/dist/interactions.d.ts +9 -43
- package/dist/interactions.d.ts.map +1 -1
- package/dist/interactions.js +10 -52
- package/dist/interactions.js.map +1 -1
- package/dist/orchestration/base-deployment-manager.js +7 -7
- package/dist/orchestration/base-deployment-manager.js.map +1 -1
- package/dist/platform/unified-thread-consumer.d.ts.map +1 -1
- package/dist/platform/unified-thread-consumer.js +38 -34
- package/dist/platform/unified-thread-consumer.js.map +1 -1
- package/dist/routes/public/agent.d.ts +4 -0
- package/dist/routes/public/agent.d.ts.map +1 -1
- package/dist/routes/public/agent.js +21 -0
- package/dist/routes/public/agent.js.map +1 -1
- package/dist/services/core-services.d.ts.map +1 -1
- package/dist/services/core-services.js +4 -0
- package/dist/services/core-services.js.map +1 -1
- package/package.json +2 -2
- package/src/__tests__/agent-config-routes.test.ts +0 -254
- package/src/__tests__/agent-history-routes.test.ts +0 -72
- package/src/__tests__/agent-routes.test.ts +0 -68
- package/src/__tests__/agent-schedules-routes.test.ts +0 -59
- package/src/__tests__/agent-settings-store.test.ts +0 -323
- package/src/__tests__/bedrock-model-catalog.test.ts +0 -40
- package/src/__tests__/bedrock-openai-service.test.ts +0 -157
- package/src/__tests__/bedrock-provider-module.test.ts +0 -56
- package/src/__tests__/chat-instance-manager-slack.test.ts +0 -204
- package/src/__tests__/chat-response-bridge.test.ts +0 -131
- package/src/__tests__/config-memory-plugins.test.ts +0 -92
- package/src/__tests__/config-request-store.test.ts +0 -127
- package/src/__tests__/connection-routes.test.ts +0 -144
- package/src/__tests__/core-services-store-selection.test.ts +0 -92
- package/src/__tests__/docker-deployment.test.ts +0 -1211
- package/src/__tests__/embedded-deployment.test.ts +0 -342
- package/src/__tests__/grant-store.test.ts +0 -148
- package/src/__tests__/http-proxy.test.ts +0 -281
- package/src/__tests__/instruction-service.test.ts +0 -37
- package/src/__tests__/link-buttons.test.ts +0 -112
- package/src/__tests__/lobu.test.ts +0 -32
- package/src/__tests__/mcp-config-service.test.ts +0 -347
- package/src/__tests__/mcp-proxy.test.ts +0 -694
- package/src/__tests__/message-handler-bridge.test.ts +0 -17
- package/src/__tests__/model-selection.test.ts +0 -172
- package/src/__tests__/oauth-templates.test.ts +0 -39
- package/src/__tests__/platform-adapter-slack-send.test.ts +0 -114
- package/src/__tests__/platform-helpers-model-resolution.test.ts +0 -253
- package/src/__tests__/provider-inheritance.test.ts +0 -212
- package/src/__tests__/routes/cli-auth.test.ts +0 -337
- package/src/__tests__/routes/interactions.test.ts +0 -121
- package/src/__tests__/secret-proxy.test.ts +0 -85
- package/src/__tests__/session-manager.test.ts +0 -572
- package/src/__tests__/setup.ts +0 -133
- package/src/__tests__/skill-and-mcp-registry.test.ts +0 -203
- package/src/__tests__/slack-routes.test.ts +0 -161
- package/src/__tests__/system-config-resolver.test.ts +0 -75
- package/src/__tests__/system-message-limiter.test.ts +0 -89
- package/src/__tests__/system-skills-service.test.ts +0 -362
- package/src/__tests__/transcription-service.test.ts +0 -222
- package/src/__tests__/utils/rate-limiter.test.ts +0 -102
- package/src/__tests__/worker-connection-manager.test.ts +0 -497
- package/src/__tests__/worker-job-router.test.ts +0 -722
- package/src/api/index.ts +0 -1
- package/src/api/platform.ts +0 -292
- package/src/api/response-renderer.ts +0 -157
- package/src/auth/agent-metadata-store.ts +0 -168
- package/src/auth/api-auth-middleware.ts +0 -69
- package/src/auth/api-key-provider-module.ts +0 -213
- package/src/auth/base-provider-module.ts +0 -201
- package/src/auth/bedrock/provider-module.ts +0 -110
- package/src/auth/chatgpt/chatgpt-oauth-module.ts +0 -185
- package/src/auth/chatgpt/device-code-client.ts +0 -218
- package/src/auth/chatgpt/index.ts +0 -1
- package/src/auth/claude/oauth-module.ts +0 -280
- package/src/auth/cli/token-service.ts +0 -249
- package/src/auth/external/client.ts +0 -560
- package/src/auth/external/device-code-client.ts +0 -235
- package/src/auth/mcp/config-service.ts +0 -420
- package/src/auth/mcp/proxy.ts +0 -1086
- package/src/auth/mcp/string-substitution.ts +0 -17
- package/src/auth/mcp/tool-cache.ts +0 -90
- package/src/auth/oauth/base-client.ts +0 -267
- package/src/auth/oauth/client.ts +0 -153
- package/src/auth/oauth/credentials.ts +0 -7
- package/src/auth/oauth/providers.ts +0 -69
- package/src/auth/oauth/state-store.ts +0 -150
- package/src/auth/oauth-templates.ts +0 -179
- package/src/auth/provider-catalog.ts +0 -220
- package/src/auth/provider-model-options.ts +0 -41
- package/src/auth/settings/agent-settings-store.ts +0 -565
- package/src/auth/settings/auth-profiles-manager.ts +0 -216
- package/src/auth/settings/index.ts +0 -12
- package/src/auth/settings/model-preference-store.ts +0 -52
- package/src/auth/settings/model-selection.ts +0 -135
- package/src/auth/settings/resolved-settings-view.ts +0 -298
- package/src/auth/settings/template-utils.ts +0 -44
- package/src/auth/settings/token-service.ts +0 -88
- package/src/auth/system-env-store.ts +0 -98
- package/src/auth/user-agents-store.ts +0 -68
- package/src/channels/binding-service.ts +0 -214
- package/src/channels/index.ts +0 -4
- package/src/cli/gateway.ts +0 -1312
- package/src/cli/index.ts +0 -74
- package/src/commands/built-in-commands.ts +0 -80
- package/src/commands/command-dispatcher.ts +0 -94
- package/src/commands/command-reply-adapters.ts +0 -27
- package/src/config/file-loader.ts +0 -618
- package/src/config/index.ts +0 -588
- package/src/config/network-allowlist.ts +0 -71
- package/src/connections/chat-instance-manager.ts +0 -1284
- package/src/connections/chat-response-bridge.ts +0 -618
- package/src/connections/index.ts +0 -7
- package/src/connections/interaction-bridge.ts +0 -831
- package/src/connections/message-handler-bridge.ts +0 -415
- package/src/connections/platform-auth-methods.ts +0 -15
- package/src/connections/types.ts +0 -84
- package/src/gateway/connection-manager.ts +0 -291
- package/src/gateway/index.ts +0 -698
- package/src/gateway/job-router.ts +0 -201
- package/src/gateway-main.ts +0 -200
- package/src/index.ts +0 -41
- package/src/infrastructure/queue/index.ts +0 -12
- package/src/infrastructure/queue/queue-producer.ts +0 -148
- package/src/infrastructure/queue/redis-queue.ts +0 -361
- package/src/infrastructure/queue/types.ts +0 -133
- package/src/infrastructure/redis/system-message-limiter.ts +0 -94
- package/src/interactions/config-request-store.ts +0 -198
- package/src/interactions.ts +0 -363
- package/src/lobu.ts +0 -311
- package/src/metrics/prometheus.ts +0 -159
- package/src/modules/module-system.ts +0 -179
- package/src/orchestration/base-deployment-manager.ts +0 -900
- package/src/orchestration/deployment-utils.ts +0 -98
- package/src/orchestration/impl/docker-deployment.ts +0 -620
- package/src/orchestration/impl/embedded-deployment.ts +0 -268
- package/src/orchestration/impl/index.ts +0 -8
- package/src/orchestration/impl/k8s/deployment.ts +0 -1061
- package/src/orchestration/impl/k8s/helpers.ts +0 -610
- package/src/orchestration/impl/k8s/index.ts +0 -1
- package/src/orchestration/index.ts +0 -333
- package/src/orchestration/message-consumer.ts +0 -584
- package/src/orchestration/scheduled-wakeup.ts +0 -704
- package/src/permissions/approval-policy.ts +0 -36
- package/src/permissions/grant-store.ts +0 -219
- package/src/platform/file-handler.ts +0 -66
- package/src/platform/link-buttons.ts +0 -57
- package/src/platform/renderer-utils.ts +0 -44
- package/src/platform/response-renderer.ts +0 -84
- package/src/platform/unified-thread-consumer.ts +0 -187
- package/src/platform.ts +0 -318
- package/src/proxy/http-proxy.ts +0 -752
- package/src/proxy/proxy-manager.ts +0 -81
- package/src/proxy/secret-proxy.ts +0 -402
- package/src/proxy/token-refresh-job.ts +0 -143
- package/src/routes/internal/audio.ts +0 -141
- package/src/routes/internal/device-auth.ts +0 -652
- package/src/routes/internal/files.ts +0 -226
- package/src/routes/internal/history.ts +0 -69
- package/src/routes/internal/images.ts +0 -127
- package/src/routes/internal/interactions.ts +0 -84
- package/src/routes/internal/middleware.ts +0 -23
- package/src/routes/internal/schedule.ts +0 -226
- package/src/routes/internal/types.ts +0 -22
- package/src/routes/openapi-auto.ts +0 -239
- package/src/routes/public/agent-access.ts +0 -23
- package/src/routes/public/agent-config.ts +0 -675
- package/src/routes/public/agent-history.ts +0 -422
- package/src/routes/public/agent-schedules.ts +0 -296
- package/src/routes/public/agent.ts +0 -1086
- package/src/routes/public/agents.ts +0 -373
- package/src/routes/public/channels.ts +0 -191
- package/src/routes/public/cli-auth.ts +0 -896
- package/src/routes/public/connections.ts +0 -574
- package/src/routes/public/landing.ts +0 -16
- package/src/routes/public/oauth.ts +0 -147
- package/src/routes/public/settings-auth.ts +0 -104
- package/src/routes/public/slack.ts +0 -173
- package/src/routes/shared/agent-ownership.ts +0 -101
- package/src/routes/shared/token-verifier.ts +0 -34
- package/src/services/bedrock-model-catalog.ts +0 -217
- package/src/services/bedrock-openai-service.ts +0 -658
- package/src/services/core-services.ts +0 -1072
- package/src/services/image-generation-service.ts +0 -257
- package/src/services/instruction-service.ts +0 -318
- package/src/services/mcp-registry.ts +0 -94
- package/src/services/platform-helpers.ts +0 -287
- package/src/services/session-manager.ts +0 -262
- package/src/services/settings-resolver.ts +0 -74
- package/src/services/system-config-resolver.ts +0 -89
- package/src/services/system-skills-service.ts +0 -229
- package/src/services/transcription-service.ts +0 -684
- package/src/session.ts +0 -110
- package/src/spaces/index.ts +0 -1
- package/src/spaces/space-resolver.ts +0 -17
- package/src/stores/in-memory-agent-store.ts +0 -403
- package/src/stores/redis-agent-store.ts +0 -279
- package/src/utils/public-url.ts +0 -44
- package/src/utils/rate-limiter.ts +0 -94
- package/tsconfig.json +0 -33
|
@@ -1,658 +0,0 @@
|
|
|
1
|
-
import { getModel } from "@mariozechner/pi-ai";
|
|
2
|
-
import { streamBedrock } from "@mariozechner/pi-ai/dist/providers/amazon-bedrock.js";
|
|
3
|
-
import type { Model } from "@mariozechner/pi-ai/dist/types.js";
|
|
4
|
-
import type { Context } from "hono";
|
|
5
|
-
import { Hono } from "hono";
|
|
6
|
-
import { createLogger } from "@lobu/core";
|
|
7
|
-
import {
|
|
8
|
-
BedrockModelCatalog,
|
|
9
|
-
buildDynamicBedrockModel,
|
|
10
|
-
resolveAwsRegion,
|
|
11
|
-
} from "./bedrock-model-catalog";
|
|
12
|
-
|
|
13
|
-
const logger = createLogger("bedrock-openai-service");
|
|
14
|
-
|
|
15
|
-
type BedrockStreamEvent = {
|
|
16
|
-
type: string;
|
|
17
|
-
contentIndex?: number;
|
|
18
|
-
delta?: string;
|
|
19
|
-
toolCall?: { id: string; name: string };
|
|
20
|
-
reason?: string;
|
|
21
|
-
message?: {
|
|
22
|
-
usage?: {
|
|
23
|
-
input?: number;
|
|
24
|
-
output?: number;
|
|
25
|
-
cacheRead?: number;
|
|
26
|
-
cacheWrite?: number;
|
|
27
|
-
totalTokens?: number;
|
|
28
|
-
};
|
|
29
|
-
};
|
|
30
|
-
error?: { errorMessage?: string };
|
|
31
|
-
};
|
|
32
|
-
|
|
33
|
-
interface OpenAITextPart {
|
|
34
|
-
type: "text";
|
|
35
|
-
text: string;
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
interface OpenAIImagePart {
|
|
39
|
-
type: "image_url";
|
|
40
|
-
image_url?: {
|
|
41
|
-
url?: string;
|
|
42
|
-
};
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
type OpenAIMessageContent = string | Array<OpenAITextPart | OpenAIImagePart>;
|
|
46
|
-
|
|
47
|
-
interface OpenAIChatMessage {
|
|
48
|
-
role: "system" | "developer" | "user" | "assistant" | "tool";
|
|
49
|
-
content?: OpenAIMessageContent | null;
|
|
50
|
-
tool_call_id?: string;
|
|
51
|
-
tool_calls?: Array<{
|
|
52
|
-
id?: string;
|
|
53
|
-
type?: "function";
|
|
54
|
-
function?: {
|
|
55
|
-
name?: string;
|
|
56
|
-
arguments?: string;
|
|
57
|
-
};
|
|
58
|
-
}>;
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
interface OpenAIChatTool {
|
|
62
|
-
type?: "function";
|
|
63
|
-
function?: {
|
|
64
|
-
name?: string;
|
|
65
|
-
description?: string;
|
|
66
|
-
parameters?: Record<string, unknown>;
|
|
67
|
-
};
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
interface OpenAIChatCompletionRequest {
|
|
71
|
-
model: string;
|
|
72
|
-
messages: OpenAIChatMessage[];
|
|
73
|
-
tools?: OpenAIChatTool[];
|
|
74
|
-
tool_choice?:
|
|
75
|
-
| "none"
|
|
76
|
-
| "auto"
|
|
77
|
-
| "required"
|
|
78
|
-
| {
|
|
79
|
-
type?: "function";
|
|
80
|
-
function?: {
|
|
81
|
-
name?: string;
|
|
82
|
-
};
|
|
83
|
-
};
|
|
84
|
-
max_tokens?: number;
|
|
85
|
-
max_completion_tokens?: number;
|
|
86
|
-
temperature?: number;
|
|
87
|
-
stop?: string | string[];
|
|
88
|
-
stream?: boolean;
|
|
89
|
-
stream_options?: {
|
|
90
|
-
include_usage?: boolean;
|
|
91
|
-
};
|
|
92
|
-
}
|
|
93
|
-
|
|
94
|
-
type PiMessage =
|
|
95
|
-
| {
|
|
96
|
-
role: "user";
|
|
97
|
-
content: Array<
|
|
98
|
-
| { type: "text"; text: string }
|
|
99
|
-
| { type: "image"; mimeType: string; data: string }
|
|
100
|
-
>;
|
|
101
|
-
}
|
|
102
|
-
| {
|
|
103
|
-
role: "assistant";
|
|
104
|
-
content: Array<
|
|
105
|
-
| { type: "text"; text: string }
|
|
106
|
-
| {
|
|
107
|
-
type: "toolCall";
|
|
108
|
-
id: string;
|
|
109
|
-
name: string;
|
|
110
|
-
arguments: Record<string, unknown>;
|
|
111
|
-
}
|
|
112
|
-
>;
|
|
113
|
-
}
|
|
114
|
-
| {
|
|
115
|
-
role: "toolResult";
|
|
116
|
-
toolCallId: string;
|
|
117
|
-
content: Array<
|
|
118
|
-
| { type: "text"; text: string }
|
|
119
|
-
| { type: "image"; mimeType: string; data: string }
|
|
120
|
-
>;
|
|
121
|
-
isError?: boolean;
|
|
122
|
-
};
|
|
123
|
-
|
|
124
|
-
interface BedrockContextPayload {
|
|
125
|
-
messages: PiMessage[];
|
|
126
|
-
systemPrompt?: string;
|
|
127
|
-
tools?: Array<{
|
|
128
|
-
name: string;
|
|
129
|
-
description?: string;
|
|
130
|
-
parameters: Record<string, unknown>;
|
|
131
|
-
}>;
|
|
132
|
-
}
|
|
133
|
-
|
|
134
|
-
type ModelResolver = typeof getModel;
|
|
135
|
-
type BedrockStreamer = typeof streamBedrock;
|
|
136
|
-
|
|
137
|
-
function parseDataUrl(url?: string): { mimeType: string; data: string } | null {
|
|
138
|
-
if (!url) return null;
|
|
139
|
-
const match = url.match(/^data:([^;,]+);base64,(.+)$/);
|
|
140
|
-
if (!match) return null;
|
|
141
|
-
return {
|
|
142
|
-
mimeType: match[1]!,
|
|
143
|
-
data: match[2]!,
|
|
144
|
-
};
|
|
145
|
-
}
|
|
146
|
-
|
|
147
|
-
function normalizeMessageContent(
|
|
148
|
-
content: OpenAIMessageContent | null | undefined
|
|
149
|
-
): Array<OpenAITextPart | OpenAIImagePart> {
|
|
150
|
-
if (typeof content === "string") {
|
|
151
|
-
return content.length > 0 ? [{ type: "text", text: content }] : [];
|
|
152
|
-
}
|
|
153
|
-
return Array.isArray(content) ? content : [];
|
|
154
|
-
}
|
|
155
|
-
|
|
156
|
-
function parseToolArguments(raw?: string): Record<string, unknown> {
|
|
157
|
-
if (!raw?.trim()) return {};
|
|
158
|
-
try {
|
|
159
|
-
const parsed = JSON.parse(raw);
|
|
160
|
-
return parsed && typeof parsed === "object" ? parsed : {};
|
|
161
|
-
} catch {
|
|
162
|
-
return {};
|
|
163
|
-
}
|
|
164
|
-
}
|
|
165
|
-
|
|
166
|
-
export function buildBedrockContext(
|
|
167
|
-
request: OpenAIChatCompletionRequest
|
|
168
|
-
): BedrockContextPayload {
|
|
169
|
-
const messages: PiMessage[] = [];
|
|
170
|
-
const systemPrompts: string[] = [];
|
|
171
|
-
|
|
172
|
-
for (const message of request.messages || []) {
|
|
173
|
-
if (message.role === "system" || message.role === "developer") {
|
|
174
|
-
const text = normalizeMessageContent(message.content)
|
|
175
|
-
.filter((part): part is OpenAITextPart => part.type === "text")
|
|
176
|
-
.map((part) => part.text)
|
|
177
|
-
.join("\n")
|
|
178
|
-
.trim();
|
|
179
|
-
if (text) systemPrompts.push(text);
|
|
180
|
-
continue;
|
|
181
|
-
}
|
|
182
|
-
|
|
183
|
-
if (message.role === "tool") {
|
|
184
|
-
if (!message.tool_call_id) continue;
|
|
185
|
-
const content = normalizeMessageContent(message.content)
|
|
186
|
-
.map((part) => {
|
|
187
|
-
if (part.type === "text") {
|
|
188
|
-
return { type: "text" as const, text: part.text };
|
|
189
|
-
}
|
|
190
|
-
const image = parseDataUrl(part.image_url?.url);
|
|
191
|
-
return image
|
|
192
|
-
? {
|
|
193
|
-
type: "image" as const,
|
|
194
|
-
mimeType: image.mimeType,
|
|
195
|
-
data: image.data,
|
|
196
|
-
}
|
|
197
|
-
: null;
|
|
198
|
-
})
|
|
199
|
-
.filter(
|
|
200
|
-
(
|
|
201
|
-
part
|
|
202
|
-
): part is
|
|
203
|
-
| { type: "text"; text: string }
|
|
204
|
-
| { type: "image"; mimeType: string; data: string } => Boolean(part)
|
|
205
|
-
);
|
|
206
|
-
|
|
207
|
-
messages.push({
|
|
208
|
-
role: "toolResult",
|
|
209
|
-
toolCallId: message.tool_call_id,
|
|
210
|
-
content: content.length > 0 ? content : [{ type: "text", text: "" }],
|
|
211
|
-
});
|
|
212
|
-
continue;
|
|
213
|
-
}
|
|
214
|
-
|
|
215
|
-
if (message.role === "assistant") {
|
|
216
|
-
const content = normalizeMessageContent(message.content)
|
|
217
|
-
.filter((part): part is OpenAITextPart => part.type === "text")
|
|
218
|
-
.map((part) => ({ type: "text" as const, text: part.text }));
|
|
219
|
-
|
|
220
|
-
const toolCalls = (message.tool_calls || []).map((toolCall) => ({
|
|
221
|
-
type: "toolCall" as const,
|
|
222
|
-
id: toolCall.id || crypto.randomUUID(),
|
|
223
|
-
name: toolCall.function?.name || "",
|
|
224
|
-
arguments: parseToolArguments(toolCall.function?.arguments),
|
|
225
|
-
}));
|
|
226
|
-
|
|
227
|
-
const assistantContent = [...content, ...toolCalls];
|
|
228
|
-
if (assistantContent.length > 0) {
|
|
229
|
-
messages.push({
|
|
230
|
-
role: "assistant",
|
|
231
|
-
content: assistantContent,
|
|
232
|
-
});
|
|
233
|
-
}
|
|
234
|
-
continue;
|
|
235
|
-
}
|
|
236
|
-
|
|
237
|
-
const content = normalizeMessageContent(message.content)
|
|
238
|
-
.map((part) => {
|
|
239
|
-
if (part.type === "text") {
|
|
240
|
-
return { type: "text" as const, text: part.text };
|
|
241
|
-
}
|
|
242
|
-
const image = parseDataUrl(part.image_url?.url);
|
|
243
|
-
return image
|
|
244
|
-
? {
|
|
245
|
-
type: "image" as const,
|
|
246
|
-
mimeType: image.mimeType,
|
|
247
|
-
data: image.data,
|
|
248
|
-
}
|
|
249
|
-
: null;
|
|
250
|
-
})
|
|
251
|
-
.filter(
|
|
252
|
-
(
|
|
253
|
-
part
|
|
254
|
-
): part is
|
|
255
|
-
| { type: "text"; text: string }
|
|
256
|
-
| { type: "image"; mimeType: string; data: string } => Boolean(part)
|
|
257
|
-
);
|
|
258
|
-
|
|
259
|
-
if (content.length > 0) {
|
|
260
|
-
messages.push({
|
|
261
|
-
role: "user",
|
|
262
|
-
content,
|
|
263
|
-
});
|
|
264
|
-
}
|
|
265
|
-
}
|
|
266
|
-
|
|
267
|
-
const tools = (request.tools || [])
|
|
268
|
-
.filter((tool) => tool.type === "function" && tool.function?.name)
|
|
269
|
-
.map((tool) => ({
|
|
270
|
-
name: tool.function!.name!,
|
|
271
|
-
description: tool.function?.description,
|
|
272
|
-
parameters: tool.function?.parameters || {
|
|
273
|
-
type: "object",
|
|
274
|
-
properties: {},
|
|
275
|
-
additionalProperties: true,
|
|
276
|
-
},
|
|
277
|
-
}));
|
|
278
|
-
|
|
279
|
-
return {
|
|
280
|
-
messages,
|
|
281
|
-
...(systemPrompts.length > 0
|
|
282
|
-
? { systemPrompt: systemPrompts.join("\n\n") }
|
|
283
|
-
: {}),
|
|
284
|
-
...(tools.length > 0 ? { tools } : {}),
|
|
285
|
-
};
|
|
286
|
-
}
|
|
287
|
-
|
|
288
|
-
function mapToolChoice(choice: OpenAIChatCompletionRequest["tool_choice"]):
|
|
289
|
-
| "none"
|
|
290
|
-
| "auto"
|
|
291
|
-
| "any"
|
|
292
|
-
| {
|
|
293
|
-
type: "tool";
|
|
294
|
-
name: string;
|
|
295
|
-
}
|
|
296
|
-
| undefined {
|
|
297
|
-
if (choice === "none" || choice === "auto") return choice;
|
|
298
|
-
if (choice === "required") return "any";
|
|
299
|
-
const toolName = choice?.function?.name?.trim();
|
|
300
|
-
return toolName ? { type: "tool", name: toolName } : undefined;
|
|
301
|
-
}
|
|
302
|
-
|
|
303
|
-
function mapStopReason(reason?: string): "stop" | "length" | "tool_calls" {
|
|
304
|
-
switch (reason) {
|
|
305
|
-
case "length":
|
|
306
|
-
return "length";
|
|
307
|
-
case "toolUse":
|
|
308
|
-
return "tool_calls";
|
|
309
|
-
default:
|
|
310
|
-
return "stop";
|
|
311
|
-
}
|
|
312
|
-
}
|
|
313
|
-
|
|
314
|
-
function createChunk(
|
|
315
|
-
requestModel: string,
|
|
316
|
-
created: number,
|
|
317
|
-
chunkId: string,
|
|
318
|
-
choices: unknown[],
|
|
319
|
-
extra?: Record<string, unknown>
|
|
320
|
-
) {
|
|
321
|
-
return {
|
|
322
|
-
id: chunkId,
|
|
323
|
-
object: "chat.completion.chunk",
|
|
324
|
-
created,
|
|
325
|
-
model: requestModel,
|
|
326
|
-
choices,
|
|
327
|
-
...extra,
|
|
328
|
-
};
|
|
329
|
-
}
|
|
330
|
-
|
|
331
|
-
function createSseStream(
|
|
332
|
-
requestModel: string,
|
|
333
|
-
stream: AsyncIterable<BedrockStreamEvent>,
|
|
334
|
-
includeUsage: boolean
|
|
335
|
-
): ReadableStream<Uint8Array> {
|
|
336
|
-
const encoder = new TextEncoder();
|
|
337
|
-
const created = Math.floor(Date.now() / 1000);
|
|
338
|
-
const chunkId = `chatcmpl-${crypto.randomUUID().replace(/-/g, "")}`;
|
|
339
|
-
const toolIndexes = new Map<number, number>();
|
|
340
|
-
let nextToolIndex = 0;
|
|
341
|
-
|
|
342
|
-
return new ReadableStream<Uint8Array>({
|
|
343
|
-
async start(controller) {
|
|
344
|
-
const writeData = (payload: unknown) => {
|
|
345
|
-
controller.enqueue(
|
|
346
|
-
encoder.encode(`data: ${JSON.stringify(payload)}\n\n`)
|
|
347
|
-
);
|
|
348
|
-
};
|
|
349
|
-
|
|
350
|
-
writeData(
|
|
351
|
-
createChunk(requestModel, created, chunkId, [
|
|
352
|
-
{
|
|
353
|
-
index: 0,
|
|
354
|
-
delta: { role: "assistant" },
|
|
355
|
-
finish_reason: null,
|
|
356
|
-
},
|
|
357
|
-
])
|
|
358
|
-
);
|
|
359
|
-
|
|
360
|
-
try {
|
|
361
|
-
for await (const event of stream) {
|
|
362
|
-
if (event.type === "text_delta" && event.delta) {
|
|
363
|
-
writeData(
|
|
364
|
-
createChunk(requestModel, created, chunkId, [
|
|
365
|
-
{
|
|
366
|
-
index: 0,
|
|
367
|
-
delta: { content: event.delta },
|
|
368
|
-
finish_reason: null,
|
|
369
|
-
},
|
|
370
|
-
])
|
|
371
|
-
);
|
|
372
|
-
continue;
|
|
373
|
-
}
|
|
374
|
-
|
|
375
|
-
if (event.type === "thinking_delta" && event.delta) {
|
|
376
|
-
writeData(
|
|
377
|
-
createChunk(requestModel, created, chunkId, [
|
|
378
|
-
{
|
|
379
|
-
index: 0,
|
|
380
|
-
delta: { reasoning_content: event.delta },
|
|
381
|
-
finish_reason: null,
|
|
382
|
-
},
|
|
383
|
-
])
|
|
384
|
-
);
|
|
385
|
-
continue;
|
|
386
|
-
}
|
|
387
|
-
|
|
388
|
-
if (
|
|
389
|
-
event.type === "toolcall_start" &&
|
|
390
|
-
event.contentIndex !== undefined
|
|
391
|
-
) {
|
|
392
|
-
const toolIndex = nextToolIndex++;
|
|
393
|
-
toolIndexes.set(event.contentIndex, toolIndex);
|
|
394
|
-
writeData(
|
|
395
|
-
createChunk(requestModel, created, chunkId, [
|
|
396
|
-
{
|
|
397
|
-
index: 0,
|
|
398
|
-
delta: {
|
|
399
|
-
tool_calls: [
|
|
400
|
-
{
|
|
401
|
-
index: toolIndex,
|
|
402
|
-
id: event.toolCall?.id || "",
|
|
403
|
-
type: "function",
|
|
404
|
-
function: {
|
|
405
|
-
name: event.toolCall?.name || "",
|
|
406
|
-
arguments: "",
|
|
407
|
-
},
|
|
408
|
-
},
|
|
409
|
-
],
|
|
410
|
-
},
|
|
411
|
-
finish_reason: null,
|
|
412
|
-
},
|
|
413
|
-
])
|
|
414
|
-
);
|
|
415
|
-
continue;
|
|
416
|
-
}
|
|
417
|
-
|
|
418
|
-
if (
|
|
419
|
-
event.type === "toolcall_delta" &&
|
|
420
|
-
event.contentIndex !== undefined
|
|
421
|
-
) {
|
|
422
|
-
const toolIndex = toolIndexes.get(event.contentIndex) ?? 0;
|
|
423
|
-
writeData(
|
|
424
|
-
createChunk(requestModel, created, chunkId, [
|
|
425
|
-
{
|
|
426
|
-
index: 0,
|
|
427
|
-
delta: {
|
|
428
|
-
tool_calls: [
|
|
429
|
-
{
|
|
430
|
-
index: toolIndex,
|
|
431
|
-
function: {
|
|
432
|
-
arguments: event.delta || "",
|
|
433
|
-
},
|
|
434
|
-
},
|
|
435
|
-
],
|
|
436
|
-
},
|
|
437
|
-
finish_reason: null,
|
|
438
|
-
},
|
|
439
|
-
])
|
|
440
|
-
);
|
|
441
|
-
continue;
|
|
442
|
-
}
|
|
443
|
-
|
|
444
|
-
if (event.type === "done") {
|
|
445
|
-
writeData(
|
|
446
|
-
createChunk(requestModel, created, chunkId, [
|
|
447
|
-
{
|
|
448
|
-
index: 0,
|
|
449
|
-
delta: {},
|
|
450
|
-
finish_reason: mapStopReason(event.reason),
|
|
451
|
-
},
|
|
452
|
-
])
|
|
453
|
-
);
|
|
454
|
-
|
|
455
|
-
if (includeUsage) {
|
|
456
|
-
const usage = event.message?.usage || {};
|
|
457
|
-
const promptTokens = (usage.input || 0) + (usage.cacheRead || 0);
|
|
458
|
-
const completionTokens = usage.output || 0;
|
|
459
|
-
writeData(
|
|
460
|
-
createChunk(requestModel, created, chunkId, [], {
|
|
461
|
-
usage: {
|
|
462
|
-
prompt_tokens: promptTokens,
|
|
463
|
-
completion_tokens: completionTokens,
|
|
464
|
-
total_tokens:
|
|
465
|
-
usage.totalTokens || promptTokens + completionTokens,
|
|
466
|
-
prompt_tokens_details: {
|
|
467
|
-
cached_tokens: usage.cacheRead || 0,
|
|
468
|
-
},
|
|
469
|
-
},
|
|
470
|
-
})
|
|
471
|
-
);
|
|
472
|
-
}
|
|
473
|
-
|
|
474
|
-
controller.enqueue(encoder.encode("data: [DONE]\n\n"));
|
|
475
|
-
controller.close();
|
|
476
|
-
return;
|
|
477
|
-
}
|
|
478
|
-
|
|
479
|
-
if (event.type === "error") {
|
|
480
|
-
controller.error(
|
|
481
|
-
new Error(event.error?.errorMessage || "Bedrock request failed")
|
|
482
|
-
);
|
|
483
|
-
return;
|
|
484
|
-
}
|
|
485
|
-
}
|
|
486
|
-
|
|
487
|
-
writeData(
|
|
488
|
-
createChunk(requestModel, created, chunkId, [
|
|
489
|
-
{
|
|
490
|
-
index: 0,
|
|
491
|
-
delta: {},
|
|
492
|
-
finish_reason: "stop",
|
|
493
|
-
},
|
|
494
|
-
])
|
|
495
|
-
);
|
|
496
|
-
controller.enqueue(encoder.encode("data: [DONE]\n\n"));
|
|
497
|
-
controller.close();
|
|
498
|
-
} catch (error) {
|
|
499
|
-
controller.error(error);
|
|
500
|
-
}
|
|
501
|
-
},
|
|
502
|
-
});
|
|
503
|
-
}
|
|
504
|
-
|
|
505
|
-
export interface BedrockOpenAIServiceOptions {
|
|
506
|
-
modelCatalog?: BedrockModelCatalog;
|
|
507
|
-
modelResolver?: ModelResolver;
|
|
508
|
-
bedrockStreamer?: BedrockStreamer;
|
|
509
|
-
}
|
|
510
|
-
|
|
511
|
-
export class BedrockOpenAIService {
|
|
512
|
-
private readonly app = new Hono();
|
|
513
|
-
private readonly modelCatalog: BedrockModelCatalog;
|
|
514
|
-
private readonly modelResolver: ModelResolver;
|
|
515
|
-
private readonly bedrockStreamer: BedrockStreamer;
|
|
516
|
-
|
|
517
|
-
constructor(options: BedrockOpenAIServiceOptions = {}) {
|
|
518
|
-
this.modelCatalog = options.modelCatalog || new BedrockModelCatalog();
|
|
519
|
-
this.modelResolver = options.modelResolver || getModel;
|
|
520
|
-
this.bedrockStreamer = options.bedrockStreamer || streamBedrock;
|
|
521
|
-
this.setupRoutes();
|
|
522
|
-
}
|
|
523
|
-
|
|
524
|
-
getApp(): Hono {
|
|
525
|
-
return this.app;
|
|
526
|
-
}
|
|
527
|
-
|
|
528
|
-
private setupRoutes(): void {
|
|
529
|
-
this.app.get("/health", (c) =>
|
|
530
|
-
c.json({
|
|
531
|
-
service: "bedrock-openai-service",
|
|
532
|
-
status: "enabled",
|
|
533
|
-
region: resolveAwsRegion() || null,
|
|
534
|
-
})
|
|
535
|
-
);
|
|
536
|
-
|
|
537
|
-
this.app.get("/openai/a/:agentId/v1/models", async (c) => {
|
|
538
|
-
const models = await this.modelCatalog.listModelOptions();
|
|
539
|
-
return c.json({
|
|
540
|
-
object: "list",
|
|
541
|
-
data: models.map((model) => ({
|
|
542
|
-
id: model.id,
|
|
543
|
-
object: "model",
|
|
544
|
-
created: 0,
|
|
545
|
-
owned_by: "amazon-bedrock",
|
|
546
|
-
})),
|
|
547
|
-
});
|
|
548
|
-
});
|
|
549
|
-
|
|
550
|
-
this.app.post("/openai/a/:agentId/v1/chat/completions", async (c) =>
|
|
551
|
-
this.handleChatCompletions(c)
|
|
552
|
-
);
|
|
553
|
-
}
|
|
554
|
-
|
|
555
|
-
private async resolveRuntimeModel(
|
|
556
|
-
requestedModel: string
|
|
557
|
-
): Promise<Model<"bedrock-converse-stream">> {
|
|
558
|
-
const staticModel = this.modelResolver(
|
|
559
|
-
"amazon-bedrock" as never,
|
|
560
|
-
requestedModel as never
|
|
561
|
-
) as Model<"bedrock-converse-stream"> | undefined;
|
|
562
|
-
|
|
563
|
-
if (staticModel) return staticModel;
|
|
564
|
-
|
|
565
|
-
const discoveredModel = await this.modelCatalog.getModel(requestedModel);
|
|
566
|
-
return buildDynamicBedrockModel(requestedModel, discoveredModel);
|
|
567
|
-
}
|
|
568
|
-
|
|
569
|
-
private async handleChatCompletions(c: Context): Promise<Response> {
|
|
570
|
-
const request = (await c.req
|
|
571
|
-
.json()
|
|
572
|
-
.catch(() => null)) as OpenAIChatCompletionRequest | null;
|
|
573
|
-
|
|
574
|
-
if (!request?.model) {
|
|
575
|
-
return c.json(
|
|
576
|
-
{
|
|
577
|
-
error: {
|
|
578
|
-
type: "invalid_request_error",
|
|
579
|
-
message: "Missing required field: model",
|
|
580
|
-
},
|
|
581
|
-
},
|
|
582
|
-
400
|
|
583
|
-
);
|
|
584
|
-
}
|
|
585
|
-
|
|
586
|
-
if (request.stream === false) {
|
|
587
|
-
return c.json(
|
|
588
|
-
{
|
|
589
|
-
error: {
|
|
590
|
-
type: "invalid_request_error",
|
|
591
|
-
message: "Only stream=true is supported for Amazon Bedrock",
|
|
592
|
-
},
|
|
593
|
-
},
|
|
594
|
-
400
|
|
595
|
-
);
|
|
596
|
-
}
|
|
597
|
-
|
|
598
|
-
const region = resolveAwsRegion();
|
|
599
|
-
if (!region) {
|
|
600
|
-
return c.json(
|
|
601
|
-
{
|
|
602
|
-
error: {
|
|
603
|
-
type: "invalid_request_error",
|
|
604
|
-
message: "AWS region is not configured on the gateway",
|
|
605
|
-
},
|
|
606
|
-
},
|
|
607
|
-
503
|
|
608
|
-
);
|
|
609
|
-
}
|
|
610
|
-
|
|
611
|
-
const runtimeModel = await this.resolveRuntimeModel(request.model);
|
|
612
|
-
const context = buildBedrockContext(request);
|
|
613
|
-
const stopSequences = Array.isArray(request.stop)
|
|
614
|
-
? request.stop
|
|
615
|
-
: typeof request.stop === "string"
|
|
616
|
-
? [request.stop]
|
|
617
|
-
: [];
|
|
618
|
-
const toolChoice = mapToolChoice(request.tool_choice);
|
|
619
|
-
|
|
620
|
-
logger.info(
|
|
621
|
-
{
|
|
622
|
-
modelId: request.model,
|
|
623
|
-
region,
|
|
624
|
-
toolCount: context.tools?.length || 0,
|
|
625
|
-
},
|
|
626
|
-
"Proxying OpenAI-style Bedrock request"
|
|
627
|
-
);
|
|
628
|
-
|
|
629
|
-
const stream = this.bedrockStreamer(
|
|
630
|
-
runtimeModel as never,
|
|
631
|
-
context as never,
|
|
632
|
-
{
|
|
633
|
-
signal: c.req.raw.signal,
|
|
634
|
-
region,
|
|
635
|
-
maxTokens: request.max_completion_tokens ?? request.max_tokens,
|
|
636
|
-
temperature: request.temperature,
|
|
637
|
-
...(stopSequences.length > 0 ? { stopSequences } : {}),
|
|
638
|
-
...(toolChoice ? { toolChoice } : {}),
|
|
639
|
-
}
|
|
640
|
-
) as AsyncIterable<BedrockStreamEvent>;
|
|
641
|
-
|
|
642
|
-
return new Response(
|
|
643
|
-
createSseStream(
|
|
644
|
-
request.model,
|
|
645
|
-
stream,
|
|
646
|
-
request.stream_options?.include_usage === true
|
|
647
|
-
),
|
|
648
|
-
{
|
|
649
|
-
headers: {
|
|
650
|
-
"Content-Type": "text/event-stream; charset=utf-8",
|
|
651
|
-
"Cache-Control": "no-cache, no-transform",
|
|
652
|
-
Connection: "keep-alive",
|
|
653
|
-
"X-Accel-Buffering": "no",
|
|
654
|
-
},
|
|
655
|
-
}
|
|
656
|
-
);
|
|
657
|
-
}
|
|
658
|
-
}
|