Update app.py

app.py

@@ -764,134 +764,135 @@ def update_images():
 def clear_textbox():
     return ""
 
-# 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 !!!", placeholder="After Prompt, click Retriever Only")
-#             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")
-#             retriever_button = gr.Button("Retriever")
-            
-#             gr.Markdown("<h1 style='color: red;'>Radar Map</h1>", elem_id="Map-Radar")
-#             location_output = gr.HTML()
-#             retriever_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").then(
-#                 fn=clear_state_and_textbox, inputs=[], outputs=[chat_input]
-#                 )
-            
-#             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=[], outputs=[chat_input])
-            
-#             # New ASR Component with Whisper
-#             gr.Markdown("<h2>Hey Radar</h2>")
-#             audio_input_whisper = gr.Audio(sources=["microphone"], type='numpy')
-#             transcribe_button_whisper = gr.Button("Transcribe")
-#             transcribe_button_whisper.click(fn=transcribe_function_whisper, inputs=[audio_input_whisper], outputs=[chat_input], api_name="whisper_asr")
-
-
-#             # Streaming ASR component
-#             gr.Markdown("<h2>Streaming ASR</h2>")
-#             stream_audio_input = gr.Audio(sources=["microphone"], type='numpy', streaming=True)
-#             stream_transcription = gr.State(None)  # Initialize stream state
-#             stream_audio_input.change(transcribe_function, inputs=[stream_transcription, stream_audio_input], outputs=[stream_transcription, chat_input],api_name="text_to_voice")
-
-#             # Add the clear button for ASR history
-#             clear_btn = gr.Button("Clear ASR ")
-#             # clear_btn.click(lambda: [None, ""], outputs=[stream_transcription, chat_input])
-#             clear_button.click(lambda:[None,None] ,outputs=[chat_input, state])
-
-#         # 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])
-#             # location_output = gr.HTML()
-#             bot_msg.then(show_map_if_details, [chatbot, choice], [location_output, location_output], api_name="map_finder")
-    
-# 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 !!!", placeholder="After Prompt,click Retriever Only")
+            
+            chat_input = gr.Textbox(show_copy_button=True, interactive=True, show_label=False, label="ASK Radar !!!", placeholder="After Prompt, click Retriever Only")
+            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")
             retriever_button = gr.Button("Retriever")
-
-            clear_button = gr.Button("Clear")
-            clear_button.click(lambda:[None,None] ,outputs=[chat_input, state])
-
+            
             gr.Markdown("<h1 style='color: red;'>Radar Map</h1>", elem_id="Map-Radar")
             location_output = gr.HTML()
+            retriever_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").then(
+                fn=clear_textbox,inputs=[],outputs=[chat_input]
+                )
+            # fn=clear_state_and_textbox, inputs=[], outputs=[chat_input]
             
-            # Define a single audio component
-            audio_output = gr.Audio(interactive=False, autoplay=True)
-
-            def stop_audio():
-                audio_output.stop()
-                return None
-
-            # Define the sequence of actions for the "Retriever" button
-            retriever_sequence = (
-                retriever_button.click(fn=stop_audio, inputs=[], outputs=[audio_output],api_name="Ask_Retriever")
-                .then(fn=add_message, inputs=[chatbot, chat_input], outputs=[chatbot, chat_input],api_name="voice_query")
-                .then(fn=bot, inputs=[chatbot, choice, tts_choice], outputs=[chatbot, audio_output],api_name="generate_voice_response" )
-                .then(fn=show_map_if_details, inputs=[chatbot, choice], outputs=[location_output, location_output], api_name="map_finder")
-                .then(fn=clear_textbox, inputs=[], outputs=[chat_input])
-            )
-
-            # Link the "Enter" key (submit event) to the same sequence of actions
-            chat_input.submit(fn=stop_audio, inputs=[], outputs=[audio_output])
-            chat_input.submit(fn=add_message, inputs=[chatbot, chat_input], outputs=[chatbot, chat_input],api_name="voice_query").then(
-                fn=bot, inputs=[chatbot, choice, tts_choice], outputs=[chatbot, audio_output], api_name="generate_voice_response"
-            ).then(
-                fn=show_map_if_details, inputs=[chatbot, choice], outputs=[location_output, location_output], api_name="map_finder"
-            ).then(
-                fn=clear_textbox, inputs=[], outputs=[chat_input]
-            )
-
-            audio_input = gr.Audio(sources=["microphone"], streaming=True, type='numpy', every=0.1)
-            audio_input.stream(transcribe_function, inputs=[state, audio_input], outputs=[state, chat_input], api_name="voice_query_to_text")
-
-        with gr.Column():
-            weather_output = gr.HTML(value=fetch_local_weather())
-            news_output = gr.HTML(value=fetch_local_news())
-            events_output = gr.HTML(value=fetch_local_events())
+            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=[], outputs=[chat_input])
+            
+            # New ASR Component with Whisper
+            gr.Markdown("<h2>Hey Radar</h2>")
+            audio_input_whisper = gr.Audio(sources=["microphone"], type='numpy')
+            transcribe_button_whisper = gr.Button("Transcribe")
+            transcribe_button_whisper.click(fn=transcribe_function_whisper, inputs=[audio_input_whisper], outputs=[chat_input], api_name="whisper_asr")
+
+
+            # Streaming ASR component
+            gr.Markdown("<h2>Streaming ASR</h2>")
+            stream_audio_input = gr.Audio(sources=["microphone"], type='numpy', streaming=True)
+            stream_transcription = gr.State(None)  # Initialize stream state
+            stream_audio_input.change(transcribe_function, inputs=[stream_transcription, stream_audio_input], outputs=[stream_transcription, chat_input],api_name="text_to_voice")
+
+            # Add the clear button for ASR history
+            clear_btn = gr.Button("Clear ASR ")
+            # clear_btn.click(lambda: [None, ""], outputs=[stream_transcription, chat_input])
+            clear_button.click(lambda:[None,None] ,outputs=[chat_input, state])
 
