@google/adk 2.2.1 → 2.3.0

package/dist/esm/flows/llm_flows/audio_transcriber.js

@@ -0,0 +1,142 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+var AudioEncoding = /* @__PURE__ */ ((AudioEncoding2) => {
+  AudioEncoding2[AudioEncoding2["ENCODING_UNSPECIFIED"] = 0] = "ENCODING_UNSPECIFIED";
+  AudioEncoding2[AudioEncoding2["LINEAR16"] = 1] = "LINEAR16";
+  return AudioEncoding2;
+})(AudioEncoding || {});
+function isSpeechClientLike(value) {
+  return typeof value === "object" && value !== null && typeof value.recognize === "function";
+}
+__name(isSpeechClientLike, "isSpeechClientLike");
+function isContentEntry(data) {
+  return "parts" in data || !("data" in data) && !("mimeType" in data);
+}
+__name(isContentEntry, "isContentEntry");
+function blobDataToBytes(data) {
+  if (typeof data !== "string") {
+    return data;
+  }
+  if (data.length > 0 && data.length % 4 === 0 && /^[A-Za-z0-9+/]+={0,2}$/.test(data)) {
+    const atobFn = globalThis.atob;
+    if (typeof Buffer === "undefined" && typeof atobFn === "function") {
+      const binary = atobFn(data);
+      return Uint8Array.from(binary, (char) => char.charCodeAt(0));
+    }
+    return new Uint8Array(Buffer.from(data, "base64"));
+  }
+  return new TextEncoder().encode(data);
+}
+__name(blobDataToBytes, "blobDataToBytes");
+function concatBytes(first, second) {
+  const merged = new Uint8Array(first.length + second.length);
+  merged.set(first, 0);
+  merged.set(second, first.length);
+  return merged;
+}
+__name(concatBytes, "concatBytes");
+const _AudioTranscriber = class _AudioTranscriber {
+  constructor(optionsOrClient) {
+    if (isSpeechClientLike(optionsOrClient)) {
+      this.client = optionsOrClient;
+    } else if (optionsOrClient == null ? void 0 : optionsOrClient.client) {
+      this.client = optionsOrClient.client;
+    } else {
+      this.client = {
+        recognize() {
+          throw new Error(
+            "SpeechClient is not configured on AudioTranscriber. Pass a SpeechClientLike implementation to new AudioTranscriber({client})."
+          );
+        }
+      };
+    }
+  }
+  /**
+   * Bundles consecutive audio blobs from the same speaker in
+   * `invocationContext.transcriptionCache`, transcribes user audio bundles into
+   * text `Content` entries, preserves already-transcribed `Content`
+   * entries in order, clears `invocationContext.transcriptionCache`, and
+   * returns the resulting content list.
+   *
+   * @param invocationContext The invocation context holding `transcriptionCache`.
+   * @returns Ordered list of transcribed `Content` objects.
+   */
+  async transcribeFile(invocationContext) {
+    var _a, _b, _c, _d;
+    const bundledAudio = [];
+    const transcriptionHistory = [];
+    let currentSpeaker = void 0;
+    let currentAudioData = new Uint8Array(0);
+    for (const transcriptionEntry of (_a = invocationContext.transcriptionCache) != null ? _a : []) {
+      const speaker = transcriptionEntry.role;
+      const audioData = transcriptionEntry.data;
+      if (isContentEntry(audioData)) {
+        if (currentSpeaker !== void 0) {
+          bundledAudio.push([currentSpeaker, currentAudioData]);
+          currentSpeaker = void 0;
+          currentAudioData = new Uint8Array(0);
+        }
+        bundledAudio.push([speaker, audioData]);
+        continue;
+      }
+      const rawData = audioData.data;
+      if (!rawData) {
+        continue;
+      }
+      const chunkBytes = blobDataToBytes(rawData);
+      if (chunkBytes.length === 0) {
+        continue;
+      }
+      if (speaker === currentSpeaker) {
+        currentAudioData = concatBytes(currentAudioData, chunkBytes);
+      } else {
+        if (currentSpeaker !== void 0) {
+          bundledAudio.push([currentSpeaker, currentAudioData]);
+        }
+        currentSpeaker = speaker;
+        currentAudioData = chunkBytes;
+      }
+    }
+    if (currentSpeaker !== void 0) {
+      bundledAudio.push([currentSpeaker, currentAudioData]);
+    }
+    invocationContext.transcriptionCache = [];
+    for (const [speaker, data] of bundledAudio) {
+      if (ArrayBuffer.isView(data)) {
+        const audio = { content: data };
+        const config = {
+          encoding: 1 /* LINEAR16 */,
+          sampleRateHertz: 16e3,
+          languageCode: "en-US"
+        };
+        const rawResponse = await this.client.recognize({ config, audio });
+        const response = Array.isArray(rawResponse) ? rawResponse[0] : rawResponse;
+        for (const result of (_b = response.results) != null ? _b : []) {
+          const transcript = (_d = (_c = result.alternatives) == null ? void 0 : _c[0]) == null ? void 0 : _d.transcript;
+          if (transcript !== void 0 && transcript !== null) {
+            transcriptionHistory.push({
+              role: speaker ? speaker.toLowerCase() : "user",
+              parts: [{ text: transcript }]
+            });
+          }
+        }
+      } else {
+        transcriptionHistory.push(data);
+      }
+    }
+    return transcriptionHistory;
+  }
+};
+__name(_AudioTranscriber, "AudioTranscriber");
+let AudioTranscriber = _AudioTranscriber;
+export {
+  AudioEncoding,
+  AudioTranscriber
+};

