@ai-sdk/google 4.0.99 → 4.0.100
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +9 -0
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +20 -7
- package/dist/index.js.map +1 -1
- package/dist/internal/index.d.ts +2 -1
- package/dist/internal/index.d.ts.map +1 -1
- package/dist/internal/index.js +19 -6
- package/dist/internal/index.js.map +1 -1
- package/docs/15-google.mdx +8 -0
- package/package.json +3 -3
- package/src/google-language-model.ts +35 -2
- package/src/google-prompt.ts +2 -0
package/dist/internal/index.d.ts
CHANGED
|
@@ -197,7 +197,7 @@ export declare class GoogleLanguageModel implements LanguageModelV4 {
|
|
|
197
197
|
toolNameMapping: import("@ai-sdk/provider-utils").ToolNameMapping;
|
|
198
198
|
}>;
|
|
199
199
|
private getArgs;
|
|
200
|
-
static convertGenerateContentResponse({ config, response, warnings, providerOptionsNames, toolNameMapping, jsonResponseToolName, initialPromptTokenCount }: {
|
|
200
|
+
static convertGenerateContentResponse({ config, response, warnings, providerOptionsNames, toolNameMapping, jsonResponseToolName, initialPromptTokenCount, groundingMetadataPerRequest }: {
|
|
201
201
|
config: GoogleLanguageModelConfig;
|
|
202
202
|
response: InferSchema<typeof responseSchema>;
|
|
203
203
|
warnings: SharedV4Warning[];
|
|
@@ -205,6 +205,7 @@ export declare class GoogleLanguageModel implements LanguageModelV4 {
|
|
|
205
205
|
toolNameMapping?: ReturnType<typeof createToolNameMapping>;
|
|
206
206
|
jsonResponseToolName?: string;
|
|
207
207
|
initialPromptTokenCount?: number | null;
|
|
208
|
+
groundingMetadataPerRequest?: Array<GroundingMetadataSchema | null>;
|
|
208
209
|
}): LanguageModelV4GenerateResult;
|
|
209
210
|
doGenerate(options: LanguageModelV4CallOptions): Promise<LanguageModelV4GenerateResult>;
|
|
210
211
|
doStream(options: LanguageModelV4CallOptions): Promise<LanguageModelV4StreamResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","names":["_$__google_prompt0.GoogleContent","_$__google_prompt0.GoogleSystemInstruction"],"sources":["../../src/google-prompt.ts","../../src/google-language-model-options.ts","../../src/google-language-model.ts","../../src/google-speech-model-options.ts","../../src/google-speech-model.ts","../../src/google-speech-input.ts","../../src/google-tools.ts","../../src/interactions/google-interactions-language-model-options.ts","../../src/interactions/google-interactions-language-model.ts","../../src/interactions/google-interactions-agent.ts"],"mappings":";;;;KAaY;EACV,OAAO;IAAQ;;;KAGL;EACV;EACA,OAAO,MAAM;;KAGH;EACN;EAAc;EAAmB;;EAEjC;IAAc;IAAkB;;EAChC;EACA;;EAGA;IAAgB;IAAa;IAAc;;EAC3C;;EAGA;IACE;IACA;IACA;IACA,QAAQ,MAAM;;;EAIhB;IAAY;IAAkB;;EAC9B;EACA;;EAGA;IACE;IACA;IACA;;EAEF;;EAGA;IACE;IACA;IACA;;EAEF;;EAGA;IACE;IACA;;;EAIF;IACE;IACA;;;KAII;EAEN;IAAc;IAAkB;;;EAGhC;IAAY;IAAkB;;;;;KCzExB;;;YC6EA;EACV;EACA;EACA,UAAU,WAAW;EACrB,QAAQ;EACR;;;;EAKA,sBAAsB;;;;EAKtB;IACE;IACA;;;qBAIS,+BAA+B;WACjC;WAEA,SAAS;mBAED;mBACA;UAET,oBAAoB,OAAO;;;;UAO3B,sBAAsB;IAC5B;IACA,QAAQ;MACT;EAIW,YAAA,SAAS,eAAe,QAAQ;MAMxC;MAIA,iBAAa,eAAA,YAAA,YAAA,eAAA;SAIJ,iBACX,SACA,QACA,WACE,QACA,iBACA,aACA,MACA,MACA,kBACA,iBACA,eACA,gBACA,MACA,OACA,YACA,WACA,iBACA,eAEF;IAEA,SAAS;IACT,QAAQ;IACR,SAAS;IACT;MACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gBAFUA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAwSG;SAqDP,iCACL,QACA,UACA,UACA,sBACA,iBACA,sBACA;IAEA,QAAQ;IACR,UAAU,mBAAmB;IAC7B,UAAU;IACV;IACA,kBAAkB,kBAAkB;IACpC;IACA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","names":["_$__google_prompt0.GoogleContent","_$__google_prompt0.GoogleSystemInstruction"],"sources":["../../src/google-prompt.ts","../../src/google-language-model-options.ts","../../src/google-language-model.ts","../../src/google-speech-model-options.ts","../../src/google-speech-model.ts","../../src/google-speech-input.ts","../../src/google-tools.ts","../../src/interactions/google-interactions-language-model-options.ts","../../src/interactions/google-interactions-language-model.ts","../../src/interactions/google-interactions-agent.ts"],"mappings":"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"}
|
package/dist/internal/index.js
CHANGED
|
@@ -1507,7 +1507,7 @@ var GoogleLanguageModel = class GoogleLanguageModel {
|
|
|
1507
1507
|
jsonResponseToolName: jsonResponseTool?.name
|
|
1508
1508
|
};
|
|
1509
1509
|
}
|
|
1510
|
-
static convertGenerateContentResponse({ config, response, warnings, providerOptionsNames, toolNameMapping, jsonResponseToolName, initialPromptTokenCount }) {
|
|
1510
|
+
static convertGenerateContentResponse({ config, response, warnings, providerOptionsNames, toolNameMapping, jsonResponseToolName, initialPromptTokenCount, groundingMetadataPerRequest }) {
|
|
1511
1511
|
const wrapProviderMetadata = (payload) => Object.fromEntries(providerOptionsNames.map((name) => [name, payload]));
|
|
1512
1512
|
const candidate = response.candidates?.[0];
|
|
1513
1513
|
const promptBlockReason = response.promptFeedback?.blockReason;
|
|
@@ -1635,6 +1635,7 @@ var GoogleLanguageModel = class GoogleLanguageModel {
|
|
|
1635
1635
|
providerMetadata: wrapProviderMetadata({
|
|
1636
1636
|
promptFeedback: response.promptFeedback ?? null,
|
|
1637
1637
|
groundingMetadata: candidate?.groundingMetadata ?? null,
|
|
1638
|
+
...groundingMetadataPerRequest != null ? { groundingMetadataPerRequest } : {},
|
|
1638
1639
|
urlContextMetadata: candidate?.urlContextMetadata ?? null,
|
|
1639
1640
|
safetyRatings: candidate?.safetyRatings ?? null,
|
|
1640
1641
|
usageMetadata: usageMetadata ?? null,
|
|
@@ -1660,11 +1661,13 @@ var GoogleLanguageModel = class GoogleLanguageModel {
|
|
|
1660
1661
|
});
|
|
1661
1662
|
let { responseHeaders, value: response, rawValue: rawResponse } = await generateContent(args);
|
|
1662
1663
|
const content = [];
|
|
1664
|
+
const groundingMetadataPerRequest = [];
|
|
1663
1665
|
let usageMetadata;
|
|
1664
1666
|
const firstPromptTokenCount = response.usageMetadata?.promptTokenCount;
|
|
1665
1667
|
let isContinued = false;
|
|
1666
1668
|
while (true) {
|
|
1667
1669
|
const candidate = response.candidates?.[0];
|
|
1670
|
+
groundingMetadataPerRequest.push(candidate?.groundingMetadata ?? null);
|
|
1668
1671
|
const continuationToken = candidate?.finishReason === "CONTINUATION" ? candidate.continuationToken : void 0;
|
|
1669
1672
|
usageMetadata = addGoogleUsageMetadata(usageMetadata, response.usageMetadata ?? void 0);
|
|
1670
1673
|
if (continuationToken == null) break;
|
|
@@ -1692,7 +1695,8 @@ var GoogleLanguageModel = class GoogleLanguageModel {
|
|
|
1692
1695
|
providerOptionsNames,
|
|
1693
1696
|
toolNameMapping,
|
|
1694
1697
|
jsonResponseToolName,
|
|
1695
|
-
initialPromptTokenCount: isContinued ? firstPromptTokenCount : void 0
|
|
1698
|
+
initialPromptTokenCount: isContinued ? firstPromptTokenCount : void 0,
|
|
1699
|
+
groundingMetadataPerRequest: isContinued ? groundingMetadataPerRequest : void 0
|
|
1696
1700
|
});
|
|
1697
1701
|
const result = {
|
|
1698
1702
|
...lastResult,
|
|
@@ -1722,16 +1726,24 @@ var GoogleLanguageModel = class GoogleLanguageModel {
|
|
|
1722
1726
|
fetch: this.config.fetch
|
|
1723
1727
|
});
|
|
1724
1728
|
const { responseHeaders, value: firstResponse } = await streamGenerateContent(args);
|
|
1729
|
+
const groundingMetadataPerRequest = [];
|
|
1730
|
+
let requestGroundingMetadata = null;
|
|
1725
1731
|
const response = continueGoogleStream({
|
|
1726
1732
|
stream: firstResponse,
|
|
1727
1733
|
getContinuationToken: (chunk) => {
|
|
1728
1734
|
const candidate = chunk.candidates?.[0];
|
|
1735
|
+
if (candidate?.groundingMetadata != null) requestGroundingMetadata = candidate.groundingMetadata;
|
|
1729
1736
|
return candidate?.finishReason === "CONTINUATION" ? candidate.continuationToken ?? void 0 : void 0;
|
|
1730
1737
|
},
|
|
1731
|
-
continueStream: async (continuationToken) =>
|
|
1732
|
-
|
|
1733
|
-
|
|
1734
|
-
|
|
1738
|
+
continueStream: async (continuationToken) => {
|
|
1739
|
+
const { value } = await streamGenerateContent({
|
|
1740
|
+
...args,
|
|
1741
|
+
continuationToken
|
|
1742
|
+
});
|
|
1743
|
+
groundingMetadataPerRequest.push(requestGroundingMetadata);
|
|
1744
|
+
requestGroundingMetadata = null;
|
|
1745
|
+
return value;
|
|
1746
|
+
}
|
|
1735
1747
|
});
|
|
1736
1748
|
let finishReason = {
|
|
1737
1749
|
unified: "other",
|
|
@@ -2127,6 +2139,7 @@ var GoogleLanguageModel = class GoogleLanguageModel {
|
|
|
2127
2139
|
providerMetadata: wrapProviderMetadata({
|
|
2128
2140
|
promptFeedback,
|
|
2129
2141
|
groundingMetadata: lastGroundingMetadata,
|
|
2142
|
+
...groundingMetadataPerRequest.length > 0 ? { groundingMetadataPerRequest: [...groundingMetadataPerRequest, requestGroundingMetadata] } : {},
|
|
2130
2143
|
urlContextMetadata: lastUrlContextMetadata,
|
|
2131
2144
|
safetyRatings: lastSafetyRatings,
|
|
2132
2145
|
usageMetadata: usage ?? null,
|