@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.mjs
CHANGED
|
@@ -694,11 +694,19 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
694
694
|
}) {
|
|
695
695
|
var _a;
|
|
696
696
|
const warnings = [];
|
|
697
|
-
const
|
|
698
|
-
|
|
697
|
+
const providerOptionsName = this.config.provider.includes("vertex") ? "vertex" : "google";
|
|
698
|
+
let googleOptions = await parseProviderOptions({
|
|
699
|
+
provider: providerOptionsName,
|
|
699
700
|
providerOptions,
|
|
700
701
|
schema: googleGenerativeAIProviderOptions
|
|
701
702
|
});
|
|
703
|
+
if (googleOptions == null && providerOptionsName !== "google") {
|
|
704
|
+
googleOptions = await parseProviderOptions({
|
|
705
|
+
provider: "google",
|
|
706
|
+
providerOptions,
|
|
707
|
+
schema: googleGenerativeAIProviderOptions
|
|
708
|
+
});
|
|
709
|
+
}
|
|
702
710
|
if ((tools == null ? void 0 : tools.some(
|
|
703
711
|
(tool) => tool.type === "provider" && tool.id === "google.vertex_rag_store"
|
|
704
712
|
)) && !this.config.provider.startsWith("google.vertex.")) {
|
|
@@ -760,13 +768,13 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
760
768
|
cachedContent: googleOptions == null ? void 0 : googleOptions.cachedContent,
|
|
761
769
|
labels: googleOptions == null ? void 0 : googleOptions.labels
|
|
762
770
|
},
|
|
763
|
-
warnings: [...warnings, ...toolWarnings]
|
|
771
|
+
warnings: [...warnings, ...toolWarnings],
|
|
772
|
+
providerOptionsName
|
|
764
773
|
};
|
|
765
774
|
}
|
|
766
775
|
async doGenerate(options) {
|
|
767
776
|
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
768
|
-
const { args, warnings } = await this.getArgs(options);
|
|
769
|
-
const body = JSON.stringify(args);
|
|
777
|
+
const { args, warnings, providerOptionsName } = await this.getArgs(options);
|
|
770
778
|
const mergedHeaders = combineHeaders(
|
|
771
779
|
await resolve(this.config.headers),
|
|
772
780
|
options.headers
|
|
@@ -818,7 +826,11 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
818
826
|
content.push({
|
|
819
827
|
type: part.thought === true ? "reasoning" : "text",
|
|
820
828
|
text: part.text,
|
|
821
|
-
providerMetadata: part.thoughtSignature ? {
|
|
829
|
+
providerMetadata: part.thoughtSignature ? {
|
|
830
|
+
[providerOptionsName]: {
|
|
831
|
+
thoughtSignature: part.thoughtSignature
|
|
832
|
+
}
|
|
833
|
+
} : void 0
|
|
822
834
|
});
|
|
823
835
|
} else if ("functionCall" in part) {
|
|
824
836
|
content.push({
|
|
@@ -826,14 +838,22 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
826
838
|
toolCallId: this.config.generateId(),
|
|
827
839
|
toolName: part.functionCall.name,
|
|
828
840
|
input: JSON.stringify(part.functionCall.args),
|
|
829
|
-
providerMetadata: part.thoughtSignature ? {
|
|
841
|
+
providerMetadata: part.thoughtSignature ? {
|
|
842
|
+
[providerOptionsName]: {
|
|
843
|
+
thoughtSignature: part.thoughtSignature
|
|
844
|
+
}
|
|
845
|
+
} : void 0
|
|
830
846
|
});
|
|
831
847
|
} else if ("inlineData" in part) {
|
|
832
848
|
content.push({
|
|
833
849
|
type: "file",
|
|
834
850
|
data: part.inlineData.data,
|
|
835
851
|
mediaType: part.inlineData.mimeType,
|
|
836
|
-
providerMetadata: part.thoughtSignature ? {
|
|
852
|
+
providerMetadata: part.thoughtSignature ? {
|
|
853
|
+
[providerOptionsName]: {
|
|
854
|
+
thoughtSignature: part.thoughtSignature
|
|
855
|
+
}
|
|
856
|
+
} : void 0
|
|
837
857
|
});
|
|
838
858
|
}
|
|
839
859
|
}
|
|
@@ -853,7 +873,7 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
853
873
|
usage: convertGoogleGenerativeAIUsage(usageMetadata),
|
|
854
874
|
warnings,
|
|
855
875
|
providerMetadata: {
|
|
856
|
-
|
|
876
|
+
[providerOptionsName]: {
|
|
857
877
|
promptFeedback: (_e = response.promptFeedback) != null ? _e : null,
|
|
858
878
|
groundingMetadata: (_f = candidate.groundingMetadata) != null ? _f : null,
|
|
859
879
|
urlContextMetadata: (_g = candidate.urlContextMetadata) != null ? _g : null,
|
|
@@ -861,7 +881,7 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
861
881
|
usageMetadata: usageMetadata != null ? usageMetadata : null
|
|
862
882
|
}
|
|
863
883
|
},
|
|
864
|
-
request: { body },
|
|
884
|
+
request: { body: args },
|
|
865
885
|
response: {
|
|
866
886
|
// TODO timestamp, model id, id
|
|
867
887
|
headers: responseHeaders,
|
|
@@ -870,8 +890,7 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
870
890
|
};
|
|
871
891
|
}
|
|
872
892
|
async doStream(options) {
|
|
873
|
-
const { args, warnings } = await this.getArgs(options);
|
|
874
|
-
const body = JSON.stringify(args);
|
|
893
|
+
const { args, warnings, providerOptionsName } = await this.getArgs(options);
|
|
875
894
|
const headers = combineHeaders(
|
|
876
895
|
await resolve(this.config.headers),
|
|
877
896
|
options.headers
|
|
@@ -977,7 +996,7 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
977
996
|
type: "reasoning-start",
|
|
978
997
|
id: currentReasoningBlockId,
|
|
979
998
|
providerMetadata: part.thoughtSignature ? {
|
|
980
|
-
|
|
999
|
+
[providerOptionsName]: {
|
|
981
1000
|
thoughtSignature: part.thoughtSignature
|
|
982
1001
|
}
|
|
983
1002
|
} : void 0
|
|
@@ -988,7 +1007,9 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
988
1007
|
id: currentReasoningBlockId,
|
|
989
1008
|
delta: part.text,
|
|
990
1009
|
providerMetadata: part.thoughtSignature ? {
|
|
991
|
-
|
|
1010
|
+
[providerOptionsName]: {
|
|
1011
|
+
thoughtSignature: part.thoughtSignature
|
|
1012
|
+
}
|
|
992
1013
|
} : void 0
|
|
993
1014
|
});
|
|
994
1015
|
} else {
|
|
@@ -1005,7 +1026,7 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
1005
1026
|
type: "text-start",
|
|
1006
1027
|
id: currentTextBlockId,
|
|
1007
1028
|
providerMetadata: part.thoughtSignature ? {
|
|
1008
|
-
|
|
1029
|
+
[providerOptionsName]: {
|
|
1009
1030
|
thoughtSignature: part.thoughtSignature
|
|
1010
1031
|
}
|
|
1011
1032
|
} : void 0
|
|
@@ -1016,7 +1037,9 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
1016
1037
|
id: currentTextBlockId,
|
|
1017
1038
|
delta: part.text,
|
|
1018
1039
|
providerMetadata: part.thoughtSignature ? {
|
|
1019
|
-
|
|
1040
|
+
[providerOptionsName]: {
|
|
1041
|
+
thoughtSignature: part.thoughtSignature
|
|
1042
|
+
}
|
|
1020
1043
|
} : void 0
|
|
1021
1044
|
});
|
|
1022
1045
|
}
|
|
@@ -1030,7 +1053,8 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
1030
1053
|
}
|
|
1031
1054
|
const toolCallDeltas = getToolCallsFromParts({
|
|
1032
1055
|
parts: content.parts,
|
|
1033
|
-
generateId: generateId2
|
|
1056
|
+
generateId: generateId2,
|
|
1057
|
+
providerOptionsName
|
|
1034
1058
|
});
|
|
1035
1059
|
if (toolCallDeltas != null) {
|
|
1036
1060
|
for (const toolCall of toolCallDeltas) {
|
|
@@ -1068,7 +1092,7 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
1068
1092
|
hasToolCalls
|
|
1069
1093
|
});
|
|
1070
1094
|
providerMetadata = {
|
|
1071
|
-
|
|
1095
|
+
[providerOptionsName]: {
|
|
1072
1096
|
promptFeedback: (_d = value.promptFeedback) != null ? _d : null,
|
|
1073
1097
|
groundingMetadata: (_e = candidate.groundingMetadata) != null ? _e : null,
|
|
1074
1098
|
urlContextMetadata: (_f = candidate.urlContextMetadata) != null ? _f : null,
|
|
@@ -1076,7 +1100,7 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
1076
1100
|
}
|
|
1077
1101
|
};
|
|
1078
1102
|
if (usageMetadata != null) {
|
|
1079
|
-
providerMetadata.
|
|
1103
|
+
providerMetadata[providerOptionsName].usageMetadata = usageMetadata;
|
|
1080
1104
|
}
|
|
1081
1105
|
}
|
|
1082
1106
|
},
|
|
@@ -1103,13 +1127,14 @@ var GoogleGenerativeAILanguageModel = class {
|
|
|
1103
1127
|
})
|
|
1104
1128
|
),
|
|
1105
1129
|
response: { headers: responseHeaders },
|
|
1106
|
-
request: { body }
|
|
1130
|
+
request: { body: args }
|
|
1107
1131
|
};
|
|
1108
1132
|
}
|
|
1109
1133
|
};
|
|
1110
1134
|
function getToolCallsFromParts({
|
|
1111
1135
|
parts,
|
|
1112
|
-
generateId: generateId2
|
|
1136
|
+
generateId: generateId2,
|
|
1137
|
+
providerOptionsName
|
|
1113
1138
|
}) {
|
|
1114
1139
|
const functionCallParts = parts == null ? void 0 : parts.filter(
|
|
1115
1140
|
(part) => "functionCall" in part
|
|
@@ -1119,7 +1144,11 @@ function getToolCallsFromParts({
|
|
|
1119
1144
|
toolCallId: generateId2(),
|
|
1120
1145
|
toolName: part.functionCall.name,
|
|
1121
1146
|
args: JSON.stringify(part.functionCall.args),
|
|
1122
|
-
providerMetadata: part.thoughtSignature ? {
|
|
1147
|
+
providerMetadata: part.thoughtSignature ? {
|
|
1148
|
+
[providerOptionsName]: {
|
|
1149
|
+
thoughtSignature: part.thoughtSignature
|
|
1150
|
+
}
|
|
1151
|
+
} : void 0
|
|
1123
1152
|
}));
|
|
1124
1153
|
}
|
|
1125
1154
|
function extractSources({
|