8a0903ebf2
The root barrel is now core-only and side-effect free: types, createModels/createProvider, auth substrate, lazyStream/lazyApi, faux, utils. Generated catalogs, api-registry, env-api-keys, images, global stream functions, and per-API lazy wrappers leave the root. New @earendil-works/pi-ai/compat preserves the old surface verbatim as a strict superset of the root: api-dispatch stream/complete with env key injection, the builtin registration side effect (skip-if-present so it cannot clobber earlier overrides), deprecated getModel/getModels/ getProviders aliases of the new getBuiltin* reads in providers/all, lazy api wrappers + setBedrockProviderModule, and image generation. Compat dies with the coding-agent ModelManager migration. Packaging: exports map gains ./compat, ./providers/*, ./api/*; sideEffects array lists only the effectful modules. Old-global imports across agent/coding-agent/examples and pi-ai tests switch to /compat (path-only; compat is a superset). The coding-agent extension loader resolves the pi-ai ROOT specifier to compat, so existing user extensions using the old global API keep working at runtime until compat is removed. vitest configs alias /compat to src; browser smoke imports old globals from /compat.
246 lines
7.3 KiB
TypeScript
246 lines
7.3 KiB
TypeScript
import { describe, expect, it, vi } from "vitest";
|
|
|
|
const bedrockMock = vi.hoisted(() => ({
|
|
constructorCalls: [] as Array<Record<string, unknown>>,
|
|
}));
|
|
|
|
vi.mock("@aws-sdk/client-bedrock-runtime", () => {
|
|
class BedrockRuntimeServiceException extends Error {}
|
|
|
|
class BedrockRuntimeClient {
|
|
constructor(config: Record<string, unknown>) {
|
|
bedrockMock.constructorCalls.push(config);
|
|
}
|
|
|
|
send(): Promise<never> {
|
|
return Promise.reject(new Error("mock send"));
|
|
}
|
|
}
|
|
|
|
class ConverseStreamCommand {
|
|
readonly input: unknown;
|
|
|
|
constructor(input: unknown) {
|
|
this.input = input;
|
|
}
|
|
}
|
|
|
|
return {
|
|
BedrockRuntimeClient,
|
|
BedrockRuntimeServiceException,
|
|
ConverseStreamCommand,
|
|
StopReason: {
|
|
END_TURN: "end_turn",
|
|
STOP_SEQUENCE: "stop_sequence",
|
|
MAX_TOKENS: "max_tokens",
|
|
MODEL_CONTEXT_WINDOW_EXCEEDED: "model_context_window_exceeded",
|
|
TOOL_USE: "tool_use",
|
|
},
|
|
CachePointType: { DEFAULT: "default" },
|
|
CacheTTL: { ONE_HOUR: "ONE_HOUR" },
|
|
ConversationRole: { ASSISTANT: "assistant", USER: "user" },
|
|
ImageFormat: { JPEG: "jpeg", PNG: "png", GIF: "gif", WEBP: "webp" },
|
|
ToolResultStatus: { ERROR: "error", SUCCESS: "success" },
|
|
};
|
|
});
|
|
|
|
import { stream as streamBedrock } from "../src/api/bedrock-converse-stream.ts";
|
|
import { getModel } from "../src/compat.ts";
|
|
import type { Context, Message } from "../src/types.ts";
|
|
|
|
const baseModel = getModel("amazon-bedrock", "us.anthropic.claude-sonnet-4-5-20250929-v1:0");
|
|
|
|
async function capturePayload(context: Context): Promise<unknown> {
|
|
let capturedPayload: unknown;
|
|
const s = streamBedrock(baseModel, context, {
|
|
cacheRetention: "none",
|
|
signal: AbortSignal.abort(),
|
|
onPayload: (payload) => {
|
|
capturedPayload = payload;
|
|
return payload;
|
|
},
|
|
});
|
|
for await (const event of s) {
|
|
if (event.type === "error") break;
|
|
}
|
|
return capturedPayload;
|
|
}
|
|
|
|
describe("bedrock convertMessages skips unknown content types", () => {
|
|
it("skips unknown user content blocks instead of throwing", async () => {
|
|
const messages: Message[] = [
|
|
{
|
|
role: "user",
|
|
content: [
|
|
{ type: "text", text: "hello" },
|
|
{ type: "unknown", data: "foo" },
|
|
] as any,
|
|
timestamp: Date.now(),
|
|
},
|
|
];
|
|
const payload = await capturePayload({ messages });
|
|
expect(payload).toBeDefined();
|
|
const p = payload as { messages: Array<{ role: string; content: unknown[] }> };
|
|
expect(p.messages).toHaveLength(1);
|
|
expect(p.messages[0].content).toHaveLength(1);
|
|
expect(p.messages[0].content[0]).toEqual({ text: "hello" });
|
|
});
|
|
|
|
it("skips unknown assistant content blocks instead of throwing", async () => {
|
|
const messages: Message[] = [
|
|
{
|
|
role: "assistant",
|
|
content: [
|
|
{ type: "text", text: "hello" },
|
|
{ type: "unknown", data: "foo" },
|
|
] as any,
|
|
api: "bedrock-converse-stream",
|
|
provider: "amazon-bedrock",
|
|
model: baseModel.id,
|
|
usage: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
totalTokens: 0,
|
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
|
|
},
|
|
stopReason: "stop",
|
|
timestamp: Date.now(),
|
|
},
|
|
];
|
|
const payload = await capturePayload({ messages });
|
|
expect(payload).toBeDefined();
|
|
const p = payload as { messages: Array<{ role: string; content: unknown[] }> };
|
|
expect(p.messages).toHaveLength(1);
|
|
expect(p.messages[0].content).toHaveLength(1);
|
|
expect(p.messages[0].content[0]).toEqual({ text: "hello" });
|
|
});
|
|
|
|
it("replaces user messages with only unknown content blocks with a placeholder", async () => {
|
|
const messages: Message[] = [
|
|
{
|
|
role: "user",
|
|
content: [{ type: "unknown", data: "foo" }] as any,
|
|
timestamp: Date.now(),
|
|
},
|
|
];
|
|
const payload = await capturePayload({ messages });
|
|
expect(payload).toBeDefined();
|
|
const p = payload as { messages: Array<{ role: string; content: unknown[] }> };
|
|
expect(p.messages).toHaveLength(1);
|
|
expect(p.messages[0].content).toEqual([{ text: "<empty>" }]);
|
|
});
|
|
|
|
it("replaces blank user string content with a placeholder", async () => {
|
|
const payload = await capturePayload({
|
|
messages: [{ role: "user", content: " ", timestamp: Date.now() }],
|
|
});
|
|
expect(payload).toBeDefined();
|
|
const p = payload as { messages: Array<{ role: string; content: unknown[] }> };
|
|
expect(p.messages).toHaveLength(1);
|
|
expect(p.messages[0].content).toEqual([{ text: "<empty>" }]);
|
|
});
|
|
|
|
it("filters blank user text blocks when other content remains", async () => {
|
|
const payload = await capturePayload({
|
|
messages: [
|
|
{
|
|
role: "user",
|
|
content: [
|
|
{ type: "text", text: "" },
|
|
{ type: "text", text: "hello" },
|
|
],
|
|
timestamp: Date.now(),
|
|
},
|
|
],
|
|
});
|
|
expect(payload).toBeDefined();
|
|
const p = payload as { messages: Array<{ role: string; content: unknown[] }> };
|
|
expect(p.messages).toHaveLength(1);
|
|
expect(p.messages[0].content).toEqual([{ text: "hello" }]);
|
|
});
|
|
|
|
it("replaces user content emptied by surrogate sanitization with a placeholder", async () => {
|
|
const payload = await capturePayload({
|
|
messages: [{ role: "user", content: String.fromCharCode(0xd83d), timestamp: Date.now() }],
|
|
});
|
|
expect(payload).toBeDefined();
|
|
const p = payload as { messages: Array<{ role: string; content: unknown[] }> };
|
|
expect(p.messages).toHaveLength(1);
|
|
expect(p.messages[0].content).toEqual([{ text: "<empty>" }]);
|
|
});
|
|
|
|
it("skips assistant text blocks emptied by surrogate sanitization", async () => {
|
|
const messages: Message[] = [
|
|
{
|
|
role: "assistant",
|
|
content: [{ type: "text", text: String.fromCharCode(0xd83d) }],
|
|
api: "bedrock-converse-stream",
|
|
provider: "amazon-bedrock",
|
|
model: baseModel.id,
|
|
usage: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
totalTokens: 0,
|
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
|
|
},
|
|
stopReason: "stop",
|
|
timestamp: Date.now(),
|
|
},
|
|
];
|
|
const payload = await capturePayload({ messages });
|
|
expect(payload).toBeDefined();
|
|
const p = payload as { messages: Array<{ role: string; content: unknown[] }> };
|
|
expect(p.messages).toHaveLength(0);
|
|
});
|
|
|
|
it("replaces blank tool result content with a placeholder", async () => {
|
|
const messages: Message[] = [
|
|
{
|
|
role: "toolResult",
|
|
toolCallId: "tool-1",
|
|
toolName: "tool",
|
|
content: [{ type: "text", text: "" }],
|
|
isError: false,
|
|
timestamp: Date.now(),
|
|
},
|
|
];
|
|
const payload = await capturePayload({ messages });
|
|
expect(payload).toBeDefined();
|
|
const p = payload as {
|
|
messages: Array<{ role: string; content: Array<{ toolResult: { content: unknown[] } }> }>;
|
|
};
|
|
expect(p.messages).toHaveLength(1);
|
|
expect(p.messages[0].content[0].toolResult.content).toEqual([{ text: "<empty>" }]);
|
|
});
|
|
|
|
it("skips assistant messages with only unknown content blocks", async () => {
|
|
const messages: Message[] = [
|
|
{
|
|
role: "assistant",
|
|
content: [{ type: "unknown", data: "foo" }] as any,
|
|
api: "bedrock-converse-stream",
|
|
provider: "amazon-bedrock",
|
|
model: baseModel.id,
|
|
usage: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
totalTokens: 0,
|
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
|
|
},
|
|
stopReason: "stop",
|
|
timestamp: Date.now(),
|
|
},
|
|
];
|
|
const payload = await capturePayload({ messages });
|
|
expect(payload).toBeDefined();
|
|
const p = payload as { messages: Array<{ role: string; content: unknown[] }> };
|
|
expect(p.messages).toHaveLength(0);
|
|
});
|
|
});
|