package/dist/esm/index.js

@@ -26,6 +26,10 @@ export * from "./common.js";
 import { LocalEnvironment } from "./environment/local_environment.js";
 import { VertexAiMemoryBankService } from "./memory/vertex_ai_memory_bank_service.js";
 import { VertexAiRagMemoryService } from "./memory/vertex_ai_rag_memory_service.js";
+import {
+  DebugLoggingPlugin,
+  isDebugLoggingPlugin
+} from "./plugins/debug_logging_plugin.js";
 import { DatabaseSessionService } from "./sessions/database_session_service.js";
 import { getSessionServiceFromUri } from "./sessions/registry.js";
 import { VertexAiSessionService } from "./sessions/vertex_ai_session_service.js";
@@ -36,6 +40,40 @@ import {
   loadSkillFromZipBuffer,
   validateSkillDir
 } from "./skills/loader.js";
+import {
+  APIHubToolset
+} from "./tools/apihub_tool/apihub_toolset.js";
+import {
+  APIHubClient
+} from "./tools/apihub_tool/clients/apihub_client.js";
+import {
+  SecretManagerClient
+} from "./tools/apihub_tool/clients/secret_client.js";
+import {
+  ApplicationIntegrationToolset
+} from "./tools/application_integration_tool/application_integration_toolset.js";
+import {
+  actionRequest,
+  actionResponse,
+  ConnectionsClient,
+  CONNECTOR_BASE_SPEC,
+  connectorPayload,
+  createOperation,
+  createOperationRequest,
+  deleteOperation,
+  deleteOperationRequest,
+  executeCustomQueryRequest,
+  getActionOperation,
+  getOperation,
+  getOperationRequest,
+  listOperation,
+  listOperationRequest,
+  updateOperation,
+  updateOperationRequest
+} from "./tools/application_integration_tool/clients/connections_client.js";
+import {
+  IntegrationClient
+} from "./tools/application_integration_tool/clients/integration_client.js";
 import { LOAD_WEB_PAGE, loadWebPage } from "./tools/load_web_page.js";
 import {
   credentialToParam,
@@ -54,6 +92,7 @@ import {
 } from "./tools/openapi_tool/auth/credential_exchangers/base_auth_credential_exchanger.js";
 import {
   exchangeCredential,
+  generateAuthToken,
   OAuth2BearerExchanger
 } from "./tools/openapi_tool/auth/credential_exchangers/oauth2_exchanger.js";
 import { ServiceAccountCredentialExchanger } from "./tools/openapi_tool/auth/credential_exchangers/service_account_exchanger.js";
@@ -86,59 +125,118 @@ import { SkillToolset } from "./tools/skill/skill_toolset.js";
 export * from "./integrations/agent_registry/agent_registry.js";
 export * from "./telemetry/google_cloud.js";
 export * from "./telemetry/setup.js";
+export * from "./tools/google_api_tool/index.js";
+import {
+  DEFAULT_CRITERIA,
+  EVAL_SESSION_ID_PREFIX,
+  EvalStatus,
+  getEvaluationCriteriaOrDefault,
+  getRootAgent,
+  MISSING_EVAL_DEPENDENCIES_MESSAGE,
+  parseAndGetEvalsToRun,
+  RESPONSE_EVALUATION_SCORE_KEY,
+  RESPONSE_MATCH_SCORE_KEY,
+  runEvals,
+  TOOL_TRAJECTORY_SCORE_KEY,
+  tryGetResetFunc
+} from "./cli/cli_eval.js";
+import { loadDotenvForAgent, walkToRootUntilFound } from "./cli/utils/envs.js";
+import { LOGGING_FORMAT, logToStderr, logToTmpFolder } from "./cli/utils/logs.js";
 export * from "./tools/mcp/index.js";
 export {
+  APIHubClient,
+  APIHubToolset,
   AgentEngineSandboxCodeExecutor,
+  ApplicationIntegrationToolset,
   AuthCredentialMissingError,
   AutoAuthCredentialExchanger,
   BaseAuthCredentialExchanger,
+  CONNECTOR_BASE_SPEC,
   CodeExecutionLanguage,
+  ConnectionsClient,
   ContainerCodeExecutor,
+  DEFAULT_CRITERIA,
   DatabaseSessionService,
+  DebugLoggingPlugin,
+  EVAL_SESSION_ID_PREFIX,
+  EvalStatus,
   FileArtifactService,
   FilesRetrieval,
   GCPSkillRegistry,
   GcsArtifactService,
   INTERNAL_AUTH_PREFIX,
+  IntegrationClient,
   InvocationContext,
   LOAD_WEB_PAGE,
+  LOGGING_FORMAT,
   LoadSkillResourceTool,
   LocalEnvironment,
+  MISSING_EVAL_DEPENDENCIES_MESSAGE,
   OAuth2BearerExchanger,
   OpenAPIToolset,
   OpenApiSpecParser,
   OperationParser,
+  RESPONSE_EVALUATION_SCORE_KEY,
+  RESPONSE_MATCH_SCORE_KEY,
   RestApiTool,
   RunSkillInlineScriptErrorCode,
   RunSkillInlineScriptTool,
   RunSkillScriptTool,
+  SecretManagerClient,
   ServiceAccountCredentialExchanger,
   SkillToolset,
+  TOOL_TRAJECTORY_SCORE_KEY,
   ToolAuthHandler,
   ToolContextCredentialStore,
   UnsafeLocalCodeExecutor,
   VertexAiMemoryBankService,
   VertexAiRagMemoryService,
   VertexAiSessionService,
+  actionRequest,
+  actionResponse,
+  connectorPayload,
   createApiParameter,
+  createOperation,
+  createOperationRequest,
   createRestApiTool,
   createRestApiToolFromJson,
   credentialToParam,
+  deleteOperation,
+  deleteOperationRequest,
   dictToAuthScheme,
   exchangeCredential,
+  executeCustomQueryRequest,
+  generateAuthToken,
   generateParamDoc,
   generateReturnDoc,
+  getActionOperation,
   getArtifactServiceFromUri,
+  getEvaluationCriteriaOrDefault,
+  getOperation,
+  getOperationRequest,
+  getRootAgent,
   getSessionServiceFromUri,
   getTypeHint,
+  isDebugLoggingPlugin,
+  listOperation,
+  listOperationRequest,
   loadAllSkillsInDir,
+  loadDotenvForAgent,
   loadSkillFromDir,
   loadSkillFromZipBuffer,
   loadWebPage,
+  logToStderr,
+  logToTmpFolder,
   openidDictToSchemeCredential,
   openidUrlToSchemeCredential,
+  parseAndGetEvalsToRun,
+  runEvals,
   serviceAccountDictToSchemeCredential,
   serviceAccountSchemeCredential,
   tokenToSchemeCredential,
-  validateSkillDir
+  tryGetResetFunc,
+  updateOperation,
+  updateOperationRequest,
+  validateSkillDir,
+  walkToRootUntilFound
 };

package/dist/esm/integrations/agent_registry/helpers.js

@@ -10,7 +10,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 function isGoogleApi(url) {
   try {
     const parsed = new URL(url);
-    return parsed.hostname === "googleapis.com" || parsed.hostname.endsWith(".googleapis.com");
+    return parsed.protocol === "https:" && (parsed.hostname === "googleapis.com" || parsed.hostname.endsWith(".googleapis.com"));
   } catch {
     return false;
   }

package/dist/esm/models/gemini_llm_connection.js

@@ -114,26 +114,34 @@ const _GeminiLlmConnection = class _GeminiLlmConnection {
     this.geminiSession.sendRealtimeInput({ activityEnd: {} });
   }
   /**
-   * Builds a full text response.
+   * Receives the model responses for one model turn.
    *
-   * The text should not be partial and the returned LlmResponse is not be
-   * partial.
+   * The generator ends after the message that completes the turn has been
+   * processed, or when the server closes the connection. Call `receive()`
+   * again to read the next turn; it continues from the next server message.
    *
-   * @param text The text to be included in the response.
-   * @param isThought Whether the text is a thought.
-   * @param groundingMetadata The grounding metadata to include.
-   * @returns An LlmResponse containing the full text.
+   * @returns A generator of the LlmResponses of one model turn.
    */
   async *receive() {
+    var _a, _b;
     if (!this.messageQueue) {
       throw new Error("Message queue is not initialized.");
     }
+    (_a = this.messageIterator) != null ? _a : this.messageIterator = this.messageQueue[Symbol.asyncIterator]();
     const aggregator = new LiveResponseAggregator(this.modelVersion);
-    for await (const message of this.messageQueue) {
+    while (true) {
+      const next = await this.messageIterator.next();
+      if (next.done) {
+        break;
+      }
+      const message = next.value;
       logger.debug("Got LLM Live message:", message);
       for (const response of aggregator.processMessage(message)) {
         yield response;
       }
+      if ((_b = message.serverContent) == null ? void 0 : _b.turnComplete) {
+        return;
+      }
     }
     for (const response of aggregator.close()) {
       yield response;

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;

package/dist/esm/runner/in_memory_runner.js

@@ -18,28 +18,23 @@ const _InMemoryRunner = class _InMemoryRunner extends Runner {
    * @param params The configuration for the runner.
    * @param params.app An optional application instance to run.
    * @param params.agent The root agent to run.
-   * @param params.appName The application name. Defaults to `'InMemoryRunner'`.
+   * @param params.appName The application name. Defaults to `app.name` when
+   *     `app` is provided, or `'InMemoryRunner'` otherwise.
    * @param params.plugins An optional list of plugins.
    * @param params.resumabilityConfig An optional resumability configuration.
    */
   constructor(params) {
-    var _a;
-    const {
-      agent,
-      appName = "InMemoryRunner",
-      plugins = [],
-      app,
-      resumabilityConfig
-    } = params;
+    var _a, _b;
+    const { agent, appName, plugins = [], app, resumabilityConfig } = params;
     super({
       app,
-      appName,
+      appName: (_a = appName != null ? appName : app == null ? void 0 : app.name) != null ? _a : "InMemoryRunner",
       agent,
       plugins,
       artifactService: new InMemoryArtifactService(),
       sessionService: new InMemorySessionService(),
       memoryService: new InMemoryMemoryService(),
-      resumabilityConfig: (_a = app == null ? void 0 : app.resumabilityConfig) != null ? _a : resumabilityConfig
+      resumabilityConfig: (_b = app == null ? void 0 : app.resumabilityConfig) != null ? _b : resumabilityConfig
     });
   }
 };