Update app.py

app.py

@@ -289,28 +289,7 @@ def generate_answer(message, choice):
     addresses = extract_addresses(response['output'])
     return response['output'], addresses
 
-# def bot(history, choice, tts_choice):
-#     if not history:
-#         return history
-#     response, addresses = generate_answer(history[-1][0], choice)
-#     history[-1][1] = ""
-    
-#     with concurrent.futures.ThreadPoolExecutor() as executor:
-#         if tts_choice == "Alpha":
-#             audio_future = executor.submit(generate_audio_elevenlabs, response)
-#         elif tts_choice == "Beta":
-#             audio_future = executor.submit(generate_audio_parler_tts, response)
-#         elif tts_choice == "Gamma":
-#             audio_future = executor.submit(generate_audio_mars5, response)
-        
-        
-#         for character in response:
-#             history[-1][1] += character
-#             time.sleep(0.05)
-#             yield history, None
-        
-#         audio_path = audio_future.result()
-#         yield history, audio_path
+
 
 def bot(history, choice, tts_choice, state):
     if not history:
@@ -340,21 +319,7 @@ def add_message(history, message):
 
 
 
-# def generate_voice_response(history, tts_choice):
-#     if not history:
-#         return None
-    
-#     response = history[-1][1]
-#     with concurrent.futures.ThreadPoolExecutor() as executor:
-#         if tts_choice == "Alpha":
-#             audio_future = executor.submit(generate_audio_elevenlabs, response)
-#         elif tts_choice == "Beta":
-#             audio_future = executor.submit(generate_audio_parler_tts, response)
-#         elif tts_choice == "Gamma":
-#             audio_future = executor.submit(generate_audio_mars5, response)
-        
-#         audio_path = audio_future.result()
-#     return audio_path
+
 
 def print_like_dislike(x: gr.LikeData):
     print(x.index, x.value, x.liked)
@@ -380,26 +345,7 @@ def extract_addresses(response):
 
 all_addresses = []
 
-# def generate_map(location_names):
-#     global all_addresses
-#     all_addresses.extend(location_names)
-    
-#     api_key = os.environ['GOOGLEMAPS_API_KEY']
-#     gmaps = GoogleMapsClient(key=api_key)
-    
-#     m = folium.Map(location=[33.5175,-86.809444], zoom_start=16)
-    
-#     for location_name in all_addresses:
-#         geocode_result = gmaps.geocode(location_name)
-#         if geocode_result:
-#             location = geocode_result[0]['geometry']['location']
-#             folium.Marker(
-#                 [location['lat'], 'lng'],
-#                 tooltip=f"{geocode_result[0]['formatted_address']}"
-#             ).add_to(m)
-    
-#     map_html = m._repr_html_()
-#     return map_html
+
 
 def generate_map(location_names):
     global all_addresses
