Update app.py

app.py

@@ -335,6 +335,7 @@ def initialize_agent_with_prompt(prompt_template):
     )
     return agent
 
+
 def generate_answer(message, choice):
     logging.debug(f"generate_answer called with prompt_choice: {choice}")
     
@@ -345,18 +346,98 @@ def generate_answer(message, choice):
     else:
         logging.error(f"Invalid prompt_choice: {choice}. Defaulting to 'Conversational'")
         agent = initialize_agent_with_prompt(QA_CHAIN_PROMPT_2)
+        
     response = agent(message)
-
     addresses = extract_addresses(response['output'])
     return response['output'], addresses
 
+def bot(history, choice, tts_choice):
+    if not history:
+        return history
+    
+    user_message = history[-1][0]
+    response_text, addresses = generate_answer(user_message, choice)
+    
+    # Ensure history has the correct format
+    if len(history[-1]) == 1:
+        history[-1].append(response_text)
+    else:
+        history[-1][1] = response_text
+
+    with concurrent.futures.ThreadPoolExecutor() as executor:
+        if tts_choice == "Alpha":
+            audio_future = executor.submit(generate_audio_elevenlabs, response_text)
+        elif tts_choice == "Beta":
+            audio_future = executor.submit(generate_audio_parler_tts, response_text)
+        elif tts_choice == "Gamma":
+            audio_future = executor.submit(generate_audio_mars5, response_text)
+        
+        for character in response_text:
+            history[-1][1] += character
+            time.sleep(0.05)
+            yield history, None
+        
+        audio_path = audio_future.result()
+        yield history, audio_path
+
+def add_message(history, message):
+    history = history or []
+    history.append([message, ""])  # Ensure it is a list with two elements: message and empty response
+    return history, gr.Textbox(value="", interactive=True, placeholder="Enter message or upload file...", show_label=False)
+#----------------------------------part 1-------------------------
+# def generate_answer(message, choice):
+#     logging.debug(f"generate_answer called with prompt_choice: {choice}")
+    
+#     if choice == "Details":
+#         agent = initialize_agent_with_prompt(QA_CHAIN_PROMPT_1)
+#     elif choice == "Conversational":
+#         agent = initialize_agent_with_prompt(QA_CHAIN_PROMPT_2)
+#     else:
+#         logging.error(f"Invalid prompt_choice: {choice}. Defaulting to 'Conversational'")
+#         agent = initialize_agent_with_prompt(QA_CHAIN_PROMPT_2)
+#     response = agent(message)
+
+#     addresses = extract_addresses(response['output'])
+#     return response['output'], addresses
 
 
+
+# # def bot(history, choice, tts_choice):
+# #     if not history:
+# #         return history
+# #     response_pair, addresses = generate_answer(history[-1][0], choice)
+# #     history[-1] = response_pair  # Update bot response correctly
+
+# #     with concurrent.futures.ThreadPoolExecutor() as executor:
+# #         if tts_choice == "Alpha":
+# #             audio_future = executor.submit(generate_audio_elevenlabs, response_pair[1])
+# #         elif tts_choice == "Beta":
+# #             audio_future = executor.submit(generate_audio_parler_tts, response_pair[1])
+# #         elif tts_choice == "Gamma":
+# #             audio_future = executor.submit(generate_audio_mars5, response_pair[1])
+        
+# #         for character in response_pair[1]:
+# #             history[-1][1] += character
+# #             time.sleep(0.05)
+# #             yield history, None
+        
+# #         audio_path = audio_future.result()
+# #         yield history, audio_path
+
+# # def add_message(history, message):
+# #     history = history or []
+# #     history.append([message, ""])  # Ensure it is a list with two elements: message and empty response
+# #     return history, gr.Textbox(value="", interactive=True, placeholder="Enter message or upload file...", show_label=False)
+
 # def bot(history, choice, tts_choice):
 #     if not history:
 #         return history
 #     response_pair, addresses = generate_answer(history[-1][0], choice)
-#     history[-1] = response_pair  # Update bot response correctly
+#     # Ensure history has the correct format
+#     if len(history[-1]) == 1:
+#         history[-1].append("")
+#     elif len(history[-1]) == 0:
+#         history[-1] = [history[-1][0], ""]
 
 #     with concurrent.futures.ThreadPoolExecutor() as executor:
 #         if tts_choice == "Alpha":
@@ -378,38 +459,7 @@ def generate_answer(message, choice):
 #     history = history or []
 #     history.append([message, ""])  # Ensure it is a list with two elements: message and empty response
 #     return history, gr.Textbox(value="", interactive=True, placeholder="Enter message or upload file...", show_label=False)
-
-def bot(history, choice, tts_choice):
-    if not history:
-        return history
-    response_pair, addresses = generate_answer(history[-1][0], choice)
-    # Ensure history has the correct format
-    if len(history[-1]) == 1:
-        history[-1].append("")
-    elif len(history[-1]) == 0:
-        history[-1] = [history[-1][0], ""]
-
-    with concurrent.futures.ThreadPoolExecutor() as executor:
-        if tts_choice == "Alpha":
-            audio_future = executor.submit(generate_audio_elevenlabs, response_pair[1])
-        elif tts_choice == "Beta":
-            audio_future = executor.submit(generate_audio_parler_tts, response_pair[1])
-        elif tts_choice == "Gamma":
-            audio_future = executor.submit(generate_audio_mars5, response_pair[1])
-        
-        for character in response_pair[1]:
-            history[-1][1] += character
-            time.sleep(0.05)
-            yield history, None
-        
-        audio_path = audio_future.result()
-        yield history, audio_path
-
-def add_message(history, message):
-    history = history or []
-    history.append([message, ""])  # Ensure it is a list with two elements: message and empty response
-    return history, gr.Textbox(value="", interactive=True, placeholder="Enter message or upload file...", show_label=False)
-
+#--------------------------------------------------------
 # def generate_voice_response(history, tts_choice):
 #     if not history:
 #         return None