@ai-sdk/google 3.0.0-beta.70 → 3.0.0-beta.72
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 +12 -0
- package/dist/index.js +52 -23
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +52 -23
- package/dist/index.mjs.map +1 -1
- package/dist/internal/index.js +51 -22
- package/dist/internal/index.js.map +1 -1
- package/dist/internal/index.mjs +51 -22
- package/dist/internal/index.mjs.map +1 -1
- package/package.json +1 -1
package/dist/internal/index.js
CHANGED
|
@@ -705,11 +705,19 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
705
705
|
}) {
|
|
706
706
|
var _a;
|
|
707
707
|
const warnings = [];
|
|
708
|
-
const
|
|
709
|
-
|
|
708
|
+
const providerOptionsName = this.config.provider.includes("vertex") ? "vertex" : "google";
|
|
709
|
+
let googleOptions = await (0, import_provider_utils4.parseProviderOptions)({
|
|
710
|
+
provider: providerOptionsName,
|
|
710
711
|
providerOptions,
|
|
711
712
|
schema: googleGenerativeAIProviderOptions
|
|
712
713
|
});
|
|
714
|
+
if (googleOptions == null && providerOptionsName !== "google") {
|
|
715
|
+
googleOptions = await (0, import_provider_utils4.parseProviderOptions)({
|
|
716
|
+
provider: "google",
|
|
717
|
+
providerOptions,
|
|
718
|
+
schema: googleGenerativeAIProviderOptions
|
|
719
|
+
});
|
|
720
|
+
}
|
|
713
721
|
if ((tools == null ? void 0 : tools.some(
|
|
714
722
|
(tool) => tool.type === "provider" && tool.id === "google.vertex_rag_store"
|
|
715
723
|
)) && !this.config.provider.startsWith("google.vertex.")) {
|
|
@@ -771,13 +779,13 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
771
779
|
cachedContent: googleOptions == null ? void 0 : googleOptions.cachedContent,
|
|
772
780
|
labels: googleOptions == null ? void 0 : googleOptions.labels
|
|
773
781
|
},
|
|
774
|
-
warnings: [...warnings, ...toolWarnings]
|
|
782
|
+
warnings: [...warnings, ...toolWarnings],
|
|
783
|
+
providerOptionsName
|
|
775
784
|
};
|
|
776
785
|
}
|
|
777
786
|
async doGenerate(options) {
|
|
778
787
|
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
779
|
-
const { args, warnings } = await this.getArgs(options);
|
|
780
|
-
const body = JSON.stringify(args);
|
|
788
|
+
const { args, warnings, providerOptionsName } = await this.getArgs(options);
|
|
781
789
|
const mergedHeaders = (0, import_provider_utils4.combineHeaders)(
|
|
782
790
|
await (0, import_provider_utils4.resolve)(this.config.headers),
|
|
783
791
|
options.headers
|
|
@@ -829,7 +837,11 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
829
837
|
content.push({
|
|
830
838
|
type: part.thought === true ? "reasoning" : "text",
|
|
831
839
|
text: part.text,
|
|
832
|
-
providerMetadata: part.thoughtSignature ? {
|
|
840
|
+
providerMetadata: part.thoughtSignature ? {
|
|
841
|
+
[providerOptionsName]: {
|
|
842
|
+
thoughtSignature: part.thoughtSignature
|
|
843
|
+
}
|
|
844
|
+
} : void 0
|
|
833
845
|
});
|
|
834
846
|
} else if ("functionCall" in part) {
|
|
835
847
|
content.push({
|
|
@@ -837,14 +849,22 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
837
849
|
toolCallId: this.config.generateId(),
|
|
838
850
|
toolName: part.functionCall.name,
|
|
839
851
|
input: JSON.stringify(part.functionCall.args),
|
|
840
|
-
providerMetadata: part.thoughtSignature ? {
|
|
852
|
+
providerMetadata: part.thoughtSignature ? {
|
|
853
|
+
[providerOptionsName]: {
|
|
854
|
+
thoughtSignature: part.thoughtSignature
|
|
855
|
+
}
|
|
856
|
+
} : void 0
|
|
841
857
|
});
|
|
842
858
|
} else if ("inlineData" in part) {
|
|
843
859
|
content.push({
|
|
844
860
|
type: "file",
|
|
845
861
|
data: part.inlineData.data,
|
|
846
862
|
mediaType: part.inlineData.mimeType,
|
|
847
|
-
providerMetadata: part.thoughtSignature ? {
|
|
863
|
+
providerMetadata: part.thoughtSignature ? {
|
|
864
|
+
[providerOptionsName]: {
|
|
865
|
+
thoughtSignature: part.thoughtSignature
|
|
866
|
+
}
|
|
867
|
+
} : void 0
|
|
848
868
|
});
|
|
849
869
|
}
|
|
850
870
|
}
|
|
@@ -864,7 +884,7 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
864
884
|
usage: convertGoogleGenerativeAIUsage(usageMetadata),
|
|
865
885
|
warnings,
|
|
866
886
|
providerMetadata: {
|
|
867
|
-
|
|
887
|
+
[providerOptionsName]: {
|
|
868
888
|
promptFeedback: (_e = response.promptFeedback) != null ? _e : null,
|
|
869
889
|
groundingMetadata: (_f = candidate.groundingMetadata) != null ? _f : null,
|
|
870
890
|
urlContextMetadata: (_g = candidate.urlContextMetadata) != null ? _g : null,
|
|
@@ -872,7 +892,7 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
872
892
|
usageMetadata: usageMetadata != null ? usageMetadata : null
|
|
873
893
|
}
|
|
874
894
|
},
|
|
875
|
-
request: { body },
|
|
895
|
+
request: { body: args },
|
|
876
896
|
response: {
|
|
877
897
|
// TODO timestamp, model id, id
|
|
878
898
|
headers: responseHeaders,
|
|
@@ -881,8 +901,7 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
881
901
|
};
|
|
882
902
|
}
|
|
883
903
|
async doStream(options) {
|
|
884
|
-
const { args, warnings } = await this.getArgs(options);
|
|
885
|
-
const body = JSON.stringify(args);
|
|
904
|
+
const { args, warnings, providerOptionsName } = await this.getArgs(options);
|
|
886
905
|
const headers = (0, import_provider_utils4.combineHeaders)(
|
|
887
906
|
await (0, import_provider_utils4.resolve)(this.config.headers),
|
|
888
907
|
options.headers
|
|
@@ -988,7 +1007,7 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
988
1007
|
type: "reasoning-start",
|
|
989
1008
|
id: currentReasoningBlockId,
|
|
990
1009
|
providerMetadata: part.thoughtSignature ? {
|
|
991
|
-
|
|
1010
|
+
[providerOptionsName]: {
|
|
992
1011
|
thoughtSignature: part.thoughtSignature
|
|
993
1012
|
}
|
|
994
1013
|
} : void 0
|
|
@@ -999,7 +1018,9 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
999
1018
|
id: currentReasoningBlockId,
|
|
1000
1019
|
delta: part.text,
|
|
1001
1020
|
providerMetadata: part.thoughtSignature ? {
|
|
1002
|
-
|
|
1021
|
+
[providerOptionsName]: {
|
|
1022
|
+
thoughtSignature: part.thoughtSignature
|
|
1023
|
+
}
|
|
1003
1024
|
} : void 0
|
|
1004
1025
|
});
|
|
1005
1026
|
} else {
|
|
@@ -1016,7 +1037,7 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
1016
1037
|
type: "text-start",
|
|
1017
1038
|
id: currentTextBlockId,
|
|
1018
1039
|
providerMetadata: part.thoughtSignature ? {
|
|
1019
|
-
|
|
1040
|
+
[providerOptionsName]: {
|
|
1020
1041
|
thoughtSignature: part.thoughtSignature
|
|
1021
1042
|
}
|
|
1022
1043
|
} : void 0
|
|
@@ -1027,7 +1048,9 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
1027
1048
|
id: currentTextBlockId,
|
|
1028
1049
|
delta: part.text,
|
|
1029
1050
|
providerMetadata: part.thoughtSignature ? {
|
|
1030
|
-
|
|
1051
|
+
[providerOptionsName]: {
|
|
1052
|
+
thoughtSignature: part.thoughtSignature
|
|
1053
|
+
}
|
|
1031
1054
|
} : void 0
|
|
1032
1055
|
});
|
|
1033
1056
|
}
|
|
@@ -1041,7 +1064,8 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
1041
1064
|
}
|
|
1042
1065
|
const toolCallDeltas = getToolCallsFromParts({
|
|
1043
1066
|
parts: content.parts,
|
|
1044
|
-
generateId: generateId2
|
|
1067
|
+
generateId: generateId2,
|
|
1068
|
+
providerOptionsName
|
|
1045
1069
|
});
|
|
1046
1070
|
if (toolCallDeltas != null) {
|
|
1047
1071
|
for (const toolCall of toolCallDeltas) {
|
|
@@ -1079,7 +1103,7 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
1079
1103
|
hasToolCalls
|
|
1080
1104
|
});
|
|
1081
1105
|
providerMetadata = {
|
|
1082
|
-
|
|
1106
|
+
[providerOptionsName]: {
|
|
1083
1107
|
promptFeedback: (_d = value.promptFeedback) != null ? _d : null,
|
|
1084
1108
|
groundingMetadata: (_e = candidate.groundingMetadata) != null ? _e : null,
|
|
1085
1109
|
urlContextMetadata: (_f = candidate.urlContextMetadata) != null ? _f : null,
|
|
@@ -1087,7 +1111,7 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
1087
1111
|
}
|
|
1088
1112
|
};
|
|
1089
1113
|
if (usageMetadata != null) {
|
|
1090
|
-
providerMetadata.
|
|
1114
|
+
providerMetadata[providerOptionsName].usageMetadata = usageMetadata;
|
|
1091
1115
|
}
|
|
1092
1116
|
}
|
|
1093
1117
|
},
|
|
@@ -1114,13 +1138,14 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
1114
1138
|
})
|
|
1115
1139
|
),
|
|
1116
1140
|
response: { headers: responseHeaders },
|
|
1117
|
-
request: { body }
|
|
1141
|
+
request: { body: args }
|
|
1118
1142
|
};
|
|
1119
1143
|
}
|
|
1120
1144
|
};
|
|
1121
1145
|
function getToolCallsFromParts({
|
|
1122
1146
|
parts,
|
|
1123
|
-
generateId: generateId2
|
|
1147
|
+
generateId: generateId2,
|
|
1148
|
+
providerOptionsName
|
|
1124
1149
|
}) {
|
|
1125
1150
|
const functionCallParts = parts == null ? void 0 : parts.filter(
|
|
1126
1151
|
(part) => "functionCall" in part
|
|
@@ -1130,7 +1155,11 @@ function getToolCallsFromParts({
|
|
|
1130
1155
|
toolCallId: generateId2(),
|
|
1131
1156
|
toolName: part.functionCall.name,
|
|
1132
1157
|
args: JSON.stringify(part.functionCall.args),
|
|
1133
|
-
providerMetadata: part.thoughtSignature ? {
|
|
1158
|
+
providerMetadata: part.thoughtSignature ? {
|
|
1159
|
+
[providerOptionsName]: {
|
|
1160
|
+
thoughtSignature: part.thoughtSignature
|
|
1161
|
+
}
|
|
1162
|
+
} : void 0
|
|
1134
1163
|
}));
|
|
1135
1164
|
}
|
|
1136
1165
|
function extractSources({
|