@paean-ai/adk 0.2.6 → 0.2.8

package/dist/cjs/models/google_llm.js

@@ -83,11 +83,15 @@ class Gemini extends import_base_llm.BaseLlm {
     if (this.isGemini3Preview && useVertexAI) {
       const availableApiKey = apiKey || (canReadEnv ? process.env["GOOGLE_GENAI_API_KEY"] || process.env["GEMINI_API_KEY"] : void 0);
       if (availableApiKey) {
-        import_logger.logger.info("Gemini 3 preview detected with Vertex AI mode. Switching to API key mode for correct endpoint handling.");
+        import_logger.logger.info(
+          "Gemini 3 preview detected with Vertex AI mode. Switching to API key mode for correct endpoint handling."
+        );
         useVertexAI = false;
         this.apiKey = availableApiKey;
       } else {
-        import_logger.logger.warn("Gemini 3 preview requires API key authentication for correct endpoint handling. Set GEMINI_API_KEY or GOOGLE_GENAI_API_KEY environment variable for best compatibility.");
+        import_logger.logger.warn(
+          "Gemini 3 preview requires API key authentication for correct endpoint handling. Set GEMINI_API_KEY or GOOGLE_GENAI_API_KEY environment variable for best compatibility."
+        );
       }
     }
     this.vertexai = useVertexAI;
@@ -127,7 +131,7 @@ class Gemini extends import_base_llm.BaseLlm {
    * @yields LlmResponse: The model response.
    */
   async *generateContentAsync(llmRequest, stream = false) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     this.preprocessRequest(llmRequest);
     this.maybeAppendUserContent(llmRequest);
     import_logger.logger.info(
@@ -146,6 +150,7 @@ class Gemini extends import_base_llm.BaseLlm {
         config: llmRequest.config
       });
       let thoughtText = "";
+      let thoughtSignature;
       let text = "";
       let usageMetadata;
       let lastResponse;
@@ -157,6 +162,9 @@ class Gemini extends import_base_llm.BaseLlm {
         if (firstPart == null ? void 0 : firstPart.text) {
           if ("thought" in firstPart && firstPart.thought) {
             thoughtText += firstPart.text;
+            if ("thoughtSignature" in firstPart && firstPart.thoughtSignature) {
+              thoughtSignature = firstPart.thoughtSignature;
+            }
           } else {
             text += firstPart.text;
           }
@@ -164,7 +172,11 @@ class Gemini extends import_base_llm.BaseLlm {
         } else if ((thoughtText || text) && (!firstPart || !firstPart.inlineData)) {
           const parts = [];
           if (thoughtText) {
-            parts.push({ text: thoughtText, thought: true });
+            const thoughtPart = { text: thoughtText, thought: true };
+            if (thoughtSignature) {
+              thoughtPart.thoughtSignature = thoughtSignature;
+            }
+            parts.push(thoughtPart);
           }
           if (text) {
             parts.push((0, import_genai.createPartFromText)(text));
@@ -179,12 +191,26 @@ class Gemini extends import_base_llm.BaseLlm {
           thoughtText = "";
           text = "";
         }
+        if (this.isGemini3Preview && thoughtSignature && ((_e = llmResponse.content) == null ? void 0 : _e.parts)) {
+          for (const part of llmResponse.content.parts) {
+            if (part.functionCall && !part.thoughtSignature) {
+              part.thoughtSignature = thoughtSignature;
+            }
+          }
+        }
         yield llmResponse;
+        if ((_g = (_f = llmResponse.content) == null ? void 0 : _f.parts) == null ? void 0 : _g.some((part) => part.functionCall)) {
+          thoughtSignature = void 0;
+        }
       }
-      if ((text || thoughtText) && ((_f = (_e = lastResponse == null ? void 0 : lastResponse.candidates) == null ? void 0 : _e[0]) == null ? void 0 : _f.finishReason) === import_genai.FinishReason.STOP) {
+      if ((text || thoughtText) && ((_i = (_h = lastResponse == null ? void 0 : lastResponse.candidates) == null ? void 0 : _h[0]) == null ? void 0 : _i.finishReason) === import_genai.FinishReason.STOP) {
         const parts = [];
         if (thoughtText) {
-          parts.push({ text: thoughtText, thought: true });
+          const thoughtPart = { text: thoughtText, thought: true };
+          if (thoughtSignature) {
+            thoughtPart.thoughtSignature = thoughtSignature;
+          }
+          parts.push(thoughtPart);
         }
         if (text) {
           parts.push({ text });
@@ -199,11 +225,28 @@ class Gemini extends import_base_llm.BaseLlm {
       }
     } else {
       const response = await this.apiClient.models.generateContent({
-        model: (_g = llmRequest.model) != null ? _g : this.model,
+        model: (_j = llmRequest.model) != null ? _j : this.model,
         contents: llmRequest.contents,
         config: llmRequest.config
       });
-      yield (0, import_llm_response.createLlmResponse)(response);
+      const llmResponse = (0, import_llm_response.createLlmResponse)(response);
+      if (this.isGemini3Preview && ((_k = llmResponse.content) == null ? void 0 : _k.parts)) {
+        let thoughtSig;
+        for (const part of llmResponse.content.parts) {
+          if (part.thought && part.thoughtSignature) {
+            thoughtSig = part.thoughtSignature;
+            break;
+          }
+        }
+        if (thoughtSig) {
+          for (const part of llmResponse.content.parts) {
+            if (part.functionCall && !part.thoughtSignature) {
+              part.thoughtSignature = thoughtSig;
+            }
+          }
+        }
+      }
+      yield llmResponse;
     }
   }
   get apiClient() {
@@ -228,7 +271,9 @@ class Gemini extends import_base_llm.BaseLlm {
         import_logger.logger.debug(`Using custom API endpoint: ${this.apiEndpoint}`);
         if (this.isGemini3Preview) {
           httpOptions.apiVersion = "";
-          import_logger.logger.info(`Gemini 3 preview mode: using direct API path without version prefix`);
+          import_logger.logger.info(
+            `Gemini 3 preview mode: using direct API path without version prefix`
+          );
         }
       }
       this._apiClient = new import_genai.GoogleGenAI({
@@ -292,7 +337,9 @@ class Gemini extends import_base_llm.BaseLlm {
       llmRequest.liveConnectConfig.systemInstruction = {
         role: "system",
         // TODO - b/425992518: validate type casting works well.
-        parts: [(0, import_genai.createPartFromText)(llmRequest.config.systemInstruction)]
+        parts: [
+          (0, import_genai.createPartFromText)(llmRequest.config.systemInstruction)
+        ]
       };
     }
     llmRequest.liveConnectConfig.tools = (_c = llmRequest.config) == null ? void 0 : _c.tools;