@paean-ai/adk 0.2.24 → 0.2.26

package/dist/web/models/google_llm.js

@@ -73,11 +73,13 @@ class Gemini extends BaseLlm {
     this.headers = headers;
     this.isGemini3Preview = isGemini3PreviewModel(model);
     const canReadEnv = typeof process === "object";
+    const aiStudioApiKey = canReadEnv ? process.env["AI_STUDIO_API_KEY"] : void 0;
+    const useAiStudioMode = !!aiStudioApiKey;
     this.apiEndpoint = apiEndpoint;
     if (!this.apiEndpoint && canReadEnv) {
       this.apiEndpoint = process.env["GEMINI_API_ENDPOINT"];
     }
-    if (!this.apiEndpoint && this.isGemini3Preview) {
+    if (!this.apiEndpoint && this.isGemini3Preview && !useAiStudioMode) {
       this.apiEndpoint = GEMINI3_PREVIEW_API_ENDPOINT;
       logger.info("Using Gemini 3 preview endpoint: ".concat(this.apiEndpoint));
     }
@@ -88,6 +90,15 @@ class Gemini extends BaseLlm {
         useVertexAI = vertexAIfromEnv.toLowerCase() === "true" || vertexAIfromEnv === "1";
       }
     }
+    if (useAiStudioMode) {
+      if (useVertexAI) {
+        logger.info(
+          "AI_STUDIO_API_KEY set \u2014 overriding Vertex AI mode to use AI Studio (generativelanguage.googleapis.com)"
+        );
+      }
+      useVertexAI = false;
+      this.apiKey = aiStudioApiKey;
+    }
     if (this.isGemini3Preview && useVertexAI) {
       const availableApiKey = apiKey || (canReadEnv ? process.env["GOOGLE_GENAI_API_KEY"] || process.env["GEMINI_API_KEY"] : void 0);
       if (availableApiKey) {
@@ -140,7 +151,7 @@ class Gemini extends BaseLlm {
    */
   generateContentAsync(llmRequest, stream = false) {
     return __asyncGenerator(this, null, function* () {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
       this.preprocessRequest(llmRequest);
       this.maybeAppendUserContent(llmRequest);
       logger.info(
@@ -160,6 +171,7 @@ class Gemini extends BaseLlm {
         let text = "";
         let usageMetadata;
         let lastResponse;
+        let pendingFCResponse = null;
         try {
           for (var iter = __forAwait(streamResult), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
             const response = temp.value;
@@ -190,7 +202,9 @@ class Gemini extends BaseLlm {
               } else {
                 text += firstPart.text;
               }
-              llmResponse.partial = true;
+              if (!hasFunctionCalls) {
+                llmResponse.partial = true;
+              }
               if (this.isGemini3Preview && hasFunctionCalls) {
                 thoughtText = "";
                 thoughtSignature = void 0;
@@ -260,14 +274,25 @@ class Gemini extends BaseLlm {
                   }
                 }
               }
-              const partsWithSig = llmResponse.content.parts.filter(
-                (p) => p.thoughtSignature
-              ).length;
-              if (partsWithSig === 0) {
-                logger.warn(
-                  "[Gemini3] No thoughtSignature on function call parts \u2014 may cause 400 on next request"
+            }
+            if (hasFunctionCalls) {
+              if (pendingFCResponse && ((_i = pendingFCResponse.content) == null ? void 0 : _i.parts)) {
+                const newParts = (((_j = llmResponse.content) == null ? void 0 : _j.parts) || []).filter(
+                  (p) => p.functionCall || p.thoughtSignature
                 );
+                pendingFCResponse.content.parts.push(...newParts);
+                pendingFCResponse.usageMetadata = llmResponse.usageMetadata;
+              } else {
+                pendingFCResponse = llmResponse;
+              }
+              continue;
+            }
+            if (pendingFCResponse) {
+              if (!((_l = (_k = llmResponse.content) == null ? void 0 : _k.parts) == null ? void 0 : _l.length)) {
+                continue;
               }
+              yield pendingFCResponse;
+              pendingFCResponse = null;
             }
             yield llmResponse;
           }
@@ -281,7 +306,28 @@ class Gemini extends BaseLlm {
               throw error[0];
           }
         }
-        if ((text || thoughtText) && ((_j = (_i = lastResponse == null ? void 0 : lastResponse.candidates) == null ? void 0 : _i[0]) == null ? void 0 : _j.finishReason) === FinishReason.STOP) {
+        if (pendingFCResponse) {
+          if (this.isGemini3Preview && ((_m = pendingFCResponse.content) == null ? void 0 : _m.parts)) {
+            const partsWithSig = pendingFCResponse.content.parts.filter(
+              (p) => p.thoughtSignature
+            ).length;
+            if (partsWithSig === 0 && thoughtSignature) {
+              for (const part of pendingFCResponse.content.parts) {
+                if (part.functionCall) {
+                  part.thoughtSignature = thoughtSignature;
+                  break;
+                }
+              }
+            } else if (partsWithSig === 0) {
+              logger.warn(
+                "[Gemini3] No thoughtSignature on merged function call parts \u2014 may cause 400 on next request"
+              );
+            }
+          }
+          yield pendingFCResponse;
+          pendingFCResponse = null;
+        }
+        if ((text || thoughtText) && ((_o = (_n = lastResponse == null ? void 0 : lastResponse.candidates) == null ? void 0 : _n[0]) == null ? void 0 : _o.finishReason) === FinishReason.STOP) {
           const parts = [];
           if (thoughtText) {
             const thoughtPart = { text: thoughtText, thought: true };
@@ -303,12 +349,12 @@ class Gemini extends BaseLlm {
         }
       } else {
         const response = yield new __await(this.apiClient.models.generateContent({
-          model: (_k = llmRequest.model) != null ? _k : this.model,
+          model: (_p = llmRequest.model) != null ? _p : this.model,
           contents: llmRequest.contents,
           config: llmRequest.config
         }));
         const llmResponse = createLlmResponse(response);
-        if (this.isGemini3Preview && ((_l = llmResponse.content) == null ? void 0 : _l.parts)) {
+        if (this.isGemini3Preview && ((_q = llmResponse.content) == null ? void 0 : _q.parts)) {
           let thoughtSig;
           let hasThoughtPartWithSignature = false;
           for (const part of llmResponse.content.parts) {

package/dist/web/models/llm_response.js

@@ -3,6 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { FinishReason } from "@google/genai";
 function createLlmResponse(response) {
   var _a;
   const usageMetadata = response.usageMetadata;
@@ -16,6 +17,12 @@ function createLlmResponse(response) {
         finishReason: candidate.finishReason
       };
     }
+    if (candidate.finishReason === FinishReason.STOP) {
+      return {
+        usageMetadata,
+        finishReason: candidate.finishReason
+      };
+    }
     return {
       errorCode: candidate.finishReason,
       errorMessage: candidate.finishMessage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paean-ai/adk",
-  "version": "0.2.24",
+  "version": "0.2.26",
   "description": "Google ADK JS (paean-ai fork with streaming fixes)",
   "author": "paean-ai",
   "license": "Apache-2.0",