Update app.py

app.py

@@ -275,46 +275,27 @@ def generate_answer(message, choice):
     addresses = extract_addresses(response['output'])
     return response['output'], addresses
 
-# def bot(history, choice, tts_model):
-#     if not history:
-#         return history
-#     response, addresses = generate_answer(history[-1][0], choice)
-#     history[-1][1] = ""
-    
-#     # Generate audio for the entire response in a separate thread
-#     with concurrent.futures.ThreadPoolExecutor() as executor:
-#         if tts_model == "ElevenLabs":
-#             audio_future = executor.submit(generate_audio_elevenlabs, response)
-#         else:
-#             audio_future = executor.submit(generate_audio_parler_tts, response)
-        
-#         for character in response:
-#             history[-1][1] += character
-#             time.sleep(0.05)  # Adjust the speed of text appearance
-#             yield history, None
-        
-#         audio_path = audio_future.result()
-#         yield history, audio_path
-
 def bot(history, choice, tts_model):
     if not history:
         return history
     response, addresses = generate_answer(history[-1][0], choice)
     history[-1][1] = ""
-
+    
+    # Generate audio for the entire response in a separate thread
     with concurrent.futures.ThreadPoolExecutor() as executor:
         if tts_model == "ElevenLabs":
             audio_future = executor.submit(generate_audio_elevenlabs, response)
         else:
             audio_future = executor.submit(generate_audio_parler_tts, response)
-
+        
         for character in response:
             history[-1][1] += character
-            time.sleep(0.05)
-            yield history, None, gr.update(visible=True, value=history[-1][1])
-
+            time.sleep(0.05)  # Adjust the speed of text appearance
+            yield history, None
+        
         audio_path = audio_future.result()
-        yield history, audio_path, gr.update(visible=True, value=history[-1][1])
+        yield history, audio_path
+
 
 def add_message(history, message):
     history.append((message, None))
@@ -576,100 +557,48 @@ def update_images():
     image_3 = generate_image(hardcoded_prompt_3)
     return image_1, image_2, image_3
 
-# with gr.Blocks(theme='Pijush2023/scikit-learn-pijush') as demo:
-    
-#     with gr.Row():
-#         with gr.Column():
-#             state = gr.State()
-            
-#             chatbot = gr.Chatbot([], elem_id="RADAR:Channel 94.1", bubble_full_width=False)
-#             choice = gr.Radio(label="Select Style", choices=["Details", "Conversational"], value="Conversational")
-#             tts_choice = gr.Radio(label="Select TTS Model", choices=["ElevenLabs", "Parler TTS"], value="Parler TTS")
-            
-#             gr.Markdown("<h1 style='color: red;'>Talk to RADAR</h1>", elem_id="voice-markdown")
-#             chat_input = gr.Textbox(show_copy_button=True, interactive=True, show_label=False, label="ASK Radar !!!")
-#             chat_msg = chat_input.submit(add_message, [chatbot, chat_input], [chatbot, chat_input])
-#             bot_msg = chat_msg.then(bot, [chatbot, choice, tts_choice], [chatbot, gr.Audio(interactive=False, autoplay=True)])
-#             bot_msg.then(lambda: gr.Textbox(value="", interactive=True, placeholder="Ask Radar!!!...", show_label=False), None, [chat_input])
-#             chatbot.like(print_like_dislike, None, None)
-#             clear_button = gr.Button("Clear")
-#             clear_button.click(fn=clear_textbox, inputs=None, outputs=chat_input)
-           
-            
-#             audio_input = gr.Audio(sources=["microphone"], streaming=True, type='numpy')
-#             audio_input.stream(transcribe_function, inputs=[state, audio_input], outputs=[state, chat_input], api_name="SAMLOne_real_time")
-
-#             # gr.Markdown("<h1 style='color: red;'>Map</h1>", elem_id="location-markdown")
-#             # location_output = gr.HTML()
-#             # bot_msg.then(show_map_if_details, [chatbot, choice], [location_output, location_output])
-        
-#         # with gr.Column():
-#         #     weather_output = gr.HTML(value=fetch_local_weather())
-#         #     news_output = gr.HTML(value=fetch_local_news())
-#         #     news_output = gr.HTML(value=fetch_local_events())
-            
-#         with gr.Column():
-            
-#             image_output_1 = gr.Image(value=generate_image(hardcoded_prompt_1), width=400, height=400)
-#             image_output_2 = gr.Image(value=generate_image(hardcoded_prompt_2), width=400, height=400)
-#             image_output_3 = gr.Image(value=generate_image(hardcoded_prompt_3), width=400, height=400)
-
-
-#             refresh_button = gr.Button("Refresh Images")
-#             refresh_button.click(fn=update_images, inputs=None, outputs=[image_output_1, image_output_2, image_output_3])
-     
-# demo.queue()
-# demo.launch(share=True)
-
-def generate_follow_up_buttons(response):
-    return gr.update(visible=True), gr.update(value=response)
-
-def handle_follow_up_choice(choice, history):
-    follow_up_responses = {
-        "Question 1": "This is the response to follow-up question 1.",
-        "Question 2": "This is the response to follow-up question 2."
-    }
-    follow_up_response = follow_up_responses.get(choice, "Sorry, I didn't understand that choice.")
-    history.append((choice, follow_up_response))
-    return history, gr.update(visible=False)
-
-
-
 with gr.Blocks(theme='Pijush2023/scikit-learn-pijush') as demo:
