@google/adk 2.0.0 → 2.2.0

package/dist/esm/memory/vertex_ai_memory_bank_service.js

@@ -40,7 +40,7 @@ const ENABLE_CONSOLIDATION_KEY = "enable_consolidation";
 const MAX_DIRECT_MEMORIES_PER_GENERATE_CALL = 5;
 function shouldFilterOutEvent(content) {
   return !((content == null ? void 0 : content.parts) || []).some(
-    (p) => p.text || p.inlineData || p.fileData
+    (p) => p.text || p.inlineData || p.fileData || p.functionCall || p.functionResponse || p.executableCode || p.codeExecutionResult || p.toolCall || p.toolResponse
   );
 }
 __name(shouldFilterOutEvent, "shouldFilterOutEvent");
@@ -126,6 +126,15 @@ const _VertexAiMemoryBankService = class _VertexAiMemoryBankService {
   }
   /**
    * Adds explicit memory items using Vertex Memory Bank.
+   *
+   * When a `MemoryEntry.id` is set, it is forwarded as the `memoryId` of the
+   * created memory, so the caller picks the last component of the memory
+   * resource name instead of letting the service generate one. An explicit
+   * `customMetadata['memoryId']` takes precedence over `MemoryEntry.id`.
+   *
+   * The id is forwarded unvalidated, so an id the API rejects fails the create
+   * call. Vertex accepts up to 63 characters from `[a-z0-9-]`, starting with a
+   * letter and ending with a letter or number.
    */
   async addMemory(request) {
     if (isConsolidationEnabled(request.customMetadata)) {
@@ -201,7 +210,8 @@ const _VertexAiMemoryBankService = class _VertexAiMemoryBankService {
       const memoryRevisionLabels = revisionLabelsForMemory(memory);
       const config = buildCreateMemoryConfig({
         customMetadata: memoryMetadata,
-        memoryRevisionLabels
+        memoryRevisionLabels,
+        memoryId: memory.id
       });
       const params = {
         name: `reasoningEngines/${this.agentEngineId}`,
@@ -213,7 +223,7 @@ const _VertexAiMemoryBankService = class _VertexAiMemoryBankService {
         config
       };
       const operation = await this.memories.createInternal(params);
-      logger.info("Create memory response received.");
+      logger.debug("Create memory response received.");
       logger.debug(`Create memory response: ${JSON.stringify(operation)}`);
     }
   }
@@ -237,7 +247,7 @@ const _VertexAiMemoryBankService = class _VertexAiMemoryBankService {
         config
       };
       const operation = await this.memories.generateInternal(params);
-      logger.info("Generate direct memory response received.");
+      logger.debug("Generate direct memory response received.");
       logger.debug(
         `Generate direct memory response: ${JSON.stringify(operation)}`
       );
@@ -302,6 +312,9 @@ function buildCreateMemoryConfig(params) {
       };
     }
   }