+        # 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], api_name="update_images")
-
+            refresh_button.click(fn=update_images, inputs=None, outputs=[image_output_1, image_output_2, image_output_3])
+            # location_output = gr.HTML()
+            bot_msg.then(show_map_if_details, [chatbot, choice], [location_output, location_output], api_name="map_finder")
+    
 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 !!!", placeholder="After Prompt,click Retriever Only")
+#             tts_choice = gr.Radio(label="Select TTS System", choices=["Alpha", "Beta", "Gamma"], value="Alpha")
+#             retriever_button = gr.Button("Retriever")
+
+#             clear_button = gr.Button("Clear")
+#             clear_button.click(lambda:[None,None] ,outputs=[chat_input, state])
+
+#             gr.Markdown("<h1 style='color: red;'>Radar Map</h1>", elem_id="Map-Radar")
+#             location_output = gr.HTML()
+            
+#             # Define a single audio component
+#             audio_output = gr.Audio(interactive=False, autoplay=True)
+
+#             def stop_audio():
+#                 audio_output.stop()
+#                 return None
+
+#             # Define the sequence of actions for the "Retriever" button
+#             retriever_sequence = (
+#                 retriever_button.click(fn=stop_audio, inputs=[], outputs=[audio_output],api_name="Ask_Retriever")
+#                 .then(fn=add_message, inputs=[chatbot, chat_input], outputs=[chatbot, chat_input],api_name="voice_query")
+#                 .then(fn=bot, inputs=[chatbot, choice, tts_choice], outputs=[chatbot, audio_output],api_name="generate_voice_response" )
+#                 .then(fn=show_map_if_details, inputs=[chatbot, choice], outputs=[location_output, location_output], api_name="map_finder")
+#                 .then(fn=clear_textbox, inputs=[], outputs=[chat_input])
+#             )
+
+#             # Link the "Enter" key (submit event) to the same sequence of actions
+#             chat_input.submit(fn=stop_audio, inputs=[], outputs=[audio_output])
+#             chat_input.submit(fn=add_message, inputs=[chatbot, chat_input], outputs=[chatbot, chat_input],api_name="voice_query").then(
+#                 fn=bot, inputs=[chatbot, choice, tts_choice], outputs=[chatbot, audio_output], api_name="generate_voice_response"
+#             ).then(
+#                 fn=show_map_if_details, inputs=[chatbot, choice], outputs=[location_output, location_output], api_name="map_finder"
+#             ).then(
+#                 fn=clear_textbox, inputs=[], outputs=[chat_input]
+#             )
+
+#             audio_input = gr.Audio(sources=["microphone"], streaming=True, type='numpy', every=0.1)
+#             audio_input.stream(transcribe_function, inputs=[state, audio_input], outputs=[state, chat_input], api_name="voice_query_to_text")
+
+#         with gr.Column():
+#             weather_output = gr.HTML(value=fetch_local_weather())
+#             news_output = gr.HTML(value=fetch_local_news())
+#             events_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], api_name="update_images")
+
+# demo.queue()
+# demo.launch(share=True)
+