Upgrade to version v1.3.3

Upgrade to version v1.3.3

Author: ihmaws

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.3] - 2024-03-28
+
+### Fixed
+
+-   Bug with Bedrock Meta/Cohere deployments in RAG configurations ([#83](https://github.com/aws-solutions/generative-ai-application-builder-on-aws/issues/83))
+
+### Security
+
+-   Updated Node and Python packages to resolve vulnerabilities
+
 ## [1.3.2] - 2024-03-07
 
 ### Security

NOTICE.txt

@@ -120,10 +120,12 @@ isort                                                       MIT
 jest                                                        MIT
 jmespath                                                    MIT
 jsonpatch                                                   BSD License
+jsonpath-ng                                                 Apache2.0
 jsonpointer                                                 BSD License
 langchain                                                   MIT
 langchain-community                                         MIT
 langchain-core                                              MIT
+langchain-text-splitters                                    MIT
 langsmith                                                   MIT
 license-expression                                          Apache-2.0
 lodash                                                      MIT
@@ -137,10 +139,12 @@ npmlog                                                      ISC
 numexpr                                                     MIT
 numpy                                                       BSD-3-Clause
 openapi-schema-pydantic                                     MIT
+orjson                                                      Apache-2.0, MIT
 packaging                                                   Apache 2.0, BSD License
 pathspec                                                    MPL 2.0
 platformdirs                                                MIT
 pluggy                                                      MIT
+ply                                                         BSD
 portfinder                                                  MIT
 prettier                                                    MIT
 pyasn1                                                      BSD License (BSD-2-Clause)
@@ -173,8 +177,7 @@ tailwindcss                                                 MIT
 tenacity                                                    Apache-2.0
 tokenizers                                                  Apache-2.0
 tomli                                                       MIT
-tqdm                                                        MIT
-tqdm                                                        MPL 2.0, MIT
+tqdm                                                        MIT, MPL 2.0
 ts-jest                                                     MIT
 ts-node                                                     MIT
 types-PyYAML                                                Apache-2.0

deployment/build-s3-dist.sh

@@ -40,7 +40,7 @@ set -e
 # Check to see if input has been provided:
 if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ] || [ -z "$4" ]; then
     echo "Please provide all required parameters for the build script"
-    echo "For example: ./build-s3-dist.sh solutions trademarked-solution-name v1.3.2 template-bucket-name"
+    echo "For example: ./build-s3-dist.sh solutions trademarked-solution-name v1.3.3 template-bucket-name"
     exit 1
 fi
 
@@ -91,10 +91,10 @@ echo "setting override warning to $overrideWarningsEnabled"
 node_modules/aws-cdk/bin/cdk synth --quiet --asset-metdata false --path-metadata false
 
 if [ $? -ne 0 ]; then
-  echo "******************************************************************************"
-  echo "cdk-nag found errors"
-  echo "******************************************************************************"
-  exit 1
+    echo "******************************************************************************"
+    echo "cdk-nag found errors"
+    echo "******************************************************************************"
+    exit 1
 fi
 
 echo "------------------------------------------------------------------------------"
@@ -114,8 +114,7 @@ node $template_dir/cdk-solution-helper/index
 echo "------------------------------------------------------------------------------"
 echo "Updating placeholders"
 echo "------------------------------------------------------------------------------"
-for file in $template_dist_dir/*.template
-do
+for file in $template_dist_dir/*.template; do
     replace="s/%%BUCKET_NAME%%/$bucket_name/g"
     sed -i -e $replace $file
 
@@ -134,7 +133,7 @@ echo "[Packing] Source code artifacts"
 echo "------------------------------------------------------------------------------"
 # ... For each asset.* source code artifact...
 cd $source_dir/infrastructure/cdk.out
-for d in `find . -mindepth 1 -maxdepth 1 -type d`; do
+for d in $(find . -mindepth 1 -maxdepth 1 -type d); do
     # Rename the artifact, removing the period for handler compatibility
     pfname="$(basename -- $d)"
     fname="$(echo $pfname | sed -e 's/\.//g')"
@@ -161,8 +160,8 @@ echo "---------------------------------------"
 echo "Printing cdk-nag reports"
 echo "---------------------------------------"
 cd $source_dir/infrastructure/cdk.out
-for csv in `find . -name "*.csv"`; do
+for csv in $(find . -name "*.csv"); do
     echo -e "File: $csv"
     echo "---------------------------------------"
-    cat $csv | perl -pe 's/((?<=,)|(?<=^)),/ ,/g;' | column -t -s, | less -S    
-done
+    cat $csv | perl -pe 's/((?<=,)|(?<=^)),/ ,/g;' | column -t -s, | less -S
+done

source/infrastructure/cdk.json

@@ -1,7 +1,9 @@
 {
   "app": "../pre-build-lambda-layers.sh && npx ts-node --prefer-ts-exts bin/gen-ai-app-builder.ts",
   "watch": {
-    "include": ["**"],
+    "include": [
+      "**"
+    ],
     "exclude": [
       "README.md",
       "cdk*.json",
@@ -17,7 +19,10 @@
   "context": {
     "@aws-cdk/aws-lambda:recognizeLayerVersion": true,
     "@aws-cdk/core:checkSecretUsage": true,
-    "@aws-cdk/core:target-partitions": ["aws", "aws-cn"],
+    "@aws-cdk/core:target-partitions": [
+      "aws",
+      "aws-cn"
+    ],
     "@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver": true,
     "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true,
     "@aws-cdk/aws-ecs:arnFormatIncludesClusterName": true,
@@ -57,9 +62,9 @@
     "@aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForCodeCommitSource": true,
     "solution_id": "SO0276",
     "solution_name": "generative-ai-application-builder-on-aws",
-    "solution_version": "v1.3.2",
+    "solution_version": "v1.3.3",
     "app_registry_name": "GAAB",
     "application_type": "AWS-Solutions",
     "application_trademark_name": "Generative AI Application Builder on AWS"
   }
-}
+}

source/infrastructure/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "gen-ai-app-builder-on-aws-infrastructure",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "bin": {
     "infrastructure": "bin/gen-ai-app-builder.js"
   },

source/infrastructure/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-lambda",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "A mock lambda implementation for CDK infrastructure unit",
   "main": "index.js",
   "scripts": {
@@ -17,4 +17,4 @@
     "url": "https://aws.amazon.com/solutions"
   },
   "license": "Apache-2.0"
-}
+}

source/infrastructure/test/mock-lambda-func/node-lambda/package-lock.json

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mock-lambda-function"
-version = "1.3.2"
+version = "1.3.3"
 authors = [ "Amazon Web Services" ]
 description = "Mock lambda implementation to unit test infrastructure code"
 packages = [