@ai-sdk/google 2.0.0-alpha.9 → 2.0.0-beta.2

package/dist/index.mjs

@@ -248,9 +248,7 @@ function isEmptyObjectSchema(jsonSchema) {
 import {
   UnsupportedFunctionalityError
 } from "@ai-sdk/provider";
-import {
-  convertToBase64
-} from "@ai-sdk/provider-utils";
+import { convertToBase64 } from "@ai-sdk/provider-utils";
 function convertToGoogleGenerativeAIMessages(prompt) {
   const systemInstructionParts = [];
   const contents = [];
@@ -328,7 +326,7 @@ function convertToGoogleGenerativeAIMessages(prompt) {
                 return {
                   functionCall: {
                     name: part.toolName,
-                    args: part.args
+                    args: part.input
                   }
                 };
               }
@@ -346,7 +344,7 @@ function convertToGoogleGenerativeAIMessages(prompt) {
               name: part.toolName,
               response: {
                 name: part.toolName,
-                content: part.result
+                content: part.output.value
               }
             }
           }))
@@ -382,7 +380,8 @@ var dynamicRetrievalConfig = z4.object({
 var googleGenerativeAIProviderOptions = z4.object({
   responseModalities: z4.array(z4.enum(["TEXT", "IMAGE"])).optional(),
   thinkingConfig: z4.object({
-    thinkingBudget: z4.number().optional()
+    thinkingBudget: z4.number().optional(),
+    includeThoughts: z4.boolean().optional()
   }).optional(),
   /**
   Optional.
@@ -488,7 +487,7 @@ function prepareTools({
       functionDeclarations.push({
         name: tool.name,
         description: (_a = tool.description) != null ? _a : "",
-        parameters: convertJSONSchemaToOpenAPISchema(tool.parameters)
+        parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema)
       });
     }
   }
@@ -595,14 +594,27 @@ var GoogleGenerativeAILanguageModel = class {
     toolChoice,
     providerOptions
   }) {
-    var _a, _b;
+    var _a, _b, _c;
     const warnings = [];
     const googleOptions = await parseProviderOptions2({
       provider: "google",
       providerOptions,
       schema: googleGenerativeAIProviderOptions
     });
+    if (((_a = googleOptions == null ? void 0 : googleOptions.thinkingConfig) == null ? void 0 : _a.includeThoughts) === true && !this.config.provider.startsWith("google.vertex.")) {
+      warnings.push({
+        type: "other",
+        message: `The 'includeThoughts' option is only supported with the Google Vertex provider and might not be supported or could behave unexpectedly with the current Google provider (${this.config.provider}).`
+      });
+    }
     const { contents, systemInstruction } = convertToGoogleGenerativeAIMessages(prompt);
+    const isGemmaModel = this.modelId.toLowerCase().startsWith("gemma-");
+    if (isGemmaModel && systemInstruction && systemInstruction.parts.length > 0) {
+      warnings.push({
+        type: "other",
+        message: `GEMMA models do not support system instructions. System messages will be ignored. Consider including instructions in the first user message instead.`
+      });
+    }
     const {
       tools: googleTools,
       toolConfig: googleToolConfig,
@@ -610,7 +622,7 @@ var GoogleGenerativeAILanguageModel = class {
     } = prepareTools({
       tools,
       toolChoice,
-      useSearchGrounding: (_a = googleOptions == null ? void 0 : googleOptions.useSearchGrounding) != null ? _a : false,
+      useSearchGrounding: (_b = googleOptions == null ? void 0 : googleOptions.useSearchGrounding) != null ? _b : false,
       dynamicRetrievalConfig: googleOptions == null ? void 0 : googleOptions.dynamicRetrievalConfig,
       modelId: this.modelId
     });
@@ -631,7 +643,7 @@ var GoogleGenerativeAILanguageModel = class {
           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:
           // TODO convert into provider option
-          ((_b = googleOptions == null ? void 0 : googleOptions.structuredOutputs) != null ? _b : true) ? convertJSONSchemaToOpenAPISchema(responseFormat.schema) : void 0,
+          ((_c = googleOptions == null ? void 0 : googleOptions.structuredOutputs) != null ? _c : true) ? convertJSONSchemaToOpenAPISchema(responseFormat.schema) : void 0,
           ...(googleOptions == null ? void 0 : googleOptions.audioTimestamp) && {
             audioTimestamp: googleOptions.audioTimestamp
           },
@@ -640,7 +652,7 @@ var GoogleGenerativeAILanguageModel = class {
           thinkingConfig: googleOptions == null ? void 0 : googleOptions.thinkingConfig
         },
         contents,
-        systemInstruction,
+        systemInstruction: isGemmaModel ? void 0 : systemInstruction,
         safetySettings: googleOptions == null ? void 0 : googleOptions.safetySettings,
         tools: googleTools,
         toolConfig: googleToolConfig,
@@ -675,16 +687,20 @@ var GoogleGenerativeAILanguageModel = class {
     const candidate = response.candidates[0];
     const content = [];
     const parts = candidate.content == null || typeof candidate.content !== "object" || !("parts" in candidate.content) ? [] : (_a = candidate.content.parts) != null ? _a : [];
+    const usageMetadata = response.usageMetadata;
     for (const part of parts) {
-      if ("text" in part && part.text.length > 0) {
-        content.push({ type: "text", text: part.text });
+      if ("text" in part && part.text != null && part.text.length > 0) {
+        if (part.thought === true) {
+          content.push({ type: "reasoning", text: part.text });
+        } else {
+          content.push({ type: "text", text: part.text });
+        }
       } else if ("functionCall" in part) {
         content.push({
           type: "tool-call",
-          toolCallType: "function",
           toolCallId: this.config.generateId(),
           toolName: part.functionCall.name,
-          args: JSON.stringify(part.functionCall.args)
+          input: JSON.stringify(part.functionCall.args)
         });
       } else if ("inlineData" in part) {
         content.push({
@@ -701,7 +717,6 @@ var GoogleGenerativeAILanguageModel = class {
     for (const source of sources) {
       content.push(source);
     }
-    const usageMetadata = response.usageMetadata;
     return {
       content,
       finishReason: mapGoogleGenerativeAIFinishReason({
@@ -757,6 +772,9 @@ var GoogleGenerativeAILanguageModel = class {
     let providerMetadata = void 0;
     const generateId2 = this.config.generateId;
     let hasToolCalls = false;
+    let currentTextBlockId = null;
+    let currentReasoningBlockId = null;
+    let blockCounter = 0;
     return {
       stream: response.pipeThrough(
         new TransformStream({
@@ -764,7 +782,10 @@ var GoogleGenerativeAILanguageModel = class {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+            if (options.includeRawChunks) {
+              controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
+            }
             if (!chunk.success) {
               controller.enqueue({ type: "error", error: chunk.error });
               return;
@@ -784,9 +805,51 @@ var GoogleGenerativeAILanguageModel = class {
             }
             const content = candidate.content;
             if (content != null) {
-              const deltaText = getTextFromParts(content.parts);
-              if (deltaText != null) {
-                controller.enqueue(deltaText);
+              const parts = (_g = content.parts) != null ? _g : [];
+              for (const part of parts) {
+                if ("text" in part && part.text != null && part.text.length > 0) {
+                  if (part.thought === true) {
+                    if (currentTextBlockId !== null) {
+                      controller.enqueue({
+                        type: "text-end",
+                        id: currentTextBlockId
+                      });
+                      currentTextBlockId = null;
+                    }
+                    if (currentReasoningBlockId === null) {
+                      currentReasoningBlockId = String(blockCounter++);
+                      controller.enqueue({
+                        type: "reasoning-start",
+                        id: currentReasoningBlockId
+                      });
+                    }
+                    controller.enqueue({
+                      type: "reasoning-delta",
+                      id: currentReasoningBlockId,
+                      delta: part.text
+                    });
+                  } else {
+                    if (currentReasoningBlockId !== null) {
+                      controller.enqueue({
+                        type: "reasoning-end",
+                        id: currentReasoningBlockId
+                      });
+                      currentReasoningBlockId = null;
+                    }
+                    if (currentTextBlockId === null) {
+                      currentTextBlockId = String(blockCounter++);
+                      controller.enqueue({
+                        type: "text-start",
+                        id: currentTextBlockId
+                      });
+                    }
+                    controller.enqueue({
+                      type: "text-delta",
+                      id: currentTextBlockId,
+                      delta: part.text
+                    });
+                  }
+                }
               }
               const inlineDataParts = getInlineDataParts(content.parts);
               if (inlineDataParts != null) {
@@ -805,18 +868,24 @@ var GoogleGenerativeAILanguageModel = class {
               if (toolCallDeltas != null) {
                 for (const toolCall of toolCallDeltas) {
                   controller.enqueue({
-                    type: "tool-call-delta",
-                    toolCallType: "function",
-                    toolCallId: toolCall.toolCallId,
-                    toolName: toolCall.toolName,
-                    argsTextDelta: toolCall.args
+                    type: "tool-input-start",
+                    id: toolCall.toolCallId,
+                    toolName: toolCall.toolName
+                  });
+                  controller.enqueue({
+                    type: "tool-input-delta",
+                    id: toolCall.toolCallId,
+                    delta: toolCall.args
+                  });
+                  controller.enqueue({
+                    type: "tool-input-end",
+                    id: toolCall.toolCallId
                   });
                   controller.enqueue({
                     type: "tool-call",
-                    toolCallType: "function",
                     toolCallId: toolCall.toolCallId,
                     toolName: toolCall.toolName,
-                    args: toolCall.args
+                    input: toolCall.args
                   });
                   hasToolCalls = true;
                 }
@@ -827,22 +896,34 @@ var GoogleGenerativeAILanguageModel = class {
                 finishReason: candidate.finishReason,
                 hasToolCalls
               });
-              const sources = (_g = extractSources({
+              const sources = (_h = extractSources({
                 groundingMetadata: candidate.groundingMetadata,
                 generateId: generateId2
-              })) != null ? _g : [];
+              })) != null ? _h : [];
               for (const source of sources) {
                 controller.enqueue(source);
               }
               providerMetadata = {
                 google: {
-                  groundingMetadata: (_h = candidate.groundingMetadata) != null ? _h : null,
-                  safetyRatings: (_i = candidate.safetyRatings) != null ? _i : null
+                  groundingMetadata: (_i = candidate.groundingMetadata) != null ? _i : null,
+                  safetyRatings: (_j = candidate.safetyRatings) != null ? _j : null
                 }
               };
             }
           },
           flush(controller) {
+            if (currentTextBlockId !== null) {
+              controller.enqueue({
+                type: "text-end",
+                id: currentTextBlockId
+              });
+            }
+            if (currentReasoningBlockId !== null) {
+              controller.enqueue({
+                type: "reasoning-end",
+                id: currentReasoningBlockId
+              });
+            }
             controller.enqueue({
               type: "finish",
               finishReason,
@@ -866,19 +947,11 @@ function getToolCallsFromParts({
   );
   return functionCallParts == null || functionCallParts.length === 0 ? void 0 : functionCallParts.map((part) => ({
     type: "tool-call",
-    toolCallType: "function",
     toolCallId: generateId2(),
     toolName: part.functionCall.name,
     args: JSON.stringify(part.functionCall.args)
   }));
 }
-function getTextFromParts(parts) {
-  const textParts = parts == null ? void 0 : parts.filter((part) => "text" in part);
-  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(
     (part) => "inlineData" in part
@@ -900,12 +973,9 @@ function extractSources({
   }));
 }
 var contentSchema = z5.object({
-  role: z5.string(),
   parts: z5.array(
     z5.union([
-      z5.object({
-        text: z5.string()
-      }),
+      // note: order matters since text can be fully empty
       z5.object({
         functionCall: z5.object({
           name: z5.string(),
@@ -917,6 +987,10 @@ var contentSchema = z5.object({
           mimeType: z5.string(),
           data: z5.string()
         })
+      }),
+      z5.object({
+        text: z5.string().nullish(),
+        thought: z5.boolean().nullish()
       })
     ])
   ).nullish()