@ai-sdk/google 2.0.0-canary.2 → 2.0.0-canary.4

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @ai-sdk/google
 
+## 2.0.0-canary.4
+
+### Patch Changes
+
+- Updated dependencies [a166433]
+- Updated dependencies [abf9a79]
+- Updated dependencies [9f95b35]
+- Updated dependencies [0a87932]
+- Updated dependencies [6dc848c]
+  - @ai-sdk/provider-utils@3.0.0-canary.3
+  - @ai-sdk/provider@2.0.0-canary.2
+
+## 2.0.0-canary.3
+
+### Patch Changes
+
+- Updated dependencies [c57e248]
+- Updated dependencies [33f4a6a]
+  - @ai-sdk/provider@2.0.0-canary.1
+  - @ai-sdk/provider-utils@3.0.0-canary.2
+
 ## 2.0.0-canary.2
 
 ### Patch Changes

package/dist/index.js

@@ -27,7 +27,7 @@ module.exports = __toCommonJS(src_exports);
 
 // src/google-provider.ts
 var import_provider4 = require("@ai-sdk/provider");
-var import_provider_utils5 = require("@ai-sdk/provider-utils");
+var import_provider_utils4 = require("@ai-sdk/provider-utils");
 
 // src/google-generative-ai-embedding-model.ts
 var import_provider = require("@ai-sdk/provider");
@@ -112,7 +112,7 @@ var googleGenerativeAITextEmbeddingResponseSchema = import_zod2.z.object({
 });
 
 // src/google-generative-ai-language-model.ts
-var import_provider_utils4 = require("@ai-sdk/provider-utils");
+var import_provider_utils3 = require("@ai-sdk/provider-utils");
 var import_zod3 = require("zod");
 
 // src/convert-json-schema-to-openapi-schema.ts
