@google/adk 2.2.1 → 2.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/adk",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "description": "Google ADK JS",
   "author": "Google",
   "license": "Apache-2.0",
@@ -84,9 +84,9 @@
   "dependencies": {
     "@a2a-js/sdk": "^0.3.10",
     "@google-cloud/vertexai": "^1.12.0",
-    "@google/genai": "^2.9.0",
+    "@google/genai": "^2.29.1",
     "@mikro-orm/core": "^7.2.0",
-    "@opentelemetry/api": "1.9.0",
+    "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/api-logs": "^0.222.0",
     "@opentelemetry/exporter-logs-otlp-http": "^0.222.0",
     "@opentelemetry/exporter-metrics-otlp-http": "^0.222.0",
@@ -113,6 +113,7 @@
   "devDependencies": {
     "@google-cloud/opentelemetry-cloud-monitoring-exporter": "^0.21.0",
     "@google-cloud/opentelemetry-cloud-trace-exporter": "^3.0.0",
+    "@google-cloud/secret-manager": "^7.1.1",
     "@google-cloud/storage": "^7.17.1",
     "@mikro-orm/sqlite": "^7.2.0",
     "@modelcontextprotocol/sdk": "^1.26.0",
@@ -126,6 +127,7 @@
   "peerDependencies": {
     "@google-cloud/opentelemetry-cloud-monitoring-exporter": "^0.21.0",
     "@google-cloud/opentelemetry-cloud-trace-exporter": "^3.0.0",
+    "@google-cloud/secret-manager": "^7.1.1",
     "@google-cloud/storage": "^7.17.1",
     "@mikro-orm/mariadb": "^7.2.0",
     "@mikro-orm/mssql": "^7.2.0",
@@ -142,6 +144,9 @@
     "@google-cloud/opentelemetry-cloud-trace-exporter": {
       "optional": true
     },
+    "@google-cloud/secret-manager": {
+      "optional": true
+    },
     "@google-cloud/storage": {
       "optional": true
     },

package/dist/cjs/models/gemini_continuation.js

@@ -1,232 +0,0 @@
-/**
-  * @license
-  * Copyright 2026 Google LLC
-  * SPDX-License-Identifier: Apache-2.0
-  */
-
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var gemini_continuation_exports = {};
-__export(gemini_continuation_exports, {
-  GeminiContinuation: () => GeminiContinuation,
-  MAX_RESUMES: () => MAX_RESUMES,
-  resumeToken: () => resumeToken
-});
-module.exports = __toCommonJS(gemini_continuation_exports);
-var import_genai = require("@google/genai");
-var import_content_processor_utils = require("../agents/processors/content_processor_utils.js");
-var import_logger = require("../utils/logger.js");
-var import_llm_response = require("./llm_response.js");
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-const MAX_RESUMES = 256;
-function resumeToken(response) {
-  var _a;
-  const candidate = (_a = response.candidates) == null ? void 0 : _a[0];
-  if ((candidate == null ? void 0 : candidate.finishReason) !== import_genai.FinishReason.CONTINUATION) {
-    return void 0;
-  }
-  if (!candidate.continuationToken) {
-    import_logger.logger.warn(
-      "The model paused the generation for continuation, but the response carries no continuation token, so the partial output is returned."
-    );
-    return void 0;
-  }
-  return candidate.continuationToken;
-}
-__name(resumeToken, "resumeToken");
-const _GeminiContinuation = class _GeminiContinuation {
-  constructor(contents, config) {
-    this.config = config;
-    this.parts = [];
-    this.resumes = 0;
-    this.contents = [...contents];
-  }
-  /**
-   * Adds one request's output to the generation: its parts to the content and
-   * its usage to the total.
-   */
-  addOutput(newParts, newUsage) {
-    this.usage = addUsage(this.usage, newUsage);
-    this.appendParts(newParts);
-  }
-  /**
-   * Returns the request that resumes the generation after a request that
-   * ended with `nextToken`. Returns undefined if the request did not pause,
-   * returned the previous token again, or the generation was already resumed
-   * {@link MAX_RESUMES} times.
-   */
-  resumeRequest(nextToken) {
-    if (nextToken === void 0) {
-      return void 0;
-    }
-    if (!this.willResume(nextToken)) {
-      if (nextToken === this.token) {
-        import_logger.logger.warn(
-          "The model returned the same continuation token twice; returning the output generated so far."
-        );
-      } else {
-        import_logger.logger.warn(
-          `The model paused the generation ${MAX_RESUMES} times; returning the output generated so far.`
-        );
-      }
-      return void 0;
-    }
-    this.token = nextToken;
-    this.resumes++;
-    import_logger.logger.debug("The model paused the generation; resuming it.");
-    return this.buildResumeRequest(nextToken);
-  }
-  /** Returns `response` with the content and usage of all requests, if resumed. */
-  complete(response) {
-    var _a;
-    if (!this.resumed) {
-      return (0, import_llm_response.createLlmResponse)(response);
-    }
-    const candidate = (_a = response.candidates) == null ? void 0 : _a[0];
-    return (0, import_llm_response.createLlmResponse)({
-      ...response,
-      usageMetadata: this.usage,
-      candidates: candidate && this.parts.length > 0 ? [{ ...candidate, content: this.content() }] : response.candidates
-    });
-  }
-  /**
-   * Returns the final streamed `response`, with usage summed across all
-   * requests if resumed.
-   */
-  withSummedUsage(response) {
-    return this.resumed ? { ...response, usageMetadata: this.usage } : response;
-  }
-  /** Returns whether a request that ended with `nextToken` is resumed. */
-  willResume(nextToken) {
-    return nextToken !== this.token && this.resumes < MAX_RESUMES;
-  }
-  /** Whether the generation took more than one request. */
-  get resumed() {
-    return this.token !== void 0;
-  }
-  content() {
-    return { role: "model", parts: [...this.parts] };
-  }
-  buildResumeRequest(nextToken) {
-    const contents = [...this.contents];
-    if (this.parts.length > 0) {
-      const content = structuredClone(this.content());
-      (0, import_content_processor_utils.removeClientFunctionCallId)(content);
-      contents.push(content);
-    }
-    return {
-      contents,
-      config: { ...this.config, continuationToken: nextToken }
-    };
-  }
-  /** Appends `newParts`, joining text as the streaming aggregator does. */
-  appendParts(newParts) {
-    for (const part of newParts) {
-      const last = this.parts.length - 1;
-      const previous = last >= 0 ? this.parts[last] : void 0;
-      if (previous && canJoin(previous, part)) {
-        const joined = { text: previous.text + part.text };
-        if (previous.thought !== void 0) {
-          joined.thought = previous.thought;
-        }
-        const signature = previous.thoughtSignature || part.thoughtSignature;
-        if (signature !== void 0) {
-          joined.thoughtSignature = signature;
-        }
-        this.parts[last] = joined;
-      } else {
-        this.parts.push(part);
-      }
-    }
-  }
-};
-__name(_GeminiContinuation, "GeminiContinuation");
-let GeminiContinuation = _GeminiContinuation;
-function canJoin(first, second) {
-  var _a, _b;
-  return isText(first) && isText(second) && ((_a = first.thought) != null ? _a : false) === ((_b = second.thought) != null ? _b : false);
-}
-__name(canJoin, "canJoin");
-function isText(part) {
-  if (!part.text) {
-    return false;
-  }
-  return Object.entries(part).every(
-    ([key, value]) => value === void 0 || key === "text" || key === "thought" || key === "thoughtSignature"
-  );
-}
-__name(isText, "isText");
-const COUNT_FIELDS = [
-  "promptTokenCount",
-  "candidatesTokenCount",
-  "totalTokenCount",
-  "cachedContentTokenCount",
-  "thoughtsTokenCount",
-  "toolUsePromptTokenCount"
-];
-const MODALITY_FIELDS = [
-  "promptTokensDetails",
-  "candidatesTokensDetails",
-  "cacheTokensDetails",
-  "toolUsePromptTokensDetails"
-];
-function addUsage(total, next) {
-  var _a, _b;
-  if (!total || !next) {
-    return total != null ? total : next;
-  }
-  const combined = { ...next };
-  for (const field of COUNT_FIELDS) {
-    if (total[field] !== void 0 || next[field] !== void 0) {
-      combined[field] = ((_a = total[field]) != null ? _a : 0) + ((_b = next[field]) != null ? _b : 0);
-    }
-  }
-  for (const field of MODALITY_FIELDS) {
-    if (total[field] !== void 0 || next[field] !== void 0) {
-      combined[field] = addModalityCounts(total[field], next[field]);
-    }
-  }
-  return combined;
-}
-__name(addUsage, "addUsage");
-function addModalityCounts(first, second) {
-  var _a, _b;
-  const totals = /* @__PURE__ */ new Map();
-  for (const count of [...first != null ? first : [], ...second != null ? second : []]) {
-    totals.set(
-      count.modality,
-      ((_a = totals.get(count.modality)) != null ? _a : 0) + ((_b = count.tokenCount) != null ? _b : 0)
-    );
-  }
-  return [...totals].map(
-    ([modality, tokenCount]) => modality === void 0 ? { tokenCount } : { modality, tokenCount }
-  );
-}
-__name(addModalityCounts, "addModalityCounts");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  GeminiContinuation,
-  MAX_RESUMES,
-  resumeToken
-});

package/dist/esm/models/gemini_continuation.js

@@ -1,205 +0,0 @@
-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
- */
-import {
-  FinishReason
-} from "@google/genai";
-import { removeClientFunctionCallId } from "../agents/processors/content_processor_utils.js";
-import { logger } from "../utils/logger.js";
-import { createLlmResponse } from "./llm_response.js";
-const MAX_RESUMES = 256;
-function resumeToken(response) {
-  var _a;
-  const candidate = (_a = response.candidates) == null ? void 0 : _a[0];
-  if ((candidate == null ? void 0 : candidate.finishReason) !== FinishReason.CONTINUATION) {
-    return void 0;
-  }
-  if (!candidate.continuationToken) {
-    logger.warn(
-      "The model paused the generation for continuation, but the response carries no continuation token, so the partial output is returned."
-    );
-    return void 0;
-  }
-  return candidate.continuationToken;
-}
-__name(resumeToken, "resumeToken");
-const _GeminiContinuation = class _GeminiContinuation {
-  constructor(contents, config) {
-    this.config = config;
-    this.parts = [];
-    this.resumes = 0;
-    this.contents = [...contents];
-  }
-  /**
-   * Adds one request's output to the generation: its parts to the content and
-   * its usage to the total.
-   */
-  addOutput(newParts, newUsage) {
-    this.usage = addUsage(this.usage, newUsage);
-    this.appendParts(newParts);
-  }
-  /**
-   * Returns the request that resumes the generation after a request that
-   * ended with `nextToken`. Returns undefined if the request did not pause,
-   * returned the previous token again, or the generation was already resumed
-   * {@link MAX_RESUMES} times.
-   */
-  resumeRequest(nextToken) {
-    if (nextToken === void 0) {
-      return void 0;
-    }
-    if (!this.willResume(nextToken)) {
-      if (nextToken === this.token) {
-        logger.warn(
-          "The model returned the same continuation token twice; returning the output generated so far."
-        );
-      } else {
-        logger.warn(
-          `The model paused the generation ${MAX_RESUMES} times; returning the output generated so far.`
-        );
-      }
-      return void 0;
-    }
-    this.token = nextToken;
-    this.resumes++;
-    logger.debug("The model paused the generation; resuming it.");
-    return this.buildResumeRequest(nextToken);
-  }
-  /** Returns `response` with the content and usage of all requests, if resumed. */
-  complete(response) {
-    var _a;
-    if (!this.resumed) {
-      return createLlmResponse(response);
-    }
-    const candidate = (_a = response.candidates) == null ? void 0 : _a[0];
-    return createLlmResponse({
-      ...response,
-      usageMetadata: this.usage,
-      candidates: candidate && this.parts.length > 0 ? [{ ...candidate, content: this.content() }] : response.candidates
-    });
-  }
-  /**
-   * Returns the final streamed `response`, with usage summed across all
-   * requests if resumed.
-   */
-  withSummedUsage(response) {
-    return this.resumed ? { ...response, usageMetadata: this.usage } : response;
-  }
-  /** Returns whether a request that ended with `nextToken` is resumed. */
-  willResume(nextToken) {
-    return nextToken !== this.token && this.resumes < MAX_RESUMES;
-  }
-  /** Whether the generation took more than one request. */
-  get resumed() {
-    return this.token !== void 0;
-  }
-  content() {
-    return { role: "model", parts: [...this.parts] };
-  }
-  buildResumeRequest(nextToken) {
-    const contents = [...this.contents];
-    if (this.parts.length > 0) {
-      const content = structuredClone(this.content());
-      removeClientFunctionCallId(content);
-      contents.push(content);
-    }
-    return {
-      contents,
-      config: { ...this.config, continuationToken: nextToken }
-    };
-  }
-  /** Appends `newParts`, joining text as the streaming aggregator does. */
-  appendParts(newParts) {
-    for (const part of newParts) {
-      const last = this.parts.length - 1;
-      const previous = last >= 0 ? this.parts[last] : void 0;
-      if (previous && canJoin(previous, part)) {
-        const joined = { text: previous.text + part.text };
-        if (previous.thought !== void 0) {
-          joined.thought = previous.thought;
-        }
-        const signature = previous.thoughtSignature || part.thoughtSignature;
-        if (signature !== void 0) {
-          joined.thoughtSignature = signature;
-        }
-        this.parts[last] = joined;
-      } else {
-        this.parts.push(part);
-      }
-    }
-  }
-};
-__name(_GeminiContinuation, "GeminiContinuation");
-let GeminiContinuation = _GeminiContinuation;
-function canJoin(first, second) {
-  var _a, _b;
-  return isText(first) && isText(second) && ((_a = first.thought) != null ? _a : false) === ((_b = second.thought) != null ? _b : false);
-}
-__name(canJoin, "canJoin");
-function isText(part) {
-  if (!part.text) {
-    return false;
-  }
-  return Object.entries(part).every(
-    ([key, value]) => value === void 0 || key === "text" || key === "thought" || key === "thoughtSignature"
-  );
-}
-__name(isText, "isText");
-const COUNT_FIELDS = [
-  "promptTokenCount",
-  "candidatesTokenCount",
-  "totalTokenCount",
-  "cachedContentTokenCount",
-  "thoughtsTokenCount",
-  "toolUsePromptTokenCount"
-];
-const MODALITY_FIELDS = [
-  "promptTokensDetails",
-  "candidatesTokensDetails",
-  "cacheTokensDetails",
-  "toolUsePromptTokensDetails"
-];
-function addUsage(total, next) {
-  var _a, _b;
-  if (!total || !next) {
-    return total != null ? total : next;
-  }
-  const combined = { ...next };
-  for (const field of COUNT_FIELDS) {
-    if (total[field] !== void 0 || next[field] !== void 0) {
-      combined[field] = ((_a = total[field]) != null ? _a : 0) + ((_b = next[field]) != null ? _b : 0);
-    }
-  }
-  for (const field of MODALITY_FIELDS) {
-    if (total[field] !== void 0 || next[field] !== void 0) {
-      combined[field] = addModalityCounts(total[field], next[field]);
-    }
-  }
-  return combined;
-}
-__name(addUsage, "addUsage");
-function addModalityCounts(first, second) {
-  var _a, _b;
-  const totals = /* @__PURE__ */ new Map();
-  for (const count of [...first != null ? first : [], ...second != null ? second : []]) {
-    totals.set(
-      count.modality,
-      ((_a = totals.get(count.modality)) != null ? _a : 0) + ((_b = count.tokenCount) != null ? _b : 0)
-    );
-  }
-  return [...totals].map(
-    ([modality, tokenCount]) => modality === void 0 ? { tokenCount } : { modality, tokenCount }
-  );
-}
-__name(addModalityCounts, "addModalityCounts");
-export {
-  GeminiContinuation,
-  MAX_RESUMES,
-  resumeToken
-};

package/dist/types/models/gemini_continuation.d.ts

@@ -1,59 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-import { Content, GenerateContentConfig, GenerateContentResponse, GenerateContentResponseUsageMetadata, Part } from '@google/genai';
-import { LlmResponse } from './llm_response.js';
-/** The most times one generation is resumed after the model pauses it. */
-export declare const MAX_RESUMES = 256;
-/** The contents and config of a request that resumes a paused generation. */
-export interface ResumeRequest {
-    contents: Content[];
-    config: GenerateContentConfig;
-}
-/**
- * Returns the token that resumes `response`, or undefined if it did not pause
- * or has no token.
- */
-export declare function resumeToken(response: GenerateContentResponse): string | undefined;
-/**
- * One generation, carried across the requests that resume it after the model
- * pauses it.
- */
-export declare class GeminiContinuation {
-    private readonly config?;
-    private readonly contents;
-    private readonly parts;
-    private usage?;
-    private token?;
-    private resumes;
-    constructor(contents: Content[], config?: GenerateContentConfig | undefined);
-    /**
-     * Adds one request's output to the generation: its parts to the content and
-     * its usage to the total.
-     */
-    addOutput(newParts: Part[], newUsage: GenerateContentResponseUsageMetadata | undefined): void;
-    /**
-     * Returns the request that resumes the generation after a request that
-     * ended with `nextToken`. Returns undefined if the request did not pause,
-     * returned the previous token again, or the generation was already resumed
-     * {@link MAX_RESUMES} times.
-     */
-    resumeRequest(nextToken: string | undefined): ResumeRequest | undefined;
-    /** Returns `response` with the content and usage of all requests, if resumed. */
-    complete(response: GenerateContentResponse): LlmResponse;
-    /**
-     * Returns the final streamed `response`, with usage summed across all
-     * requests if resumed.
-     */
-    withSummedUsage(response: LlmResponse): LlmResponse;
-    /** Returns whether a request that ended with `nextToken` is resumed. */
-    willResume(nextToken: string): boolean;
-    /** Whether the generation took more than one request. */
-    private get resumed();
-    private content;
-    private buildResumeRequest;
-    /** Appends `newParts`, joining text as the streaming aggregator does. */
-    private appendParts;
-}