@ai-sdk/google 2.0.0-canary.6 → 2.0.0-canary.8

package/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @ai-sdk/google
 
+## 2.0.0-canary.8
+
+### Patch Changes
+
+- 26735b5: chore(embedding-model): add v2 interface
+- 443d8ec: feat(embedding-model-v2): add response body field
+- fd65bc6: chore(embedding-model-v2): rename rawResponse to response
+- Updated dependencies [26735b5]
+- Updated dependencies [443d8ec]
+- Updated dependencies [14c9410]
+- Updated dependencies [d9c98f4]
+- Updated dependencies [c4a2fec]
+- Updated dependencies [0054544]
+- Updated dependencies [9e9c809]
+- Updated dependencies [32831c6]
+- Updated dependencies [d0f9495]
+- Updated dependencies [fd65bc6]
+- Updated dependencies [393138b]
+- Updated dependencies [7182d14]
+  - @ai-sdk/provider@2.0.0-canary.6
+  - @ai-sdk/provider-utils@3.0.0-canary.7
+
+## 2.0.0-canary.7
+
+### Patch Changes
+
+- f10304b: feat(tool-calling): don't require the user to have to pass parameters
+- Updated dependencies [411e483]
+- Updated dependencies [79457bd]
+- Updated dependencies [ad80501]
+- Updated dependencies [1766ede]
+- Updated dependencies [f10304b]
+  - @ai-sdk/provider@2.0.0-canary.5
+  - @ai-sdk/provider-utils@3.0.0-canary.6
+
 ## 2.0.0-canary.6
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { ProviderV2, LanguageModelV2, EmbeddingModelV1 } from '@ai-sdk/provider';
+import { ProviderV2, LanguageModelV2, EmbeddingModelV2 } from '@ai-sdk/provider';
 import { FetchFunction } from '@ai-sdk/provider-utils';
 
 declare const googleErrorDataSchema: z.ZodObject<{
@@ -308,12 +308,12 @@ interface GoogleGenerativeAIProvider extends ProviderV2 {
     /**
   @deprecated Use `textEmbeddingModel()` instead.
      */
-    embedding(modelId: GoogleGenerativeAIEmbeddingModelId, settings?: GoogleGenerativeAIEmbeddingSettings): EmbeddingModelV1<string>;
+    embedding(modelId: GoogleGenerativeAIEmbeddingModelId, settings?: GoogleGenerativeAIEmbeddingSettings): EmbeddingModelV2<string>;
     /**
   @deprecated Use `textEmbeddingModel()` instead.
    */
-    textEmbedding(modelId: GoogleGenerativeAIEmbeddingModelId, settings?: GoogleGenerativeAIEmbeddingSettings): EmbeddingModelV1<string>;
-    textEmbeddingModel(modelId: GoogleGenerativeAIEmbeddingModelId, settings?: GoogleGenerativeAIEmbeddingSettings): EmbeddingModelV1<string>;
+    textEmbedding(modelId: GoogleGenerativeAIEmbeddingModelId, settings?: GoogleGenerativeAIEmbeddingSettings): EmbeddingModelV2<string>;
+    textEmbeddingModel(modelId: GoogleGenerativeAIEmbeddingModelId, settings?: GoogleGenerativeAIEmbeddingSettings): EmbeddingModelV2<string>;
 }
 interface GoogleGenerativeAIProviderSettings {
     /**

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { ProviderV2, LanguageModelV2, EmbeddingModelV1 } from '@ai-sdk/provider';
+import { ProviderV2, LanguageModelV2, EmbeddingModelV2 } from '@ai-sdk/provider';
 import { FetchFunction } from '@ai-sdk/provider-utils';
 
 declare const googleErrorDataSchema: z.ZodObject<{
@@ -308,12 +308,12 @@ interface GoogleGenerativeAIProvider extends ProviderV2 {
     /**
   @deprecated Use `textEmbeddingModel()` instead.
      */
-    embedding(modelId: GoogleGenerativeAIEmbeddingModelId, settings?: GoogleGenerativeAIEmbeddingSettings): EmbeddingModelV1<string>;
+    embedding(modelId: GoogleGenerativeAIEmbeddingModelId, settings?: GoogleGenerativeAIEmbeddingSettings): EmbeddingModelV2<string>;
     /**
   @deprecated Use `textEmbeddingModel()` instead.
    */
-    textEmbedding(modelId: GoogleGenerativeAIEmbeddingModelId, settings?: GoogleGenerativeAIEmbeddingSettings): EmbeddingModelV1<string>;
-    textEmbeddingModel(modelId: GoogleGenerativeAIEmbeddingModelId, settings?: GoogleGenerativeAIEmbeddingSettings): EmbeddingModelV1<string>;
+    textEmbedding(modelId: GoogleGenerativeAIEmbeddingModelId, settings?: GoogleGenerativeAIEmbeddingSettings): EmbeddingModelV2<string>;
+    textEmbeddingModel(modelId: GoogleGenerativeAIEmbeddingModelId, settings?: GoogleGenerativeAIEmbeddingSettings): EmbeddingModelV2<string>;
 }
 interface GoogleGenerativeAIProviderSettings {
     /**

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_utils4 = require("@ai-sdk/provider-utils");
+var import_provider_utils5 = require("@ai-sdk/provider-utils");
 
 // src/google-generative-ai-embedding-model.ts
 var import_provider = require("@ai-sdk/provider");
@@ -52,7 +52,7 @@ var googleFailedResponseHandler = (0, import_provider_utils.createJsonErrorRespo
 // src/google-generative-ai-embedding-model.ts
 var GoogleGenerativeAIEmbeddingModel = class {
   constructor(modelId, settings, config) {
-    this.specificationVersion = "v1";
+    this.specificationVersion = "v2";
     this.modelId = modelId;
     this.settings = settings;
     this.config = config;
@@ -83,7 +83,11 @@ var GoogleGenerativeAIEmbeddingModel = class {
       await (0, import_provider_utils2.resolve)(this.config.headers),
       headers
     );
-    const { responseHeaders, value: response } = await (0, import_provider_utils2.postJsonToApi)({
+    const {
+      responseHeaders,
+      value: response,
+      rawValue
+    } = await (0, import_provider_utils2.postJsonToApi)({
       url: `${this.config.baseURL}/models/${this.modelId}:batchEmbedContents`,
       headers: mergedHeaders,
       body: {
@@ -103,7 +107,7 @@ var GoogleGenerativeAIEmbeddingModel = class {
     return {
       embeddings: response.embeddings.map((item) => item.values),
       usage: void 0,
-      rawResponse: { headers: responseHeaders }
+      response: { headers: responseHeaders, body: rawValue }
     };
   }
 };
@@ -112,12 +116,12 @@ var googleGenerativeAITextEmbeddingResponseSchema = import_zod2.z.object({
 });
 
 // src/google-generative-ai-language-model.ts
-var import_provider_utils3 = require("@ai-sdk/provider-utils");
+var import_provider_utils4 = require("@ai-sdk/provider-utils");
 var import_zod3 = require("zod");
 
 // src/convert-json-schema-to-openapi-schema.ts
 function convertJSONSchemaToOpenAPISchema(jsonSchema) {
-  if (isEmptyObjectSchema(jsonSchema)) {
+  if (jsonSchema == null || isEmptyObjectSchema(jsonSchema)) {
     return void 0;
   }
   if (typeof jsonSchema === "boolean") {
@@ -214,6 +218,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) {
   const systemInstructionParts = [];
   const contents = [];
@@ -246,7 +251,12 @@ function convertToGoogleGenerativeAIMessages(prompt) {
                     mimeType: mediaType,
                     fileUri: part.data.toString()
                   }
-                } : { inlineData: { mimeType: mediaType, data: part.data } }
+                } : {
+                  inlineData: {
+                    mimeType: mediaType,
+                    data: (0, import_provider_utils3.convertToBase64)(part.data)
+                  }
+                }
               );
               break;
             }
@@ -278,7 +288,7 @@ function convertToGoogleGenerativeAIMessages(prompt) {
                 return {
                   inlineData: {
                     mimeType: part.mediaType,
-                    data: part.data
+                    data: (0, import_provider_utils3.convertToBase64)(part.data)
                   }
                 };
               }
@@ -455,7 +465,7 @@ var GoogleGenerativeAILanguageModel = class {
   }
   async getArgs({
     prompt,
-    maxTokens,
+    maxOutputTokens,
     temperature,
     topP,
     topK,
@@ -470,7 +480,7 @@ var GoogleGenerativeAILanguageModel = class {
   }) {
     var _a;
     const warnings = [];
-    const googleOptions = (0, import_provider_utils3.parseProviderOptions)({
+    const googleOptions = (0, import_provider_utils4.parseProviderOptions)({
       provider: "google",
       providerOptions,
       schema: googleGenerativeAIProviderOptionsSchema
@@ -491,7 +501,7 @@ var GoogleGenerativeAILanguageModel = class {
       args: {
         generationConfig: {
           // standardized settings:
-          maxOutputTokens: maxTokens,
+          maxOutputTokens,
           temperature,
           topK,
           topP,
@@ -527,26 +537,25 @@ 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_utils3.combineHeaders)(
-      await (0, import_provider_utils3.resolve)(this.config.headers),
+    const mergedHeaders = (0, import_provider_utils4.combineHeaders)(
+      await (0, import_provider_utils4.resolve)(this.config.headers),
       options.headers
     );
     const {
       responseHeaders,
       value: response,
       rawValue: rawResponse
-    } = await (0, import_provider_utils3.postJsonToApi)({
+    } = await (0, import_provider_utils4.postJsonToApi)({
       url: `${this.config.baseURL}/${getModelPath(
         this.modelId
       )}:generateContent`,
       headers: mergedHeaders,
       body: args,
       failedResponseHandler: googleFailedResponseHandler,
-      successfulResponseHandler: (0, import_provider_utils3.createJsonResponseHandler)(responseSchema),
+      successfulResponseHandler: (0, import_provider_utils4.createJsonResponseHandler)(responseSchema),
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
-    const { contents: rawPrompt, ...rawSettings } = args;
     const candidate = response.candidates[0];
     const parts = candidate.content == null || typeof candidate.content !== "object" || !("parts" in candidate.content) ? [] : candidate.content.parts;
     const toolCalls = getToolCallsFromParts({
@@ -557,6 +566,7 @@ var GoogleGenerativeAILanguageModel = class {
     return {
       text: getTextFromParts(parts),
       files: (_a = getInlineDataParts(parts)) == null ? void 0 : _a.map((part) => ({
+        type: "file",
         data: part.inlineData.data,
         mediaType: part.inlineData.mimeType
       })),
@@ -566,8 +576,8 @@ var GoogleGenerativeAILanguageModel = class {
         hasToolCalls: toolCalls != null && toolCalls.length > 0
       }),
       usage: {
-        promptTokens: (_b = usageMetadata == null ? void 0 : usageMetadata.promptTokenCount) != null ? _b : NaN,
-        completionTokens: (_c = usageMetadata == null ? void 0 : usageMetadata.candidatesTokenCount) != null ? _c : NaN
+        inputTokens: (_b = usageMetadata == null ? void 0 : usageMetadata.promptTokenCount) != null ? _b : void 0,
+        outputTokens: (_c = usageMetadata == null ? void 0 : usageMetadata.candidatesTokenCount) != null ? _c : void 0
       },
       warnings,
       providerMetadata: {
@@ -591,26 +601,25 @@ var GoogleGenerativeAILanguageModel = class {
   async doStream(options) {
     const { args, warnings } = await this.getArgs(options);
     const body = JSON.stringify(args);
-    const headers = (0, import_provider_utils3.combineHeaders)(
-      await (0, import_provider_utils3.resolve)(this.config.headers),
+    const headers = (0, import_provider_utils4.combineHeaders)(
+      await (0, import_provider_utils4.resolve)(this.config.headers),
       options.headers
     );
-    const { responseHeaders, value: response } = await (0, import_provider_utils3.postJsonToApi)({
+    const { responseHeaders, value: response } = await (0, import_provider_utils4.postJsonToApi)({
       url: `${this.config.baseURL}/${getModelPath(
         this.modelId
       )}:streamGenerateContent?alt=sse`,
       headers,
       body: args,
       failedResponseHandler: googleFailedResponseHandler,
-      successfulResponseHandler: (0, import_provider_utils3.createEventSourceResponseHandler)(chunkSchema),
+      successfulResponseHandler: (0, import_provider_utils4.createEventSourceResponseHandler)(chunkSchema),
       abortSignal: options.abortSignal,
       fetch: this.config.fetch
     });
-    const { contents: rawPrompt, ...rawSettings } = args;
     let finishReason = "unknown";
-    let usage = {
-      promptTokens: Number.NaN,
-      completionTokens: Number.NaN
+    const usage = {
+      inputTokens: void 0,
+      outputTokens: void 0
     };
     let providerMetadata = void 0;
     const generateId2 = this.config.generateId;
@@ -627,10 +636,8 @@ var GoogleGenerativeAILanguageModel = class {
             const value = chunk.value;
             const usageMetadata = value.usageMetadata;
             if (usageMetadata != null) {
-              usage = {
-                promptTokens: (_a = usageMetadata.promptTokenCount) != null ? _a : NaN,
-                completionTokens: (_b = usageMetadata.candidatesTokenCount) != null ? _b : NaN
-              };
+              usage.inputTokens = (_a = usageMetadata.promptTokenCount) != null ? _a : void 0;
+              usage.outputTokens = (_b = usageMetadata.candidatesTokenCount) != null ? _b : void 0;
             }
             const candidate = (_c = value.candidates) == null ? void 0 : _c[0];
             if (candidate == null) {
@@ -640,10 +647,7 @@ var GoogleGenerativeAILanguageModel = class {
             if (content != null) {
               const deltaText = getTextFromParts(content.parts);
               if (deltaText != null) {
-                controller.enqueue({
-                  type: "text-delta",
-                  textDelta: deltaText
-                });
+                controller.enqueue(deltaText);
               }
               const inlineDataParts = getInlineDataParts(content.parts);
               if (inlineDataParts != null) {
@@ -689,7 +693,7 @@ var GoogleGenerativeAILanguageModel = class {
                 generateId: generateId2
               })) != null ? _d : [];
               for (const source of sources) {
-                controller.enqueue({ type: "source", source });
+                controller.enqueue(source);
               }
               providerMetadata = {
                 google: {
@@ -723,6 +727,7 @@ function getToolCallsFromParts({
     (part) => "functionCall" in part
   );
   return functionCallParts == null || functionCallParts.length === 0 ? void 0 : functionCallParts.map((part) => ({
+    type: "tool-call",
     toolCallType: "function",
     toolCallId: generateId2(),
     toolName: part.functionCall.name,
@@ -731,7 +736,10 @@ function getToolCallsFromParts({
 }
 function getTextFromParts(parts) {
   const textParts = parts == null ? void 0 : parts.filter((part) => "text" in part);
-  return textParts == null || textParts.length === 0 ? void 0 : textParts.map((part) => part.text).join("");
+  return textParts == null || textParts.length === 0 ? void 0 : {
+    type: "text",
+    text: textParts.map((part) => part.text).join("")
+  };
 }
 function getInlineDataParts(parts) {
   return parts == null ? void 0 : parts.filter(
@@ -746,6 +754,7 @@ function extractSources({
   return (_a = groundingMetadata == null ? void 0 : groundingMetadata.groundingChunks) == null ? void 0 : _a.filter(
     (chunk) => chunk.web != null
   ).map((chunk) => ({
+    type: "source",
     sourceType: "url",
     id: generateId2(),
     url: chunk.web.uri,
@@ -854,9 +863,9 @@ function isSupportedFileUrl(url) {
 // src/google-provider.ts
 function createGoogleGenerativeAI(options = {}) {
   var _a;
-  const baseURL = (_a = (0, import_provider_utils4.withoutTrailingSlash)(options.baseURL)) != null ? _a : "https://generativelanguage.googleapis.com/v1beta";
+  const baseURL = (_a = (0, import_provider_utils5.withoutTrailingSlash)(options.baseURL)) != null ? _a : "https://generativelanguage.googleapis.com/v1beta";
   const getHeaders = () => ({
-    "x-goog-api-key": (0, import_provider_utils4.loadApiKey)({
+    "x-goog-api-key": (0, import_provider_utils5.loadApiKey)({
       apiKey: options.apiKey,
       environmentVariableName: "GOOGLE_GENERATIVE_AI_API_KEY",
       description: "Google Generative AI"
@@ -869,7 +878,7 @@ function createGoogleGenerativeAI(options = {}) {
       provider: "google.generative-ai",
       baseURL,
       headers: getHeaders,
-      generateId: (_a2 = options.generateId) != null ? _a2 : import_provider_utils4.generateId,
+      generateId: (_a2 = options.generateId) != null ? _a2 : import_provider_utils5.generateId,
       isSupportedUrl: isSupportedFileUrl,
       fetch: options.fetch
     });