Merge branch 'main' into main

.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx --no -- commitlint --edit "$1"

.projenrc.ts

@@ -10,7 +10,7 @@
  *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions
  *  and limitations under the License.
  */
-import { awscdk } from 'projen';
+import { JsonPatch, awscdk } from 'projen';
 import { NpmAccess } from 'projen/lib/javascript';
 import {
   buildMeritBadgerWorkflow,
@@ -27,15 +27,15 @@ import {
 const GITHUB_USER = 'awslabs';
 const PUBLICATION_NAMESPACE = 'cdklabs';
 const PROJECT_NAME = 'generative-ai-cdk-constructs';
-const CDK_VERSION: string = '2.88.0';
+const CDK_VERSION: string = '2.114.0';
 
 const project = new awscdk.AwsCdkConstructLibrary({
   author: 'Amazon Web Services - Prototyping and Cloud Engineering',
   authorAddress: 'https://aws.amazon.com',
   authorOrganization: true,
   description: 'AWS Generative AI CDK Constructs is a library for well-architected generative AI patterns.',
   cdkVersion: CDK_VERSION,
-  projenVersion: '~0.77.4',
+  projenVersion: '~0.78.8',
   constructsVersion: '10.3.0',
   defaultReleaseBranch: 'main',
   jsiiVersion: '~5.1.0',
@@ -45,7 +45,13 @@ const project = new awscdk.AwsCdkConstructLibrary({
 
   // description: undefined,  /* The description is just a string that helps people understand the purpose of the package. */
   keywords: ['constructs', 'aws-cdk', 'generative-ai', 'emerging-tech'],
-  devDeps: ['eslint-plugin-header'],
+  devDeps: [
+    '@commitlint/config-conventional',
+    'commitlint',
+    'eslint-plugin-header',
+    'husky',
+    'pinst',
+  ],
   deps: ['cdk-nag'],
 
   // Keep synchronized with https://github.com/nodejs/release#release-schedule
@@ -151,5 +157,22 @@ project.eslint?.addRules({
   'header/header': [2, 'header.js'],
 });
 
+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
+packageJson?.patch(JsonPatch.add('/scripts/prepack', 'pinst --disable'));
+packageJson?.patch(JsonPatch.add('/scripts/postpack', 'pinst --enable'));
+
+// Add generation of new available models for constructs
+project.addTask('generate-models-containers', {
+  description: 'Generate new list of models available from Jumpstart and DLC containers',
+  steps: [
+    {
+      say: 'Generate new list of models available from Jumpstart and DLC containers',
+      cwd: project.srcdir+'/patterns/gen-ai/aws-model-deployment-sagemaker/code-generation',
+      exec: 'npm run generate',
+    },
+  ],
+});
 
 project.synth();

CHANGELOG.md

@@ -1,3 +1,7 @@
+# CDK Generative AI Constructs V0.1.21 (2024-01-11)
+
+Based on CDK library version 2.114.0
+
 # CDK Generative AI Constructs V0.1.0 (2023-11-30)
 
 Based on CDK library version 2.111.0

DEVELOPER_GUIDE.md

@@ -16,9 +16,9 @@ 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.111.0
+- [AWS CDK](https://github.com/aws/aws-cdk/releases/tag/v2.102.0) >= 2.114.0
 - [Python](https://www.python.org/downloads/) >=3.9
-- [Projen](https://github.com/projen/projen) >= 0.77.4
+- [Projen](https://github.com/projen/projen) >= 0.78.8
 - [Yarn](https://classic.yarnpkg.com/lang/en/docs/cli/install/) >= 1.22.19
 
 You can use the command below to install the dependencies listed above

README.md

@@ -75,7 +75,9 @@ The following constructs are available in the library:
 | [Question answering](./src/patterns/gen-ai/aws-qa-appsync-opensearch/) | Question answering with a large language model (Anthropic Claude V2) using a RAG (retrieval augmented generation) source and/or long context. | Amazon OpenSearch, AWS Lambda, Amazon Bedrock, AWS AppSync | 
 | [Summarization](./src/patterns/gen-ai/aws-summarization-appsync-stepfn/) | Document summarization with a large language model (Anthropic Claude V2). | AWS Lambda, Amazon Bedrock, AWS AppSync and Amazon Elasticache for Redis.  |
 | [Lambda layer](./src/patterns/gen-ai/aws-langchain-common-layer/) | Python Lambda layer providing dependencies and utilities to develop generative AI applications on AWS. | AWS Lambda, Amazon Bedrock, Amazon SageMaker | 
-| [SageMaker model deployment](./src/patterns/gen-ai/aws-model-deployment-sagemaker/) | Deploy a foundation model from Amazon SageMaker JumpStart or Hugging Face to an Amazon SageMaker endpoint. | Amazon SageMaker | 
+| [SageMaker model deployment (Jumpstart)](./src/patterns/gen-ai/aws-model-deployment-sagemaker/README_jumpstart.md) | Deploy a foundation model from Amazon SageMaker JumpStart to an Amazon SageMaker endpoint. | Amazon SageMaker | 
+| [SageMaker model deployment (Hugging Face)](./src/patterns/gen-ai/aws-model-deployment-sagemaker/README_hugging_face.md) | Deploy a foundation model from Hugging Face to an Amazon SageMaker endpoint. | Amazon SageMaker | 
+| [SageMaker model deployment (Custom)](./src/patterns/gen-ai/aws-model-deployment-sagemaker/README_custom_sagemaker_endpoint.md) | Deploy a foundation model from an S3 location to an Amazon SageMaker endpoint. | Amazon SageMaker | 
 
 # Sample Use Cases
 

src/common/helpers/utils.ts

@@ -11,6 +11,11 @@
  *  and limitations under the License.
  */
 import * as cdk from 'aws-cdk-lib';
+/**
+ * The version of this package
+ */
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+export const version = require('../../../package.json').version;
 /**
  * @internal This is an internal core function and should not be called directly by Solutions Constructs clients.
  *

src/index.ts

@@ -15,3 +15,4 @@ export * from './patterns/gen-ai/aws-summarization-appsync-stepfn';
 export * from './patterns/gen-ai/aws-langchain-common-layer';
 export * from './patterns/gen-ai/aws-qa-appsync-opensearch';
 export * from './patterns/gen-ai/aws-model-deployment-sagemaker';
+export { version } from './common/helpers/utils';