From 9622fa7abe303c703a0cab58bddea5d703f5822d Mon Sep 17 00:00:00 2001
From: Marc Burnie <63939269+marcburnie@users.noreply.github.com>
Date: Thu, 30 Nov 2023 09:43:12 -0600
Subject: [PATCH] fix for null history case

---
 .../src/lambdahook.py                         | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/lambdas/qna_bot_qbusiness_lambdahook/src/lambdahook.py b/lambdas/qna_bot_qbusiness_lambdahook/src/lambdahook.py
index 77be6d0..cdfcb35 100644
--- a/lambdas/qna_bot_qbusiness_lambdahook/src/lambdahook.py
+++ b/lambdas/qna_bot_qbusiness_lambdahook/src/lambdahook.py
@@ -19,21 +19,19 @@
 
 def get_amazonq_response(prompt, context, amazonq_userid):
     print(f"get_amazonq_response: prompt={prompt}, app_id={AMAZONQ_APP_ID}, context={context}")
+    input = {
+        "applicationId": AMAZONQ_APP_ID,
+        "userMessage": prompt,
+        "userId": amazonq_userid
+    }
     if context:
-        input = {
-            "applicationId": AMAZONQ_APP_ID,
-            "conversationId": context["conversationId"],
-            "parentMessageId": context["parentMessageId"],
-            "userMessage": prompt,
-            "userId": amazonq_userid
-        }
+        if context["conversationId"]:
+            input["conversationId"] = context["conversationId"]
+        if context["parentMessageId"]:
+            input["parentMessageId"] = context["parentMessageId"]
     else:
-        input = {
-            "applicationId": AMAZONQ_APP_ID,
-            "userMessage": prompt,
-            "userId": amazonq_userid,
-            "clientToken": str(uuid.uuid4())
-        }
+        input["clientToken"] = str(uuid.uuid4())
+
     print("Amazon Q Input: ", json.dumps(input))
     try:
         resp = qbusiness_client.chat_sync(**input)