feature/claude haiku 3.5 model included

jfbaeta · jfbaeta · commit 4a950ac6669d · 2025-03-25T10:26:44.000-04:00
diff --git a/README.md b/README.md
@@ -116,13 +116,13 @@ Each model has its own strengths and characteristics. You can switch between the
 1. Clone the repository:
 
    ```
-   git clone https://github.com/aws-samples/live-chat-content-moderation-with-genai-on-aws.git
+   git clone https://github.com/aws-solutions-library-samples/guidance-for-live-chat-content-moderation-with-generative-ai-on-aws.git
    ```
 
 2. Navigate to the project directory:
 
    ```
-   cd live-chat-content-moderation-with-genai-on-aws/scripts
+   cd guidance-for-live-chat-content-moderation-with-generative-ai-on-aws/scripts
    ```
 
 3. Run the installation script:
@@ -224,7 +224,7 @@ To switch between different AI models or prompts:
 ./prompt-switch.bash <model-name>
 ```
 
-Replace `<model-name>` with one of the available options: `titan`, `haiku`, `llama` or `nova-micro`. The aforementioned `./install.bash` script configures Anthropic Claude Haiku to be used by default.
+Replace `<model-name>` with one of the available options: `titan`, `haiku`, `haiku-3.5`, `llama` or `nova-micro`. The aforementioned `./install.bash` script configures Anthropic Claude Haiku to be used by default.
 
 ### Updating the Front-End
 
@@ -337,7 +337,7 @@ To delete all resources associated with the Live Chat Moderation system:
 
    ```
    cd backend/cdk
