@google/adk 1.1.0 → 1.3.0

package/dist/esm/runner/in_memory_runner.js

@@ -10,11 +10,16 @@ import { InMemoryMemoryService } from "../memory/in_memory_memory_service.js";
 import { InMemorySessionService } from "../sessions/in_memory_session_service.js";
 import { Runner } from "./runner.js";
 class InMemoryRunner extends Runner {
-  constructor({
-    agent,
-    appName = "InMemoryRunner",
-    plugins = []
-  }) {
+  /**
+   * Creates a new InMemoryRunner instance.
+   *
+   * @param params The configuration for the runner.
+   * @param params.agent The root agent to run.
+   * @param params.appName The application name. Defaults to `'InMemoryRunner'`.
+   * @param params.plugins An optional list of plugins.
+   */
+  constructor(params) {
+    const { agent, appName = "InMemoryRunner", plugins = [] } = params;
     super({
       appName,
       agent,

package/dist/esm/runner/runner.js

@@ -25,6 +25,7 @@ import {
   runAsyncGeneratorWithOtelContext,
   tracer
 } from "../telemetry/tracing.js";
+import { isBaseToolset } from "../tools/base_toolset.js";
 import { logger } from "../utils/logger.js";
 import { isGemini2OrAbove } from "../utils/model_name.js";
 const RUNNER_SIGNATURE_SYMBOL = Symbol.for("google.adk.runner");
@@ -33,6 +34,11 @@ function isRunner(obj) {
 }
 _a = RUNNER_SIGNATURE_SYMBOL;
 class Runner {
+  /**
+   * Creates a new Runner instance.
+   *
+   * @param input The configuration for the runner.
+   */
   constructor(input) {
     this[_a] = true;
     var _a2;
@@ -65,7 +71,8 @@ class Runner {
         sessionId,
         newMessage: params.newMessage,
         stateDelta: params.stateDelta,
-        runConfig: params.runConfig
+        runConfig: params.runConfig,
+        customMetadata: params.customMetadata
       });
     } finally {
       await this.sessionService.deleteSession({
@@ -170,7 +177,8 @@ class Runner {
                 invocationId: invocationContext.invocationId,
                 author: "user",
                 actions: stateDelta ? createEventActions({ stateDelta }) : void 0,
-                content: newMessage
+                content: newMessage,
+                customMetadata: params.customMetadata
               })
             });
             if ((_e = params.abortSignal) == null ? void 0 : _e.aborted) {
@@ -235,6 +243,8 @@ class Runner {
       );
     } finally {
       span.end();
+      const toolsets = getAllToolsets(this.agent);
+      await Promise.allSettled(toolsets.map((t) => t.close()));
     }
   }
   /**
@@ -354,6 +364,26 @@ function findEventByLastFunctionResponseId(events) {
   }
   return null;
 }
+function getAllToolsets(agent) {
+  const toolsets = [];
+  const visited = /* @__PURE__ */ new Set();
+  function traverse(curr) {
+    if (visited.has(curr)) return;
+    visited.add(curr);
+    if (isLlmAgent(curr)) {
+      for (const tool of curr.tools) {
+        if (isBaseToolset(tool)) {
+          toolsets.push(tool);
+        }
+      }
+    }
+    for (const sub of curr.subAgents) {
+      traverse(sub);
+    }
+  }
+  traverse(agent);
+  return toolsets;
+}
 export {
   Runner,
   isRunner

package/dist/esm/sessions/base_session_service.js

@@ -74,6 +74,15 @@ function trimTempDeltaState(event) {
   event.actions.stateDelta = filteredStateDelta;
   return event;
 }
+function trimTempState(state) {
+  const filteredState = {};
+  for (const [key, value] of Object.entries(state)) {
+    if (!key.startsWith(State.TEMP_PREFIX)) {
+      filteredState[key] = value;
+    }
+  }
+  return filteredState;
+}
 function mergeStates(appState = {}, userState = {}, sessionState = {}) {
   const merged = cloneDeep(sessionState);
   for (const [k, v] of Object.entries(appState)) {
@@ -87,5 +96,6 @@ function mergeStates(appState = {}, userState = {}, sessionState = {}) {
 export {
   BaseSessionService,
   mergeStates,
-  trimTempDeltaState
+  trimTempDeltaState,
+  trimTempState
 };

package/dist/esm/sessions/database_session_service.js

@@ -108,7 +108,7 @@ class DatabaseSessionService extends BaseSessionService {
           appStateDelta[key.replace(State.APP_PREFIX, "")] = value;
         } else if (key.startsWith(State.USER_PREFIX)) {
           userStateDelta[key.replace(State.USER_PREFIX, "")] = value;
-        } else {
+        } else if (!key.startsWith(State.TEMP_PREFIX)) {
           sessionState[key] = value;
         }
       }
@@ -193,7 +193,11 @@ class DatabaseSessionService extends BaseSessionService {
   }
   async listSessions({
     appName,
-    userId
+    userId,
+    limit,
+    offset,
+    page,
+    order
   }) {
     await this.init();
     const em = this.orm.em.fork();
@@ -201,7 +205,49 @@ class DatabaseSessionService extends BaseSessionService {
     if (userId) {
       where.userId = userId;
     }
-    const storageSessions = await em.find(StorageSession, where);
+    const orderBy = order === "asc" ? { updateTime: "ASC", id: "ASC" } : order === "desc" ? { updateTime: "DESC", id: "ASC" } : void 0;
+    let storageSessions;
+    let paginationMeta;
+    if (limit !== void 0) {
+      const totalItems = await em.count(StorageSession, where);
+      const totalPages = limit === 0 ? 0 : Math.ceil(totalItems / limit);
+      let effectiveOffset;
+      let effectivePage;
+      if (page !== void 0) {
+        effectiveOffset = (page - 1) * limit;
+        effectivePage = page;
+      } else {
+        effectiveOffset = offset != null ? offset : 0;
+        effectivePage = limit === 0 ? 1 : Math.floor(effectiveOffset / limit) + 1;
+      }
+      storageSessions = await em.find(StorageSession, where, {
+        orderBy,
+        limit,
+        offset: effectiveOffset
+      });
+      paginationMeta = { page: effectivePage, limit, totalItems, totalPages };
+    } else if (offset) {
+      const totalItems = await em.count(StorageSession, where);
+      storageSessions = await em.find(StorageSession, where, {
+        orderBy,
+        offset
+      });
+      paginationMeta = {
+        page: 1,
+        limit: totalItems,
+        totalItems,
+        totalPages: totalItems === 0 ? 0 : 1
+      };
+    } else {
+      storageSessions = await em.find(StorageSession, where, { orderBy });
+      const totalItems = storageSessions.length;
+      paginationMeta = {
+        page: 1,
+        limit: totalItems,
+        totalItems,
+        totalPages: totalItems === 0 ? 0 : 1
+      };
+    }
     const appStateModel = await em.findOne(StorageAppState, { appName });
     const appState = (appStateModel == null ? void 0 : appStateModel.state) || {};
     const userStateMap = {};
@@ -226,7 +272,7 @@ class DatabaseSessionService extends BaseSessionService {
         lastUpdateTime: ss.updateTime.getTime()
       });
     });
-    return { sessions };
+    return { sessions, ...paginationMeta };
   }
   async deleteSession({
     appName,
@@ -311,7 +357,7 @@ class DatabaseSessionService extends BaseSessionService {
             appDelta[key.replace(State.APP_PREFIX, "")] = value;
           } else if (key.startsWith(State.USER_PREFIX)) {
             userDelta[key.replace(State.USER_PREFIX, "")] = value;
-          } else {
+          } else if (!key.startsWith(State.TEMP_PREFIX)) {
             sessionDelta[key] = value;
           }
         }

package/dist/esm/sessions/db/schema.js

@@ -22,6 +22,7 @@ import {
 } from "../../events/event.js";
 const SCHEMA_VERSION_KEY = "schema_version";
 const SCHEMA_VERSION_1_JSON = "1";
+const STORAGE_KEY_COLUMN_LENGTH = 191;
 class CamelCaseToSnakeCaseJsonType extends JsonType {
   convertToDatabaseValue(value) {
     return JSON.stringify(transformToSnakeCaseEvent(value));
@@ -50,7 +51,11 @@ let StorageAppState = class {
   }
 };
 __decorateClass([
-  PrimaryKey({ type: "string", fieldName: "app_name" })
+  PrimaryKey({
+    type: "string",
+    fieldName: "app_name",
+    length: STORAGE_KEY_COLUMN_LENGTH
+  })
 ], StorageAppState.prototype, "appName", 2);
 __decorateClass([
   Property({ type: "json" })
@@ -73,10 +78,18 @@ let StorageUserState = class {
   }
 };
 __decorateClass([
-  PrimaryKey({ type: "string", fieldName: "app_name" })
+  PrimaryKey({
+    type: "string",
+    fieldName: "app_name",
+    length: STORAGE_KEY_COLUMN_LENGTH
+  })
 ], StorageUserState.prototype, "appName", 2);
 __decorateClass([
-  PrimaryKey({ type: "string", fieldName: "user_id" })
+  PrimaryKey({
+    type: "string",
+    fieldName: "user_id",
+    length: STORAGE_KEY_COLUMN_LENGTH
+  })
 ], StorageUserState.prototype, "userId", 2);
 __decorateClass([
   Property({ type: "json" })
@@ -100,13 +113,21 @@ let StorageSession = class {
   }
 };
 __decorateClass([
-  PrimaryKey({ type: "string" })
+  PrimaryKey({ type: "string", length: STORAGE_KEY_COLUMN_LENGTH })
 ], StorageSession.prototype, "id", 2);
 __decorateClass([
-  PrimaryKey({ type: "string", fieldName: "app_name" })
+  PrimaryKey({
+    type: "string",
+    fieldName: "app_name",
+    length: STORAGE_KEY_COLUMN_LENGTH
+  })
 ], StorageSession.prototype, "appName", 2);
 __decorateClass([
-  PrimaryKey({ type: "string", fieldName: "user_id" })
+  PrimaryKey({
+    type: "string",
+    fieldName: "user_id",
+    length: STORAGE_KEY_COLUMN_LENGTH
+  })
 ], StorageSession.prototype, "userId", 2);
 __decorateClass([
   Property({ type: "json" })
@@ -132,16 +153,28 @@ PrimaryKey.name;
 let StorageEvent = class {
 };
 __decorateClass([
-  PrimaryKey({ type: "string" })
+  PrimaryKey({ type: "string", length: STORAGE_KEY_COLUMN_LENGTH })
 ], StorageEvent.prototype, "id", 2);
 __decorateClass([
-  PrimaryKey({ type: "string", fieldName: "app_name" })
+  PrimaryKey({
+    type: "string",
+    fieldName: "app_name",
+    length: STORAGE_KEY_COLUMN_LENGTH
+  })
 ], StorageEvent.prototype, "appName", 2);
 __decorateClass([
-  PrimaryKey({ type: "string", fieldName: "user_id" })
+  PrimaryKey({
+    type: "string",
+    fieldName: "user_id",
+    length: STORAGE_KEY_COLUMN_LENGTH
+  })
 ], StorageEvent.prototype, "userId", 2);
 __decorateClass([
-  PrimaryKey({ type: "string", fieldName: "session_id" })
+  PrimaryKey({
+    type: "string",
+    fieldName: "session_id",
+    length: STORAGE_KEY_COLUMN_LENGTH
+  })
 ], StorageEvent.prototype, "sessionId", 2);
 __decorateClass([
   Property({ type: "string", fieldName: "invocation_id" })
@@ -166,6 +199,7 @@ export {
   ENTITIES,
   SCHEMA_VERSION_1_JSON,
   SCHEMA_VERSION_KEY,
+  STORAGE_KEY_COLUMN_LENGTH,
   StorageAppState,
   StorageEvent,
   StorageMetadata,

package/dist/esm/sessions/in_memory_session_service.js

@@ -10,7 +10,8 @@ import { randomUUID } from "../utils/env_aware_utils.js";
 import { logger } from "../utils/logger.js";
 import {
   BaseSessionService,
-  mergeStates
+  mergeStates,
+  trimTempState
 } from "./base_session_service.js";
 import { createSession } from "./session.js";
 import { State } from "./state.js";
@@ -41,11 +42,12 @@ class InMemorySessionService extends BaseSessionService {
     sessionId
   }) {
     var _a;
+    const filteredState = state ? trimTempState(state) : void 0;
     const session = createSession({
       id: sessionId || randomUUID(),
       appName,
       userId,
-      state,
+      state: filteredState,
       events: [],
       lastUpdateTime: Date.now()
     });
@@ -104,25 +106,81 @@ class InMemorySessionService extends BaseSessionService {
   }
   listSessions({
     appName,
-    userId
+    userId,
+    limit,
+    offset,
+    page,
+    order
   }) {
     if (!this.sessions[appName] || !this.sessions[appName][userId]) {
-      return Promise.resolve({ sessions: [] });
+      if (limit !== void 0) {
+        const effectiveOffset2 = page !== void 0 ? (page - 1) * limit : offset != null ? offset : 0;
+        const effectivePage2 = page !== void 0 ? page : limit === 0 ? 1 : Math.floor(effectiveOffset2 / limit) + 1;
+        return Promise.resolve({
+          sessions: [],
+          page: effectivePage2,
+          limit,
+          totalItems: 0,
+          totalPages: 0
+        });
+      }
+      return Promise.resolve({
+        sessions: [],
+        page: 1,
+        limit: 0,
+        totalItems: 0,
+        totalPages: 0
+      });
     }
-    const sessionsWithoutEvents = [];
-    for (const session of Object.values(this.sessions[appName][userId])) {
-      sessionsWithoutEvents.push(
-        createSession({
-          id: session.id,
-          appName: session.appName,
-          userId: session.userId,
-          state: {},
-          events: [],
-          lastUpdateTime: session.lastUpdateTime
-        })
+    const all = Object.values(this.sessions[appName][userId]).map(
+      (session) => createSession({
+        id: session.id,
+        appName: session.appName,
+        userId: session.userId,
+        state: {},
+        events: [],
+        lastUpdateTime: session.lastUpdateTime
+      })
+    );
+    if (order === "asc") {
+      all.sort(
+        (a, b) => a.lastUpdateTime - b.lastUpdateTime || a.id.localeCompare(b.id)
+      );
+    } else if (order === "desc") {
+      all.sort(
+        (a, b) => b.lastUpdateTime - a.lastUpdateTime || a.id.localeCompare(b.id)
       );
     }
-    return Promise.resolve({ sessions: sessionsWithoutEvents });
+    if (limit === void 0) {
+      const totalItems2 = all.length;
+      const sliced = offset ? all.slice(offset) : all;
+      return Promise.resolve({
+        sessions: sliced,
+        page: 1,
+        limit: totalItems2,
+        totalItems: totalItems2,
+        totalPages: totalItems2 === 0 ? 0 : 1
+      });
+    }
+    const totalItems = all.length;
+    const totalPages = limit === 0 ? 0 : Math.ceil(totalItems / limit);
+    let effectiveOffset;
+    let effectivePage;
+    if (page !== void 0) {
+      effectiveOffset = (page - 1) * limit;
+      effectivePage = page;
+    } else {
+      effectiveOffset = offset != null ? offset : 0;
+      effectivePage = limit === 0 ? 1 : Math.floor(effectiveOffset / limit) + 1;
+    }
+    const paginated = all.slice(effectiveOffset, effectiveOffset + limit);
+    return Promise.resolve({
+      sessions: paginated,
+      page: effectivePage,
+      limit,
+      totalItems,
+      totalPages
+    });
   }
   async deleteSession({
     appName,

package/dist/esm/sessions/registry.js

@@ -13,6 +13,10 @@ import {
   InMemorySessionService,
   isInMemoryConnectionString
 } from "./in_memory_session_service.js";
+import {
+  VertexAiSessionService,
+  isVertexAiConnectionString
+} from "./vertex_ai_session_service.js";
 function getSessionServiceFromUri(uri) {
   if (isInMemoryConnectionString(uri)) {
     return new InMemorySessionService();
@@ -20,6 +24,9 @@ function getSessionServiceFromUri(uri) {
   if (isDatabaseConnectionString(uri)) {
     return new DatabaseSessionService(uri);
   }
+  if (isVertexAiConnectionString(uri)) {
+    return new VertexAiSessionService({});
+  }
   throw new Error(`Unsupported session service URI: ${uri}`);
 }
 export {