@google/adk 2.2.0 → 2.3.0

package/dist/esm/models/google_llm.js

@@ -16,7 +16,7 @@ import { isBrowser, isEnterpriseModeEnabled } 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 { GeminiStreamingResponseAggregator } from "../utils/streaming_utils.js";
 import { BaseLlm } from "./base_llm.js";
 import { GeminiLlmConnection } from "./gemini_llm_connection.js";
 import { generateContentViaInteractions } from "./interactions_utils.js";
@@ -76,7 +76,7 @@ const _Gemini = class _Gemini extends (_b = BaseLlm, _a = GEMINI_MODEL_SYMBOL, _
    *     metadata and no `content`; only a stream with neither ends silently.
    */
   async *generateContentAsync(llmRequest, stream = false, abortSignal) {
-    var _a2, _b2, _c;
+    var _a2, _b2;
     if (this.useInteractionsApi) {
       yield* generateContentViaInteractions(this.apiClient, llmRequest, stream);
       return;
@@ -98,28 +98,23 @@ const _Gemini = class _Gemini extends (_b = BaseLlm, _a = GEMINI_MODEL_SYMBOL, _
     if (abortSignal) {
       llmRequest.config.abortSignal = abortSignal;
     }
+    const params = {
+      model: (_b2 = llmRequest.model) != null ? _b2 : this.model,
+      contents: llmRequest.contents,
+      config: llmRequest.config
+    };
     if (stream) {
-      const streamResult = await this.apiClient.models.generateContentStream({
-        model: (_b2 = llmRequest.model) != null ? _b2 : this.model,
-        contents: llmRequest.contents,
-        config: llmRequest.config
-      });
-      const aggregator = new StreamingResponseAggregator();
+      const streamResult = await this.apiClient.models.generateContentStream(params);
+      const aggregator = new GeminiStreamingResponseAggregator();
       for await (const response of streamResult) {
-        for await (const llmResponse of aggregator.processResponse(response)) {
-          yield llmResponse;
-        }
+        yield* aggregator.processResponse(response);
       }
       const finalResponse = aggregator.close();
       if (finalResponse) {
         yield finalResponse;
       }
     } else {
-      const response = await this.apiClient.models.generateContent({
-        model: (_c = llmRequest.model) != null ? _c : this.model,
-        contents: llmRequest.contents,
-        config: llmRequest.config
-      });
+      const response = await this.apiClient.models.generateContent(params);
       yield createLlmResponse(response);
     }
   }
@@ -139,6 +134,7 @@ const _Gemini = class _Gemini extends (_b = BaseLlm, _a = GEMINI_MODEL_SYMBOL, _
       });
     } else {
       this._apiClient = new GoogleGenAI({
+        vertexai: false,
         apiKey: this.apiKey,
         httpOptions: this.getHttpOptions()
       });
@@ -174,6 +170,7 @@ const _Gemini = class _Gemini extends (_b = BaseLlm, _a = GEMINI_MODEL_SYMBOL, _
         });
       } else {
         this._liveApiClient = new GoogleGenAI({
+          vertexai: false,
           apiKey: this.apiKey,
           httpOptions: this.getLiveHttpOptions()
         });
@@ -280,7 +277,7 @@ function geminiInitParams({
 }) {
   const params = { model, vertexai, project, location, apiKey };
   params.vertexai = !!vertexai;
-  if (!params.vertexai && !isBrowser()) {
+  if (vertexai === void 0 && !isBrowser()) {
     params.vertexai = isEnterpriseModeEnabled();
   }
   if (params.vertexai) {

package/dist/esm/models/llm_response.js

@@ -7,9 +7,17 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+function withOwnInitialPromptTokenCount(usage) {
+  const initialPromptTokenCount = usage == null ? void 0 : usage.initialPromptTokenCount;
+  if (!usage || initialPromptTokenCount === void 0 || initialPromptTokenCount === usage.promptTokenCount || Object.prototype.propertyIsEnumerable.call(usage, "initialPromptTokenCount")) {
+    return usage;
+  }
+  return { ...usage, initialPromptTokenCount };
+}
+__name(withOwnInitialPromptTokenCount, "withOwnInitialPromptTokenCount");
 function createLlmResponse(response) {
   var _a;
-  const usageMetadata = response.usageMetadata;
+  const usageMetadata = withOwnInitialPromptTokenCount(response.usageMetadata);
   if (response.candidates && response.candidates.length > 0) {
     const candidate = response.candidates[0];
     if (((_a = candidate.content) == null ? void 0 : _a.parts) && candidate.content.parts.length > 0) {

package/dist/esm/models/registry.js

@@ -75,7 +75,7 @@ const _LLMRegistry = class _LLMRegistry {
     }
     for (const [regex, llmClass] of _LLMRegistry.llmRegistryDict.entries()) {
       const pattern = new RegExp(
-        `^${regex instanceof RegExp ? regex.source : regex}$`,
+        `^(?:${regex instanceof RegExp ? regex.source : regex})$`,
         regex instanceof RegExp ? regex.flags : void 0
       );
       if (pattern.test(model)) {

package/dist/esm/models/routed_llm.js

@@ -28,14 +28,12 @@ const _RoutedLlm = class _RoutedLlm extends BaseLlm {
   /**
    * Generates content by delegating to the selected model.
    */
-  async *generateContentAsync(llmRequest, stream) {
+  async *generateContentAsync(llmRequest, stream, abortSignal) {
     logger.info(`Routing request via ${this.model}`);
-    yield* runWithRouting(
-      this.models,
-      llmRequest,
-      this.router,
-      (model) => model.generateContentAsync(llmRequest, stream)
-    );
+    yield* runWithRouting(this.models, llmRequest, this.router, (model) => {
+      llmRequest.model = model.model;
+      return model.generateContentAsync(llmRequest, stream, abortSignal);
+    });
   }
   /**
    * Creates a live connection to the LLM by delegating to the selected model.
@@ -47,7 +45,10 @@ const _RoutedLlm = class _RoutedLlm extends BaseLlm {
       this.models,
       llmRequest,
       this.router,
-      (model) => model.connect(llmRequest)
+      (model) => {
+        llmRequest.model = model.model;
+        return model.connect(llmRequest);
+      }
     );
     const result = await generator.next();
     if (result.done || result.value === void 0) {

package/dist/esm/planners/plan_re_act_planner.js

@@ -41,7 +41,7 @@ const _PlanReActPlanner = class _PlanReActPlanner extends BasePlanner {
       }
       handleNonFunctionCallPart(part, preservedParts);
     }
-    if (firstFcPartIndex > 0) {
+    if (firstFcPartIndex >= 0) {
       for (let j = firstFcPartIndex + 1; j < responseParts.length; j++) {
         if (!responseParts[j].functionCall) {
           break;