feat(construct): merge with main

Author: Dinesh Sajwan

.eslintrc.json

@@ -29,7 +29,7 @@ import {
 const GITHUB_USER = 'awslabs';
 const PUBLICATION_NAMESPACE = 'cdklabs';
 const PROJECT_NAME = 'generative-ai-cdk-constructs';
-const CDK_VERSION: string = '2.116.0';
+const CDK_VERSION: string = '2.122.0';
 
 const project = new awscdk.AwsCdkConstructLibrary({
   author: 'Amazon Web Services - Prototyping and Cloud Engineering',
@@ -167,18 +167,24 @@ project.eslint?.addRules({
 
 project.eslint?.addIgnorePattern('LangchainProps.ts');
 project.eslint?.addIgnorePattern('AdapterProps.ts');
+project.eslint?.addIgnorePattern('DockerLambdaCustomProps.ts');
 
 // Shared interfaces extending pre-existing CDK interfaces
-new ProjenStruct(project, { name: 'LangchainProps', filePath: 'src/patterns/gen-ai/aws-langchain-common-layer/LangchainProps.ts' })
+new ProjenStruct(project, { name: 'LangchainProps', filePath: 'src/common/props/LangchainProps.ts' })
   .mixin(Struct.fromFqn('aws-cdk-lib.aws_lambda.LayerVersionProps'))
   .withoutDeprecated()
   .omit('code', 'compatibleRuntimes', 'compatibleArchitectures');
 
-new ProjenStruct(project, { name: 'AdapterProps', filePath: 'src/patterns/gen-ai/aws-langchain-common-layer/AdapterProps.ts' })
+new ProjenStruct(project, { name: 'AdapterProps', filePath: 'src/common/props/AdapterProps.ts' })
   .mixin(Struct.fromFqn('aws-cdk-lib.aws_lambda.LayerVersionProps'))
   .withoutDeprecated()
   .omit('code');
 
+new ProjenStruct(project, { name: 'DockerLambdaCustomProps', filePath: 'src/common/props/DockerLambdaCustomProps.ts' })
+  .mixin(Struct.fromFqn('aws-cdk-lib.aws_lambda.DockerImageFunctionProps'))
+  .withoutDeprecated()
+  .omit('tracing', 'functionName', 'description', 'role', 'vpc', 'vpcSubnets', 'securityGroups', 'role', 'layers', 'allowPublicSubnet', 'allowAllOutbound');
+
 const packageJson = project.tryFindObjectFile('package.json');
 packageJson?.patch(JsonPatch.add('/scripts/prepare', 'husky install')); // yarn 1
 packageJson?.patch(JsonPatch.add('/scripts/postinstall', 'husky install')); // yarn 2

.gitattributes

@@ -1,3 +1,7 @@
+# CDK Generative AI Constructs V0.1.60 (2024-02-13)
+
+Based on CDK library version 2.122.0
+
 # CDK Generative AI Constructs V0.1.35 (2024-01-24)
 
 Based on CDK library version 2.116.0

.gitignore

@@ -16,7 +16,7 @@ Default output format [None]: json
 ```
 
 - [Node](https://nodejs.org/en) >= v20.9.0
-- [AWS CDK](https://github.com/aws/aws-cdk/releases/tag/v2.102.0) >= 2.114.0
+- [AWS CDK](https://github.com/aws/aws-cdk/releases/tag/v2.122.0) >= 2.122.0
 - [Python](https://www.python.org/downloads/) >=3.9
 - [Projen](https://github.com/projen/projen) >= 0.78.8
 - [Yarn](https://classic.yarnpkg.com/lang/en/docs/cli/install/) >= 1.22.19

.projen/deps.json

@@ -81,6 +81,7 @@ The following constructs are available in the library:
 | [Amazon Bedrock](./src/cdk-lib/bedrock/README.md) | CDK L2 Constructs for Amazon Bedrock. | Amazon Bedrock, Amazon OpenSearch Serverless, AWS Lambda |
 | [Amazon OpenSearch Serverless Vector Collection](./src/cdk-lib/opensearchserverless/README.md) | CDK L2 Constructs to create a vector collection. | Amazon OpenSearch Vector Index |
 | [Amazon OpenSearch Vector Index](./src/cdk-lib/opensearch-vectorindex/README.md) | CDK L1 Custom Resource to create a vector index. | Amazon OpenSearch Serverless, AWS Lambda |
+| [Content Generation](./src/patterns/gen-ai/aws-contentgen-appsync-lambda/) | Generate images from text using Amazon titan-image-generator-v1 or stability.stable-diffusion-xl model.  | AWS Lambda, Amazon Bedrock, AWS AppSync | 
 
 # Sample Use Cases
 
@@ -95,6 +96,9 @@ The official samples repository https://github.com/aws-samples/generative-ai-cdk
 | [CDK Live! Building generative AI applications and architectures leveraging AWS CDK Constructs!](https://www.youtube.com/watch?v=NI1F4Xxqyr8) | CDK Live! episode focused on building and deploying generative AI applications and architectures on AWS using the AWS Cloud Development Kit (CDK) and the AWS Generative AI CDK Constructs. |
 | [Announcing AWS Generative AI CDK Constructs!](https://aws.amazon.com/blogs/devops/announcing-generative-ai-cdk-constructs/) | Blog post announcing the release of the AWS Generative AI CDK Constructs. |
 | [aws-genai-llm-chatbot](https://github.com/aws-samples/aws-genai-llm-chatbot/tree/main) | Multi-Model and Multi-RAG Powered Chatbot Using AWS CDK on AWS allowing you to experiment with a variety of Large Language Models and Multimodal Language Models, settings and prompts in your own AWS account. |
+| [amazon-bedrock-rag](https://github.com/aws-samples/amazon-bedrock-rag) | Fully managed RAG solution using Knowledge Bases for Amazon Bedrock. |
+| [Amazon Bedrock Knowledge Bases with Private Data](https://blog.serverlessadvocate.com/amazon-bedrock-knowledge-bases-with-private-data-7685d04ef396) | Blog post and associated code sample demonstrating how to integrate Knowledge Bases into Amazon Bedrock to provide foundational models with contextual data from private data sources. |
+| [Automating tasks using Amazon Bedrock Agents and AI](https://blog.serverlessadvocate.com/automating-tasks-using-amazon-bedrock-agents-and-ai-4b6fb8856589) | Blog post and associated code sample demonstrating how to deploy an Amazon Bedrock Agent and a Knowledge Base through a hotel and spa use case. |
 
 # Operational Metrics Collection
 

.projen/files.json

@@ -13,6 +13,7 @@
 ### Classes
 
 - [ContainerImage](classes/ContainerImage.md)
+- [ContentGenerationAppSyncLambda](classes/ContentGenerationAppSyncLambda.md)
 - [CustomSageMakerEndpoint](classes/CustomSageMakerEndpoint.md)
 - [DeepLearningContainerImage](classes/DeepLearningContainerImage.md)
 - [HuggingFaceSageMakerEndpoint](classes/HuggingFaceSageMakerEndpoint.md)
@@ -30,7 +31,9 @@
 
 - [AdapterProps](interfaces/AdapterProps.md)
 - [ContainerImageConfig](interfaces/ContainerImageConfig.md)
+- [ContentGenerationAppSyncLambdaProps](interfaces/ContentGenerationAppSyncLambdaProps.md)
 - [CustomSageMakerEndpointProps](interfaces/CustomSageMakerEndpointProps.md)
+- [DockerLambdaCustomProps](interfaces/DockerLambdaCustomProps.md)
 - [HuggingFaceSageMakerEndpointProps](interfaces/HuggingFaceSageMakerEndpointProps.md)
 - [IInstanceAliase](interfaces/IInstanceAliase.md)
 - [IInstanceValiant](interfaces/IInstanceValiant.md)

.projenrc.ts

@@ -0,0 +1,193 @@
+[@cdklabs/generative-ai-cdk-constructs](../README.md) / ContentGenerationAppSyncLambda
+
+# Class: ContentGenerationAppSyncLambda
+
+**`Summary`**
+
+The ContentGenerationAppSyncLambda class.
+
+## Hierarchy
+
+- `Construct`
+
+  ↳ **`ContentGenerationAppSyncLambda`**
+
+## Table of contents
+
+### Constructors
+
+- [constructor](ContentGenerationAppSyncLambda.md#constructor)
+
+### Properties
+
+- [cgLambdaFunction](ContentGenerationAppSyncLambda.md#cglambdafunction)
+- [generatedImageBus](ContentGenerationAppSyncLambda.md#generatedimagebus)
+- [graphqlApi](ContentGenerationAppSyncLambda.md#graphqlapi)
+- [node](ContentGenerationAppSyncLambda.md#node)
+- [s3GenerateAssetsBucket](ContentGenerationAppSyncLambda.md#s3generateassetsbucket)
+- [s3GenerateAssetsBucketInterface](ContentGenerationAppSyncLambda.md#s3generateassetsbucketinterface)
+- [securityGroup](ContentGenerationAppSyncLambda.md#securitygroup)
+- [vpc](ContentGenerationAppSyncLambda.md#vpc)
+
+### Methods
+
+- [toString](ContentGenerationAppSyncLambda.md#tostring)
+- [isConstruct](ContentGenerationAppSyncLambda.md#isconstruct)
+
+## Constructors
+
+### constructor
+
+• **new ContentGenerationAppSyncLambda**(`scope`, `id`, `props`): [`ContentGenerationAppSyncLambda`](ContentGenerationAppSyncLambda.md)
+
+#### Parameters
+
+| Name | Type | Description |
+| :------ | :------ | :------ |
+| `scope` | `Construct` | represents the scope for all the resources. |
+| `id` | `string` | this is a a scope-unique id. |
+| `props` | [`ContentGenerationAppSyncLambdaProps`](../interfaces/ContentGenerationAppSyncLambdaProps.md) | user provided props for the construct. |
+
+#### Returns
+
+[`ContentGenerationAppSyncLambda`](ContentGenerationAppSyncLambda.md)
+
+**`Summary`**
+
+Constructs a new instance of the ContentGenerationAppSyncLambda class.
+
+**`Since`**
+
+0.0.0
+
+**`Access`**
+
+public
+
+#### Overrides
+
+Construct.constructor
+
+## Properties
+
+### cgLambdaFunction
+
+• `Readonly` **cgLambdaFunction**: `DockerImageFunction`
+
+Returns an instance of appsync.IGraphqlApi created by the construct
+
+___
+
+### generatedImageBus
+
+• `Readonly` **generatedImageBus**: `IEventBus`
+
+Returns the instance of events.IEventBus used by the construct
+
+___
+
+### graphqlApi
+
+• `Readonly` **graphqlApi**: `IGraphqlApi`
+
+Returns an instance of appsync.IGraphqlApi created by the construct
+
+___
+
+### node
+
+• `Readonly` **node**: `Node`
+
+The tree node.
+
+#### Inherited from
+
+Construct.node
+
+___
+
+### s3GenerateAssetsBucket
+
+• `Optional` `Readonly` **s3GenerateAssetsBucket**: `Bucket`
+
+Returns an instance of s3.Bucket created by the construct.
+IMPORTANT: If existingGeneratedAssetsBucketObj was provided in Pattern Construct Props,
+this property will be undefined
+
+___
+
+### s3GenerateAssetsBucketInterface
+
+• `Readonly` **s3GenerateAssetsBucketInterface**: `IBucket`
+
+Returns an instance of s3.IBucket created by the construct
+
+___
+
+### securityGroup
+
+• `Readonly` **securityGroup**: `ISecurityGroup`
+
+Returns the instance of ec2.ISecurityGroup used by the construct
+
+___
+
+### vpc
+
+• `Readonly` **vpc**: `IVpc`
+
+Returns the instance of ec2.IVpc used by the construct
+
+## Methods
+
+### toString
+
+▸ **toString**(): `string`
+
+Returns a string representation of this construct.
+
+#### Returns
+
+`string`
+
+#### Inherited from
+
+Construct.toString
+
+___
+
+### isConstruct
+
+▸ **isConstruct**(`x`): x is Construct
+
+Checks if `x` is a construct.
+
+Use this method instead of `instanceof` to properly detect `Construct`
+instances, even when the construct library is symlinked.
+
+Explanation: in JavaScript, multiple copies of the `constructs` library on
+disk are seen as independent, completely different libraries. As a
+consequence, the class `Construct` in each copy of the `constructs` library
+is seen as a different class, and an instance of one class will not test as
+`instanceof` the other class. `npm install` will not create installations
+like this, but users may manually symlink construct libraries together or
+use a monorepo tool: in those cases, multiple copies of the `constructs`
+library can be accidentally installed, and `instanceof` will behave
+unpredictably. It is safest to avoid using `instanceof`, and using
+this type-testing method instead.
+
+#### Parameters
+
+| Name | Type | Description |
+| :------ | :------ | :------ |
+| `x` | `any` | Any object |
+
+#### Returns
+
+x is Construct
+
+true if `x` is an object created from a class which extends `Construct`.
+
+#### Inherited from
+
+Construct.isConstruct

CHANGELOG.md

@@ -20,6 +20,7 @@ The JumpStartSageMakerEndpoint class.
 
 ### Properties
 
+- [acceptEula](JumpStartSageMakerEndpoint.md#accepteula)
 - [cfnEndpoint](JumpStartSageMakerEndpoint.md#cfnendpoint)
 - [cfnEndpointConfig](JumpStartSageMakerEndpoint.md#cfnendpointconfig)
 - [cfnModel](JumpStartSageMakerEndpoint.md#cfnmodel)
@@ -71,6 +72,12 @@ The JumpStartSageMakerEndpoint class.
 
 ## Properties
 
+### acceptEula
+
+• `Private` `Readonly` **acceptEula**: `boolean`
+
+___
+
 ### cfnEndpoint
 
 • `Readonly` **cfnEndpoint**: `CfnEndpoint`

DEVELOPER_GUIDE.md

@@ -23,6 +23,7 @@ The QaAppsyncOpensearch class.
 - [graphqlApi](QaAppsyncOpensearch.md#graphqlapi)
 - [node](QaAppsyncOpensearch.md#node)
 - [qaBus](QaAppsyncOpensearch.md#qabus)
+- [qaLambdaFunction](QaAppsyncOpensearch.md#qalambdafunction)
 - [s3InputAssetsBucket](QaAppsyncOpensearch.md#s3inputassetsbucket)
 - [s3InputAssetsBucketInterface](QaAppsyncOpensearch.md#s3inputassetsbucketinterface)
 - [securityGroup](QaAppsyncOpensearch.md#securitygroup)
@@ -97,6 +98,14 @@ Returns the instance of events.IEventBus used by the construct
 
 ___
 
+### qaLambdaFunction
+
+• `Readonly` **qaLambdaFunction**: `DockerImageFunction`
+
+Returns an instance of appsync.IGraphqlApi created by the construct
+
+___
+
 ### s3InputAssetsBucket
 
 • `Optional` `Readonly` **s3InputAssetsBucket**: `Bucket`