-   cdk destroy
+   cdk destroy --all
    ```
 
 ## Next Steps
@@ -348,8 +348,6 @@ To further enhance your Live Chat Moderation system:
 
 2. Implement User Authentication: Add user authentication to associate messages with verified user accounts.
 
-3. You can improve DDoS attack protection of the solution by using AWS Shield Advanced to enable advanced protection up to the application layer (Layer 7 on OSI network model). Check reference blog https://aws.amazon.com/blogs/security/protect-apis-with-amazon-api-gateway-and-perimeter-protection-services/
-
 ## Notices
 
 _Customers are responsible for making their own independent assessment of the information in this Guidance. This Guidance: (a) is for informational purposes only, (b) represents AWS current product offerings and practices, which are subject to change without notice, and (c) does not create any commitments or assurances from AWS and its affiliates, suppliers or licensors. AWS products or services are provided “as is” without warranties, representations, or conditions of any kind, whether express or implied. AWS responsibilities and liabilities to its customers are controlled by AWS agreements, and this Guidance is not part of, nor does it modify, any agreement between AWS and its customers._
diff --git a/backend/cdk/lib/api-stack.ts b/backend/cdk/lib/api-stack.ts
@@ -301,12 +301,21 @@ export class Api extends cdk.NestedStack {
           statements: [
             new iam.PolicyStatement({
               effect: iam.Effect.ALLOW,
-              actions: ["bedrock:ListFoundationModels", "bedrock:InvokeModel"],
+              actions: [
+                "bedrock:ListFoundationModels",
+                "bedrock:InvokeModel",
+                "bedrock:GetInferenceProfile",
+                "bedrock:ListInferenceProfiles"
+              ],
               resources: [
                 `arn:aws:bedrock:${this.region}:*:foundation-model/amazon.titan-text-premier-v1:0`,
                 `arn:aws:bedrock:${this.region}:*:foundation-model/anthropic.claude-3-haiku-20240307-v1:0`,
                 `arn:aws:bedrock:${this.region}:*:foundation-model/meta.llama3-8b-instruct-v1:0`,
-                `arn:aws:bedrock:${this.region}:*:foundation-model/amazon.nova-micro-v1:0`
+                `arn:aws:bedrock:${this.region}:*:foundation-model/amazon.nova-micro-v1:0`,
+                // first '*' used instead of ${this.region} to allow internal cross-region inference
+                // second '*' used before [model-id] to include both [model-id] and [region].[model-id]
+                `arn:aws:bedrock:*:*:foundation-model/*anthropic.claude-3-5-haiku-20241022-v1:0`,
+                `arn:aws:bedrock:*:*:inference-profile/*anthropic.claude-3-5-haiku-20241022-v1:0`,
               ],
             }),
           ],
diff --git a/backend/cdk/lib/database-stack.ts b/backend/cdk/lib/database-stack.ts
@@ -1,8 +1,5 @@
 import * as cdk from "aws-cdk-lib";
 import * as dynamodb from "aws-cdk-lib/aws-dynamodb";
-import * as cloudtrail from "aws-cdk-lib/aws-cloudtrail";
-import * as iam from "aws-cdk-lib/aws-iam";
-import * as s3 from "aws-cdk-lib/aws-s3";
 import { Construct } from "constructs";
 
 interface DatabaseProps extends cdk.NestedStackProps {
@@ -78,89 +75,6 @@ export class Database extends cdk.NestedStack {
       pointInTimeRecovery: true,
     });
 
-    /*
-    // S3 Bucket for DynamoDB Data Events CloudTrail Logging
-    const s3BucketDynamoDBCloudTrailLogging = new s3.Bucket(
-      this,
-      "s3BucketDynamoDBCloudTrailLogging",
-      {
-        encryption: s3.BucketEncryption.S3_MANAGED,
-        blockPublicAccess: s3.BlockPublicAccess.BLOCK_ALL,
-        enforceSSL: true,
-        autoDeleteObjects: true,
-        removalPolicy: cdk.RemovalPolicy.DESTROY,
-      }
-    );
-
-    const trailName = "ChatModeration-DynamoDB-DataEvents-Trail";
-
-    const cloudTrailPrincipal = new iam.ServicePrincipal(
-      "cloudtrail.amazonaws.com"
-    );
-
-    s3BucketDynamoDBCloudTrailLogging.addToResourcePolicy(
-      new iam.PolicyStatement({
-        sid: "AllowGetBucketAcl",
-        effect: iam.Effect.ALLOW,
-        principals: [cloudTrailPrincipal],
-        actions: ["s3:GetBucketAcl"],
-        resources: [s3BucketDynamoDBCloudTrailLogging.bucketArn],
-        conditions: {
-          StringEquals: {
-            "AWS:SourceArn": `arn:aws:cloudtrail:${this.region}:${this.account}:trail/${trailName}`,
-          },
-        },
-      })
-    );
-
-    s3BucketDynamoDBCloudTrailLogging.addToResourcePolicy(
-      new iam.PolicyStatement({
-        sid: "AllowPutObject",
-        effect: iam.Effect.ALLOW,
-        principals: [cloudTrailPrincipal],
-        actions: ["s3:PutObject"],
-        resources: [
-          `arn:aws:s3:::${s3BucketDynamoDBCloudTrailLogging.bucketName}/AWSLogs/${this.account}/*`,
-        ],
-        conditions: {
-          StringEquals: {
-            "s3:x-amz-acl": "bucket-owner-full-control",
-            "AWS:SourceArn": `arn:aws:cloudtrail:${this.region}:${this.account}:trail/${trailName}`,
-          },
-        },
-      })
-    );
-
-    const cfnTrail = new cloudtrail.CfnTrail(this, "DynamoDBDataEventsTrail", {
-      isLogging: true,
-      s3BucketName: s3BucketDynamoDBCloudTrailLogging.bucketName,
-      trailName: trailName,
-      isMultiRegionTrail: false,
-      includeGlobalServiceEvents: false,
-      eventSelectors: [
-        {
-          dataResources: [
-            {
-              type: "AWS::DynamoDB::Table",
-              values: [
-                approvedMessagesTable.tableArn,
-                unapprovedMessagesTable.tableArn,
-                hallucinationsTable.tableArn,
-                promptStoreTable.tableArn,
-              ],
-            },
-          ],
-          includeManagementEvents: false,
-          readWriteType: "All",
-        },
-      ],
-    });
-
-    cfnTrail.addDependency(
-      s3BucketDynamoDBCloudTrailLogging.node.defaultChild as cdk.CfnResource
-    );
-    */
-
     // Outputs
     this.approvedMessagesTableName = approvedMessagesTable.tableName;
     new cdk.CfnOutput(this, "ApprovedMessagesTableName", {
diff --git a/backend/cdk/lib/main-stack.ts b/backend/cdk/lib/main-stack.ts
@@ -65,7 +65,7 @@ export class MainStack extends cdk.Stack {
       promptSwitchParameterName: promptSwitch.promptSwitchParameterName,
     });
 
-    // WAF Nested Stack in us-east-1
+    // WAF Stack in us-east-1
     const wafStack = new Waf(this, 'Waf', {
       stackName: "Waf",
       crossRegionReferences: true,
@@ -85,6 +85,7 @@ export class MainStack extends cdk.Stack {
     const bedrockModels = [
       "amazon.titan-text-premier-v1:0",
       "anthropic.claude-3-haiku-20240307-v1:0",
+      "anthropic.claude-3-5-haiku-20241022-v1:0",
       "meta.llama3-8b-instruct-v1:0",
       "amazon.nova-micro-v1:0"
     ];
diff --git a/scripts/insert-prompt.bash b/scripts/insert-prompt.bash
@@ -2,7 +2,7 @@
 
 # Check if an argument is provided
 if [ -z "$1" ]; then
-  echo -e "\n${RED}[ERROR] Please provide a model name (titan, haiku, llama or nova-micro) as an argument."
+  echo -e "\n${RED}[ERROR] Please provide a model name (titan, haiku, haiku-3.5, llama or nova-micro) as an argument."
   exit 1
 fi
 
@@ -37,12 +37,20 @@ case "$1" in
     ;;
   haiku)
     MODEL_ID="anthropic.claude-3-haiku-20240307-v1:0"
-    MODEL_NAME="Anthropic Claude Haiku"
+    MODEL_NAME="Anthropic Claude Haiku 3"
     MODEL_OUTPUT_KEY="HaikuModelUUID"
     MAX_TOKENS=256
     TEMPERATURE=0
     TOP_P=0
     ;;
+  haiku-3.5)
+    MODEL_ID="us.anthropic.claude-3-5-haiku-20241022-v1:0"
+    MODEL_NAME="Anthropic Claude Haiku 3.5"
+    MODEL_OUTPUT_KEY="Haiku35ModelUUID"
+    MAX_TOKENS=256
+    TEMPERATURE=0
+    TOP_P=0
+    ;;
   llama)
     MODEL_ID="meta.llama3-8b-instruct-v1:0"
     MODEL_NAME="Meta Llama"
@@ -60,7 +68,7 @@ case "$1" in
     TOP_P=0
     ;;
   *)
