Merge pull request #772 from aws-solutions/feature/v6.1.2

Update to version v6.1.2
aws-solutions · Oct 7, 2024 · fde71d1 · fde71d1
2 parents 717ca94 + f132862
commit fde71d1
Show file tree

Hide file tree

Showing 58 changed files with 194 additions and 89 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,20 @@ 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).
 
+## [6.1.2] - 2024-10-07
+
+### Fixed
+
+- Cleared context state credential and updated the page history after logout
+
+### Changed
+
+- Added [Anthropic Claude 3.5 Sonnet](https://docs.aws.amazon.com/bedrock/latest/userguide/models-supported.html) as an additional option to the list LLM models provided through cloudformation parameters `LLMBedrockModelId` and `BedrockKnowledgeBaseModel`
+
+### Deprecated
+
+- Sagemaker support has been deprecated and will be removed in the next release
+
 ## [6.1.1] - 2024-09-26
 
 ### Fixed

diff --git a/README.md b/README.md
@@ -336,6 +336,7 @@ As QnABot evolves over the years, it makes use of various services and functiona
 _Note: **Deployable solution versions** refers to the ability to deploy the version of QnABot in their AWS accounts. **Actively supported versions** for QnABot is only available for the latest version of QnABot._
 
 ### Deployable Versions
+- [v6.1.2](https://github.com/aws-solutions/qnabot-on-aws/releases/tag/v6.1.2) - [Public](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.2/qnabot-on-aws-main.template)/[VPC](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.2/qnabot-on-aws-vpc.template)
 - [v6.1.1](https://github.com/aws-solutions/qnabot-on-aws/releases/tag/v6.1.1) - [Public](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.1/qnabot-on-aws-main.template)/[VPC](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.1/qnabot-on-aws-vpc.template)
 - [v6.1.0](https://github.com/aws-solutions/qnabot-on-aws/releases/tag/v6.1.0) - [Public](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.0/qnabot-on-aws-main.template)/[VPC](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.1.0/qnabot-on-aws-vpc.template)
 - [v6.0.3](https://github.com/aws-solutions/qnabot-on-aws/releases/tag/v6.0.3) - [Public](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.0.3/qnabot-on-aws-main.template)/[VPC](https://solutions-reference.s3.amazonaws.com/qnabot-on-aws/v6.0.3/qnabot-on-aws-vpc.template)

diff --git a/source/cli/aws_solutions/qnabot/cli/qnabot_cli.py b/source/cli/aws_solutions/qnabot/cli/qnabot_cli.py
@@ -23,7 +23,7 @@
 @click.pass_context
 def cli(ctx) -> None:
     os.environ["SOLUTION_ID"] = "SO0189"
-    os.environ["SOLUTION_VERSION"] = "v6.1.1"
+    os.environ["SOLUTION_VERSION"] = "v6.1.2"
 
 
 @cli.command("import")

diff --git a/source/docs/LLM_Retrieval_and_generative_question_answering/README.md b/source/docs/LLM_Retrieval_and_generative_question_answering/README.md
@@ -71,6 +71,7 @@ Utilizes one of the Amazon Bedrock foundation models to generate text. Currently
 - [Anthropic Claude Instant 1.2](https://us-east-1.console.aws.amazon.com/bedrock/home?region=us-east-1#/providers?model=anthropic.claude-instant-v1)
 - [Anthropic Claude 2.1](https://us-east-1.console.aws.amazon.com/bedrock/home?region=us-east-1#/providers?model=anthropic.claude-v2:1)
 - [Anthropic Claude 3 Sonnet](https://us-east-1.console.aws.amazon.com/bedrock/home?region=us-east-1#/providers?model=anthropic.claude-3-sonnet-20240229-v1:0)
+- [Anthropic Claude 3.5 Sonnet](https://us-east-1.console.aws.amazon.com/bedrock/home?region=us-east-1#/providers?model=anthropic.claude-3-5-sonnet-20240620-v1:0)
 - [Anthropic Claude 3 Haiku](https://us-east-1.console.aws.amazon.com/bedrock/home?region=us-east-1#/providers?model=anthropic.claude-3-haiku-20240307-v1:0)
 - [AI21 Jurassic-2 Ultra](https://us-east-1.console.aws.amazon.com/bedrock/home?region=us-east-1#/providers?model=ai21.j2-ultra-v1)
 - [AI21 Jurassic-2 Mid](https://us-east-1.console.aws.amazon.com/bedrock/home?region=us-east-1#/providers?model=ai21.j2-mid-v1)

diff --git a/source/docs/bedrock_knowledgebase_rag/README.md b/source/docs/bedrock_knowledgebase_rag/README.md
@@ -17,8 +17,9 @@ With this integration, QnABot on AWS can answer a question and its follow-up fro
 - [Titan Text G1 - Premier](https://us-east-1.console.aws.amazon.com/bedrock/home?region=us-east-1#/providers?model=amazon.titan-text-premier-v1:0)
 - [Anthropic Claude Instant 1.2](https://us-east-1.console.aws.amazon.com/bedrock/home?region=us-east-1#/providers?model=anthropic.claude-instant-v1)
 - [Anthropic Claude 2.1](https://us-east-1.console.aws.amazon.com/bedrock/home?region=us-east-1#/providers?model=anthropic.claude-v2:1)
-- [Anthropic Claude 3 Sonnet](https://us-east-1.console.aws.amazon.com/bedrock/home?region=us-east-1#/providers?model=anthropic.claude-3-sonnet-20240229-v1:0)
 - [Anthropic Claude 3 Haiku](https://us-east-1.console.aws.amazon.com/bedrock/home?region=us-east-1#/providers?model=anthropic.claude-3-haiku-20240307-v1:0)
+- [Anthropic Claude 3 Sonnet](https://us-east-1.console.aws.amazon.com/bedrock/home?region=us-east-1#/providers?model=anthropic.claude-3-sonnet-20240229-v1:0)
+- [Anthropic Claude 3.5 Sonnet](https://us-east-1.console.aws.amazon.com/bedrock/home?region=us-east-1#/providers?model=anthropic.claude-3-5-sonnet-20240620-v1:0)
 
 
 ## Amazon Bedrock Knowledge Base Quick Setup:

diff --git a/source/lambda/aws-sdk-layer/package-lock.json b/source/lambda/aws-sdk-layer/package-lock.json
diff --git a/source/lambda/aws-sdk-layer/package.json b/source/lambda/aws-sdk-layer/package.json
@@ -1,6 +1,6 @@
 {
     "name": "aws-layer",
-    "version": "6.1.1",
+    "version": "6.1.2",
     "description": "QnABot Lambda aws-sdk-layer",
     "main": "index.js",
     "scripts": {

diff --git a/source/lambda/cfn-lambda-layer/package-lock.json b/source/lambda/cfn-lambda-layer/package-lock.json
diff --git a/source/lambda/cfn-lambda-layer/package.json b/source/lambda/cfn-lambda-layer/package.json
@@ -1,6 +1,6 @@
 {
     "name": "cfn-lambda-layer",
-    "version": "6.1.1",
+    "version": "6.1.2",
     "description": "QnABot Cfn Lambda Layer",
     "main": "index.js",
     "scripts": {

diff --git a/source/lambda/cfn/package-lock.json b/source/lambda/cfn/package-lock.json
diff --git a/source/lambda/cfn/package.json b/source/lambda/cfn/package.json
@@ -1,6 +1,6 @@
 {
     "name": "cfn",
-    "version": "6.1.1",
+    "version": "6.1.2",
     "description": "QnABot Cfn Lambda",
     "main": "index.js",
     "scripts": {

diff --git a/source/lambda/common-modules-layer/package-lock.json b/source/lambda/common-modules-layer/package-lock.json
diff --git a/source/lambda/common-modules-layer/package.json b/source/lambda/common-modules-layer/package.json
@@ -1,6 +1,6 @@
 {
     "name": "common-modules-layer",
-    "version": "6.1.1",
+    "version": "6.1.2",
     "description": "QnABot Common-modules-layer lambda",
     "main": "index.js",
     "scripts": {

diff --git a/source/lambda/connect/package-lock.json b/source/lambda/connect/package-lock.json
diff --git a/source/lambda/connect/package.json b/source/lambda/connect/package.json
@@ -1,6 +1,6 @@
 {
     "name": "connect",
-    "version": "6.1.1",
+    "version": "6.1.2",
     "description": "Lambda function used to support the Connect setup wizard",
     "repository": {
         "type": "git",

diff --git a/source/lambda/es-proxy-layer/lib/bedrock/bedrockClient.js b/source/lambda/es-proxy-layer/lib/bedrock/bedrockClient.js
@@ -33,6 +33,7 @@ const capabilityMapping = {
     'meta.llama3-8b-instruct-v1': 'C041',
     'amazon.titan-text-premier-v1': 'C042',
     'amazon.titan-embed-text-v2': 'C043',
+    'anthropic.claude-3.5-sonnet-v1': 'C044'
 };
 
 function isEmbedding(modelId) {

diff --git a/source/lambda/es-proxy-layer/package-lock.json b/source/lambda/es-proxy-layer/package-lock.json
diff --git a/source/lambda/es-proxy-layer/package.json b/source/lambda/es-proxy-layer/package.json
@@ -1,6 +1,6 @@
 {
     "name": "proxy-es",
-    "version": "6.1.1",
+    "version": "6.1.2",
     "description": "QnABot Lambda managing querying of data store",
     "main": "index.js",
     "scripts": {

diff --git a/source/lambda/es-proxy-layer/test/bedrockModels.test.js b/source/lambda/es-proxy-layer/test/bedrockModels.test.js
@@ -126,6 +126,26 @@ const llmModelBodies = {
             }
         ],
     },
+    'anthropic.claude-3-5-sonnet-20240620-v1': {
+        max_tokens: 256,
+        temperature: 0,
+        top_k: 250,
+        top_p: 1,
+        stop_sequences: ['\n\nHuman:'],
+        anthropic_version: 'bedrock-2023-05-31',
+        system : 'You are a helpful AI assistant.',
+        messages : [
+            {
+                role: 'user',
+                content: [
+                    {
+                        type: 'text',
+                        text: 'test prompt'
+                    }
+                ]
+            }
+        ],
+    },
     'anthropic.claude-3-haiku-20240307-v1': {
         max_tokens: 256,
         temperature: 0,
@@ -284,6 +304,17 @@ const llmModelResponses = {
             })
         )
     },
+    'anthropic.claude-3-5-sonnet-20240620-v1': {
+        body: Buffer.from(
+            JSON.stringify({
+                content: [
+                    { 
+                        text: 'test response' 
+                    }
+                ]
+            })
+        )
+    },
     'cohere.command-text-v14': {
         body: Buffer.from(
             JSON.stringify({

diff --git a/source/lambda/export/package-lock.json b/source/lambda/export/package-lock.json
diff --git a/source/lambda/export/package.json b/source/lambda/export/package.json
@@ -1,6 +1,6 @@
 {
     "name": "export",
-    "version": "6.1.1",
+    "version": "6.1.2",
     "description": "QnABot Lambda handling export of QIDs",
     "main": "index.js",
     "scripts": {

diff --git a/source/lambda/fulfillment/package-lock.json b/source/lambda/fulfillment/package-lock.json
diff --git a/source/lambda/fulfillment/package.json b/source/lambda/fulfillment/package.json
@@ -1,6 +1,6 @@
 {
     "name": "fulfillment",
-    "version": "6.1.1",
+    "version": "6.1.2",
     "description": "QnABot Lambda handling fulfillment of user requests",
     "main": "handler.js",
     "scripts": {

diff --git a/source/lambda/genesys/package-lock.json b/source/lambda/genesys/package-lock.json
diff --git a/source/lambda/genesys/package.json b/source/lambda/genesys/package.json
@@ -1,6 +1,6 @@
 {
     "name": "genesys",
-    "version": "6.1.1",
+    "version": "6.1.2",
     "description": "Lambda function used to support the Genesys setup wizard",
     "repository": {
         "type": "git",

diff --git a/source/lambda/import/package-lock.json b/source/lambda/import/package-lock.json
diff --git a/source/lambda/import/package.json b/source/lambda/import/package.json
@@ -1,6 +1,6 @@
 {
     "name": "import",
-    "version": "6.1.1",
+    "version": "6.1.2",
     "description": "QnABot Lambda handling import of QIDs",
     "main": "index.js",
     "scripts": {

diff --git a/source/lambda/js_lambda_hook_sdk/package-lock.json b/source/lambda/js_lambda_hook_sdk/package-lock.json
diff --git a/source/lambda/js_lambda_hook_sdk/package.json b/source/lambda/js_lambda_hook_sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "js_lambda_hook_sdk",
-    "version": "6.1.1",
+    "version": "6.1.2",
     "description": "QnABot convenience layer, allowing users to create custom lambda hooks",
     "directories": {
         "lambda_hook_sdk": "lambda_hook_sdk",

diff --git a/source/lambda/lex-build/package-lock.json b/source/lambda/lex-build/package-lock.json
diff --git a/source/lambda/lex-build/package.json b/source/lambda/lex-build/package.json
@@ -1,6 +1,6 @@
 {
     "name": "lex-build",
-    "version": "6.1.1",
+    "version": "6.1.2",
     "description": "QnABot lambda for rebuilding Amazon Lex bots",
     "main": "handler.js",
     "scripts": {