@google/adk 1.2.0 → 1.4.0

package/dist/esm/models/google_llm.js

@@ -5,6 +5,7 @@ const require = topLevelCreateRequire(import.meta.url);
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+var _a, _b;
 import {
   createPartFromText,
   GoogleGenAI
@@ -12,11 +13,17 @@ import {
 import { getBooleanEnvVar, isBrowser } from "../utils/env_aware_utils.js";
 import { logger } from "../utils/logger.js";
 import { GoogleLLMVariant } from "../utils/variant_utils.js";
+import { AsyncQueue } from "../utils/async_queue.js";
 import { StreamingResponseAggregator } from "../utils/streaming_utils.js";
 import { BaseLlm } from "./base_llm.js";
 import { GeminiLlmConnection } from "./gemini_llm_connection.js";
+import { generateContentViaInteractions } from "./interactions_utils.js";
 import { createLlmResponse } from "./llm_response.js";
-class Gemini extends BaseLlm {
+const GEMINI_MODEL_SYMBOL = Symbol.for("google.adk.geminiModel");
+function isGemini(obj) {
+  return typeof obj === "object" && obj !== null && GEMINI_MODEL_SYMBOL in obj && obj[GEMINI_MODEL_SYMBOL] === true;
+}
+class Gemini extends (_b = BaseLlm, _a = GEMINI_MODEL_SYMBOL, _b) {
   /**
    * @param params The parameters for creating a Gemini instance.
    */
@@ -26,12 +33,14 @@ class Gemini extends BaseLlm {
     vertexai,
     project,
     location,
-    headers
+    headers,
+    useInteractionsApi
   }) {
     if (!model) {
       model = "gemini-2.5-flash";
     }
     super({ model });
+    this[_a] = true;
     const params = geminiInitParams({
       model,
       vertexai,
@@ -49,6 +58,7 @@ class Gemini extends BaseLlm {
     this.apiKey = params.apiKey;
     this.headers = headers;
     this.vertexai = !!params.vertexai;
+    this.useInteractionsApi = !!useInteractionsApi;
   }
   /**
    * Sends a request to the Gemini model.
@@ -58,11 +68,15 @@ class Gemini extends BaseLlm {
    * @yields LlmResponse: The model response.
    */
   async *generateContentAsync(llmRequest, stream = false, abortSignal) {
-    var _a, _b, _c;
+    var _a2, _b2, _c;
+    if (this.useInteractionsApi) {
+      yield* generateContentViaInteractions(this.apiClient, llmRequest, stream);
+      return;
+    }
     this.preprocessRequest(llmRequest);
     this.maybeAppendUserContent(llmRequest);
     logger.info(
-      `Sending out request, model: ${(_a = llmRequest.model) != null ? _a : this.model}, backend: ${this.apiBackend}, stream: ${stream}`
+      `Sending out request, model: ${(_a2 = llmRequest.model) != null ? _a2 : this.model}, backend: ${this.apiBackend}, stream: ${stream}`
     );
     if (!llmRequest.config) {
       llmRequest.config = {};
@@ -78,7 +92,7 @@ class Gemini extends BaseLlm {
     }
     if (stream) {
       const streamResult = await this.apiClient.models.generateContentStream({
-        model: (_b = llmRequest.model) != null ? _b : this.model,
+        model: (_b2 = llmRequest.model) != null ? _b2 : this.model,
         contents: llmRequest.contents,
         config: llmRequest.config
       });
@@ -143,10 +157,19 @@ class Gemini extends BaseLlm {
   }
   get liveApiClient() {
     if (!this._liveApiClient) {
-      this._liveApiClient = new GoogleGenAI({
-        apiKey: this.apiKey,
-        httpOptions: this.getLiveHttpOptions()
-      });
+      if (this.vertexai) {
+        this._liveApiClient = new GoogleGenAI({
+          vertexai: this.vertexai,
+          project: this.project,
+          location: this.location || "global",
+          httpOptions: this.getLiveHttpOptions()
+        });
+      } else {
+        this._liveApiClient = new GoogleGenAI({
+          apiKey: this.apiKey,
+          httpOptions: this.getLiveHttpOptions()
+        });
+      }
     }
     return this._liveApiClient;
   }
@@ -157,8 +180,8 @@ class Gemini extends BaseLlm {
    * @returns BaseLlmConnection, the connection to the Gemini model.
    */
   async connect(llmRequest) {
-    var _a, _b, _c, _d;
-    if ((_a = llmRequest.liveConnectConfig) == null ? void 0 : _a.httpOptions) {
+    var _a2, _b2, _c, _d;
+    if ((_a2 = llmRequest.liveConnectConfig) == null ? void 0 : _a2.httpOptions) {
       if (!llmRequest.liveConnectConfig.httpOptions.headers) {
         llmRequest.liveConnectConfig.httpOptions.headers = {};
       }
@@ -168,7 +191,7 @@ class Gemini extends BaseLlm {
       );
       llmRequest.liveConnectConfig.httpOptions.apiVersion = this.liveApiVersion;
     }
-    if ((_b = llmRequest.config) == null ? void 0 : _b.systemInstruction) {
+    if ((_b2 = llmRequest.config) == null ? void 0 : _b2.systemInstruction) {
       llmRequest.liveConnectConfig.systemInstruction = {
         role: "system",
         // TODO - b/425992518: validate type casting works well.
@@ -178,16 +201,24 @@ class Gemini extends BaseLlm {
       };
     }
     llmRequest.liveConnectConfig.tools = (_c = llmRequest.config) == null ? void 0 : _c.tools;
+    const modelVersion = (_d = llmRequest.model) != null ? _d : this.model;
+    const messageQueue = new AsyncQueue();
     const liveSession = await this.liveApiClient.live.connect({
-      model: (_d = llmRequest.model) != null ? _d : this.model,
+      model: modelVersion,
       config: llmRequest.liveConnectConfig,
       callbacks: {
-        // TODO - b/425992518: GenAI SDK inconsistent API, missing methods.
-        onmessage: () => {
+        onmessage: (message) => {
+          messageQueue.push(message);
+        },
+        onerror: (error) => {
+          messageQueue.error(error);
+        },
+        onclose: () => {
+          messageQueue.close();
         }
       }
     });
-    return new GeminiLlmConnection(liveSession);
+    return new GeminiLlmConnection(liveSession, modelVersion, messageQueue);
   }
   preprocessRequest(llmRequest) {
     if (this.apiBackend === GoogleLLMVariant.GEMINI_API) {
@@ -261,5 +292,6 @@ function geminiInitParams({
 }
 export {
   Gemini,
-  geminiInitParams
+  geminiInitParams,
+  isGemini
 };