@@ -709,150 +655,6 @@ 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")
-            
-#             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],api_name="voice_query")
-#             tts_choice = gr.Radio(label="Select TTS System", choices=["Alpha", "Beta", "Gamma"], value="Alpha")
-#             retriver_button = gr.Button("Retriver")
-#             # retriver_button.click(fn=add_message, inputs=[chatbot, chat_input], outputs=[chatbot, chat_input]).then(fn=bot, inputs=[chatbot, choice, tts_choice], outputs=[chatbot],api_name="Ask_Retriever")
-#             # retriver_button.click(fn=add_message, inputs=[chatbot, chat_input], outputs=[chatbot, chat_input]).then(
-#             #     fn=bot, inputs=[chatbot, choice, tts_choice], outputs=[chatbot], api_name="Ask_Retriever")
-#             retriver_button.click(fn=add_message, inputs=[chatbot, chat_input], outputs=[chatbot, chat_input]).then(
-#                     fn=bot, inputs=[chatbot, choice, tts_choice, state], outputs=[chatbot], api_name="Ask_Retriever")
-
-#             #gr.Audio(interactive=False, autoplay=True)]
-
-#             # voice_response_button = gr.Button("Voice Response")
-#             # voice_response_button.click(fn=generate_voice_response, inputs=[chatbot, tts_choice], outputs=[gr.Audio(interactive=False, autoplay=True)],api_name="generate_voice_response")
-
-#             bot_msg = chat_msg.then(bot, [chatbot, choice, tts_choice], [chatbot, gr.Audio(interactive=False, autoplay=True)],api_name="generate_voice_response")
-#             # 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="voice_query_to_text")
-            
-
-#             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],api_name="map_finder")
-        
-        
-#         # 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)
-
-# 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")
-            
-#             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], api_name="voice_query")
-#             tts_choice = gr.Radio(label="Select TTS System", choices=["Alpha", "Beta", "Gamma"], value="Alpha")
-#             retriver_button = gr.Button("Retriever")
-#             retriver_button.click(fn=add_message, inputs=[chatbot, chat_input], outputs=[chatbot, chat_input]).then(
-#                 fn=bot, inputs=[chatbot, choice, tts_choice, state], outputs=[chatbot, gr.Audio(interactive=False, autoplay=True)], api_name="Ask_Retriever")
-            
-#             # bot_msg = chat_msg.then(bot, [chatbot, choice, tts_choice], [chatbot, gr.Audio(interactive=False, autoplay=True], api_name="generate_voice_response")
-#             bot_msg = chat_msg.then(bot, [chatbot, choice, tts_choice], [chatbot], api_name="generate_voice_response")
-            
-#             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="voice_query_to_text")
-
-#             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], api_name="map_finder")
-        
-#         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)
-
-# 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")
-            
-#             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], api_name="voice_query")
-#             tts_choice = gr.Radio(label="Select TTS System", choices=["Alpha", "Beta", "Gamma"], value="Alpha")
-#             retriver_button = gr.Button("Retriever")
-#             # retriver_button.click(fn=add_message, inputs=[chatbot, chat_input], outputs=[chatbot, chat_input]).then(
-#             #     fn=bot, inputs=[chatbot, choice, tts_choice, state], outputs=[chatbot, gr.Audio(interactive=False, autoplay=True)], api_name="Ask_Retriever")
-#             location_output = gr.HTML() 
-#             retriver_button.click(fn=add_message, inputs=[chatbot, chat_input], outputs=[chatbot, chat_input]).then(
-#                 fn=bot, inputs=[chatbot, choice, tts_choice, state], outputs=[chatbot, gr.Audio(interactive=False, autoplay=True)], api_name="Ask_Retriever").then(
-#                 fn=show_map_if_details, inputs=[chatbot, choice], outputs=[location_output, location_output], api_name="map_finder")      
-#             bot_msg = chat_msg.then(bot, [chatbot, choice, tts_choice], [chatbot], api_name="generate_voice_response")
-#             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="voice_query_to_text")
-
-#             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], api_name="map_finder")
-        
-#         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)
-
 with gr.Blocks(theme='Pijush2023/scikit-learn-pijush') as demo:
     with gr.Row():
         with gr.Column():
@@ -867,12 +669,12 @@ with gr.Blocks(theme='Pijush2023/scikit-learn-pijush') as demo:
             chat_msg = chat_input.submit(add_message, [chatbot, chat_input], [chatbot, chat_input], api_name="voice_query")
             tts_choice = gr.Radio(label="Select TTS System", choices=["Alpha", "Beta", "Gamma"], value="Alpha")
             retriver_button = gr.Button("Retriever")
-            location_output = gr.HTML()  # Initialize location_output here
+            
             retriver_button.click(fn=add_message, inputs=[chatbot, chat_input], outputs=[chatbot, chat_input]).then(
                 fn=bot, inputs=[chatbot, choice, tts_choice, state], outputs=[chatbot, gr.Audio(interactive=False, autoplay=True)], api_name="Ask_Retriever").then(
                 fn=show_map_if_details, inputs=[chatbot, choice], outputs=[location_output, location_output], api_name="map_finder")
             
-            bot_msg = chat_msg.then(bot, [chatbot, choice, tts_choice], [chatbot, gr.Audio(interactive=False, autoplay=True)], api_name="generate_voice_response")
+            bot_msg = chat_msg.then(bot, [chatbot, choice, tts_choice], [chatbot], api_name="generate_voice_response")
             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")
@@ -881,7 +683,15 @@ with gr.Blocks(theme='Pijush2023/scikit-learn-pijush') as demo:
             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="voice_query_to_text")
 
-            gr.Markdown("<h1 style='color: red;'>Map</h1>", elem_id="location-markdown")
+            gr.Markdown("<h1 style='color: red;'>Radar Map</h1>", elem_id="Map-Radar")
+            location_output = gr.HTML()  # Initialize location_output here
+            
+
+        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)