can1357
a5673c90f8
- Removed the Google Interactions transport and deleted interaction-specific request options from the shared AI stream typing/API surface. - Simplified Google provider routing to eliminate interactions auto-selection logic and keep `streamGoogle` on the `:streamGenerateContent` path. - Updated Vertex request handling to use resolved stream hosts without `/interactions`/`Api-Revision` and removed related interaction constants. - Deleted obsolete Interactions tests and updated remaining Google stream tests to no longer reference `useInteractionsApi`/`storeInteraction`/`previousInteractionId`.
48 lines
1.6 KiB
TypeScript
48 lines
1.6 KiB
TypeScript
import * as AIError from "../error";
|
|
import { getEnvApiKey } from "../stream";
|
|
import type { Context, Model, StreamFunction } from "../types";
|
|
import type { AssistantMessageEventStream } from "../utils/event-stream";
|
|
import {
|
|
buildGoogleGenerateContentParams,
|
|
type GoogleGenAIRequestPlan,
|
|
type GoogleSharedStreamOptions,
|
|
streamGoogleGenAI,
|
|
} from "./google-shared";
|
|
|
|
export type GoogleOptions = GoogleSharedStreamOptions;
|
|
|
|
const DEFAULT_GENERATIVE_LANGUAGE_BASE = "https://generativelanguage.googleapis.com/v1beta";
|
|
|
|
export const streamGoogle: StreamFunction<"google-generative-ai"> = (
|
|
model: Model<"google-generative-ai">,
|
|
context: Context,
|
|
options?: GoogleOptions,
|
|
): AssistantMessageEventStream => {
|
|
const apiKey = options?.apiKey || getEnvApiKey(model.provider);
|
|
if (!apiKey) {
|
|
throw new AIError.MissingApiKeyError(
|
|
undefined,
|
|
"Google Generative AI requires an API key (GEMINI_API_KEY or options.apiKey).",
|
|
);
|
|
}
|
|
|
|
return streamGoogleGenAI({
|
|
model,
|
|
options,
|
|
api: "google-generative-ai",
|
|
prepare: (): GoogleGenAIRequestPlan => {
|
|
const params = buildGoogleGenerateContentParams(model, context, options ?? {});
|
|
// `model.baseUrl` already includes the API version segment when set (mirrors the
|
|
// `apiVersion: ""` reset that the SDK relied on for custom base URLs).
|
|
const base = model.baseUrl?.trim() || DEFAULT_GENERATIVE_LANGUAGE_BASE;
|
|
const url = `${base}/models/${model.id}:streamGenerateContent?alt=sse`;
|
|
const headers: Record<string, string> = {
|
|
"x-goog-api-key": apiKey,
|
|
...(model.headers ?? {}),
|
|
...(options?.headers ?? {}),
|
|
};
|
|
return { params, url, headers, fetch: options?.fetch };
|
|
},
|
|
});
|
|
};
|