Skip to content

Commit

Permalink
feat(client-bedrock-agent): This release introduces the ability to ge…
Browse files Browse the repository at this point in the history 
…nerate SQL using natural language, through a new GenerateQuery API (with native integration into Knowledge Bases); ability to ingest and retrieve images through Bedrock Data Automation; and ability to create a Knowledge Base backed by Kendra GenAI Index.
  • Loading branch information
awstools committed Dec 4, 2024
1 parent 2366a2b commit ac7f368
Show file tree
Hide file tree
Showing 10 changed files with 1,968 additions and 115 deletions.
16 changes: 12 additions & 4 deletions clients/client-bedrock-agent/src/commands/CreateDataSourceCommand.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export interface CreateDataSourceCommandOutput extends CreateDataSourceResponse,
* name: "STRING_VALUE", // required
* description: "STRING_VALUE",
* dataSourceConfiguration: { // DataSourceConfiguration
* type: "S3" || "WEB" || "CONFLUENCE" || "SALESFORCE" || "SHAREPOINT" || "CUSTOM", // required
* type: "S3" || "WEB" || "CONFLUENCE" || "SALESFORCE" || "SHAREPOINT" || "CUSTOM" || "REDSHIFT_METADATA", // required
* s3Configuration: { // S3DataSourceConfiguration
* bucketArn: "STRING_VALUE", // required
* inclusionPrefixes: [ // S3Prefixes
Expand Down Expand Up @@ -199,12 +199,16 @@ export interface CreateDataSourceCommandOutput extends CreateDataSourceResponse,
* ],
* },
* parsingConfiguration: { // ParsingConfiguration
* parsingStrategy: "BEDROCK_FOUNDATION_MODEL", // required
* parsingStrategy: "BEDROCK_FOUNDATION_MODEL" || "BEDROCK_DATA_AUTOMATION", // required
* bedrockFoundationModelConfiguration: { // BedrockFoundationModelConfiguration
* modelArn: "STRING_VALUE", // required
* parsingPrompt: { // ParsingPrompt
* parsingPromptText: "STRING_VALUE", // required
* },
* parsingModality: "MULTIMODAL",
* },
* bedrockDataAutomationConfiguration: { // BedrockDataAutomationConfiguration
* parsingModality: "MULTIMODAL",
* },
* },
* },
Expand All @@ -219,7 +223,7 @@ export interface CreateDataSourceCommandOutput extends CreateDataSourceResponse,
* // status: "AVAILABLE" || "DELETING" || "DELETE_UNSUCCESSFUL", // required
* // description: "STRING_VALUE",
* // dataSourceConfiguration: { // DataSourceConfiguration
* // type: "S3" || "WEB" || "CONFLUENCE" || "SALESFORCE" || "SHAREPOINT" || "CUSTOM", // required
* // type: "S3" || "WEB" || "CONFLUENCE" || "SALESFORCE" || "SHAREPOINT" || "CUSTOM" || "REDSHIFT_METADATA", // required
* // s3Configuration: { // S3DataSourceConfiguration
* // bucketArn: "STRING_VALUE", // required
* // inclusionPrefixes: [ // S3Prefixes
Expand Down Expand Up @@ -368,12 +372,16 @@ export interface CreateDataSourceCommandOutput extends CreateDataSourceResponse,
* // ],
* // },
* // parsingConfiguration: { // ParsingConfiguration
* // parsingStrategy: "BEDROCK_FOUNDATION_MODEL", // required
* // parsingStrategy: "BEDROCK_FOUNDATION_MODEL" || "BEDROCK_DATA_AUTOMATION", // required
* // bedrockFoundationModelConfiguration: { // BedrockFoundationModelConfiguration
* // modelArn: "STRING_VALUE", // required
* // parsingPrompt: { // ParsingPrompt
* // parsingPromptText: "STRING_VALUE", // required
* // },
* // parsingModality: "MULTIMODAL",
* // },
* // bedrockDataAutomationConfiguration: { // BedrockDataAutomationConfiguration
* // parsingModality: "MULTIMODAL",
* // },
* // },
* // },
Expand Down
161 changes: 157 additions & 4 deletions clients/client-bedrock-agent/src/commands/CreateKnowledgeBaseCommand.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ import { MetadataBearer as __MetadataBearer } from "@smithy/types";

import { BedrockAgentClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../BedrockAgentClient";
import { commonParams } from "../endpoint/EndpointParameters";
import { CreateKnowledgeBaseRequest, CreateKnowledgeBaseResponse } from "../models/models_1";
import {
CreateKnowledgeBaseRequest,
CreateKnowledgeBaseRequestFilterSensitiveLog,
CreateKnowledgeBaseResponse,
CreateKnowledgeBaseResponseFilterSensitiveLog,
} from "../models/models_1";
import { de_CreateKnowledgeBaseCommand, se_CreateKnowledgeBaseCommand } from "../protocols/Aws_restJson1";

/**
Expand Down Expand Up @@ -72,7 +77,7 @@ export interface CreateKnowledgeBaseCommandOutput extends CreateKnowledgeBaseRes
* description: "STRING_VALUE",
* roleArn: "STRING_VALUE", // required
* knowledgeBaseConfiguration: { // KnowledgeBaseConfiguration
* type: "VECTOR", // required
* type: "VECTOR" || "KENDRA" || "SQL", // required
* vectorKnowledgeBaseConfiguration: { // VectorKnowledgeBaseConfiguration
* embeddingModelArn: "STRING_VALUE", // required
* embeddingModelConfiguration: { // EmbeddingModelConfiguration
Expand All @@ -81,6 +86,80 @@ export interface CreateKnowledgeBaseCommandOutput extends CreateKnowledgeBaseRes
* embeddingDataType: "FLOAT32" || "BINARY",
* },
* },
* supplementalDataStorageConfiguration: { // SupplementalDataStorageConfiguration
* storageLocations: [ // SupplementalDataStorageLocations // required
* { // SupplementalDataStorageLocation
* type: "S3", // required
* s3Location: { // S3Location
* uri: "STRING_VALUE", // required
* },
* },
* ],
* },
* },
* kendraKnowledgeBaseConfiguration: { // KendraKnowledgeBaseConfiguration
* kendraIndexArn: "STRING_VALUE", // required
* },
* sqlKnowledgeBaseConfiguration: { // SqlKnowledgeBaseConfiguration
* type: "REDSHIFT", // required
* redshiftConfiguration: { // RedshiftConfiguration
* storageConfigurations: [ // RedshiftQueryEngineStorageConfigurations // required
* { // RedshiftQueryEngineStorageConfiguration
* type: "REDSHIFT" || "AWS_DATA_CATALOG", // required
* awsDataCatalogConfiguration: { // RedshiftQueryEngineAwsDataCatalogStorageConfiguration
* tableNames: [ // AwsDataCatalogTableNames // required
* "STRING_VALUE",
* ],
* },
* redshiftConfiguration: { // RedshiftQueryEngineRedshiftStorageConfiguration
* databaseName: "STRING_VALUE", // required
* },
* },
* ],
* queryEngineConfiguration: { // RedshiftQueryEngineConfiguration
* type: "SERVERLESS" || "PROVISIONED", // required
* serverlessConfiguration: { // RedshiftServerlessConfiguration
* workgroupArn: "STRING_VALUE", // required
* authConfiguration: { // RedshiftServerlessAuthConfiguration
* type: "IAM" || "USERNAME_PASSWORD", // required
* usernamePasswordSecretArn: "STRING_VALUE",
* },
* },
* provisionedConfiguration: { // RedshiftProvisionedConfiguration
* clusterIdentifier: "STRING_VALUE", // required
* authConfiguration: { // RedshiftProvisionedAuthConfiguration
* type: "IAM" || "USERNAME_PASSWORD" || "USERNAME", // required
* databaseUser: "STRING_VALUE",
* usernamePasswordSecretArn: "STRING_VALUE",
* },
* },
* },
* queryGenerationConfiguration: { // QueryGenerationConfiguration
* executionTimeoutSeconds: Number("int"),
* generationContext: { // QueryGenerationContext
* tables: [ // QueryGenerationTables
* { // QueryGenerationTable
* name: "STRING_VALUE", // required
* description: "STRING_VALUE",
* inclusion: "INCLUDE" || "EXCLUDE",
* columns: [ // QueryGenerationColumns
* { // QueryGenerationColumn
* name: "STRING_VALUE",
* description: "STRING_VALUE",
* inclusion: "INCLUDE" || "EXCLUDE",
* },
* ],
* },
* ],
* curatedQueries: [ // CuratedQueries
* { // CuratedQuery
* naturalLanguage: "STRING_VALUE", // required
* sql: "STRING_VALUE", // required
* },
* ],
* },
* },
* },
* },
* },
* storageConfiguration: { // StorageConfiguration
Expand Down Expand Up @@ -153,7 +232,7 @@ export interface CreateKnowledgeBaseCommandOutput extends CreateKnowledgeBaseRes
* // description: "STRING_VALUE",
* // roleArn: "STRING_VALUE", // required
* // knowledgeBaseConfiguration: { // KnowledgeBaseConfiguration
* // type: "VECTOR", // required
* // type: "VECTOR" || "KENDRA" || "SQL", // required
* // vectorKnowledgeBaseConfiguration: { // VectorKnowledgeBaseConfiguration
* // embeddingModelArn: "STRING_VALUE", // required
* // embeddingModelConfiguration: { // EmbeddingModelConfiguration
Expand All @@ -162,6 +241,80 @@ export interface CreateKnowledgeBaseCommandOutput extends CreateKnowledgeBaseRes
* // embeddingDataType: "FLOAT32" || "BINARY",
* // },
* // },
* // supplementalDataStorageConfiguration: { // SupplementalDataStorageConfiguration
* // storageLocations: [ // SupplementalDataStorageLocations // required
* // { // SupplementalDataStorageLocation
* // type: "S3", // required
* // s3Location: { // S3Location
* // uri: "STRING_VALUE", // required
* // },
* // },
* // ],
* // },
* // },
* // kendraKnowledgeBaseConfiguration: { // KendraKnowledgeBaseConfiguration
* // kendraIndexArn: "STRING_VALUE", // required
* // },
* // sqlKnowledgeBaseConfiguration: { // SqlKnowledgeBaseConfiguration
* // type: "REDSHIFT", // required
* // redshiftConfiguration: { // RedshiftConfiguration
* // storageConfigurations: [ // RedshiftQueryEngineStorageConfigurations // required
* // { // RedshiftQueryEngineStorageConfiguration
* // type: "REDSHIFT" || "AWS_DATA_CATALOG", // required
* // awsDataCatalogConfiguration: { // RedshiftQueryEngineAwsDataCatalogStorageConfiguration
* // tableNames: [ // AwsDataCatalogTableNames // required
* // "STRING_VALUE",
* // ],
* // },
* // redshiftConfiguration: { // RedshiftQueryEngineRedshiftStorageConfiguration
* // databaseName: "STRING_VALUE", // required
* // },
* // },
* // ],
* // queryEngineConfiguration: { // RedshiftQueryEngineConfiguration
* // type: "SERVERLESS" || "PROVISIONED", // required
* // serverlessConfiguration: { // RedshiftServerlessConfiguration
* // workgroupArn: "STRING_VALUE", // required
* // authConfiguration: { // RedshiftServerlessAuthConfiguration
* // type: "IAM" || "USERNAME_PASSWORD", // required
* // usernamePasswordSecretArn: "STRING_VALUE",
* // },
* // },
* // provisionedConfiguration: { // RedshiftProvisionedConfiguration
* // clusterIdentifier: "STRING_VALUE", // required
* // authConfiguration: { // RedshiftProvisionedAuthConfiguration
* // type: "IAM" || "USERNAME_PASSWORD" || "USERNAME", // required
* // databaseUser: "STRING_VALUE",
* // usernamePasswordSecretArn: "STRING_VALUE",
* // },
* // },
* // },
* // queryGenerationConfiguration: { // QueryGenerationConfiguration
* // executionTimeoutSeconds: Number("int"),
* // generationContext: { // QueryGenerationContext
* // tables: [ // QueryGenerationTables
* // { // QueryGenerationTable
* // name: "STRING_VALUE", // required
* // description: "STRING_VALUE",
* // inclusion: "INCLUDE" || "EXCLUDE",
* // columns: [ // QueryGenerationColumns
* // { // QueryGenerationColumn
* // name: "STRING_VALUE",
* // description: "STRING_VALUE",
* // inclusion: "INCLUDE" || "EXCLUDE",
* // },
* // ],
* // },
* // ],
* // curatedQueries: [ // CuratedQueries
* // { // CuratedQuery
* // naturalLanguage: "STRING_VALUE", // required
* // sql: "STRING_VALUE", // required
* // },
* // ],
* // },
* // },
* // },
* // },
* // },
* // storageConfiguration: { // StorageConfiguration
Expand Down Expand Up @@ -277,7 +430,7 @@ export class CreateKnowledgeBaseCommand extends $Command
})
.s("AmazonBedrockAgentBuildTimeLambda", "CreateKnowledgeBase", {})
.n("BedrockAgentClient", "CreateKnowledgeBaseCommand")
.f(void 0, void 0)
.f(CreateKnowledgeBaseRequestFilterSensitiveLog, CreateKnowledgeBaseResponseFilterSensitiveLog)
.ser(se_CreateKnowledgeBaseCommand)
.de(de_CreateKnowledgeBaseCommand)
.build() {
Expand Down
8 changes: 6 additions & 2 deletions clients/client-bedrock-agent/src/commands/GetDataSourceCommand.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export interface GetDataSourceCommandOutput extends GetDataSourceResponse, __Met
* // status: "AVAILABLE" || "DELETING" || "DELETE_UNSUCCESSFUL", // required
* // description: "STRING_VALUE",
* // dataSourceConfiguration: { // DataSourceConfiguration
* // type: "S3" || "WEB" || "CONFLUENCE" || "SALESFORCE" || "SHAREPOINT" || "CUSTOM", // required
* // type: "S3" || "WEB" || "CONFLUENCE" || "SALESFORCE" || "SHAREPOINT" || "CUSTOM" || "REDSHIFT_METADATA", // required
* // s3Configuration: { // S3DataSourceConfiguration
* // bucketArn: "STRING_VALUE", // required
* // inclusionPrefixes: [ // S3Prefixes
Expand Down Expand Up @@ -202,12 +202,16 @@ export interface GetDataSourceCommandOutput extends GetDataSourceResponse, __Met
* // ],
* // },
* // parsingConfiguration: { // ParsingConfiguration
* // parsingStrategy: "BEDROCK_FOUNDATION_MODEL", // required
* // parsingStrategy: "BEDROCK_FOUNDATION_MODEL" || "BEDROCK_DATA_AUTOMATION", // required
* // bedrockFoundationModelConfiguration: { // BedrockFoundationModelConfiguration
* // modelArn: "STRING_VALUE", // required
* // parsingPrompt: { // ParsingPrompt
* // parsingPromptText: "STRING_VALUE", // required
* // },
* // parsingModality: "MULTIMODAL",
* // },
* // bedrockDataAutomationConfiguration: { // BedrockDataAutomationConfiguration
* // parsingModality: "MULTIMODAL",
* // },
* // },
* // },
Expand Down
84 changes: 81 additions & 3 deletions clients/client-bedrock-agent/src/commands/GetKnowledgeBaseCommand.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ import { MetadataBearer as __MetadataBearer } from "@smithy/types";

import { BedrockAgentClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../BedrockAgentClient";
import { commonParams } from "../endpoint/EndpointParameters";
import { GetKnowledgeBaseRequest, GetKnowledgeBaseResponse } from "../models/models_1";
import {
GetKnowledgeBaseRequest,
GetKnowledgeBaseResponse,
GetKnowledgeBaseResponseFilterSensitiveLog,
} from "../models/models_1";
import { de_GetKnowledgeBaseCommand, se_GetKnowledgeBaseCommand } from "../protocols/Aws_restJson1";

/**
Expand Down Expand Up @@ -48,7 +52,7 @@ export interface GetKnowledgeBaseCommandOutput extends GetKnowledgeBaseResponse,
* // description: "STRING_VALUE",
* // roleArn: "STRING_VALUE", // required
* // knowledgeBaseConfiguration: { // KnowledgeBaseConfiguration
* // type: "VECTOR", // required
* // type: "VECTOR" || "KENDRA" || "SQL", // required
* // vectorKnowledgeBaseConfiguration: { // VectorKnowledgeBaseConfiguration
* // embeddingModelArn: "STRING_VALUE", // required
* // embeddingModelConfiguration: { // EmbeddingModelConfiguration
Expand All @@ -57,6 +61,80 @@ export interface GetKnowledgeBaseCommandOutput extends GetKnowledgeBaseResponse,
* // embeddingDataType: "FLOAT32" || "BINARY",
* // },
* // },
* // supplementalDataStorageConfiguration: { // SupplementalDataStorageConfiguration
* // storageLocations: [ // SupplementalDataStorageLocations // required
* // { // SupplementalDataStorageLocation
* // type: "S3", // required
* // s3Location: { // S3Location
* // uri: "STRING_VALUE", // required
* // },
* // },
* // ],
* // },
* // },
* // kendraKnowledgeBaseConfiguration: { // KendraKnowledgeBaseConfiguration
* // kendraIndexArn: "STRING_VALUE", // required
* // },
* // sqlKnowledgeBaseConfiguration: { // SqlKnowledgeBaseConfiguration
* // type: "REDSHIFT", // required
* // redshiftConfiguration: { // RedshiftConfiguration
* // storageConfigurations: [ // RedshiftQueryEngineStorageConfigurations // required
* // { // RedshiftQueryEngineStorageConfiguration
* // type: "REDSHIFT" || "AWS_DATA_CATALOG", // required
* // awsDataCatalogConfiguration: { // RedshiftQueryEngineAwsDataCatalogStorageConfiguration
* // tableNames: [ // AwsDataCatalogTableNames // required
* // "STRING_VALUE",
* // ],
* // },
* // redshiftConfiguration: { // RedshiftQueryEngineRedshiftStorageConfiguration
* // databaseName: "STRING_VALUE", // required
* // },
* // },
* // ],
* // queryEngineConfiguration: { // RedshiftQueryEngineConfiguration
* // type: "SERVERLESS" || "PROVISIONED", // required
* // serverlessConfiguration: { // RedshiftServerlessConfiguration
* // workgroupArn: "STRING_VALUE", // required
* // authConfiguration: { // RedshiftServerlessAuthConfiguration
* // type: "IAM" || "USERNAME_PASSWORD", // required
* // usernamePasswordSecretArn: "STRING_VALUE",
* // },
* // },
* // provisionedConfiguration: { // RedshiftProvisionedConfiguration
* // clusterIdentifier: "STRING_VALUE", // required
* // authConfiguration: { // RedshiftProvisionedAuthConfiguration
* // type: "IAM" || "USERNAME_PASSWORD" || "USERNAME", // required
* // databaseUser: "STRING_VALUE",
* // usernamePasswordSecretArn: "STRING_VALUE",
* // },
* // },
* // },
* // queryGenerationConfiguration: { // QueryGenerationConfiguration
* // executionTimeoutSeconds: Number("int"),
* // generationContext: { // QueryGenerationContext
* // tables: [ // QueryGenerationTables
* // { // QueryGenerationTable
* // name: "STRING_VALUE", // required
* // description: "STRING_VALUE",
* // inclusion: "INCLUDE" || "EXCLUDE",
* // columns: [ // QueryGenerationColumns
* // { // QueryGenerationColumn
* // name: "STRING_VALUE",
* // description: "STRING_VALUE",
* // inclusion: "INCLUDE" || "EXCLUDE",
* // },
* // ],
* // },
* // ],
* // curatedQueries: [ // CuratedQueries
* // { // CuratedQuery
* // naturalLanguage: "STRING_VALUE", // required
* // sql: "STRING_VALUE", // required
* // },
* // ],
* // },
* // },
* // },
* // },
* // },
* // storageConfiguration: { // StorageConfiguration
Expand Down Expand Up @@ -169,7 +247,7 @@ export class GetKnowledgeBaseCommand extends $Command
})
.s("AmazonBedrockAgentBuildTimeLambda", "GetKnowledgeBase", {})
.n("BedrockAgentClient", "GetKnowledgeBaseCommand")
.f(void 0, void 0)
.f(void 0, GetKnowledgeBaseResponseFilterSensitiveLog)
.ser(se_GetKnowledgeBaseCommand)
.de(de_GetKnowledgeBaseCommand)
.build() {
Expand Down
Loading

0 comments on commit ac7f368

Please sign in to comment.