cloudassist-ai-provider 0.0.1 → 0.0.2

package/dist/internal/index.mjs

@@ -349,13 +349,14 @@ function prepareTools({
 
 // src/convert-to-google-generative-ai-messages.ts
 function convertToGoogleGenerativeAIMessages(prompt, options) {
-  var _a, _b;
+  var _a, _b, _c;
   const systemInstructionParts = [];
   const contents = [];
   let systemMessagesAllowed = true;
   const isGemmaModel = (_a = options == null ? void 0 : options.isGemmaModel) != null ? _a : false;
   const modelId = (_b = options == null ? void 0 : options.modelId) != null ? _b : "";
   const includeToolCallId = isClaudeModel(modelId);
+  const providerKey = (_c = options == null ? void 0 : options.providerKey) != null ? _c : "google";
   for (const { role, content } of prompt) {
     switch (role) {
       case "system": {
@@ -403,8 +404,8 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
         contents.push({
           role: "model",
           parts: content.map((part) => {
-            var _a2, _b2, _c;
-            const thoughtSignature = ((_b2 = (_a2 = part.providerOptions) == null ? void 0 : _a2.google) == null ? void 0 : _b2.thoughtSignature) != null ? String((_c = part.providerOptions.google) == null ? void 0 : _c.thoughtSignature) : void 0;
+            var _a2, _b2, _c2;
+            const thoughtSignature = ((_b2 = (_a2 = part.providerOptions) == null ? void 0 : _a2[providerKey]) == null ? void 0 : _b2.thoughtSignature) != null ? String((_c2 = part.providerOptions[providerKey]) == null ? void 0 : _c2.thoughtSignature) : void 0;
             switch (part.type) {
               case "text": {
                 return part.text.length === 0 ? void 0 : {
@@ -713,6 +714,19 @@ function mapGoogleGenerativeAIFinishReason({
   }
 }
 
+// src/provider-key.ts
+var ALLOWED_PROVIDER_KEYS = [
+  "antigravity",
+  "gemini-cli",
+  "cloudassist",
+  "google"
+];
+function getProviderKey(providerOptions) {
+  return ALLOWED_PROVIDER_KEYS.find(
+    (key) => (providerOptions == null ? void 0 : providerOptions[key]) !== void 0
+  );
+}
+
 // src/google-generative-ai-language-model.ts
 var GoogleGenerativeAILanguageModel = class {
   constructor(modelId, config) {
@@ -746,8 +760,9 @@ var GoogleGenerativeAILanguageModel = class {
   }) {
     var _a;
     const warnings = [];
+    const providerKey = getProviderKey(providerOptions);
     const googleOptions = await parseProviderOptions({
-      provider: "google",
+      provider: providerKey != null ? providerKey : "google",
       providerOptions,
       schema: googleGenerativeAIProviderOptions
     });
@@ -762,7 +777,7 @@ var GoogleGenerativeAILanguageModel = class {
     const isGemmaModel = this.modelId.toLowerCase().startsWith("gemma-");
     const { contents, systemInstruction } = convertToGoogleGenerativeAIMessages(
       prompt,
-      { isGemmaModel, modelId: this.modelId }
+      { isGemmaModel, modelId: this.modelId, providerKey }
     );
     const {
       tools: googleTools2,
@@ -824,12 +839,13 @@ var GoogleGenerativeAILanguageModel = class {
         requestType: googleOptions == null ? void 0 : googleOptions.requestType,
         userAgent: googleOptions == null ? void 0 : googleOptions.userAgent,
         requestId: googleOptions == null ? void 0 : googleOptions.requestId
-      }
+      },
+      providerKey
     };
   }
   async doGenerate(options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
-    const { args, warnings, cloudAssistOptions } = await this.getArgs(options);
+    const { args, warnings, cloudAssistOptions, providerKey } = await this.getArgs(options);
     const wrappedRequest = {
       project: cloudAssistOptions.projectId,
       model: this.modelId,
@@ -900,7 +916,11 @@ var GoogleGenerativeAILanguageModel = class {
               content.push({
                 type: "text",
                 text: currentTextContent,
-                providerMetadata: currentTextThoughtSignature ? { google: { thoughtSignature: currentTextThoughtSignature } } : void 0
+                providerMetadata: currentTextThoughtSignature ? {
+                  [providerKey != null ? providerKey : "google"]: {
+                    thoughtSignature: currentTextThoughtSignature
+                  }
+                } : void 0
               });
               currentTextContent = "";
               currentTextThoughtSignature = void 0;
@@ -910,7 +930,7 @@ var GoogleGenerativeAILanguageModel = class {
                 type: "reasoning",
                 text: currentReasoningContent,
                 providerMetadata: currentReasoningThoughtSignature ? {
-                  google: {
+                  [providerKey != null ? providerKey : "google"]: {
                     thoughtSignature: currentReasoningThoughtSignature
                   }
                 } : void 0
@@ -947,7 +967,7 @@ var GoogleGenerativeAILanguageModel = class {
                   type: "text",
                   text: currentTextContent,
                   providerMetadata: currentTextThoughtSignature ? {
-                    google: {
+                    [providerKey != null ? providerKey : "google"]: {
                       thoughtSignature: currentTextThoughtSignature
                     }
                   } : void 0
@@ -966,7 +986,7 @@ var GoogleGenerativeAILanguageModel = class {
                   type: "reasoning",
                   text: currentReasoningContent,
                   providerMetadata: currentReasoningThoughtSignature ? {
-                    google: {
+                    [providerKey != null ? providerKey : "google"]: {
                       thoughtSignature: currentReasoningThoughtSignature
                     }
                   } : void 0
@@ -985,7 +1005,11 @@ var GoogleGenerativeAILanguageModel = class {
               content.push({
                 type: "text",
                 text: currentTextContent,
-                providerMetadata: currentTextThoughtSignature ? { google: { thoughtSignature: currentTextThoughtSignature } } : void 0
+                providerMetadata: currentTextThoughtSignature ? {
+                  [providerKey != null ? providerKey : "google"]: {
+                    thoughtSignature: currentTextThoughtSignature
+                  }
+                } : void 0
               });
               currentTextContent = "";
               currentTextThoughtSignature = void 0;
@@ -995,7 +1019,7 @@ var GoogleGenerativeAILanguageModel = class {
                 type: "reasoning",
                 text: currentReasoningContent,
                 providerMetadata: currentReasoningThoughtSignature ? {
-                  google: {
+                  [providerKey != null ? providerKey : "google"]: {
                     thoughtSignature: currentReasoningThoughtSignature
                   }
                 } : void 0
@@ -1009,14 +1033,22 @@ var GoogleGenerativeAILanguageModel = class {
               toolCallId,
               toolName: part.functionCall.name,
               input: JSON.stringify(part.functionCall.args),
-              providerMetadata: part.thoughtSignature ? { google: { thoughtSignature: part.thoughtSignature } } : void 0
+              providerMetadata: part.thoughtSignature ? {
+                [providerKey != null ? providerKey : "google"]: {
+                  thoughtSignature: part.thoughtSignature
+                }
+              } : void 0
             });
           } else if ("inlineData" in part) {
             if (currentTextContent) {
               content.push({
                 type: "text",
                 text: currentTextContent,
-                providerMetadata: currentTextThoughtSignature ? { google: { thoughtSignature: currentTextThoughtSignature } } : void 0
+                providerMetadata: currentTextThoughtSignature ? {
+                  [providerKey != null ? providerKey : "google"]: {
+                    thoughtSignature: currentTextThoughtSignature
+                  }
+                } : void 0
               });
               currentTextContent = "";
               currentTextThoughtSignature = void 0;
@@ -1026,7 +1058,7 @@ var GoogleGenerativeAILanguageModel = class {
                 type: "reasoning",
                 text: currentReasoningContent,
                 providerMetadata: currentReasoningThoughtSignature ? {
-                  google: {
+                  [providerKey != null ? providerKey : "google"]: {
                     thoughtSignature: currentReasoningThoughtSignature
                   }
                 } : void 0
@@ -1055,14 +1087,22 @@ var GoogleGenerativeAILanguageModel = class {
       content.push({
         type: "text",
         text: currentTextContent,
-        providerMetadata: currentTextThoughtSignature ? { google: { thoughtSignature: currentTextThoughtSignature } } : void 0
+        providerMetadata: currentTextThoughtSignature ? {
+          [providerKey != null ? providerKey : "google"]: {
+            thoughtSignature: currentTextThoughtSignature
+          }
+        } : void 0
       });
     }
     if (currentReasoningContent) {
       content.push({
         type: "reasoning",
         text: currentReasoningContent,
-        providerMetadata: currentReasoningThoughtSignature ? { google: { thoughtSignature: currentReasoningThoughtSignature } } : void 0
+        providerMetadata: currentReasoningThoughtSignature ? {
+          [providerKey != null ? providerKey : "google"]: {
+            thoughtSignature: currentReasoningThoughtSignature
+          }
+        } : void 0
       });
     }
     const sources = (_h = extractSources({
@@ -1084,7 +1124,7 @@ var GoogleGenerativeAILanguageModel = class {
       },
       warnings,
       providerMetadata: {
-        google: {
+        [providerKey != null ? providerKey : "google"]: {
           promptFeedback: promptFeedback != null ? promptFeedback : null,
           groundingMetadata: groundingMetadata != null ? groundingMetadata : null,
           urlContextMetadata: urlContextMetadata != null ? urlContextMetadata : null,
@@ -1100,7 +1140,7 @@ var GoogleGenerativeAILanguageModel = class {
   }
   async doStream(options) {
     var _a, _b;
-    const { args, warnings, cloudAssistOptions } = await this.getArgs(options);
+    const { args, warnings, cloudAssistOptions, providerKey } = await this.getArgs(options);
     const wrappedRequest = {
       project: cloudAssistOptions.projectId,
       model: this.modelId,
@@ -1226,7 +1266,7 @@ var GoogleGenerativeAILanguageModel = class {
                         type: "reasoning-start",
                         id: currentReasoningBlockId,
                         providerMetadata: part.thoughtSignature ? {
-                          google: {
+                          [providerKey != null ? providerKey : "google"]: {
                             thoughtSignature: part.thoughtSignature
                           }
                         } : void 0
@@ -1237,7 +1277,9 @@ var GoogleGenerativeAILanguageModel = class {
                       id: currentReasoningBlockId,
                       delta: part.text,
                       providerMetadata: part.thoughtSignature ? {
-                        google: { thoughtSignature: part.thoughtSignature }
+                        [providerKey != null ? providerKey : "google"]: {
+                          thoughtSignature: part.thoughtSignature
+                        }
                       } : void 0
                     });
                   } else {
@@ -1254,7 +1296,7 @@ var GoogleGenerativeAILanguageModel = class {
                         type: "text-start",
                         id: currentTextBlockId,
                         providerMetadata: part.thoughtSignature ? {
-                          google: {
+                          [providerKey != null ? providerKey : "google"]: {
                             thoughtSignature: part.thoughtSignature
                           }
                         } : void 0
@@ -1265,7 +1307,9 @@ var GoogleGenerativeAILanguageModel = class {
                       id: currentTextBlockId,
                       delta: part.text,
                       providerMetadata: part.thoughtSignature ? {
-                        google: { thoughtSignature: part.thoughtSignature }
+                        [providerKey != null ? providerKey : "google"]: {
+                          thoughtSignature: part.thoughtSignature
+                        }
                       } : void 0
                     });
                   }
@@ -1280,7 +1324,8 @@ var GoogleGenerativeAILanguageModel = class {
               const toolCallDeltas = getToolCallsFromParts({
                 parts: content.parts,
                 generateId: generateId2,
-                useToolCallId
+                useToolCallId,
+                providerKey
               });
               if (toolCallDeltas != null) {
                 for (const toolCall of toolCallDeltas) {
@@ -1318,7 +1363,7 @@ var GoogleGenerativeAILanguageModel = class {
                 hasToolCalls
               });
               providerMetadata = {
-                google: {
+                [providerKey != null ? providerKey : "google"]: {
                   promptFeedback: (_j = responseData.promptFeedback) != null ? _j : null,
                   groundingMetadata: (_k = candidate.groundingMetadata) != null ? _k : null,
                   urlContextMetadata: (_l = candidate.urlContextMetadata) != null ? _l : null,
@@ -1326,7 +1371,7 @@ var GoogleGenerativeAILanguageModel = class {
                 }
               };
               if (usageMetadata != null) {
-                providerMetadata.google.usageMetadata = usageMetadata;
+                providerMetadata[providerKey != null ? providerKey : "google"].usageMetadata = usageMetadata;
               }
             }
           },
@@ -1360,7 +1405,8 @@ var GoogleGenerativeAILanguageModel = class {
 function getToolCallsFromParts({
   parts,
   generateId: generateId2,
-  useToolCallId = false
+  useToolCallId = false,
+  providerKey
 }) {
   const functionCallParts = parts == null ? void 0 : parts.filter(
     (part) => "functionCall" in part
@@ -1371,7 +1417,11 @@ function getToolCallsFromParts({
     toolCallId: useToolCallId && part.functionCall.id ? part.functionCall.id : generateId2(),
     toolName: part.functionCall.name,
     args: JSON.stringify(part.functionCall.args),
-    providerMetadata: part.thoughtSignature ? { google: { thoughtSignature: part.thoughtSignature } } : void 0
+    providerMetadata: part.thoughtSignature ? {
+      [providerKey != null ? providerKey : "google"]: {
+        thoughtSignature: part.thoughtSignature
+      }
+    } : void 0
   }));
 }
 function extractSources({