@@ -214,9 +214,7 @@ function isEmptyObjectSchema(jsonSchema) {
 
 // src/convert-to-google-generative-ai-messages.ts
 var import_provider2 = require("@ai-sdk/provider");
-var import_provider_utils3 = require("@ai-sdk/provider-utils");
 function convertToGoogleGenerativeAIMessages(prompt) {
-  var _a, _b;
   const systemInstructionParts = [];
   const contents = [];
   let systemMessagesAllowed = true;
@@ -240,35 +238,15 @@ function convertToGoogleGenerativeAIMessages(prompt) {
               parts.push({ text: part.text });
               break;
             }
-            case "image": {
-              parts.push(
-                part.image instanceof URL ? {
-                  fileData: {
-                    mimeType: (_a = part.mimeType) != null ? _a : "image/jpeg",
-                    fileUri: part.image.toString()
-                  }
-                } : {
-                  inlineData: {
-                    mimeType: (_b = part.mimeType) != null ? _b : "image/jpeg",
-                    data: (0, import_provider_utils3.convertUint8ArrayToBase64)(part.image)
-                  }
-                }
-              );
-              break;
-            }
             case "file": {
+              const mediaType = part.mediaType === "image/*" ? "image/jpeg" : part.mediaType;
               parts.push(
                 part.data instanceof URL ? {
                   fileData: {
-                    mimeType: part.mimeType,
+                    mimeType: mediaType,
                     fileUri: part.data.toString()
                   }
-                } : {
-                  inlineData: {
-                    mimeType: part.mimeType,
-                    data: part.data
-                  }
-                }
+                } : { inlineData: { mimeType: mediaType, data: part.data } }
               );
               break;
             }
@@ -287,7 +265,7 @@ function convertToGoogleGenerativeAIMessages(prompt) {
                 return part.text.length === 0 ? void 0 : { text: part.text };
               }
               case "file": {
-                if (part.mimeType !== "image/png") {
+                if (part.mediaType !== "image/png") {
                   throw new import_provider2.UnsupportedFunctionalityError({
                     functionality: "Only PNG images are supported in assistant messages"
                   });
@@ -299,7 +277,7 @@ function convertToGoogleGenerativeAIMessages(prompt) {
                 }
                 return {
                   inlineData: {
-                    mimeType: part.mimeType,
+                    mimeType: part.mediaType,
                     data: part.data
                   }
                 };
@@ -348,9 +326,15 @@ function getModelPath(modelId) {
 
 // src/google-prepare-tools.ts
 var import_provider3 = require("@ai-sdk/provider");
-function prepareTools(mode, useSearchGrounding, dynamicRetrievalConfig, modelId) {
-  var _a, _b;
-  const tools = ((_a = mode.tools) == null ? void 0 : _a.length) ? mode.tools : void 0;
+function prepareTools({
+  tools,
+  toolChoice,
+  useSearchGrounding,
+  dynamicRetrievalConfig,
+  modelId
+}) {
+  var _a;
+  tools = (tools == null ? void 0 : tools.length) ? tools : void 0;
   const toolWarnings = [];
   const isGemini2 = modelId.includes("gemini-2");
   const supportsDynamicRetrieval = modelId.includes("gemini-1.5-flash") && !modelId.includes("-8b");
@@ -373,12 +357,11 @@ function prepareTools(mode, useSearchGrounding, dynamicRetrievalConfig, modelId)
     } else {
       functionDeclarations.push({
         name: tool.name,
-        description: (_b = tool.description) != null ? _b : "",
+        description: (_a = tool.description) != null ? _a : "",
         parameters: convertJSONSchemaToOpenAPISchema(tool.parameters)
       });
     }
   }
-  const toolChoice = mode.toolChoice;
   if (toolChoice == null) {
     return {
       tools: { functionDeclarations },
@@ -420,7 +403,7 @@ function prepareTools(mode, useSearchGrounding, dynamicRetrievalConfig, modelId)
     default: {
       const _exhaustiveCheck = type;
       throw new import_provider3.UnsupportedFunctionalityError({
-        functionality: `Unsupported tool choice type: ${_exhaustiveCheck}`
+        functionality: `tool choice type: ${_exhaustiveCheck}`
       });
     }
   }
@@ -471,7 +454,6 @@ var GoogleGenerativeAILanguageModel = class {
     return this.config.provider;
   }
   async getArgs({
-    mode,
     prompt,
     maxTokens,
     temperature,
@@ -482,105 +464,61 @@ var GoogleGenerativeAILanguageModel = class {
     stopSequences,
     responseFormat,
     seed,
-    providerMetadata
+    tools,
+    toolChoice,
+    providerOptions
   }) {
-    var _a, _b;
-    const type = mode.type;
+    var _a;
     const warnings = [];
-    const googleOptions = (0, import_provider_utils4.parseProviderOptions)({
+    const googleOptions = (0, import_provider_utils3.parseProviderOptions)({
       provider: "google",
-      providerOptions: providerMetadata,
+      providerOptions,
       schema: googleGenerativeAIProviderOptionsSchema
     });
-    const generationConfig = {
-      // standardized settings:
-      maxOutputTokens: maxTokens,
-      temperature,
-      topK,
-      topP,
-      frequencyPenalty,
-      presencePenalty,
-      stopSequences,
-      seed,
-      // response format:
-      responseMimeType: (responseFormat == null ? void 0 : responseFormat.type) === "json" ? "application/json" : void 0,
-      responseSchema: (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && // Google GenAI does not support all OpenAPI Schema features,
-      // so this is needed as an escape hatch:
-      this.supportsStructuredOutputs ? convertJSONSchemaToOpenAPISchema(responseFormat.schema) : void 0,
-      ...this.settings.audioTimestamp && {
-        audioTimestamp: this.settings.audioTimestamp
-      },
-      // provider options:
-      responseModalities: googleOptions == null ? void 0 : googleOptions.responseModalities
-    };
     const { contents, systemInstruction } = convertToGoogleGenerativeAIMessages(prompt);
-    switch (type) {
-      case "regular": {
-        const { tools, toolConfig, toolWarnings } = prepareTools(
-          mode,
-          (_a = this.settings.useSearchGrounding) != null ? _a : false,
-          this.settings.dynamicRetrievalConfig,
-          this.modelId
-        );
-        return {
-          args: {
-            generationConfig,
-            contents,
-            systemInstruction,
-            safetySettings: this.settings.safetySettings,
-            tools,
-            toolConfig,
-            cachedContent: this.settings.cachedContent
-          },
-          warnings: [...warnings, ...toolWarnings]
-        };
-      }
-      case "object-json": {
-        return {
-          args: {
-            generationConfig: {
-              ...generationConfig,
-              responseMimeType: "application/json",
-              responseSchema: mode.schema != null && // Google GenAI does not support all OpenAPI Schema features,
-              // so this is needed as an escape hatch:
-              this.supportsStructuredOutputs ? convertJSONSchemaToOpenAPISchema(mode.schema) : void 0
-            },
-            contents,
-            systemInstruction,
-            safetySettings: this.settings.safetySettings,
-            cachedContent: this.settings.cachedContent
-          },
-          warnings
-        };
-      }
-      case "object-tool": {
-        return {
-          args: {
-            generationConfig,
-            contents,
-            tools: {
-              functionDeclarations: [
-                {
-                  name: mode.tool.name,
-                  description: (_b = mode.tool.description) != null ? _b : "",
-                  parameters: convertJSONSchemaToOpenAPISchema(
-                    mode.tool.parameters
-                  )
-                }
-              ]
-            },
-            toolConfig: { functionCallingConfig: { mode: "ANY" } },
-            safetySettings: this.settings.safetySettings,
-            cachedContent: this.settings.cachedContent
+    const {
+      tools: googleTools,
+      toolConfig: googleToolConfig,
+      toolWarnings
+    } = prepareTools({
+      tools,
+      toolChoice,
+      useSearchGrounding: (_a = this.settings.useSearchGrounding) != null ? _a : false,
+      dynamicRetrievalConfig: this.settings.dynamicRetrievalConfig,
+      modelId: this.modelId
+    });
+    return {
+      args: {
+        generationConfig: {
+          // standardized settings:
+          maxOutputTokens: maxTokens,
+          temperature,
+          topK,
+          topP,
+          frequencyPenalty,
+          presencePenalty,
+          stopSequences,
+          seed,
+          // response format:
+          responseMimeType: (responseFormat == null ? void 0 : responseFormat.type) === "json" ? "application/json" : void 0,
+          responseSchema: (responseFormat == null ? void 0 : responseFormat.type) === "json" && responseFormat.schema != null && // Google GenAI does not support all OpenAPI Schema features,
+          // so this is needed as an escape hatch:
+          this.supportsStructuredOutputs ? convertJSONSchemaToOpenAPISchema(responseFormat.schema) : void 0,
+          ...this.settings.audioTimestamp && {
+            audioTimestamp: this.settings.audioTimestamp
           },
-          warnings
-        };
-      }
-      default: {
-        const _exhaustiveCheck = type;
-        throw new Error(`Unsupported type: ${_exhaustiveCheck}`);
-      }
-    }
+          // provider options:
+          responseModalities: googleOptions == null ? void 0 : googleOptions.responseModalities
+        },
+        contents,
+        systemInstruction,
+        safetySettings: this.settings.safetySettings,
+        tools: googleTools,
+        toolConfig: googleToolConfig,
+        cachedContent: this.settings.cachedContent
+      },
+      warnings: [...warnings, ...toolWarnings]
+    };
   }
   supportsUrl(url) {
     return this.config.isSupportedUrl(url);
@@ -589,22 +527,22 @@ var GoogleGenerativeAILanguageModel = class {
     var _a, _b, _c, _d, _e;
     const { args, warnings } = await this.getArgs(options);
     const body = JSON.stringify(args);
-    const mergedHeaders = (0, import_provider_utils4.combineHeaders)(
-      await (0, import_provider_utils4.resolve)(this.config.headers),
+    const mergedHeaders = (0, import_provider_utils3.combineHeaders)(
+      await (0, import_provider_utils3.resolve)(this.config.headers),
       options.headers
     );
     const {
       responseHeaders,
       value: response,
       rawValue: rawResponse
-    } = await (0, import_provider_utils4.postJsonToApi)({
+    } = await (0, import_provider_utils3.postJsonToApi)({
       url: `${this.config.baseURL}/${getModelPath(
         this.modelId
       )}:generateContent`,
       headers: mergedHeaders,
       body: args,
       failedResponseHandler: googleFailedResponseHandler,
-      successfulResponseHandler: (0, import_provider_utils4.createJsonResponseHandler)(responseSchema),
+      successfulResponseHandler: (0, import_provider_utils3.createJsonResponseHandler)(responseSchema),
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
@@ -620,7 +558,7 @@ var GoogleGenerativeAILanguageModel = class {
       text: getTextFromParts(parts),
       files: (_a = getInlineDataParts(parts)) == null ? void 0 : _a.map((part) => ({
         data: part.inlineData.data,
-        mimeType: part.inlineData.mimeType
+        mediaType: part.inlineData.mimeType
       })),
       toolCalls,
       finishReason: mapGoogleGenerativeAIFinishReason({
@@ -650,18 +588,18 @@ var GoogleGenerativeAILanguageModel = class {
   async doStream(options) {
     const { args, warnings } = await this.getArgs(options);
     const body = JSON.stringify(args);
-    const headers = (0, import_provider_utils4.combineHeaders)(
-      await (0, import_provider_utils4.resolve)(this.config.headers),
+    const headers = (0, import_provider_utils3.combineHeaders)(
+      await (0, import_provider_utils3.resolve)(this.config.headers),
       options.headers
     );
-    const { responseHeaders, value: response } = await (0, import_provider_utils4.postJsonToApi)({
+    const { responseHeaders, value: response } = await (0, import_provider_utils3.postJsonToApi)({
       url: `${this.config.baseURL}/${getModelPath(
         this.modelId
       )}:streamGenerateContent?alt=sse`,
       headers,
       body: args,
       failedResponseHandler: googleFailedResponseHandler,
-      successfulResponseHandler: (0, import_provider_utils4.createEventSourceResponseHandler)(chunkSchema),
+      successfulResponseHandler: (0, import_provider_utils3.createEventSourceResponseHandler)(chunkSchema),
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
@@ -709,7 +647,7 @@ var GoogleGenerativeAILanguageModel = class {
                 for (const part of inlineDataParts) {
                   controller.enqueue({
                     type: "file",
-                    mimeType: part.inlineData.mimeType,
+                    mediaType: part.inlineData.mimeType,
                     data: part.inlineData.data
                   });
                 }
@@ -914,9 +852,9 @@ function isSupportedFileUrl(url) {
 // src/google-provider.ts
 function createGoogleGenerativeAI(options = {}) {
   var _a;
-  const baseURL = (_a = (0, import_provider_utils5.withoutTrailingSlash)(options.baseURL)) != null ? _a : "https://generativelanguage.googleapis.com/v1beta";
+  const baseURL = (_a = (0, import_provider_utils4.withoutTrailingSlash)(options.baseURL)) != null ? _a : "https://generativelanguage.googleapis.com/v1beta";
   const getHeaders = () => ({
-    "x-goog-api-key": (0, import_provider_utils5.loadApiKey)({
+    "x-goog-api-key": (0, import_provider_utils4.loadApiKey)({
       apiKey: options.apiKey,
       environmentVariableName: "GOOGLE_GENERATIVE_AI_API_KEY",
       description: "Google Generative AI"
@@ -929,7 +867,7 @@ function createGoogleGenerativeAI(options = {}) {
       provider: "google.generative-ai",
       baseURL,
       headers: getHeaders,
-      generateId: (_a2 = options.generateId) != null ? _a2 : import_provider_utils5.generateId,
+      generateId: (_a2 = options.generateId) != null ? _a2 : import_provider_utils4.generateId,
       isSupportedUrl: isSupportedFileUrl,
       fetch: options.fetch
     });