Merge branch 'main' into feat/issue_137

Author: MichaelWalker-git

.husky/commit-msg

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

.projen/deps.json

@@ -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,
@@ -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,6 +157,12 @@ 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',
@@ -163,5 +175,4 @@ project.addTask('generate-models-containers', {
   ],
 });
 
-
 project.synth();

.projen/tasks.json

@@ -90,13 +90,6 @@ The official samples repository https://github.com/aws-samples/generative-ai-cdk
 | [AWS re:Invent 2023 - Keynote with Dr. Werner Vogels](https://youtu.be/UTRBVPvzt9w?t=6252) | Dr. Werner Vogels, Amazon.com's VP and CTO, announces the AWS Generative AI CDK Constructs during his AWS re:Invent 2023 keynote. |
 | [aws-cdk-stack-builder-tool](https://github.com/aws-samples/aws-cdk-stack-builder-tool) | AWS CDK Builder is a browser-based tool designed to streamline bootstrapping of Infrastructure as Code (IaC) projects using the AWS Cloud Development Kit (CDK). |
 
-# Additional Resources
-
-| Resource |Description|
-|:-------------|:-------------|
-| [AWS re:Invent 2023 - Keynote with Dr. Werner Vogels](https://youtu.be/UTRBVPvzt9w?t=6252) | Dr. Werner Vogels, Amazon.com's VP and CTO, announces the AWS Generative AI CDK Constructs during his AWS re:Invent 2023 keynote. |
-| [aws-cdk-stack-builder-tool](https://github.com/aws-samples/aws-cdk-stack-builder-tool) | AWS CDK Builder is a browser-based tool designed to streamline bootstrapping of Infrastructure as Code (IaC) projects using the AWS Cloud Development Kit (CDK). |
-
 # Operational Metrics Collection
 
 Provided CDK constructs collect anonymous operational metrics to help AWS improve the quality and features of the constructs. Data collection is subject to the AWS Privacy Policy (https://aws.amazon.com/privacy/). To opt out of this feature, simply disable it by setting the construct property "enableOperationalMetric" to false for each construct used. Defaults to true.

.projenrc.ts

@@ -123,7 +123,7 @@ Parameters
 
 
 ## Architecture
-![Architecture Diagram](architecture_CustomSageMakerEndpoint.png.png)
+![Architecture Diagram](architecture_CustomSageMakerEndpoint.png)
 
 ## Cost
 

README.md

@@ -295,7 +295,7 @@ export class QaAppsyncOpensearch extends Construct {
       'questionAnsweringGraphqlApi',
       {
         name: 'questionAnsweringGraphqlApi' + stage,
-        schema: appsync.SchemaFile.fromAsset(
+        definition: appsync.Definition.fromFile(
           path.join(
             __dirname,
             '../../../../resources/gen-ai/aws-qa-appsync-opensearch/schema.graphql',

package.json

@@ -347,7 +347,9 @@ export class RagAppsyncStepfnOpensearch extends Construct {
       'ingestionGraphqlApi',
       {
         name: 'ingestionGraphqlApi'+stage,
-        schema: appsync.SchemaFile.fromAsset(path.join(__dirname, '../../../../resources/gen-ai/aws-rag-appsync-stepfn-opensearch/schema.graphql')),
+        definition: appsync.Definition.fromFile(
+          path.join(__dirname, '../../../../resources/gen-ai/aws-rag-appsync-stepfn-opensearch/schema.graphql'),
+        ),
         authorizationConfig: {
           defaultAuthorization: {
             authorizationType: appsync.AuthorizationType.USER_POOL,

src/patterns/gen-ai/aws-model-deployment-sagemaker/README_custom_sagemaker_endpoint.md

@@ -415,7 +415,9 @@ export class SummarizationAppsyncStepfn extends Construct {
       {
         name: apiName+stage,
         logConfig: api_log_config,
-        schema: appsync.SchemaFile.fromAsset(path.join(__dirname, '../../../../resources/gen-ai/aws-summarization-appsync-stepfn/schema.graphql')),
+        definition: appsync.Definition.fromFile(
+          path.join(__dirname, '../../../../resources/gen-ai/aws-summarization-appsync-stepfn/schema.graphql'),
+        ),
         authorizationConfig: authorizationConfig,
         xrayEnabled: enable_xray,
       });