+  if (params.memoryId !== void 0 && config["memoryId"] === void 0) {
+    config["memoryId"] = params.memoryId;
+  }
   const revisionLabels = {
     ...customRevisionLabels,
     ...params.memoryRevisionLabels
@@ -435,9 +448,8 @@ function mergeCustomMetadataForMemory(params) {
   if (params.customMetadata) {
     Object.assign(mergedMetadata, params.customMetadata);
   }
-  const memoryWithMetadata = params.memory;
-  if (memoryWithMetadata.customMetadata) {
-    Object.assign(mergedMetadata, memoryWithMetadata.customMetadata);
+  if (params.memory.customMetadata) {
+    Object.assign(mergedMetadata, params.memory.customMetadata);
   }
   if (Object.keys(mergedMetadata).length === 0) {
     return void 0;

package/dist/esm/memory/vertex_ai_rag_api.js

@@ -0,0 +1,93 @@
+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 { GoogleAuth } from "google-auth-library";
+const CLOUD_PLATFORM_SCOPE = "https://www.googleapis.com/auth/cloud-platform";
+const _VertexRagApiClient = class _VertexRagApiClient {
+  constructor(options) {
+    this.host = `https://${options.location}-aiplatform.googleapis.com`;
+    this.auth = new GoogleAuth({ scopes: [CLOUD_PLATFORM_SCOPE] });
+  }
+  /** Lists one page of the files in a corpus. */
+  async listRagFiles(params) {
+    const query = new URLSearchParams({ pageSize: String(params.pageSize) });
+    if (params.pageToken) {
+      query.set("pageToken", params.pageToken);
+    }
+    const url = `${this.host}/v1/${params.ragCorpus}/ragFiles?${query.toString()}`;
+    return this.send(url, {
+      method: "GET",
+      headers: await this.authHeaders(url)
+    });
+  }
+  /** Uploads `content` into a corpus as one RAG file. */
+  async uploadRagFile(params) {
+    const url = `${this.host}/upload/v1/${params.ragCorpus}/ragFiles:upload`;
+    const metadata = JSON.stringify({
+      ragFile: { displayName: params.displayName },
+      // Empty message: the corpus default chunking applies. The reference SDK
+      // omits this key unless chunking is configured, so it is optional here.
+      uploadRagFileConfig: {}
+    });
+    const body = new FormData();
+    body.append(
+      "metadata",
+      new Blob([metadata], { type: "application/json; charset=UTF-8" })
+    );
+    body.append(
+      "file",
+      new Blob([params.content], { type: "text/plain; charset=UTF-8" }),
+      "content.txt"
+    );
+    const headers = await this.authHeaders(url);
+    headers.set("X-Goog-Upload-Protocol", "multipart");
+    const response = await this.send(url, {
+      method: "POST",
+      headers,
+      body
+    });
+    if (response.error) {
+      throw new Error(
+        `Vertex AI RAG file upload was rejected: ${JSON.stringify(response.error)}`
+      );
+    }
+  }
+  /** Runs a retrieval query over a corpus. */
+  async retrieveContexts(params) {
+    const url = `${this.host}/v1/${params.parent}:retrieveContexts`;
+    const headers = await this.authHeaders(url);
+    headers.set("Content-Type", "application/json");
+    return this.send(url, {
+      method: "POST",
+      headers,
+      body: JSON.stringify({
+        vertexRagStore: params.vertexRagStore,
+        query: params.query
+      })
+    });
+  }
+  async authHeaders(url) {
+    const client = await this.auth.getClient();
+    return client.getRequestHeaders(url);
+  }
+  async send(url, init) {
+    const response = await fetch(url, init);
+    if (!response.ok) {
+      throw new Error(
+        `Vertex AI RAG request failed with status ${response.status}: ${await response.text()}`
+      );
+    }
+    return await response.json();
+  }
+};
+__name(_VertexRagApiClient, "VertexRagApiClient");
+let VertexRagApiClient = _VertexRagApiClient;
+export {
+  VertexRagApiClient
+};

package/dist/esm/memory/vertex_ai_rag_memory_service.js

@@ -0,0 +1,208 @@
+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 { formatError } from "../utils/error_utils.js";
+import { logger } from "../utils/logger.js";
+import {
+  buildSourceDisplayName,
+  parseSourceDisplayName,
+  parseTranscriptEvents,
+  serializeSessionTranscript
+} from "./rag_memory_transcript.js";
+import {
+  VertexRagApiClient
+} from "./vertex_ai_rag_api.js";
+const RAG_FILE_PAGE_SIZE = 100;
+const MAX_RAG_FILE_PAGES = 10;
+const DEFAULT_VECTOR_DISTANCE_THRESHOLD = 10;
+function resolveRagCorpus(options) {
+  var _a, _b, _c;
+  const ragCorpus = (_a = options.ragCorpus) == null ? void 0 : _a.trim();
+  if (!ragCorpus) {
+    throw new Error("ragCorpus is required for VertexAiRagMemoryService.");
+  }
+  const segments = ragCorpus.split("/");
+  const isResourceName = segments.length >= 4 && segments[0] === "projects" && segments[2] === "locations";
+  const projectId = (_b = options.projectId) != null ? _b : isResourceName ? segments[1] : process.env["GOOGLE_CLOUD_PROJECT"];
+  const location = (_c = options.location) != null ? _c : isResourceName ? segments[3] : process.env["GOOGLE_CLOUD_LOCATION"];
+  if (!projectId) {
+    throw new Error(
+      "projectId is required for VertexAiRagMemoryService: pass projectId, set GOOGLE_CLOUD_PROJECT, or give ragCorpus as a full resource name."
+    );
+  }
+  if (!location) {
+    throw new Error(
+      "location is required for VertexAiRagMemoryService: pass location, set GOOGLE_CLOUD_LOCATION, or give ragCorpus as a full resource name."
+    );
+  }
+  return {
+    projectId,
+    location,
+    ragCorpus: isResourceName ? ragCorpus : `projects/${projectId}/locations/${location}/ragCorpora/${ragCorpus}`
+  };
+}
+__name(resolveRagCorpus, "resolveRagCorpus");
+function tenantSource(displayName, appName, userId) {
+  if (!displayName) {
+    return void 0;
+  }
+  const source = parseSourceDisplayName(displayName);
+  if (!source || source.appName !== appName || source.userId !== userId) {
+    return void 0;
+  }
+  return source;
+}
+__name(tenantSource, "tenantSource");
+function toMemoryEntries(contexts, request) {
+  var _a;
+  const eventsBySession = /* @__PURE__ */ new Map();
+  for (const context of contexts) {
+    const source = tenantSource(
+      context.sourceDisplayName,
+      request.appName,
+      request.userId
+    );
+    if (!source) {
+      continue;
+    }
+    let events = eventsBySession.get(source.sessionId);
+    if (!events) {
+      events = /* @__PURE__ */ new Map();
+      eventsBySession.set(source.sessionId, events);
+    }
+    for (const event of parseTranscriptEvents((_a = context.text) != null ? _a : "")) {
+      if (!events.has(event.timestamp)) {
+        events.set(event.timestamp, event);
+      }
+    }
+  }
+  const memories = [];
+  for (const events of eventsBySession.values()) {
+    const sorted = [...events.values()].sort(
+      (a, b) => a.timestamp - b.timestamp
+    );
+    for (const event of sorted) {
+      memories.push({
+        author: event.author,
+        content: { parts: [{ text: event.text }] },
+        timestamp: new Date(event.timestamp).toISOString()
+      });
+    }
+  }
+  return memories;
+}
+__name(toMemoryEntries, "toMemoryEntries");
+const _VertexAiRagMemoryService = class _VertexAiRagMemoryService {
+  /**
+   * @param ragApiClient An internal seam for tests to substitute a fake REST
+   *     client. Production callers omit it and get a client for the resolved
+   *     location.
+   * @internal
+   */
+  constructor(options, ragApiClient) {
+    var _a;
+    const resolved = resolveRagCorpus(options);
+    this.ragCorpus = resolved.ragCorpus;
+    this.projectId = resolved.projectId;
+    this.location = resolved.location;
+    this.similarityTopK = options.similarityTopK;
+    this.vectorDistanceThreshold = (_a = options.vectorDistanceThreshold) != null ? _a : DEFAULT_VECTOR_DISTANCE_THRESHOLD;
+    this.ragApiClient = ragApiClient != null ? ragApiClient : new VertexRagApiClient({ location: this.location });
+  }
+  /** Uploads the session's transcript into the corpus as one RAG file. */
+  async addSessionToMemory(session) {
+    return this.ragApiClient.uploadRagFile({
+      ragCorpus: this.ragCorpus,
+      displayName: buildSourceDisplayName(
+        session.appName,
+        session.userId,
+        session.id
+      ),
+      content: serializeSessionTranscript(session)
+    });
+  }
+  async searchMemory(request) {
+    var _a, _b;
+    const ragFileIds = await this.listTenantRagFileIds(request);
+    if ((ragFileIds == null ? void 0 : ragFileIds.length) === 0) {
+      return { memories: [] };
+    }
+    const response = await this.ragApiClient.retrieveContexts({
+      parent: `projects/${this.projectId}/locations/${this.location}`,
+      vertexRagStore: {
+        ragResources: [{ ragCorpus: this.ragCorpus, ragFileIds }]
+      },
+      query: {
+        text: request.query,
+        // Top-k belongs on the query: retrieveContexts ignores
+        // VertexRagStore.similarityTopK.
+        ragRetrievalConfig: {
+          topK: this.similarityTopK,
+          filter: { vectorDistanceThreshold: this.vectorDistanceThreshold }
+        }
+      }
+    });
+    return {
+      memories: toMemoryEntries((_b = (_a = response.contexts) == null ? void 0 : _a.contexts) != null ? _b : [], request)
+    };
+  }
+  /**
+   * Returns the ids of the corpus files owned by the requesting app and user,
+   * or `undefined` when the corpus could not be listed within the page budget.
+   *
+   * An `undefined` result retrieves over the whole corpus. Narrowing only
+   * improves ranking and transfer size, and every returned context is filtered
+   * by tenant anyway. Scoping to a partial listing would instead hide the
+   * caller's own memories.
+   */
+  async listTenantRagFileIds(request) {
+    var _a;
+    const ragFileIds = [];
+    let pageToken;
+    try {
+      for (let page = 0; page < MAX_RAG_FILE_PAGES; page++) {
+        const response = await this.ragApiClient.listRagFiles({
+          ragCorpus: this.ragCorpus,
+          pageSize: RAG_FILE_PAGE_SIZE,
+          pageToken
+        });
+        for (const ragFile of (_a = response.ragFiles) != null ? _a : []) {
+          const source = tenantSource(
+            ragFile.displayName,
+            request.appName,
+            request.userId
+          );
+          if (source && ragFile.name) {
+            ragFileIds.push(
+              ragFile.name.slice(ragFile.name.lastIndexOf("/") + 1)
+            );
+          }
+        }
+        pageToken = response.nextPageToken;
+        if (!pageToken) {
+          return ragFileIds;
+        }
+      }
+    } catch (e) {
+      logger.warn(
+        `Listing the corpus failed, so retrieval is not scoped to the requesting app and user: ${formatError(e)}`
+      );
+      return void 0;
+    }
+    logger.warn(
+      `Listing ${this.ragCorpus} did not finish within ${MAX_RAG_FILE_PAGES} pages, so retrieval is not scoped to the requesting app and user.`
+    );
+    return void 0;
+  }
+};
+__name(_VertexAiRagMemoryService, "VertexAiRagMemoryService");
+let VertexAiRagMemoryService = _VertexAiRagMemoryService;
+export {
+  VertexAiRagMemoryService
+};

package/dist/esm/models/apigee_llm.js

@@ -134,7 +134,7 @@ function validateModel(model) {
   if (modelPart.length === 0) {
     return false;
   }
-  const components = modelPart.split("/", -1);
+  const components = modelPart.split("/");
   if (components[components.length - 1].length === 0) {
     return false;
   }

package/dist/esm/models/base_llm.js

@@ -8,8 +8,8 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  * SPDX-License-Identifier: Apache-2.0
  */
 var _a;
-import { getClientLabels } from "../utils/client_labels.js";
-const BASE_MODEL_SYMBOL = Symbol.for("google.adk.baseModel");
+import { getTrackingHeaders } from "../utils/client_labels.js";
+const BASE_MODEL_SYMBOL = /* @__PURE__ */ Symbol.for("google.adk.baseModel");
 function isBaseLlm(obj) {
   return typeof obj === "object" && obj !== null && BASE_MODEL_SYMBOL in obj && obj[BASE_MODEL_SYMBOL] === true;
 }
@@ -30,12 +30,7 @@ const _BaseLlm = class _BaseLlm {
     this.model = model;
   }
   get trackingHeaders() {
-    const labels = getClientLabels();
-    const headerValue = labels.join(" ");
-    return {
-      "x-goog-api-client": headerValue,
-      "user-agent": headerValue
-    };
+    return getTrackingHeaders();
   }
   /**
    * Appends a user content, so that model can continue to output.