@google/adk 0.2.5 → 0.4.0

package/dist/cjs/artifacts/gcs_artifact_service.js

@@ -1,6 +1,6 @@
 /**
   * @license
-  * Copyright 2025 Google LLC
+  * Copyright 2026 Google LLC
   * SPDX-License-Identifier: Apache-2.0
   */
 
@@ -29,6 +29,7 @@ __export(gcs_artifact_service_exports, {
 module.exports = __toCommonJS(gcs_artifact_service_exports);
 var import_storage = require("@google-cloud/storage");
 var import_genai = require("@google/genai");
+var import_logger = require("../utils/logger.js");
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -39,87 +40,154 @@ class GcsArtifactService {
     this.bucket = new import_storage.Storage().bucket(bucket);
   }
   async saveArtifact(request) {
+    if (!request.artifact.inlineData && !request.artifact.text) {
+      throw new Error("Artifact must have either inlineData or text content.");
+    }
     const versions = await this.listVersions(request);
     const version = versions.length > 0 ? Math.max(...versions) + 1 : 0;
-    const file = this.bucket.file(getFileName({
-      ...request,
-      version
-    }));
+    const file = this.bucket.file(
+      getFileName({
+        ...request,
+        version
+      })
+    );
+    const metadata = request.customMetadata || {};
     if (request.artifact.inlineData) {
-      await file.save(JSON.stringify(request.artifact.inlineData.data), {
-        contentType: request.artifact.inlineData.mimeType
-      });
-      return version;
-    }
-    if (request.artifact.text) {
-      await file.save(request.artifact.text, {
-        contentType: "text/plain"
-      });
+      await file.save(
+        Buffer.from(request.artifact.inlineData.data || "", "base64"),
+        {
+          contentType: request.artifact.inlineData.mimeType,
+          metadata
+        }
+      );
       return version;
     }
-    throw new Error("Artifact must have either inlineData or text.");
+    await file.save(request.artifact.text, {
+      contentType: "text/plain",
+      metadata
+    });
+    return version;
   }
   async loadArtifact(request) {
-    let version = request.version;
-    if (version === void 0) {
-      const versions = await this.listVersions(request);
-      if (versions.length === 0) {
-        return void 0;
+    try {
+      let version = request.version;
+      if (version === void 0) {
+        const versions = await this.listVersions(request);
+        if (versions.length === 0) {
+          return void 0;
+        }
+        version = Math.max(...versions);
       }
-      version = Math.max(...versions);
-    }
-    const file = this.bucket.file(getFileName({
-      ...request,
-      version
-    }));
-    const [[metadata], [rawDataBuffer]] = await Promise.all([file.getMetadata(), file.download()]);
-    if (metadata.contentType === "text/plain") {
-      return (0, import_genai.createPartFromText)(rawDataBuffer.toString("utf-8"));
+      const file = this.bucket.file(
+        getFileName({
+          ...request,
+          version
+        })
+      );
+      const [[metadata], [rawDataBuffer]] = await Promise.all([
+        file.getMetadata(),
+        file.download()
+      ]);
+      if (metadata.contentType === "text/plain") {
+        return (0, import_genai.createPartFromText)(rawDataBuffer.toString("utf-8"));
+      }
+      return (0, import_genai.createPartFromBase64)(
+        rawDataBuffer.toString("base64"),
+        metadata.contentType
+      );
+    } catch (e) {
+      import_logger.logger.warn(
+        `[GcsArtifactService] loadArtifact: Failed to load artifact ${request.filename}`,
+        e
+      );
+      return void 0;
     }
-    return (0, import_genai.createPartFromBase64)(
-      rawDataBuffer.toString("base64"),
-      metadata.contentType
-    );
   }
   async listArtifactKeys(request) {
-    const fileNames = [];
     const sessionPrefix = `${request.appName}/${request.userId}/${request.sessionId}/`;
     const usernamePrefix = `${request.appName}/${request.userId}/user/`;
-    const [
-      [sessionFiles],
-      [userSessionFiles]
-    ] = await Promise.all([
+    const [[sessionFiles], [userSessionFiles]] = await Promise.all([
       this.bucket.getFiles({ prefix: sessionPrefix }),
       this.bucket.getFiles({ prefix: usernamePrefix })
     ]);
-    for (const file of sessionFiles) {
-      fileNames.push(file.name.split("/").pop());
-    }
-    for (const file of userSessionFiles) {
-      fileNames.push(file.name.split("/").pop());
-    }
-    return fileNames.sort((a, b) => a.localeCompare(b));
+    return [
+      ...extractArtifactKeys(sessionFiles, sessionPrefix),
+      ...extractArtifactKeys(userSessionFiles, usernamePrefix, "user:")
+    ].sort((a, b) => a.localeCompare(b));
   }
   async deleteArtifact(request) {
     const versions = await this.listVersions(request);
-    await Promise.all(versions.map((version) => {
-      const file = this.bucket.file(getFileName({
-        ...request,
-        version
-      }));
-      return file.delete();
-    }));
+    await Promise.all(
+      versions.map((version) => {
+        const file = this.bucket.file(
+          getFileName({
+            ...request,
+            version
+          })
+        );
+        return file.delete();
+      })
+    );
     return;
   }
   async listVersions(request) {
     const prefix = getFileName(request);
-    const [files] = await this.bucket.getFiles({ prefix });
+    const searchPrefix = prefix + "/";
+    const [files] = await this.bucket.getFiles({ prefix: searchPrefix });
     const versions = [];
     for (const file of files) {
       const version = file.name.split("/").pop();
-      versions.push(parseInt(version, 10));
+      const v = parseInt(version, 10);
+      if (!isNaN(v)) {
+        versions.push(v);
+      }
+    }
+    return versions.sort((a, b) => a - b);
+  }
+  async listArtifactVersions(request) {
+    const versions = await this.listVersions(request);
+    const artifactVersions = [];
+    for (const version of versions) {
+      const artifactVersion = await this.getArtifactVersion({
+        ...request,
+        version
+      });
+      if (artifactVersion) {
+        artifactVersions.push(artifactVersion);
+      }
+    }
+    return artifactVersions;
+  }
+  async getArtifactVersion(request) {
+    try {
+      let version = request.version;
+      if (version === void 0) {
+        const versions = await this.listVersions(request);
+        if (versions.length === 0) {
+          return void 0;
+        }
+        version = Math.max(...versions);
+      }
+      const file = this.bucket.file(
+        getFileName({
+          ...request,
+          version
+        })
+      );
+      const [metadata] = await file.getMetadata();
+      return {
+        version,
+        mimeType: metadata.contentType,
+        customMetadata: metadata.metadata,
+        canonicalUri: file.publicUrl()
+      };
+    } catch (e) {
+      import_logger.logger.warn(
+        `[GcsArtifactService] getArtifactVersion: Failed to get artifact version for userId: ${request.userId} sessionId: ${request.sessionId} filename: ${request.filename} version: ${request.version}`,
+        e
+      );
+      return void 0;
     }
-    return versions;
   }
 }
 function getFileName({
@@ -129,10 +197,29 @@ function getFileName({
   filename,
   version
 }) {
-  if (filename.startsWith("user:")) {
-    return `${appName}/${userId}/user/${filename}/${version}`;
+  const isUser = filename.startsWith("user:");
+  const cleanFilename = isUser ? filename.substring(5) : filename;
+  const prefix = isUser ? `${appName}/${userId}/user/${cleanFilename}` : `${appName}/${userId}/${sessionId}/${cleanFilename}`;
+  return version !== void 0 ? `${prefix}/${version}` : prefix;
+}
+function extractArtifactKeys(files, fileNamePrefix, keyPrefix = "") {
+  const keys = /* @__PURE__ */ new Set();
+  for (const file of files) {
+    if (!file.name.startsWith(fileNamePrefix)) {
+      continue;
+    }
+    const relative = file.name.substring(fileNamePrefix.length);
+    const name = getFileNameFromPath(relative);
+    keys.add(`${keyPrefix}${name}`);
+  }
+  return [...keys];
+}
+function getFileNameFromPath(filePath) {
+  const parts = filePath.split("/");
+  if (parts.length < 2) {
+    return filePath;
   }
-  return `${appName}/${userId}/${sessionId}/${filename}/${version}`;
+  return parts.slice(0, -1).join("/");
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/artifacts/in_memory_artifact_service.js

@@ -1,6 +1,6 @@
 /**
   * @license
-  * Copyright 2025 Google LLC
+  * Copyright 2026 Google LLC
   * SPDX-License-Identifier: Apache-2.0
   */
 
@@ -24,7 +24,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var in_memory_artifact_service_exports = {};
 __export(in_memory_artifact_service_exports, {
-  InMemoryArtifactService: () => InMemoryArtifactService
+  InMemoryArtifactService: () => InMemoryArtifactService,
+  isInMemoryConnectionString: () => isInMemoryConnectionString
 });
 module.exports = __toCommonJS(in_memory_artifact_service_exports);
 /**
@@ -32,6 +33,9 @@ module.exports = __toCommonJS(in_memory_artifact_service_exports);
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+function isInMemoryConnectionString(uri) {
+  return uri === "memory://";
+}
 class InMemoryArtifactService {
   constructor() {
     this.artifacts = {};
@@ -41,14 +45,24 @@ class InMemoryArtifactService {
     userId,
     sessionId,
     filename,
-    artifact
+    artifact,
+    customMetadata
   }) {
+    if (!artifact.inlineData && !artifact.text) {
+      return Promise.reject(
+        new Error("Artifact must have either inlineData or text content.")
+      );
+    }
     const path = artifactPath(appName, userId, sessionId, filename);
     if (!this.artifacts[path]) {
       this.artifacts[path] = [];
     }
     const version = this.artifacts[path].length;
-    this.artifacts[path].push(artifact);
+    const metadata = {
+      version,
+      customMetadata
+    };
+    this.artifacts[path].push({ part: artifact, metadata });
     return Promise.resolve(version);
   }
   loadArtifact({
@@ -66,9 +80,13 @@ class InMemoryArtifactService {
     if (version === void 0) {
       version = versions.length - 1;
     }
-    return Promise.resolve(versions[version]);
+    return Promise.resolve(versions[version].part);
   }
-  listArtifactKeys({ appName, userId, sessionId }) {
+  listArtifactKeys({
+    appName,
+    userId,
+    sessionId
+  }) {
     const sessionPrefix = `${appName}/${userId}/${sessionId}/`;
     const usernamespacePrefix = `${appName}/${userId}/user/`;
     const filenames = [];
@@ -83,7 +101,12 @@ class InMemoryArtifactService {
     }
     return Promise.resolve(filenames.sort());
   }
-  deleteArtifact({ appName, userId, sessionId, filename }) {
+  deleteArtifact({
+    appName,
+    userId,
+    sessionId,
+    filename
+  }) {
     const path = artifactPath(appName, userId, sessionId, filename);
     if (!this.artifacts[path]) {
       return Promise.resolve();
@@ -91,18 +114,56 @@ class InMemoryArtifactService {
     delete this.artifacts[path];
     return Promise.resolve();
   }
-  listVersions({ appName, userId, sessionId, filename }) {
+  listVersions({
+    appName,
+    userId,
+    sessionId,
+    filename
+  }) {
     const path = artifactPath(appName, userId, sessionId, filename);
     const artifacts = this.artifacts[path];
     if (!artifacts) {
       return Promise.resolve([]);
     }
-    let versions = [];
+    const versions = [];
     for (let i = 0; i < artifacts.length; i++) {
       versions.push(i);
     }
     return Promise.resolve(versions);
   }
+  listArtifactVersions({
+    appName,
+    userId,
+    sessionId,
+    filename
+  }) {
+    const path = artifactPath(appName, userId, sessionId, filename);
+    const artifacts = this.artifacts[path];
+    if (!artifacts) {
+      return Promise.resolve([]);
+    }
+    return Promise.resolve(artifacts.map((a) => a.metadata));
+  }
+  getArtifactVersion({
+    appName,
+    userId,
+    sessionId,
+    filename,
+    version
+  }) {
+    const path = artifactPath(appName, userId, sessionId, filename);
+    const versions = this.artifacts[path];
+    if (!versions) {
+      return Promise.resolve(void 0);
+    }
+    if (version === void 0) {
+      version = versions.length - 1;
+    }
+    if (versions[version]) {
+      return Promise.resolve(versions[version].metadata);
+    }
+    return Promise.resolve(void 0);
+  }
 }
 function artifactPath(appName, userId, sessionId, filename) {
   if (fileHasUserNamespace(filename)) {
@@ -115,5 +176,6 @@ function fileHasUserNamespace(filename) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  InMemoryArtifactService
+  InMemoryArtifactService,
+  isInMemoryConnectionString
 });

package/dist/cjs/artifacts/registry.js

@@ -0,0 +1,55 @@
+/**
+  * @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 __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 registry_exports = {};
+__export(registry_exports, {
+  getArtifactServiceFromUri: () => getArtifactServiceFromUri
+});
+module.exports = __toCommonJS(registry_exports);
+var import_file_artifact_service = require("./file_artifact_service.js");
+var import_gcs_artifact_service = require("./gcs_artifact_service.js");
+var import_in_memory_artifact_service = require("./in_memory_artifact_service.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+function getArtifactServiceFromUri(uri) {
+  if ((0, import_in_memory_artifact_service.isInMemoryConnectionString)(uri)) {
+    return new import_in_memory_artifact_service.InMemoryArtifactService();
+  }
+  if (uri.startsWith("gs://")) {
+    const bucket = uri.split("://")[1];
+    return new import_gcs_artifact_service.GcsArtifactService(bucket);
+  }
+  if (uri.startsWith("file://")) {
+    const rootDir = uri.split("://")[1];
+    return new import_file_artifact_service.FileArtifactService(rootDir);
+  }
+  throw new Error(`Unsupported artifact service URI: ${uri}`);
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getArtifactServiceFromUri
+});

package/dist/cjs/auth/auth_credential.js

@@ -1,6 +1,6 @@
 /**
   * @license
-  * Copyright 2025 Google LLC
+  * Copyright 2026 Google LLC
   * SPDX-License-Identifier: Apache-2.0
   */
 

package/dist/cjs/auth/auth_handler.js

@@ -1,6 +1,6 @@
 /**
   * @license
-  * Copyright 2025 Google LLC
+  * Copyright 2026 Google LLC
   * SPDX-License-Identifier: Apache-2.0
   */
 
@@ -66,7 +66,9 @@ class AuthHandler {
       };
     }
     if (!this.authConfig.rawAuthCredential.oauth2.clientId || !this.authConfig.rawAuthCredential.oauth2.clientSecret) {
-      throw new Error(`Auth Scheme ${authSchemeType} requires both clientId and clientSecret in authCredential.oauth2.`);
+      throw new Error(
+        `Auth Scheme ${authSchemeType} requires both clientId and clientSecret in authCredential.oauth2.`
+      );
     }
     return {
       credentialKey: this.authConfig.credentialKey,

package/dist/cjs/auth/auth_schemes.js

@@ -1,6 +1,6 @@
 /**
   * @license
-  * Copyright 2025 Google LLC
+  * Copyright 2026 Google LLC
   * SPDX-License-Identifier: Apache-2.0
   */
 

package/dist/cjs/auth/auth_tool.js

@@ -1,6 +1,6 @@
 /**
   * @license
-  * Copyright 2025 Google LLC
+  * Copyright 2026 Google LLC
   * SPDX-License-Identifier: Apache-2.0
   */
 

package/dist/cjs/auth/credential_service/base_credential_service.js

@@ -1,6 +1,6 @@
 /**
   * @license
-  * Copyright 2025 Google LLC
+  * Copyright 2026 Google LLC
   * SPDX-License-Identifier: Apache-2.0
   */
 

package/dist/cjs/auth/credential_service/in_memory_credential_service.js

@@ -1,6 +1,6 @@
 /**
   * @license
-  * Copyright 2025 Google LLC
+  * Copyright 2026 Google LLC
   * SPDX-License-Identifier: Apache-2.0
   */
 

package/dist/cjs/auth/exchanger/base_credential_exchanger.js

@@ -1,6 +1,6 @@
 /**
   * @license
-  * Copyright 2025 Google LLC
+  * Copyright 2026 Google LLC
   * SPDX-License-Identifier: Apache-2.0
   */
 

package/dist/cjs/auth/exchanger/credential_exchanger_registry.js

@@ -1,6 +1,6 @@
 /**
   * @license
-  * Copyright 2025 Google LLC
+  * Copyright 2026 Google LLC
   * SPDX-License-Identifier: Apache-2.0
   */
 

package/dist/cjs/code_executors/base_code_executor.js

@@ -1,6 +1,6 @@
 /**
   * @license
-  * Copyright 2025 Google LLC
+  * Copyright 2026 Google LLC
   * SPDX-License-Identifier: Apache-2.0
   */
 
@@ -34,7 +34,9 @@ module.exports = __toCommonJS(base_code_executor_exports);
  * SPDX-License-Identifier: Apache-2.0
  */
 var _a;
-const BASE_CODE_EXECUTOR_SIGNATURE_SYMBOL = Symbol.for("google.adk.baseCodeExecutor");
+const BASE_CODE_EXECUTOR_SIGNATURE_SYMBOL = Symbol.for(
+  "google.adk.baseCodeExecutor"
+);
 function isBaseCodeExecutor(obj) {
   return typeof obj === "object" && obj !== null && BASE_CODE_EXECUTOR_SIGNATURE_SYMBOL in obj && obj[BASE_CODE_EXECUTOR_SIGNATURE_SYMBOL] === true;
 }

package/dist/cjs/code_executors/built_in_code_executor.js

@@ -1,6 +1,6 @@
 /**
   * @license
-  * Copyright 2025 Google LLC
+  * Copyright 2026 Google LLC
   * SPDX-License-Identifier: Apache-2.0
   */
 
@@ -36,7 +36,9 @@ var import_base_code_executor = require("./base_code_executor.js");
  * SPDX-License-Identifier: Apache-2.0
  */
 var _a, _b;
-const BUILT_IN_CODE_EXECUTOR_SIGNATURE_SYMBOL = Symbol.for("google.adk.builtInCodeExecutor");
+const BUILT_IN_CODE_EXECUTOR_SIGNATURE_SYMBOL = Symbol.for(
+  "google.adk.builtInCodeExecutor"
+);
 function isBuiltInCodeExecutor(obj) {
   return typeof obj === "object" && obj !== null && BUILT_IN_CODE_EXECUTOR_SIGNATURE_SYMBOL in obj && obj[BUILT_IN_CODE_EXECUTOR_SIGNATURE_SYMBOL] === true;
 }
@@ -46,7 +48,7 @@ class BuiltInCodeExecutor extends (_b = import_base_code_executor.BaseCodeExecut
     /** A unique symbol to identify BuiltInCodeExecutor class. */
     this[_a] = true;
   }
-  executeCode(params) {
+  executeCode(_params) {
     return Promise.resolve({
       stdout: "",
       stderr: "",
@@ -60,7 +62,9 @@ class BuiltInCodeExecutor extends (_b = import_base_code_executor.BaseCodeExecut
       llmRequest.config.tools.push({ codeExecution: {} });
       return;
     }
-    throw new Error(`Gemini code execution tool is not supported for model ${llmRequest.model}`);
+    throw new Error(
+      `Gemini code execution tool is not supported for model ${llmRequest.model}`
+    );
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/code_executors/code_execution_utils.js

@@ -1,6 +1,6 @@
 /**
   * @license
-  * Copyright 2025 Google LLC
+  * Copyright 2026 Google LLC
   * SPDX-License-Identifier: Apache-2.0
   */
 

package/dist/cjs/code_executors/code_executor_context.js

@@ -1,6 +1,6 @@
 /**
   * @license
-  * Copyright 2025 Google LLC
+  * Copyright 2026 Google LLC
   * SPDX-License-Identifier: Apache-2.0
   */
 
@@ -171,7 +171,9 @@ class CodeExecutorContext {
     if (!(CODE_EXECUTION_RESULTS_KEY in this.sessionState)) {
       this.sessionState.set(CODE_EXECUTION_RESULTS_KEY, {});
     }
-    const codeExecutionResults = this.sessionState.get(CODE_EXECUTION_RESULTS_KEY);
+    const codeExecutionResults = this.sessionState.get(
+      CODE_EXECUTION_RESULTS_KEY
+    );
     if (!(invocationId in codeExecutionResults)) {
       codeExecutionResults[invocationId] = [];
     }
@@ -183,12 +185,10 @@ class CodeExecutorContext {
     });
   }
   /**
-   * Gets the code executor context from the session state.
-   * @param invocationId The session state to get the code executor context
-   *     from.
+   * Gets the code execution context from the session state.
    * @return The code execution context for the given invocation ID.
    */
-  getCodeExecutionContext(invocationId) {
+  getCodeExecutionContext() {
     return this.sessionState.get(CONTEXT_KEY) || {};
   }
 }