Room Makeover Demo

.gitignore

@@ -40,3 +40,5 @@ workshop/datagenerator/*
 workshop/requirements.txt
 workshop/1-Personalization/generate_interactions_personalize.py
 workshop/1-Personalization/generate_interactions_personalize_offers.py
+dist
+*.code-workspace

README.md

@@ -51,9 +51,9 @@ The Retail Demo Store has been tested in the AWS regions indicated in the deploy
 | ------------- | ------------- | ------------- |
 | US East (N. Virginia) | us-east-1 | Fully supported |
 | US West (Oregon) | us-west-2 | Fully supported |
-| Europe (Ireland) | eu-west-1 | Partial support (personalized product descriptions and thematic similar product descriptions not supported) |
-| Europe (Frankfurt) | eu-central-1 | Partial support (thematic similar product descriptions not supported) |
-| Asia Pacific (Tokyo) | ap-northeast-1 | Partial support (personalized product descriptions not supported) |
+| Europe (Ireland) | eu-west-1 | Partial support (personalized product descriptions, thematic similar product descriptions and room makeover not supported) |
+| Europe (Frankfurt) | eu-central-1 | Partial support (thematic similar product descriptions and room makeover not supported) |
+| Asia Pacific (Tokyo) | ap-northeast-1 | Partial support (personalized product descriptions and room makeover not supported) |
 | Asia Pacific (Sydney) | ap-southeast-2 | Partial support (personalized product descriptions and thematic similar product descriptions not supported) |
 
 > [Note]
@@ -113,6 +113,7 @@ When deploying Retail Demo Store, enter the number as a parameter. The number sh
 
 #### Amazon Bedrock Demos
 Amazon Bedrock users need to request access to models before they are available for use. To demo Personalised Product Descriptions make sure to enable access to Anthropic's Claude v2 via the Amazon Bedrock Management Console. Instructions on enabling model access can be found [here](https://docs.aws.amazon.com/bedrock/latest/userguide/model-access.html). Amazon Bedrock is currently available in 5 regions globally, US East (N. Virginia), US West (Oregon), Asia Pacific (Tokyo), Europe (Frankfurt) and Asia Pacific (Singapore).
+To demo the Room Makeover, enable model access to Anthropic Claude 3 Haiku and Amazon Titan Multimodal Embeddings G1.
 
 ## Using the Retail Demo Store Web Application
 

aws/cloudformation-templates/apigateway-deploy.yaml

@@ -0,0 +1,27 @@
+---
+AWSTemplateFormatVersion: 2010-09-09
+
+Description: >
+    This template deploys the Retail Demo Store API Gateway
+
+Parameters:
+    ApiGatewayId:
+      Type: String
+
+Resources:
+
+  HttpApiStage:
+    Type: 'AWS::ApiGatewayV2::Stage'
+    Properties:
+      StageName: '$default'
+      ApiId: !Ref ApiGatewayId
+      AutoDeploy: true
+      AccessLogSettings:
+        DestinationArn: !GetAtt AccessLogs.Arn
+        Format: '{ "requestId":"$context.requestId", "ip": "$context.identity.sourceIp", "requestTime":"$context.requestTime", "httpMethod":"$context.httpMethod","routeKey":"$context.routeKey", "status":"$context.status","protocol":"$context.protocol", "integrationStatus": $context.integrationStatus, "integrationLatency": $context.integrationLatency, "responseLength":"$context.responseLength", "authorizerError": "$context.authorizer.error" }'
+
+  AccessLogs:
+    Type: AWS::Logs::LogGroup
+    Properties:
+      RetentionInDays: 30
+      LogGroupName: !Sub "/${AWS::StackName}/APIAccessLogs"

aws/cloudformation-templates/apigateway.yaml

@@ -686,25 +686,13 @@ Resources:
         - - integrations
           - !Ref LocationServiceIntegration
 
-  HttpApiStage:
-    Type: 'AWS::ApiGatewayV2::Stage'
-    DependsOn:
-      - GetProduct
-    Properties:
-      StageName: '$default'
-      ApiId: !Ref HttpAPI
-      AutoDeploy: true
-      AccessLogSettings:
-        DestinationArn: !GetAtt AccessLogs.Arn
-        Format: '{ "requestId":"$context.requestId", "ip": "$context.identity.sourceIp", "requestTime":"$context.requestTime", "httpMethod":"$context.httpMethod","routeKey":"$context.routeKey", "status":"$context.status","protocol":"$context.protocol", "integrationStatus": $context.integrationStatus, "integrationLatency": $context.integrationLatency, "responseLength":"$context.responseLength", "authorizerError": "$context.authorizer.error" }'
-
-  AccessLogs:
-    Type: AWS::Logs::LogGroup
-    Properties:
-      RetentionInDays: 30
-      LogGroupName: !Sub "/${AWS::StackName}/APIAccessLogs"
-
 Outputs:
   APIEndpoint:
     Description: "API Gateway endpoint URL"
-    Value: !GetAtt HttpAPI.ApiEndpoint
+    Value: !GetAtt HttpAPI.ApiEndpoint
+  ApiGatewayAuthorizer:
+    Description: API Gateway Authorizer id
+    Value: !Ref LambdaAuthorizer
+  ApiGatewayId:
+    Description: API Gateway Id
+    Value: !Ref HttpAPI

aws/cloudformation-templates/base/_template.yaml

@@ -106,6 +106,21 @@ Parameters:
     Type: String
     Description: ACM Certificate ARN for CloudFront WebUICDN
 
+  ResourceBucketImages:
+    Type: String
+    Description: >
+      (Leave empty in most cases) only specify if your product images are stored in a different bucket
+
+  ResourceBucketImagesPrefix:
+    Type: String
+    Description: >
+      (Leave empty in most cases) Images bucket prefix only specify if your product images are stored in a different bucket
+
+  SourceImagesPackage:
+    Type: String
+    Description : full url to the images.tar.gz adress
+    Default: https://code.retaildemostore.retail.aws.dev/images.tar.gz
+
 Resources:
   # Authentication
   Authentication:
@@ -259,6 +274,11 @@ Resources:
         CleanupBucketLambdaArn: !Ref CleanupBucketLambdaArn
         LoggingBucketName: !GetAtt Buckets.Outputs.LoggingBucketName
         ACMCertificateArn: !Ref ACMCertificateArn
+        ResourceBucketImages: !Ref ResourceBucketImages
+        ResourceBucketImagesPrefix: !Ref ResourceBucketImagesPrefix
+        SourceImagesPackage: !Ref SourceImagesPackage
+        ResourceBucket: !Ref ResourceBucket
+        ResourceBucketRelativePath: !Ref ResourceBucketRelativePath
 
   # Personalize Resources
   Personalize:
@@ -299,6 +319,10 @@ Outputs:
     Description: Authentication Cognito Identity Pool Id.
     Value: !GetAtt Authentication.Outputs.IdentityPoolId
 
+  CognitoAuthorizedRole:
+    Description: Authentication Cognito Authorized Role name
+    Value: !GetAtt Authentication.Outputs.CognitoAuthorizedRole
+
   StackBucketName:
     Description: Stack Bucket
     Value: !GetAtt Buckets.Outputs.StackBucketName

aws/cloudformation-templates/base/authentication.yaml

@@ -262,4 +262,7 @@ Outputs:
     Value: !Ref UserPoolClient
   IdentityPoolId:
     Description: Identity Pool Id
-    Value: !Ref IdentityPool
+    Value: !Ref IdentityPool
+  CognitoAuthorizedRole:
+    Description: Cognito Authorized Role
+    Value: !Ref CognitoAuthorizedRole

aws/cloudformation-templates/base/cloudfront.yaml

@@ -14,10 +14,35 @@ Parameters:
   ACMCertificateArn:
     Type: String
     Description: ACM Certificate ARN for CloudFront WebUICDN
+
+  ResourceBucketImages:
+    Type: String
+    Description: >
+      (Leave empty in most cases) only specify if your product images are stored in a different bucket
+
+  ResourceBucketImagesPrefix:
+    Type: String
+    Description: >
+      (Leave empty in most cases) Images bucket prefix only specify if your product images are stored in a different bucket
+
+  SourceImagesPackage:
+    Type: String
+    Description : full url to the images.tar.gz adress
+    Default: https://code.retaildemostore.retail.aws.dev/images.tar.gz
+
+  ResourceBucket:
+    Type: String
+    Description: S3Bucket Bucket where the Resources are stored (cloudformation, images, lambda code)
+
+  ResourceBucketRelativePath:
+    Type: String
+    Description: S3Bucket Path where the Resources are stored (cloudformation, images, lambda code) (i.e. path/path2), can be empty if resources are at the root of the bucket. MUST contain trailing /
+
 
 Conditions:
   ACMCertificateArnExists: 
     !Not [!Equals [!Ref ACMCertificateArn, '']]
+  CustomResourceBucketImages: !Not [ !Equals [!Ref ResourceBucketImages, ""] ]
 
 Resources:
 
@@ -194,6 +219,141 @@ Resources:
           OriginRequestPolicyId: !Ref UIOriginRequestPolicy
           ResponseHeadersPolicyId: 60669652-455b-4ae9-85a4-c4c02393f86c
 
+  CopyImagesLambdaFunction:
+    Type: 'AWS::Lambda::Function'
+    Properties:
+      Description: 'Retail Demo Store deployment utility function that copies catalog images from staging bucket to Web UI bucket'
+      Code:
+        ZipFile: |
+          import boto3
+          import cfnresponse
+          import tarfile
+          import urllib.request
+          import tempfile
+          import os          
+
+          def handler(event, context):
+            print(event)
+
+            response_data = {}
+            response_status = cfnresponse.SUCCESS
+
+            try:
+              source_bucket_name = event['ResourceProperties']['SourceBucket']
+              source_path = event['ResourceProperties']['SourceBucketPath']
+              target_bucket_name = event['ResourceProperties']['TargetBucket']
+              source_images_package = event['ResourceProperties']['SourceImagesPackage']
+
+              if event['RequestType'] == 'Create' or event['RequestType'] == 'Update':
+                os.makedirs('/tmp/images', exist_ok = True)
+                filename, _ = urllib.request.urlretrieve( source_images_package , '/tmp/images/images.tar.gz')              
+                print(filename)
+                file = tarfile.open('/tmp/images/images.tar.gz')
+                file.extractall('/tmp/images/')
+                file.close()
+                #remove images.tar.gz
+
+                os.remove('/tmp/images/images.tar.gz')
+
+                s3 = boto3.resource('s3')
+                target_bucket = s3.Bucket(target_bucket_name)
+
+                # For all files in tmpdirname
+                for root, dirs, files in os.walk('/tmp/images'):
+                  for filename in files:
+                    local_path = os.path.join(root, filename)
+                    relative_path = os.path.relpath(local_path, '/tmp/images')
+                    s3_path = os.path.join('images/', relative_path)
+                    # Upload file to target bucket
+                    target_bucket.upload_file(local_path, s3_path)
+
+                response_data['Message'] = "Resource creation succeeded"
+              elif event['RequestType'] == 'Delete':
+                response_data['Message'] = "Resource deletion succeeded"
+
+            except Exception as e:
+              print("Error: " + str(e))
+              response_status = cfnresponse.FAILED
+              response_data['Message'] = "Resource {} failed: {}".format(event['RequestType'], e)
+
+            cfnresponse.send(event, context, response_status, response_data)
+
+      Handler: index.handler
+      Runtime: python3.12
+      EphemeralStorage:
+           Size: 2048
+      Timeout: 900
+      MemorySize: 1024
+      Role: !GetAtt CopyImagesLambdaExecutionRole.Arn
+
+  CustomCopyImagesLambdaFunction:
+    Type: Custom::CopyImagesToWebUI
+    Properties:
+      ServiceToken: !GetAtt CopyImagesLambdaFunction.Arn
+      SourceBucket:
+          !If [
+            CustomResourceBucketImages,
+            !Ref ResourceBucketImages,
+            !Ref ResourceBucket
+          ]
+      SourceBucketPath:
+          !If [
+            CustomResourceBucketImages,
+            !Ref ResourceBucketImagesPrefix,
+            !Ref ResourceBucketRelativePath
+          ]
+      TargetBucket: !Ref WebUIBucket
+      SourceImagesPackage: !Ref SourceImagesPackage
+
+  CopyImagesLambdaExecutionRole:
+    Type: 'AWS::IAM::Role'
+    Properties:
+      AssumeRolePolicyDocument:
+        Version: 2012-10-17
+        Statement:
+          - Effect: Allow
+            Principal:
+              Service: lambda.amazonaws.com
+            Action:
+              - 'sts:AssumeRole'
+      Policies:
+        - PolicyName: LoggingPolicy
+          PolicyDocument:
+            Version: 2012-10-17
+            Statement:
+              - Effect: Allow
+                Action:
+                  - logs:CreateLogGroup
+                  - logs:CreateLogStream
+                  - logs:PutLogEvents
+                Resource: '*'
+        - PolicyName: S3
+          PolicyDocument:
+            Version: 2012-10-17
+            Statement:
+              - Fn::If:
+                - CustomResourceBucketImages
+                - Effect: Allow
+                  Action:
+                    - s3:List*
+                    - s3:GetObject
+                    - s3:PutObject
+                  Resource:
+                    - !Sub arn:${AWS::Partition}:s3:::${ResourceBucketImages}/*
+                    - !Sub arn:${AWS::Partition}:s3:::${ResourceBucketImages}
+                    - !Sub arn:${AWS::Partition}:s3:::${WebUIBucket}
+                    - !Sub arn:${AWS::Partition}:s3:::${WebUIBucket}/*
+                - Effect: Allow
+                  Action:
+                    - s3:List*
+                    - s3:GetObject
+                    - s3:PutObject
+                  Resource:
+                    - !Sub arn:${AWS::Partition}:s3:::${ResourceBucket}/*
+                    - !Sub arn:${AWS::Partition}:s3:::${ResourceBucket}
+                    - !Sub arn:${AWS::Partition}:s3:::${WebUIBucket}
+                    - !Sub arn:${AWS::Partition}:s3:::${WebUIBucket}/*
+
 Outputs:
   # Web UI outputs
   WebUIBucketName:

aws/cloudformation-templates/codepipeline-config-codecommit.yaml

@@ -0,0 +1,3 @@
+RepositoryName: retaildemostore-src
+BranchName: main
+PollForSourceChanges: false

aws/cloudformation-templates/codepipeline-config-github.yaml

@@ -0,0 +1,8 @@
+Owner: 
+  Ref: GitHubUser
+Repo: 
+  Ref: GitHubRepo
+Branch:
+   Ref: GitHubBranch
+OAuthToken: 
+  Ref: GitHubToken