@ai-sdk/google 4.0.51 → 4.0.53

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @ai-sdk/google
 
+## 4.0.53
+
+### Patch Changes
+
+- Updated dependencies [3e125ba]
+  - @ai-sdk/provider-utils@5.0.32
+
+## 4.0.52
+
+### Patch Changes
+
+- 7de3612: Encode provider-returned identifiers before using them in credentialed follow-up request paths.
+- a9782e1: fix: align batch result parsing, request counts, and lifecycle behavior across providers
+- 92e08e6: Preserve recursive tool input schemas without aborting Google model calls.
+- 35841f5: feat: normalize mid-stream provider error events across supported providers into public StreamProviderError instances and preserve provider-owned type, code, status, retry, and raw payload metadata
+- 0246209: Fix Google file uploads failing to type-check with TypeScript 5.9 DOM types.
+- Updated dependencies [a9782e1]
+- Updated dependencies [35841f5]
+- Updated dependencies [d2f3353]
+  - @ai-sdk/provider-utils@5.0.31
+
 ## 4.0.51
 
 ### Patch Changes

package/dist/index.js

@@ -7,7 +7,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "4.0.51" : "0.0.0-test";
+var VERSION = true ? "4.0.53" : "0.0.0-test";
 
 // src/google-embedding-model.ts
 import {
@@ -253,18 +253,18 @@ var googleGenerativeAISingleEmbeddingResponseSchema = lazySchema3(
 
 // src/google-batch.ts
 import {
-  EmptyResponseBodyError,
   InvalidArgumentError,
   InvalidResponseDataError
 } from "@ai-sdk/provider";
 import {
   combineHeaders as combineHeaders3,
   convertAsyncIteratorToReadableStream,
+  createJsonLinesResponseHandler,
   createJsonResponseHandler as createJsonResponseHandler3,
   generateId as generateId2,
   getFromApi,
   lazySchema as lazySchema6,
-  parseJSON,
+  normalizeBatchRequestCounts,
   postJsonToApi as postJsonToApi3,
   postToApi,
   resolve as resolve3,
@@ -331,6 +331,10 @@ function convertGoogleUsage(usage) {
 import {
   UnsupportedFunctionalityError
 } from "@ai-sdk/provider";
+var recursiveReferenceFunctionalityPrefix = "recursive JSON Schema reference:";
+function isRecursiveJSONSchemaReferenceError(error) {
+  return UnsupportedFunctionalityError.isInstance(error) && error.functionality.startsWith(recursiveReferenceFunctionalityPrefix);
+}
 function convertJSONSchemaToOpenAPISchema(jsonSchema, isRoot = true) {
   const rootSchema = typeof jsonSchema === "object" ? jsonSchema : void 0;
   return convertJSONSchemaDefinition(jsonSchema, isRoot, {
@@ -471,7 +475,7 @@ function convertJSONSchemaReference({
   );
   if (referenceContext.resolvingReferences.has(referenceKey)) {
     throw new UnsupportedFunctionalityError({
-      functionality: `recursive JSON Schema reference: ${reference}`,
+      functionality: `${recursiveReferenceFunctionalityPrefix} ${reference}`,
       message: "Google schema conversion does not support recursive JSON Schema references."
     });
   }
@@ -1278,7 +1282,6 @@ function prepareTools({
   modelId,
   isVertexProvider = false
 }) {
-  var _a, _b;
   tools = (tools == null ? void 0 : tools.length) ? tools : void 0;
   const toolWarnings = [];
   const { supportsGemini2Tools, supportsFileSearch, usesGemini3Features } = getGoogleModelCapabilities(modelId);
@@ -1396,11 +1399,7 @@ function prepareTools({
       const functionDeclarations2 = [];
       for (const tool of tools) {
         if (tool.type === "function") {
-          functionDeclarations2.push({
-            name: tool.name,
-            description: (_a = tool.description) != null ? _a : "",
-            parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema)
-          });
+          functionDeclarations2.push(prepareFunctionDeclaration(tool));
         }
       }
       const combinedToolConfig = {
@@ -1444,11 +1443,7 @@ function prepareTools({
   for (const tool of tools) {
     switch (tool.type) {
       case "function":
-        functionDeclarations.push({
-          name: tool.name,
-          description: (_b = tool.description) != null ? _b : "",
-          parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema)
-        });
+        functionDeclarations.push(prepareFunctionDeclaration(tool));
         if (tool.strict === true) {
           hasStrictTools = true;
         }
@@ -1515,6 +1510,27 @@ function prepareTools({
     }
   }
 }
+function prepareFunctionDeclaration(tool) {
+  var _a;
+  const declaration = {
+    name: tool.name,
+    description: (_a = tool.description) != null ? _a : ""
+  };
+  try {
+    return {
+      ...declaration,
+      parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema)
+    };
+  } catch (error) {
+    if (!isRecursiveJSONSchemaReferenceError(error)) {
+      throw error;
+    }
+    return {
+      ...declaration,
+      parametersJsonSchema: tool.inputSchema
+    };
+  }
+}
 
 // src/google-json-accumulator.ts
 var GoogleJSONAccumulator = class {
@@ -3254,17 +3270,19 @@ var GoogleBatchLanguageModel = class _GoogleBatchLanguageModel extends GoogleLan
       });
     }
     const encodedResponsesFile = responsesFile.split("/").map((segment) => encodeURIComponent(segment)).join("/");
-    const { value: stream } = await getFromApi({
+    const { value: lines } = await getFromApi({
       url: `${this.getBaseOrigin()}/download/v1beta/${encodedResponsesFile}:download?alt=media`,
       headers: await this.getHeaders(options.headers),
       failedResponseHandler: googleFailedResponseHandler,
-      successfulResponseHandler: rawStreamResponseHandler,
+      successfulResponseHandler: createJsonLinesResponseHandler(
+        googleBatchResultLineSchema
+      ),
       abortSignal: options.abortSignal,
       fetch: this.batchConfig.fetch,
       validateUrl: false
     });
     return convertAsyncIteratorToReadableStream(
-      this.iterateBatchResults(parseJsonLines(stream))
+      this.iterateBatchResults(lines)
     );
   }
   async retrieveBatch(options) {
@@ -3430,15 +3448,12 @@ function convertGoogleRequestCounts(counts) {
   const completed = parseCount((_a = counts == null ? void 0 : counts.successfulRequestCount) != null ? _a : 0);
   const failed = parseCount((_b = counts == null ? void 0 : counts.failedRequestCount) != null ? _b : 0);
   const pending = parseCount((_c = counts == null ? void 0 : counts.pendingRequestCount) != null ? _c : 0);
-  if (total == null || completed == null || failed == null || pending == null || completed + failed + pending !== total) {
-    return void 0;
-  }
-  return {
+  return normalizeBatchRequestCounts({
     total,
     pending,
     completed,
     failed
-  };
+  });
 }
 function parseCount(value) {
   const count = typeof value === "string" && /^\d+$/.test(value) ? Number(value) : value;
@@ -3464,54 +3479,6 @@ var googleUploadUrlResponseHandler = async ({
   }
   return { value: uploadUrl };
 };
-var rawStreamResponseHandler = async ({ response }) => {
-  if (response.body == null) {
-    throw new EmptyResponseBodyError();
-  }
-  return { value: response.body };
-};
-async function* parseJsonLines(stream) {
-  const reader = stream.getReader();
-  const decoder = new TextDecoder();
-  let buffer = "";
-  let finished = false;
-  try {
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done) {
-        finished = true;
-        buffer += decoder.decode();
-        break;
-      }
-      buffer += decoder.decode(value, { stream: true });
-      let lineEnd = buffer.indexOf("\n");
-      while (lineEnd !== -1) {
-        const line = buffer.slice(0, lineEnd).replace(/\r$/, "");
-        buffer = buffer.slice(lineEnd + 1);
-        if (line.trim().length > 0) {
-          yield await parseJSON({
-            text: line,
-            schema: googleBatchResultLineSchema
-          });
-        }
-        lineEnd = buffer.indexOf("\n");
-      }
-    }
-    const finalLine = buffer.replace(/\r$/, "");
-    if (finalLine.trim().length > 0) {
-      yield await parseJSON({
-        text: finalLine,
-        schema: googleBatchResultLineSchema
-      });
-    }
-  } finally {
-    if (!finished) {
-      await reader.cancel().catch(() => {
-      });
-    }
-    reader.releaseLock();
-  }
-}
 
 // src/tool/code-execution.ts
 import { createProviderExecutedToolFactory } from "@ai-sdk/provider-utils";
@@ -3902,6 +3869,10 @@ import {
   getFromApi as getFromApi2
 } from "@ai-sdk/provider-utils";
 import { z as z15 } from "zod/v4";
+function encodePathSegment(value) {
+  const encodedValue = encodeURIComponent(value);
+  return encodedValue === "." ? "%252E" : encodedValue === ".." ? "%252E%252E" : encodedValue;
+}
 var GoogleFiles = class {
   constructor(config) {
     this.config = config;
@@ -3963,7 +3934,7 @@ var GoogleFiles = class {
         "X-Goog-Upload-Offset": "0",
         "X-Goog-Upload-Command": "upload, finalize"
       },
-      body: fileBytes
+      body: ensureArrayBufferBacked(fileBytes)
     });
     if (!uploadResponse.ok) {
       const errorBody = await uploadResponse.text();
@@ -3985,8 +3956,10 @@ var GoogleFiles = class {
         });
       }
       await delay(pollIntervalMs);
+      const fileNameMatch = /^files\/([^/]+)$/.exec(file.name);
+      const filePath = fileNameMatch != null ? `files/${encodePathSegment(fileNameMatch[1])}` : encodePathSegment(file.name);
       const { value: fileStatus } = await getFromApi2({
-        url: `${this.config.baseURL}/${file.name}`,
+        url: `${this.config.baseURL}/${filePath}`,
         validateUrl: false,
         headers: combineHeaders4(resolvedHeaders),
         successfulResponseHandler: createJsonResponseHandler4(
@@ -4024,6 +3997,12 @@ var GoogleFiles = class {
     };
   }
 };
+function ensureArrayBufferBacked(data) {
+  if (data.buffer instanceof ArrayBuffer) {
+    return data;
+  }
+  return new Uint8Array(data);
+}
 var googleFileResponseSchema = lazySchema14(
   () => zodSchema14(
     z15.object({
@@ -4683,6 +4662,11 @@ import {
   WORKFLOW_SERIALIZE as WORKFLOW_SERIALIZE6
 } from "@ai-sdk/provider-utils";
 
+// src/interactions/build-google-interactions-stream-transform.ts
+import {
+  createProviderStreamError
+} from "@ai-sdk/provider-utils";
+
 // src/interactions/convert-google-interactions-usage.ts
 import { createNullLanguageModelUsage as createNullLanguageModelUsage2 } from "@ai-sdk/provider-utils";
 function convertGoogleInteractionsUsage(usage) {
@@ -4977,7 +4961,7 @@ function buildGoogleInteractionsStreamTransform({
       controller.enqueue({ type: "stream-start", warnings });
     },
     transform(chunk, controller) {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
       if (includeRawChunks) {
         controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
       }
@@ -5388,10 +5372,15 @@ function buildGoogleInteractionsStreamTransform({
         case "error": {
           const event = value;
           finishStatus = "failed";
-          const errorPayload = (_q = event.error) != null ? _q : {
-            message: "Unknown interaction error"
-          };
-          controller.enqueue({ type: "error", error: errorPayload });
+          controller.enqueue({
+            type: "error",
+            error: createProviderStreamError({
+              message: (_r = (_q = event.error) == null ? void 0 : _q.message) != null ? _r : "Unknown interaction error",
+              type: event.event_type,
+              code: (_t = (_s = event.error) == null ? void 0 : _s.code) != null ? _t : void 0,
+              data: event
+            })
+          });
           break;
         }
         default: