Merge branch 'feature/chat-with-document' into 'develop'

Feature/chat with document

See merge request genaiic-reusable-assets/engagement-artifacts/genaiic-idp-accelerator!242

Author: rstrahan

docs/web-ui.md

@@ -107,7 +107,7 @@ Your chat history will be saved as you continue your chat but if you leave the d
 ### How to Use
 
 1. Navigate to a document's detail page and scroll to the bottom
-2. In the text area, type in your question and you'll see an answer pop up after the document is analyzed with the model that's configured for summarization
+2. In the text area, type in your question and you'll see an answer pop up after the document is analyzed with the Nova Pro model
 
 ## Authentication Features
 

src/lambda/chat_with_document_resolver/index.py

@@ -52,8 +52,11 @@ def handler(event, context):
         full_prompt = "You are an assistant that's responsible for getting details from document text attached here based on questions from the user.\n\n"
         full_prompt += "If you don't know the answer, just say that you don't know. Don't try to make up an answer.\n\n"
         full_prompt += "Additionally, use the user and assistant responses in the following JSON object to see what's been asked and what the resposes were in the past.\n\n"
-        full_prompt += "The JSON object is: " + json.dumps(history) + ".\n\n"
-        full_prompt += "The user's question is: " + prompt
+        # full_prompt += "Your response MUST be in the following JSON format: {'content': [{'text': 'String'}]}.\n\n"
+        # full_prompt += "You MUST NOT include outside of that JSON format.\n\n"
+        # full_prompt += "Do NOT include the role or anything else in the response."
+        full_prompt += "The history JSON object is: " + json.dumps(history) + ".\n\n"
+        full_prompt += "The user's question is: " + prompt + "\n\n"
 
         # this feature is not enabled until the model can be selected on the chat screen
         # selectedModelId = event['arguments']['modelId']
@@ -67,13 +70,14 @@ def handler(event, context):
 
         # Call Bedrock Runtime to get Python code based on the prompt
         if (len(objectKey)):
-            encoded_string = objectKey.encode()
-            md5_hash = hashlib.md5(encoded_string, usedforsecurity=False)
-            hex_representation = md5_hash.hexdigest()
+            # encoded_string = objectKey.encode()
+            # md5_hash = hashlib.md5(encoded_string)
+            # hex_representation = md5_hash.hexdigest()
 
             # full text key
             fulltext_key = objectKey + '/summary/fulltext.txt'
 
+            logger.info(f"Model: {selectedModelId}")
             logger.info(f"Output Bucket: {output_bucket}")
             logger.info(f"Full Text Key: {fulltext_key}")
 
@@ -108,6 +112,7 @@ def handler(event, context):
 
             # print('invoking model converse')
 
+            selectedModelId = 'us.amazon.nova-pro-v1:0'
             response = bedrock_runtime.converse(
                 modelId=selectedModelId,
                 messages=message
@@ -121,25 +126,22 @@ def handler(event, context):
             # print(f"cacheWriteInputTokens:  {token_usage['cacheWriteInputTokens']}")
             # print(f"Stop reason: {response['stopReason']}")
 
-            output_message = response['output']['message']
-
-            model_response_text = ''
-            for content in output_message['content']:
-                model_response_text += content['text']
 
-            # print output_message
+            output_message = response['output']['message']
+            text_content = output_message['content'][0]['text']
 
-            chat_response = {"cr" : output_message }
+            chat_response = {"cr": {"content": [{"text": text_content}]}}
             return json.dumps(chat_response)
 
 
+
     except ClientError as e:
         error_code = e.response['Error']['Code']
         error_message = e.response['Error']['Message']
         logger.error(f"S3 ClientError: {error_code} - {error_message}")
 
         if error_code == 'NoSuchKey':
-            raise Exception(f"File not found: {objectKey}")
+            raise Exception(f"File not found: {fulltext_key}. The chat feature will not work with files that were processed prior to v0.3.11.")
         elif error_code == 'NoSuchBucket':
             raise Exception(f"Bucket not found: {output_bucket}")
         else:

src/ui/src/components/chat-panel/ChatPanel.jsx

@@ -80,6 +80,7 @@ const ChatPanel = (item) => {
     const chatResponse = getChatResponse(objectKey, prompt, jsonChatHistory);
 
     let chatResponseData = {};
+    let chatItem = {};
 
     chatResponse
       .then((r) => {
@@ -93,12 +94,10 @@ const ChatPanel = (item) => {
             type: 'msg',
           };
 
-          const chatItem = {
+          chatItem = {
             ask: prompt,
             response: cResponse.cr.content[0].text,
           };
-
-          setJsonChatHistory((prevChatHistory) => [...prevChatHistory, chatItem]);
         }
       })
       .catch((r) => {
@@ -114,8 +113,8 @@ const ChatPanel = (item) => {
       .finally(() => {
         // remove loader from the chat queries
         setChatQueries((prevChatQueries) => prevChatQueries.filter((data) => data.role !== 'loader'));
-
         setChatQueries((prevChatQueries) => [...prevChatQueries, chatResponseData]);
+        setJsonChatHistory((prevChatHistory) => [...prevChatHistory, chatItem]);
         const maxScrollHeight = document.documentElement.scrollHeight;
         window.scrollTo(0, maxScrollHeight);
       });