@ai-sdk/google 4.0.50 → 4.0.53

package/src/google-files.ts

@@ -34,6 +34,17 @@ interface GoogleFilesConfig {
   fetch?: FetchFunction;
 }
 
+function encodePathSegment(value: string): string {
+  const encodedValue = encodeURIComponent(value);
+
+  // URL parsing normalizes both literal and percent-encoded dot segments.
+  return encodedValue === '.'
+    ? '%252E'
+    : encodedValue === '..'
+      ? '%252E%252E'
+      : encodedValue;
+}
+
 export class GoogleFiles implements FilesV4 {
   readonly specificationVersion = 'v4';
 
@@ -106,7 +117,7 @@ export class GoogleFiles implements FilesV4 {
         'X-Goog-Upload-Offset': '0',
         'X-Goog-Upload-Command': 'upload, finalize',
       },
-      body: fileBytes,
+      body: ensureArrayBufferBacked(fileBytes),
     });
 
     if (!uploadResponse.ok) {
@@ -137,8 +148,14 @@ export class GoogleFiles implements FilesV4 {
 
       await delay(pollIntervalMs);
 
+      const fileNameMatch = /^files\/([^/]+)$/.exec(file.name);
+      const filePath =
+        fileNameMatch != null
+          ? `files/${encodePathSegment(fileNameMatch[1])}`
+          : encodePathSegment(file.name);
+
       const { value: fileStatus } = await getFromApi({
-        url: `${this.config.baseURL}/${file.name}`,
+        url: `${this.config.baseURL}/${filePath}`,
         validateUrl: false,
         headers: combineHeaders(resolvedHeaders),
         successfulResponseHandler: createJsonResponseHandler(
@@ -182,6 +199,14 @@ export class GoogleFiles implements FilesV4 {
   }
 }
 
+function ensureArrayBufferBacked(data: Uint8Array): Uint8Array<ArrayBuffer> {
+  if (data.buffer instanceof ArrayBuffer) {
+    return data as Uint8Array<ArrayBuffer>;
+  }
+
+  return new Uint8Array(data);
+}
+
 type GoogleFileResource = {
   name: string;
   displayName?: string | null;

package/src/google-language-model.ts

@@ -62,7 +62,7 @@ const configurableSafetySettingCategories = [
   'HARM_CATEGORY_SEXUALLY_EXPLICIT',
 ] as const;
 
-type GoogleConfig = {
+export type GoogleLanguageModelConfig = {
   provider: string;
   baseURL: string;
   headers?: Resolvable<Record<string, string | undefined>>;
@@ -80,7 +80,7 @@ export class GoogleLanguageModel implements LanguageModelV4 {
 
   readonly modelId: GoogleModelId;
 
-  private readonly config: GoogleConfig;
+  private readonly config: GoogleLanguageModelConfig;
   private readonly generateId: () => string;
 
   static [WORKFLOW_SERIALIZE](model: GoogleLanguageModel) {
@@ -92,12 +92,12 @@ export class GoogleLanguageModel implements LanguageModelV4 {
 
   static [WORKFLOW_DESERIALIZE](options: {
     modelId: string;
-    config: GoogleConfig;
+    config: GoogleLanguageModelConfig;
   }) {
     return new GoogleLanguageModel(options.modelId, options.config);
   }
 
-  constructor(modelId: GoogleModelId, config: GoogleConfig) {
+  constructor(modelId: GoogleModelId, config: GoogleLanguageModelConfig) {
     this.modelId = modelId;
     this.config = config;
     this.generateId = config.generateId ?? generateId;
@@ -111,7 +111,7 @@ export class GoogleLanguageModel implements LanguageModelV4 {
     return this.config.supportedUrls?.() ?? {};
   }
 
-  private async getArgs(
+  protected async getArgs(
     {
       prompt,
       maxOutputTokens,
@@ -375,38 +375,19 @@ export class GoogleLanguageModel implements LanguageModelV4 {
     };
   }
 
-  async doGenerate(
-    options: LanguageModelV4CallOptions,
-  ): Promise<LanguageModelV4GenerateResult> {
-    const { args, warnings, providerOptionsNames, extraHeaders } =
-      await this.getArgs(options);
+  protected convertGenerateContentResponse({
+    response,
+    warnings,
+    providerOptionsNames,
+  }: {
+    response: InferSchema<typeof responseSchema>;
+    warnings: SharedV4Warning[];
+    providerOptionsNames: readonly string[];
+  }): LanguageModelV4GenerateResult {
     const wrapProviderMetadata = (payload: Record<string, unknown>) =>
       Object.fromEntries(
         providerOptionsNames.map(name => [name, payload]),
       ) as SharedV4ProviderMetadata;
-
-    const mergedHeaders = combineHeaders(
-      this.config.headers ? await resolve(this.config.headers) : undefined,
-      options.headers,
-      extraHeaders,
-    );
-
-    const {
-      responseHeaders,
-      value: response,
-      rawValue: rawResponse,
-    } = await postJsonToApi({
-      url: `${this.config.baseURL}/${getModelPath(
-        this.modelId,
-      )}:generateContent`,
-      headers: mergedHeaders,
-      body: args,
-      failedResponseHandler: googleFailedResponseHandler,
-      successfulResponseHandler: createJsonResponseHandler(responseSchema),
-      abortSignal: options.abortSignal,
-      fetch: this.config.fetch,
-    });
-
     const candidate = response.candidates[0];
     const content: Array<LanguageModelV4Content> = [];
 
@@ -566,10 +547,52 @@ export class GoogleLanguageModel implements LanguageModelV4 {
         finishMessage: candidate.finishMessage ?? null,
         serviceTier: usageMetadata?.serviceTier ?? null,
       } satisfies GoogleProviderMetadata),
-      request: { body: args },
       response: {
         // TODO timestamp, model id
         id: response.responseId ?? undefined,
+      },
+    };
+  }
+
+  async doGenerate(
+    options: LanguageModelV4CallOptions,
+  ): Promise<LanguageModelV4GenerateResult> {
+    const { args, warnings, providerOptionsNames, extraHeaders } =
+      await this.getArgs(options);
+
+    const mergedHeaders = combineHeaders(
+      this.config.headers ? await resolve(this.config.headers) : undefined,
+      options.headers,
+      extraHeaders,
+    );
+
+    const {
+      responseHeaders,
+      value: response,
+      rawValue: rawResponse,
+    } = await postJsonToApi({
+      url: `${this.config.baseURL}/${getModelPath(
+        this.modelId,
+      )}:generateContent`,
+      headers: mergedHeaders,
+      body: args,
+      failedResponseHandler: googleFailedResponseHandler,
+      successfulResponseHandler: createJsonResponseHandler(responseSchema),
+      abortSignal: options.abortSignal,
+      fetch: this.config.fetch,
+    });
+
+    const result = this.convertGenerateContentResponse({
+      response,
+      warnings,
+      providerOptionsNames,
+    });
+
+    return {
+      ...result,
+      request: { body: args },
+      response: {
+        ...result.response,
         headers: responseHeaders,
         body: rawResponse,
       },
@@ -1563,7 +1586,7 @@ export const getUrlContextMetadataSchema = () =>
       .nullish(),
   });
 
-const responseSchema = lazySchema(() =>
+export const responseSchema = lazySchema(() =>
   zodSchema(
     z.object({
       responseId: z.string().nullish(),

package/src/google-prepare-tools.ts

@@ -3,10 +3,25 @@ import {
   type LanguageModelV4CallOptions,
   type SharedV4Warning,
 } from '@ai-sdk/provider';
-import { convertJSONSchemaToOpenAPISchema } from './convert-json-schema-to-openapi-schema';
+import {
+  convertJSONSchemaToOpenAPISchema,
+  isRecursiveJSONSchemaReferenceError,
+} from './convert-json-schema-to-openapi-schema';
 import type { GoogleModelId } from './google-language-model-options';
 import { getGoogleModelCapabilities } from './google-model-capabilities';
 
+type FunctionTool = Extract<
+  NonNullable<LanguageModelV4CallOptions['tools']>[number],
+  { type: 'function' }
+>;
+
+type GoogleFunctionDeclaration = {
+  name: string;
+  description: string;
+  parameters?: unknown;
+  parametersJsonSchema?: unknown;
+};
+
 export function prepareTools({
   tools,
   toolChoice,
@@ -21,11 +36,7 @@ export function prepareTools({
   tools:
     | Array<
         | {
-            functionDeclarations: Array<{
-              name: string;
-              description: string;
-              parameters: unknown;
-            }>;
+            functionDeclarations: GoogleFunctionDeclaration[];
           }
         | Record<string, any>
       >
@@ -172,18 +183,10 @@ export function prepareTools({
     });
 
     if (hasFunctionTools && usesGemini3Features && googleTools.length > 0) {
-      const functionDeclarations: Array<{
-        name: string;
-        description: string;
-        parameters: unknown;
-      }> = [];
+      const functionDeclarations: GoogleFunctionDeclaration[] = [];
       for (const tool of tools) {
         if (tool.type === 'function') {
-          functionDeclarations.push({
-            name: tool.name,
-            description: tool.description ?? '',
-            parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema),
-          });
+          functionDeclarations.push(prepareFunctionDeclaration(tool));
         }
       }
 
@@ -238,11 +241,7 @@ export function prepareTools({
   for (const tool of tools) {
     switch (tool.type) {
       case 'function':
-        functionDeclarations.push({
-          name: tool.name,
-          description: tool.description ?? '',
-          parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema),
-        });
+        functionDeclarations.push(prepareFunctionDeclaration(tool));
         if (tool.strict === true) {
           hasStrictTools = true;
         }
@@ -314,3 +313,28 @@ export function prepareTools({
     }
   }
 }
+
+function prepareFunctionDeclaration(
+  tool: FunctionTool,
+): GoogleFunctionDeclaration {
+  const declaration = {
+    name: tool.name,
+    description: tool.description ?? '',
+  };
+
+  try {
+    return {
+      ...declaration,
+      parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema),
+    };
+  } catch (error) {
+    if (!isRecursiveJSONSchemaReferenceError(error)) {
+      throw error;
+    }
+
+    return {
+      ...declaration,
+      parametersJsonSchema: tool.inputSchema,
+    };
+  }
+}

package/src/google-provider.ts

@@ -1,5 +1,6 @@
 import type {
   EmbeddingModelV4,
+  Experimental_BatchLanguageModelV4 as BatchLanguageModelV4,
   Experimental_VideoModelV4,
   FilesV4,
   ImageModelV4,
@@ -21,7 +22,7 @@ import {
 import { VERSION } from './version';
 import { GoogleEmbeddingModel } from './google-embedding-model';
 import type { GoogleEmbeddingModelId } from './google-embedding-model-options';
-import { GoogleLanguageModel } from './google-language-model';
+import { GoogleBatchLanguageModel } from './google-batch';
 import type { GoogleModelId } from './google-language-model-options';
 import { googleTools } from './google-tools';
 
@@ -46,11 +47,11 @@ import { GoogleSpeechTranslationModel } from './speech-translation/google-speech
 import type { GoogleSpeechTranslationModelId } from './speech-translation/google-speech-translation-model-options';
 
 export interface GoogleProvider extends ProviderV4 {
-  (modelId: GoogleModelId): LanguageModelV4;
+  (modelId: GoogleModelId): BatchLanguageModelV4;
 
-  languageModel(modelId: GoogleModelId): LanguageModelV4;
+  languageModel(modelId: GoogleModelId): BatchLanguageModelV4;
 
-  chat(modelId: GoogleModelId): LanguageModelV4;
+  chat(modelId: GoogleModelId): BatchLanguageModelV4;
 
   /**
    * Creates a model for image generation.
@@ -63,7 +64,7 @@ export interface GoogleProvider extends ProviderV4 {
   /**
    * @deprecated Use `chat()` instead.
    */
-  generativeAI(modelId: GoogleModelId): LanguageModelV4;
+  generativeAI(modelId: GoogleModelId): BatchLanguageModelV4;
 
   /**
    * Creates a model for text embeddings.
@@ -240,7 +241,7 @@ export function createGoogle(
     );
 
   const createChatModel = (modelId: GoogleModelId) =>
-    new GoogleLanguageModel(modelId, {
+    new GoogleBatchLanguageModel(modelId, {
       provider: providerName,
       baseURL,
       headers: getHeaders,

package/src/interactions/build-google-interactions-stream-transform.ts

@@ -6,7 +6,10 @@ import type {
   SharedV4ProviderMetadata,
   SharedV4Warning,
 } from '@ai-sdk/provider';
-import type { ParseResult } from '@ai-sdk/provider-utils';
+import {
+  createProviderStreamError,
+  type ParseResult,
+} from '@ai-sdk/provider-utils';
 import type {
   GoogleInteractionsEvent,
   GoogleInteractionsUsage,
@@ -821,10 +824,15 @@ export function buildGoogleInteractionsStreamTransform({
             { event_type: 'error' }
           >;
           finishStatus = 'failed';
-          const errorPayload = event.error ?? {
-            message: 'Unknown interaction error',
-          };
-          controller.enqueue({ type: 'error', error: errorPayload });
+          controller.enqueue({
+            type: 'error',
+            error: createProviderStreamError({
+              message: event.error?.message ?? 'Unknown interaction error',
+              type: event.event_type,
+              code: event.error?.code ?? undefined,
+              data: event,
+            }),
+          });
           break;
         }