-    echo -e "\n${RED}[ERROR] Invalid model name provided. Please use titan, haiku, llama or nova-micro."
+    echo -e "\n${RED}[ERROR] Invalid model name provided. Please use titan, haiku, haiku-3.5, llama or nova-micro."
     exit 1
     ;;
 esac
diff --git a/scripts/install.bash b/scripts/install.bash
@@ -145,6 +145,8 @@ update_and_run_scripts() {
     run_script ./insert-prompt.bash titan
     
     run_script ./insert-prompt.bash haiku
+
+    run_script ./insert-prompt.bash haiku-3.5
     
     run_script ./insert-prompt.bash llama
 
diff --git a/scripts/prompt-switch.bash b/scripts/prompt-switch.bash
@@ -9,6 +9,7 @@ STACK_NAME=$(jq -r 'keys[0]' "$CDK_OUTPUTS_FILE")
 # Extract and export the necessary values
 TITAN_MODEL_UUID=$(jq -r '.'"$STACK_NAME"'.TitanModelUUID' "$CDK_OUTPUTS_FILE")
 HAIKU_MODEL_UUID=$(jq -r '.'"$STACK_NAME"'.HaikuModelUUID' "$CDK_OUTPUTS_FILE")
+HAIKU35_MODEL_UUID=$(jq -r '.'"$STACK_NAME"'.Haiku35ModelUUID' "$CDK_OUTPUTS_FILE")
 LLAMA_MODEL_UUID=$(jq -r '.'"$STACK_NAME"'.LlamaModelUUID' "$CDK_OUTPUTS_FILE")
 NOVA_MICRO_MODEL_UUID=$(jq -r '.'"$STACK_NAME"'.NovaMicroModelUUID' "$CDK_OUTPUTS_FILE")
 PROMPT_SWITCH_PARAMETER_NAME=$(jq -r '.'"$STACK_NAME"'.PromptSwitchParameterName' "$CDK_OUTPUTS_FILE")
@@ -22,7 +23,7 @@ NC='\033[0m' # No Color
 
 # Check if an argument is provided
 if [ -z "$1" ]; then
-  echo -e "\n${RED}[ERROR] Please provide a model name (titan, haiku, or llama) as an argument."
+  echo -e "\n${RED}[ERROR] Please provide a model name (titan, haiku, haiku-3.5, llama or nova-micro) as an argument."
   exit 1
 fi
 
@@ -34,6 +35,9 @@ case "$1" in
   haiku)
     NEW_ACTIVE_MODEL="$HAIKU_MODEL_UUID"
     ;;
+  haiku-3.5)
+    NEW_ACTIVE_MODEL="$HAIKU35_MODEL_UUID"
+    ;;
   llama)
     NEW_ACTIVE_MODEL="$LLAMA_MODEL_UUID"
     ;;