-
+    
     with gr.Row():
         with gr.Column():
             state = gr.State()
+            
             chatbot = gr.Chatbot([], elem_id="RADAR:Channel 94.1", bubble_full_width=False)
             choice = gr.Radio(label="Select Style", choices=["Details", "Conversational"], value="Conversational")
             tts_choice = gr.Radio(label="Select TTS Model", choices=["ElevenLabs", "Parler TTS"], value="Parler TTS")
-
+            
             gr.Markdown("<h1 style='color: red;'>Talk to RADAR</h1>", elem_id="voice-markdown")
             chat_input = gr.Textbox(show_copy_button=True, interactive=True, show_label=False, label="ASK Radar !!!")
             chat_msg = chat_input.submit(add_message, [chatbot, chat_input], [chatbot, chat_input])
-            bot_msg = chat_msg.then(bot, [chatbot, choice, tts_choice], [chatbot, gr.Audio(interactive=False, autoplay=True), gr.Button("Follow-up Question 1", visible=False), gr.Button("Follow-up Question 2", visible=False)])
+            bot_msg = chat_msg.then(bot, [chatbot, choice, tts_choice], [chatbot, gr.Audio(interactive=False, autoplay=True)])
             bot_msg.then(lambda: gr.Textbox(value="", interactive=True, placeholder="Ask Radar!!!...", show_label=False), None, [chat_input])
-
-            follow_up_button_1 = gr.Button("Follow-up Question 1", visible=False)
-            follow_up_button_2 = gr.Button("Follow-up Question 2", visible=False)
-            follow_up_button_1.click(handle_follow_up_choice, inputs=[follow_up_button_1, chatbot], outputs=[chatbot, follow_up_button_1, follow_up_button_2])
-            follow_up_button_2.click(handle_follow_up_choice, inputs=[follow_up_button_2, chatbot], outputs=[chatbot, follow_up_button_1, follow_up_button_2])
-
             chatbot.like(print_like_dislike, None, None)
             clear_button = gr.Button("Clear")
             clear_button.click(fn=clear_textbox, inputs=None, outputs=chat_input)
-
+           
+            
             audio_input = gr.Audio(sources=["microphone"], streaming=True, type='numpy')
             audio_input.stream(transcribe_function, inputs=[state, audio_input], outputs=[state, chat_input], api_name="SAMLOne_real_time")
 
+            # gr.Markdown("<h1 style='color: red;'>Map</h1>", elem_id="location-markdown")
+            # location_output = gr.HTML()
+            # bot_msg.then(show_map_if_details, [chatbot, choice], [location_output, location_output])
+        
+        # with gr.Column():
+        #     weather_output = gr.HTML(value=fetch_local_weather())
+        #     news_output = gr.HTML(value=fetch_local_news())
+        #     news_output = gr.HTML(value=fetch_local_events())
+            
         with gr.Column():
+            
             image_output_1 = gr.Image(value=generate_image(hardcoded_prompt_1), width=400, height=400)
             image_output_2 = gr.Image(value=generate_image(hardcoded_prompt_2), width=400, height=400)
             image_output_3 = gr.Image(value=generate_image(hardcoded_prompt_3), width=400, height=400)
 
+
             refresh_button = gr.Button("Refresh Images")
             refresh_button.click(fn=update_images, inputs=None, outputs=[image_output_1, image_output_2, image_output_3])
-
+     
 demo.queue()
 demo.launch(share=True)
 
@@ -679,3 +608,4 @@ demo.launch(share=True)
 
 
 
+