@google/adk 2.3.0 → 2.5.0

package/dist/esm/tools/application_integration_tool/clients/connections_client.js

@@ -17,10 +17,14 @@ var __decorateClass = (decorators, target, key, kind) => {
  * SPDX-License-Identifier: Apache-2.0
  */
 import { experimental } from "../../../utils/experimental.js";
-import { toJsonObject } from "../../../utils/json_utils.js";
+import {
+  isJsonObject,
+  toJsonObject
+} from "../../../utils/json_utils.js";
 import { CloudPlatformTokenSource, sendCloudRequest } from "./cloud_request.js";
 const CONNECTOR_URL = "https://connectors.googleapis.com";
 const OPERATION_POLL_INTERVAL_MS = 1e3;
+const MAX_OPERATION_POLL_ATTEMPTS = 60;
 function toStringValue(value) {
   return typeof value === "string" ? value : "";
 }
@@ -29,6 +33,16 @@ function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 __name(sleep, "sleep");
+function formatOperationError(error) {
+  if (typeof error === "string" && error.length > 0) {
+    return error;
+  }
+  if (isJsonObject(error) && typeof error["message"] === "string" && error["message"].length > 0) {
+    return error["message"];
+  }
+  return JSON.stringify(error);
+}
+__name(formatOperationError, "formatOperationError");
 function schemaRef(name) {
   return { $ref: `#/components/schemas/${name}` };
 }
@@ -110,6 +124,12 @@ const CONNECTOR_BASE_SPEC = {
         default: 120,
         description: "Timeout in seconds for execution of custom query"
       },
+      sortByColumns: {
+        type: "array",
+        items: { type: "string" },
+        default: [],
+        description: "Column to sort the results by"
+      },
       connectorOutputPayload: { type: "object" },
       nextPageToken: { type: "string" },
       "execute-connector_Response": {
@@ -173,55 +193,48 @@ function connectorPayload(jsonSchema) {
 }
 __name(connectorPayload, "connectorPayload");
 function postOperation(options) {
-  const { summary, description, operationId, requestSchemaRef, responseSchema } = options;
-  return {
-    post: {
-      summary,
-      description,
-      operationId,
-      requestBody: {
+  const {
+    summary,
+    description,
+    operationId,
+    xOperation,
+    xEntity,
+    xAction,
+    requestSchemaRef,
+    responseSchema
+  } = options;
+  const post = {
+    summary,
+    description,
+    operationId,
+    "x-operation": xOperation,
+    requestBody: {
+      content: {
+        "application/json": {
+          schema: { $ref: requestSchemaRef }
+        }
+      }
+    },
+    responses: {
+      "200": {
+        description: "Success response",
         content: {
           "application/json": {
-            schema: { $ref: requestSchemaRef }
-          }
-        }
-      },
-      responses: {
-        "200": {
-          description: "Success response",
-          content: {
-            "application/json": {
-              schema: responseSchema
-            }
+            schema: responseSchema
           }
         }
       }
     }
   };
+  if (xEntity !== void 0) {
+    post["x-entity"] = xEntity;
+  }
+  if (xAction !== void 0) {
+    post["x-action"] = xAction;
+  }
+  return { post };
 }
 __name(postOperation, "postOperation");
-function entityIdRequest() {
-  return {
-    type: "object",
-    required: [
-      "entityId",
-      "operation",
-      "connectionName",
-      "serviceName",
-      "host",
-      "entity"
-    ],
-    properties: {
-      entityId: schemaRef("entityId"),
-      operation: schemaRef("operation"),
-      connectionName: schemaRef("connectionName"),
-      serviceName: schemaRef("serviceName"),
-      host: schemaRef("host"),
-      entity: schemaRef("entity")
-    }
-  };
-}
-__name(entityIdRequest, "entityIdRequest");
 function getActionOperation(options) {
   const {
     action,
@@ -230,7 +243,7 @@ function getActionOperation(options) {
     toolName = "",
     toolInstructions = ""
   } = options;
-  let description = `Use this tool with action = "${action}" and operation = "${operation}" only. Don't ask these values from user.`;
+  let description = `Use this tool to execute ${action}`;
   if (operation === "EXECUTE_QUERY") {
     description += " Use pageSize = 50 and timeout = 120 until user specifies a different value otherwise. If user provides a query in natural language, convert it to SQL query and then execute it using the tool.";
   }
@@ -238,6 +251,8 @@ function getActionOperation(options) {
     summary: actionDisplayName,
     description: `${description} ${toolInstructions}`,
     operationId: `${toolName}_${actionDisplayName}`,
+    xOperation: operation,
+    xAction: action,
     requestSchemaRef: `#/components/schemas/${actionDisplayName}_Request`,
     responseSchema: schemaRef(`${actionDisplayName}_Response`)
   });
@@ -252,8 +267,10 @@ function listOperation(options) {
   } = options;
   return postOperation({
     summary: `List ${entity}`,
-    description: `Returns all entities of type ${entity}. Use this tool with entity = "${entity}" and operation = "LIST_ENTITIES" only. Don't ask these values from user. Always use "" as filter clause and "" as page token and 50 as page size until user specifies a different value otherwise. Use single quotes for strings in filter clause. ${toolInstructions}`,
+    description: `Returns the list of ${entity} data. If the page token was available in the response, let users know there are more records available. Ask if the user wants to fetch the next page of results. When passing filter use the following format: \`field_name1='value1' AND field_name2='value2'\`. ${toolInstructions}`,
     operationId: `${toolName}_list_${entity}`,
+    xOperation: "LIST_ENTITIES",
+    xEntity: entity,
     requestSchemaRef: `#/components/schemas/list_${entity}_Request`,
     responseSchema: {
       description: `Returns a list of ${entity} of json schema: ${schemaAsString}`,
@@ -271,8 +288,10 @@ function getOperation(options) {
   } = options;
   return postOperation({
     summary: `Get ${entity}`,
-    description: `Returns the details of the ${entity}. Use this tool with entity = "${entity}" and operation = "GET_ENTITY" only. Don't ask these values from user.  ${toolInstructions}`,
+    description: `Returns the details of the ${entity}. ${toolInstructions}`,
     operationId: `${toolName}_get_${entity}`,
+    xOperation: "GET_ENTITY",
+    xEntity: entity,
     requestSchemaRef: `#/components/schemas/get_${entity}_Request`,
     responseSchema: {
       description: `Returns ${entity} of json schema: ${schemaAsString}`,
@@ -284,9 +303,11 @@ __name(getOperation, "getOperation");
 function createOperation(options) {
   const { entity, toolName = "", toolInstructions = "" } = options;
   return postOperation({
-    summary: `Create ${entity}`,
-    description: `Creates a new entity of type ${entity}. Use this tool with entity = "${entity}" and operation = "CREATE_ENTITY" only. Don't ask these values from user. Follow the schema of the entity provided in the instructions to create ${entity}.  ${toolInstructions}`,
+    summary: `Creates a new ${entity}`,
+    description: `Creates a new ${entity}. ${toolInstructions}`,
     operationId: `${toolName}_create_${entity}`,
+    xOperation: "CREATE_ENTITY",
+    xEntity: entity,
     requestSchemaRef: `#/components/schemas/create_${entity}_Request`,
     responseSchema: schemaRef("execute-connector_Response")
   });
@@ -295,9 +316,11 @@ __name(createOperation, "createOperation");
 function updateOperation(options) {
   const { entity, toolName = "", toolInstructions = "" } = options;
   return postOperation({
-    summary: `Update ${entity}`,
-    description: `Updates an entity of type ${entity}. Use this tool with entity = "${entity}" and operation = "UPDATE_ENTITY" only. Don't ask these values from user. Use entityId to uniquely identify the entity to update. Follow the schema of the entity provided in the instructions to update ${entity}.  ${toolInstructions}`,
+    summary: `Updates the ${entity}`,
+    description: `Updates the ${entity}. ${toolInstructions}`,
     operationId: `${toolName}_update_${entity}`,
+    xOperation: "UPDATE_ENTITY",
+    xEntity: entity,
     requestSchemaRef: `#/components/schemas/update_${entity}_Request`,
     responseSchema: schemaRef("execute-connector_Response")
   });
@@ -306,15 +329,28 @@ __name(updateOperation, "updateOperation");
 function deleteOperation(options) {
   const { entity, toolName = "", toolInstructions = "" } = options;
   return postOperation({
-    summary: `Delete ${entity}`,
-    description: `Deletes an entity of type ${entity}. Use this tool with entity = "${entity}" and operation = "DELETE_ENTITY" only. Don't ask these values from user.  ${toolInstructions}`,
+    summary: `Delete the ${entity}`,
+    description: `Deletes the ${entity}. ${toolInstructions}`,
     operationId: `${toolName}_delete_${entity}`,
+    xOperation: "DELETE_ENTITY",
+    xEntity: entity,
     requestSchemaRef: `#/components/schemas/delete_${entity}_Request`,
     responseSchema: schemaRef("execute-connector_Response")
   });
 }
 __name(deleteOperation, "deleteOperation");
-function createOperationRequest(entity) {
+function createOperationRequest(entity, options) {
+  const properties = {
+    connectorInputPayload: schemaRef(`connectorInputPayload_${entity}`),
+    operation: schemaRef("operation"),
+    connectionName: schemaRef("connectionName"),
+    serviceName: schemaRef("serviceName"),
+    host: schemaRef("host"),
+    entity: schemaRef("entity")
+  };
+  if (options == null ? void 0 : options.includeDynamicAuthConfig) {
+    properties["dynamicAuthConfig"] = schemaRef("dynamicAuthConfig");
+  }
   return {
     type: "object",
     required: [
@@ -325,18 +361,24 @@ function createOperationRequest(entity) {
       "host",
       "entity"
     ],
-    properties: {
-      connectorInputPayload: schemaRef(`connectorInputPayload_${entity}`),
-      operation: schemaRef("operation"),
-      connectionName: schemaRef("connectionName"),
-      serviceName: schemaRef("serviceName"),
-      host: schemaRef("host"),
-      entity: schemaRef("entity")
-    }
+    properties
   };
 }
 __name(createOperationRequest, "createOperationRequest");
-function updateOperationRequest(entity) {
+function updateOperationRequest(entity, options) {
+  const properties = {
+    connectorInputPayload: schemaRef(`connectorInputPayload_${entity}`),
+    entityId: schemaRef("entityId"),
+    operation: schemaRef("operation"),
+    connectionName: schemaRef("connectionName"),
+    serviceName: schemaRef("serviceName"),
+    host: schemaRef("host"),
+    entity: schemaRef("entity"),
+    filterClause: schemaRef("filterClause")
+  };
+  if (options == null ? void 0 : options.includeDynamicAuthConfig) {
+    properties["dynamicAuthConfig"] = schemaRef("dynamicAuthConfig");
+  }
   return {
     type: "object",
     required: [
@@ -348,44 +390,97 @@ function updateOperationRequest(entity) {
       "host",
       "entity"
     ],
-    properties: {
-      connectorInputPayload: schemaRef(`connectorInputPayload_${entity}`),
-      entityId: schemaRef("entityId"),
-      operation: schemaRef("operation"),
-      connectionName: schemaRef("connectionName"),
-      serviceName: schemaRef("serviceName"),
-      host: schemaRef("host"),
-      entity: schemaRef("entity")
-    }
+    properties
   };
 }
 __name(updateOperationRequest, "updateOperationRequest");
-function getOperationRequest() {
-  return entityIdRequest();
+function getOperationRequest(options) {
+  const properties = {
+    entityId: schemaRef("entityId"),
+    operation: schemaRef("operation"),
+    connectionName: schemaRef("connectionName"),
+    serviceName: schemaRef("serviceName"),
+    host: schemaRef("host"),
+    entity: schemaRef("entity")
+  };
+  if (options == null ? void 0 : options.includeDynamicAuthConfig) {
+    properties["dynamicAuthConfig"] = schemaRef("dynamicAuthConfig");
+  }
+  return {
+    type: "object",
+    required: [
+      "entityId",
+      "operation",
+      "connectionName",
+      "serviceName",
+      "host",
+      "entity"
+    ],
+    properties
+  };
 }
 __name(getOperationRequest, "getOperationRequest");
-function deleteOperationRequest() {
-  return entityIdRequest();
+function deleteOperationRequest(options) {
+  const properties = {
+    entityId: schemaRef("entityId"),
+    operation: schemaRef("operation"),
+    connectionName: schemaRef("connectionName"),
+    serviceName: schemaRef("serviceName"),
+    host: schemaRef("host"),
+    entity: schemaRef("entity"),
+    filterClause: schemaRef("filterClause")
+  };
+  if (options == null ? void 0 : options.includeDynamicAuthConfig) {
+    properties["dynamicAuthConfig"] = schemaRef("dynamicAuthConfig");
+  }
+  return {
+    type: "object",
+    required: [
+      "entityId",
+      "operation",
+      "connectionName",
+      "serviceName",
+      "host",
+      "entity"
+    ],
+    properties
+  };
 }
 __name(deleteOperationRequest, "deleteOperationRequest");
-function listOperationRequest() {
+function listOperationRequest(options) {
+  const properties = {
+    filterClause: schemaRef("filterClause"),
+    pageSize: schemaRef("pageSize"),
+    pageToken: schemaRef("pageToken"),
+    operation: schemaRef("operation"),
+    connectionName: schemaRef("connectionName"),
+    serviceName: schemaRef("serviceName"),
+    host: schemaRef("host"),
+    entity: schemaRef("entity"),
+    sortByColumns: schemaRef("sortByColumns")
+  };
+  if (options == null ? void 0 : options.includeDynamicAuthConfig) {
+    properties["dynamicAuthConfig"] = schemaRef("dynamicAuthConfig");
+  }
   return {
     type: "object",
     required: ["operation", "connectionName", "serviceName", "host", "entity"],
-    properties: {
-      filterClause: schemaRef("filterClause"),
-      pageSize: schemaRef("pageSize"),
-      pageToken: schemaRef("pageToken"),
-      operation: schemaRef("operation"),
-      connectionName: schemaRef("connectionName"),
-      serviceName: schemaRef("serviceName"),
-      host: schemaRef("host"),
-      entity: schemaRef("entity")
-    }
+    properties
   };
 }
 __name(listOperationRequest, "listOperationRequest");
-function actionRequest(action) {
+function actionRequest(action, options) {
+  const properties = {
+    operation: schemaRef("operation"),
+    connectionName: schemaRef("connectionName"),
+    serviceName: schemaRef("serviceName"),
+    host: schemaRef("host"),
+    action: schemaRef("action"),
+    connectorInputPayload: schemaRef(`connectorInputPayload_${action}`)
+  };
+  if (options == null ? void 0 : options.includeDynamicAuthConfig) {
+    properties["dynamicAuthConfig"] = schemaRef("dynamicAuthConfig");
+  }
   return {
     type: "object",
     required: [
@@ -396,14 +491,7 @@ function actionRequest(action) {
       "action",
       "connectorInputPayload"
     ],
-    properties: {
-      operation: schemaRef("operation"),
-      connectionName: schemaRef("connectionName"),
-      serviceName: schemaRef("serviceName"),
-      host: schemaRef("host"),
-      action: schemaRef("action"),
-      connectorInputPayload: schemaRef(`connectorInputPayload_${action}`)
-    }
+    properties
   };
 }
 __name(actionRequest, "actionRequest");
@@ -416,7 +504,20 @@ function actionResponse(action) {
   };
 }
 __name(actionResponse, "actionResponse");
-function executeCustomQueryRequest() {
+function executeCustomQueryRequest(options) {
+  const properties = {
+    operation: schemaRef("operation"),
+    connectionName: schemaRef("connectionName"),
+    serviceName: schemaRef("serviceName"),
+    host: schemaRef("host"),
+    action: schemaRef("action"),
+    query: schemaRef("query"),
+    timeout: schemaRef("timeout"),
+    pageSize: schemaRef("pageSize")
+  };
+  if (options == null ? void 0 : options.includeDynamicAuthConfig) {
+    properties["dynamicAuthConfig"] = schemaRef("dynamicAuthConfig");
+  }
   return {
     type: "object",
     required: [
@@ -429,16 +530,7 @@ function executeCustomQueryRequest() {
       "timeout",
       "pageSize"
     ],
-    properties: {
-      operation: schemaRef("operation"),
-      connectionName: schemaRef("connectionName"),
-      serviceName: schemaRef("serviceName"),
-      host: schemaRef("host"),
-      action: schemaRef("action"),
-      query: schemaRef("query"),
-      timeout: schemaRef("timeout"),
-      pageSize: schemaRef("pageSize")
-    }
+    properties
   };
 }
 __name(executeCustomQueryRequest, "executeCustomQueryRequest");
@@ -450,22 +542,24 @@ let ConnectionsClient = class {
     this.tokenSource = new CloudPlatformTokenSource(options.serviceAccountJson);
   }
   /**
-   * Reads the service name and host of the connection, and whether it allows
-   * an authentication override.
+   * Reads the resource name, service name and host of the connection, and
+   * whether it allows an authentication override.
    */
   async getConnectionDetails() {
     const url = `${CONNECTOR_URL}/v1/projects/${this.project}/locations/${this.location}/connections/${this.connection}?view=BASIC`;
     const connectionData = toJsonObject(await this.executeApiCall(url));
+    const name = toStringValue(connectionData["name"]);
     const host = toStringValue(connectionData["host"]);
     const serviceName = host ? toStringValue(connectionData["tlsServiceDirectory"]) : toStringValue(connectionData["serviceDirectory"]);
     const authOverrideEnabled = connectionData["authOverrideEnabled"] === true;
-    return { serviceName, host, authOverrideEnabled };
+    return { name, serviceName, host, authOverrideEnabled };
   }
   /**
    * Reads the JSON schema of an entity and the operations it supports.
    *
    * @param entity The entity name.
-   * @throws Error When the API starts no operation for the entity.
+   * @throws Error When the API starts no operation for the entity, or the
+   *   operation fails or times out.
    */
   async getEntitySchemaAndOperations(entity) {
     const url = `${CONNECTOR_URL}/v1/projects/${this.project}/locations/${this.location}/connections/${this.connection}/connectionSchemaMetadata:getEntityType?entityId=${entity}`;
@@ -490,7 +584,8 @@ let ConnectionsClient = class {
    * Reads the input and output JSON schemas of an action.
    *
    * @param action The action name.
-   * @throws Error When the API starts no operation for the action.
+   * @throws Error When the API starts no operation for the action, or the
+   *   operation fails or times out.
    */
   async getActionSchema(action) {
     const url = `${CONNECTOR_URL}/v1/projects/${this.project}/locations/${this.location}/connections/${this.connection}/connectionSchemaMetadata:getAction?actionId=${action}`;
@@ -525,15 +620,31 @@ let ConnectionsClient = class {
       invalidRequestMessage: `Invalid request. Please check the provided values of project(${this.project}), location(${this.location}), connection(${this.connection}).`
     });
   }
-  /** Polls a long-running operation until it reports `done`. */
+  /**
+   * Polls a long-running operation until it reports `done`.
+   *
+   * @throws Error When the operation reports an `error` or does not finish
+   *   within `MAX_OPERATION_POLL_ATTEMPTS` polls.
+   */
   async pollOperation(operationId) {
     const url = `${CONNECTOR_URL}/v1/${operationId}`;
-    let operation = toJsonObject(await this.executeApiCall(url));
-    while (operation["done"] !== true) {
-      await sleep(OPERATION_POLL_INTERVAL_MS);
-      operation = toJsonObject(await this.executeApiCall(url));
+    for (let attempt = 0; attempt < MAX_OPERATION_POLL_ATTEMPTS; attempt++) {
+      if (attempt > 0) {
+        await sleep(OPERATION_POLL_INTERVAL_MS);
+      }
+      const operation = toJsonObject(await this.executeApiCall(url));
+      if (operation["error"]) {
+        throw new Error(
+          `Operation ${operationId} failed: ${formatOperationError(operation["error"])}`
+        );
+      }
+      if (operation["done"] === true) {
+        return operation;
+      }
     }
-    return operation;
+    throw new Error(
+      `Operation ${operationId} timed out after ${MAX_OPERATION_POLL_ATTEMPTS} poll attempts.`
+    );
   }
 };
 __name(ConnectionsClient, "ConnectionsClient");

package/dist/esm/tools/application_integration_tool/clients/integration_client.js

@@ -44,13 +44,14 @@ import {
 } from "./connections_client.js";
 const EXECUTE_CONNECTION_INTEGRATION = "ExecuteConnection";
 const EXECUTE_CUSTOM_QUERY_ACTION = "ExecuteCustomQuery";
+const REQUEST_SCHEMA_OPTIONS = Object.freeze({ includeDynamicAuthConfig: true });
 let IntegrationClient = class {
   constructor(options) {
     var _a, _b;
     this.project = options.project;
     this.location = options.location;
     this.integration = options.integration;
-    this.trigger = options.trigger;
+    this.triggers = options.triggers;
     this.connection = options.connection;
     this.entityOperations = (_a = options.entityOperations) != null ? _a : {};
     this.actions = (_b = options.actions) != null ? _b : [];
@@ -66,6 +67,7 @@ let IntegrationClient = class {
    */
   async getOpenApiSpecForIntegration() {
     const url = `https://${this.location}-integrations.googleapis.com/v1/projects/${this.project}/locations/${this.location}:generateOpenApiSpec`;
+    const invalidRequestMessage = `Invalid request. Please check the provided values of project(${this.project}), location(${this.location}), integration(${this.integration}).`;
     const body = await sendCloudRequest({
       url,
       method: "POST",
@@ -73,13 +75,13 @@ let IntegrationClient = class {
         apiTriggerResources: [
           {
             integrationResource: this.integration,
-            triggerId: [this.trigger]
+            triggerId: this.triggers
           }
         ],
         fileFormat: "JSON"
       },
       tokenSource: this.tokenSource,
-      invalidRequestMessage: `Invalid request. Please check the provided values of project(${this.project}), location(${this.location}), integration(${this.integration}) and trigger(${this.trigger}).`
+      invalidRequestMessage
     });
     try {
       const spec = isJsonObject(body) ? body["openApiSpec"] : void 0;
@@ -140,7 +142,10 @@ let IntegrationClient = class {
               toolName,
               toolInstructions
             });
-            schemas[`create_${entity}_Request`] = createOperationRequest(entity);
+            schemas[`create_${entity}_Request`] = createOperationRequest(
+              entity,
+              REQUEST_SCHEMA_OPTIONS
+            );
             break;
           case "update":
             connectorSpec.paths[path] = updateOperation({
@@ -148,7 +153,10 @@ let IntegrationClient = class {
               toolName,
               toolInstructions
             });
-            schemas[`update_${entity}_Request`] = updateOperationRequest(entity);
+            schemas[`update_${entity}_Request`] = updateOperationRequest(
+              entity,
+              REQUEST_SCHEMA_OPTIONS
+            );
             break;
           case "delete":
             connectorSpec.paths[path] = deleteOperation({
@@ -156,7 +164,9 @@ let IntegrationClient = class {
               toolName,
               toolInstructions
             });
-            schemas[`delete_${entity}_Request`] = deleteOperationRequest();
+            schemas[`delete_${entity}_Request`] = deleteOperationRequest(
+              REQUEST_SCHEMA_OPTIONS
+            );
             break;
           case "list":
             connectorSpec.paths[path] = listOperation({
@@ -165,7 +175,9 @@ let IntegrationClient = class {
               toolName,
               toolInstructions
             });
-            schemas[`list_${entity}_Request`] = listOperationRequest();
+            schemas[`list_${entity}_Request`] = listOperationRequest(
+              REQUEST_SCHEMA_OPTIONS
+            );
             break;
           case "get":
             connectorSpec.paths[path] = getOperation({
@@ -174,7 +186,9 @@ let IntegrationClient = class {
               toolName,
               toolInstructions
             });
-            schemas[`get_${entity}_Request`] = getOperationRequest();
+            schemas[`get_${entity}_Request`] = getOperationRequest(
+              REQUEST_SCHEMA_OPTIONS
+            );
             break;
           default:
             throw new Error(
@@ -185,20 +199,26 @@ let IntegrationClient = class {
     }
     for (const action of this.actions) {
       const { inputSchema, outputSchema, displayName } = await connectionsClient.getActionSchema(action);
+      const actionDisplayName = displayName.replace(/ /g, "");
       let operation = "EXECUTE_ACTION";
       if (action === EXECUTE_CUSTOM_QUERY_ACTION) {
-        schemas[`${action}_Request`] = executeCustomQueryRequest();
+        schemas[`${actionDisplayName}_Request`] = executeCustomQueryRequest(
+          REQUEST_SCHEMA_OPTIONS
+        );
         operation = "EXECUTE_QUERY";
       } else {
-        schemas[`${displayName}_Request`] = actionRequest(displayName);
-        schemas[`connectorInputPayload_${displayName}`] = connectorPayload(inputSchema);
+        schemas[`${actionDisplayName}_Request`] = actionRequest(
+          actionDisplayName,
+          REQUEST_SCHEMA_OPTIONS
+        );
+        schemas[`connectorInputPayload_${actionDisplayName}`] = connectorPayload(inputSchema);
       }
-      schemas[`connectorOutputPayload_${displayName}`] = connectorPayload(outputSchema);
-      schemas[`${displayName}_Response`] = actionResponse(displayName);
+      schemas[`connectorOutputPayload_${actionDisplayName}`] = connectorPayload(outputSchema);
+      schemas[`${actionDisplayName}_Response`] = actionResponse(actionDisplayName);
       connectorSpec.paths[`${pathPrefix}#${action}`] = getActionOperation({
         action,
         operation,
-        actionDisplayName: displayName,
+        actionDisplayName,
         toolName,
         toolInstructions
       });