ba93da9a93
Stream implementations move from src/providers/ to src/api/, renamed by API id (anthropic.ts -> anthropic-messages.ts, google.ts -> google-generative-ai.ts, mistral.ts -> mistral-conversations.ts, amazon-bedrock.ts -> bedrock-converse-stream.ts). Every module now exports exactly stream/streamSimple; shared helpers move alongside. New ProviderStreams dispatch contract in types.ts, lazyApi() wrapper in api/lazy.ts, and one .lazy.ts wrapper per API. Bedrock's wrapper keeps the node-only variable-specifier import and setBedrockProviderModule() (now taking ProviderStreams). providers/register-builtins.ts deleted; interim until the compat entrypoint lands, builtin api-registry registration lives in stream.ts and lazy wrappers are exported from the root barrel. Old per-API lazy exports (streamAnthropic, ...) are gone; package.json subpaths retarget to dist/api/.
224 lines
6.3 KiB
TypeScript
224 lines
6.3 KiB
TypeScript
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
|
|
const googleGenAiMock = vi.hoisted(() => ({
|
|
constructorCalls: [] as Array<Record<string, unknown>>,
|
|
}));
|
|
|
|
vi.mock("@google/genai", () => {
|
|
class GoogleGenAI {
|
|
models = {
|
|
generateContentStream: async function* () {
|
|
yield {
|
|
responseId: "vertex-response-id",
|
|
candidates: [
|
|
{
|
|
content: { parts: [{ text: "ok" }] },
|
|
finishReason: "STOP",
|
|
},
|
|
],
|
|
usageMetadata: {
|
|
promptTokenCount: 1,
|
|
candidatesTokenCount: 1,
|
|
totalTokenCount: 2,
|
|
},
|
|
};
|
|
},
|
|
};
|
|
|
|
constructor(config: Record<string, unknown>) {
|
|
googleGenAiMock.constructorCalls.push(config);
|
|
}
|
|
}
|
|
|
|
return {
|
|
GoogleGenAI,
|
|
ResourceScope: {
|
|
COLLECTION: "COLLECTION",
|
|
},
|
|
ThinkingLevel: {
|
|
THINKING_LEVEL_UNSPECIFIED: "THINKING_LEVEL_UNSPECIFIED",
|
|
MINIMAL: "MINIMAL",
|
|
LOW: "LOW",
|
|
MEDIUM: "MEDIUM",
|
|
HIGH: "HIGH",
|
|
},
|
|
};
|
|
});
|
|
|
|
import { stream as streamGoogleVertex } from "../src/api/google-vertex.ts";
|
|
import { getModel } from "../src/models.ts";
|
|
import type { Context, Model } from "../src/types.ts";
|
|
|
|
const model = getModel("google-vertex", "gemini-3-flash-preview");
|
|
const context: Context = {
|
|
messages: [{ role: "user", content: "hello", timestamp: Date.now() }],
|
|
};
|
|
|
|
const originalGoogleCloudApiKey = process.env.GOOGLE_CLOUD_API_KEY;
|
|
|
|
beforeEach(() => {
|
|
googleGenAiMock.constructorCalls.length = 0;
|
|
delete process.env.GOOGLE_CLOUD_API_KEY;
|
|
});
|
|
|
|
afterEach(() => {
|
|
if (originalGoogleCloudApiKey === undefined) {
|
|
delete process.env.GOOGLE_CLOUD_API_KEY;
|
|
} else {
|
|
process.env.GOOGLE_CLOUD_API_KEY = originalGoogleCloudApiKey;
|
|
}
|
|
});
|
|
|
|
describe("google-vertex api key resolution", () => {
|
|
it("falls back to ADC when options.apiKey is a placeholder marker", async () => {
|
|
const stream = streamGoogleVertex(model, context, {
|
|
apiKey: "<authenticated>",
|
|
project: "test-project",
|
|
location: "us-central1",
|
|
});
|
|
|
|
await stream.result();
|
|
|
|
expect(googleGenAiMock.constructorCalls).toHaveLength(1);
|
|
expect(googleGenAiMock.constructorCalls[0]).toMatchObject({
|
|
vertexai: true,
|
|
project: "test-project",
|
|
location: "us-central1",
|
|
apiVersion: "v1",
|
|
});
|
|
expect(googleGenAiMock.constructorCalls[0]).not.toHaveProperty("apiKey");
|
|
});
|
|
|
|
it("falls back to ADC when options.apiKey is the gcp-vertex-credentials marker", async () => {
|
|
const stream = streamGoogleVertex(model, context, {
|
|
apiKey: "gcp-vertex-credentials",
|
|
project: "test-project",
|
|
location: "us-central1",
|
|
});
|
|
|
|
await stream.result();
|
|
|
|
expect(googleGenAiMock.constructorCalls).toHaveLength(1);
|
|
expect(googleGenAiMock.constructorCalls[0]).toMatchObject({
|
|
vertexai: true,
|
|
project: "test-project",
|
|
location: "us-central1",
|
|
apiVersion: "v1",
|
|
});
|
|
expect(googleGenAiMock.constructorCalls[0]).not.toHaveProperty("apiKey");
|
|
});
|
|
|
|
it("falls back to ADC when GOOGLE_CLOUD_API_KEY is a placeholder marker", async () => {
|
|
process.env.GOOGLE_CLOUD_API_KEY = "<authenticated>";
|
|
|
|
const stream = streamGoogleVertex(model, context, {
|
|
project: "test-project",
|
|
location: "us-central1",
|
|
});
|
|
|
|
await stream.result();
|
|
|
|
expect(googleGenAiMock.constructorCalls).toHaveLength(1);
|
|
expect(googleGenAiMock.constructorCalls[0]).toMatchObject({
|
|
vertexai: true,
|
|
project: "test-project",
|
|
location: "us-central1",
|
|
apiVersion: "v1",
|
|
});
|
|
expect(googleGenAiMock.constructorCalls[0]).not.toHaveProperty("apiKey");
|
|
});
|
|
|
|
it("still uses the API key client for real API keys", async () => {
|
|
const stream = streamGoogleVertex(model, context, {
|
|
apiKey: "AIzaSyExampleRealisticLookingApiKey123456",
|
|
});
|
|
|
|
await stream.result();
|
|
|
|
expect(googleGenAiMock.constructorCalls).toHaveLength(1);
|
|
expect(googleGenAiMock.constructorCalls[0]).toMatchObject({
|
|
vertexai: true,
|
|
apiKey: "AIzaSyExampleRealisticLookingApiKey123456",
|
|
apiVersion: "v1",
|
|
});
|
|
expect(googleGenAiMock.constructorCalls[0]).not.toHaveProperty("project");
|
|
expect(googleGenAiMock.constructorCalls[0]).not.toHaveProperty("location");
|
|
});
|
|
|
|
it("does not forward generated Vertex base URL placeholders", async () => {
|
|
const stream = streamGoogleVertex(model, context, {
|
|
project: "test-project",
|
|
location: "us-central1",
|
|
});
|
|
|
|
await stream.result();
|
|
|
|
expect(googleGenAiMock.constructorCalls).toHaveLength(1);
|
|
expect(googleGenAiMock.constructorCalls[0]?.httpOptions).toBeUndefined();
|
|
});
|
|
|
|
it("forwards custom baseUrl to the ADC client", async () => {
|
|
const customModel: Model<"google-vertex"> = { ...model, baseUrl: "https://proxy.example.com" };
|
|
const stream = streamGoogleVertex(customModel, context, {
|
|
project: "test-project",
|
|
location: "us-central1",
|
|
});
|
|
|
|
await stream.result();
|
|
|
|
expect(googleGenAiMock.constructorCalls).toHaveLength(1);
|
|
expect(googleGenAiMock.constructorCalls[0]).toMatchObject({
|
|
vertexai: true,
|
|
project: "test-project",
|
|
location: "us-central1",
|
|
apiVersion: "v1",
|
|
httpOptions: {
|
|
baseUrl: "https://proxy.example.com",
|
|
baseUrlResourceScope: "COLLECTION",
|
|
},
|
|
});
|
|
});
|
|
|
|
it("forwards custom baseUrl to the API key client", async () => {
|
|
const customModel: Model<"google-vertex"> = { ...model, baseUrl: "https://proxy.example.com" };
|
|
const stream = streamGoogleVertex(customModel, context, {
|
|
apiKey: "AIzaSyExampleRealisticLookingApiKey123456",
|
|
});
|
|
|
|
await stream.result();
|
|
|
|
expect(googleGenAiMock.constructorCalls).toHaveLength(1);
|
|
expect(googleGenAiMock.constructorCalls[0]).toMatchObject({
|
|
vertexai: true,
|
|
apiKey: "AIzaSyExampleRealisticLookingApiKey123456",
|
|
apiVersion: "v1",
|
|
httpOptions: {
|
|
baseUrl: "https://proxy.example.com",
|
|
baseUrlResourceScope: "COLLECTION",
|
|
},
|
|
});
|
|
});
|
|
|
|
it("does not append apiVersion when custom baseUrl already includes one", async () => {
|
|
const customModel: Model<"google-vertex"> = {
|
|
...model,
|
|
baseUrl: "https://proxy.example.com/v1/projects/test-project/locations/global",
|
|
};
|
|
const stream = streamGoogleVertex(customModel, context, {
|
|
project: "test-project",
|
|
location: "us-central1",
|
|
});
|
|
|
|
await stream.result();
|
|
|
|
expect(googleGenAiMock.constructorCalls).toHaveLength(1);
|
|
expect(googleGenAiMock.constructorCalls[0]).toMatchObject({
|
|
httpOptions: {
|
|
baseUrl: "https://proxy.example.com/v1/projects/test-project/locations/global",
|
|
baseUrlResourceScope: "COLLECTION",
|
|
apiVersion: "",
|
|
},
|
|
});
|
|
});
|
|
});
|