no filters warning fully working with examples

app.py

@@ -572,18 +572,7 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
                 
 
     #-------------------- New UI elements for Feedback -------------------------
-    # with gr.Row(visible=False) as feedback_row:
-    #     gr.Markdown("Was this response helpful?")
-    #     with gr.Row():
-    #         okay_btn = gr.Button("👍 Okay", elem_classes="feedback-button")
-    #         not_okay_btn = gr.Button("👎 Not to expectations", elem_classes="feedback-button")
-    # 
-    # feedback_thanks = gr.Markdown("Thanks for the feedback!", visible=False)
-    # feedback_state = gr.State()  # Add state to store logs data
-
-    def show_feedback(logs):
-        """Show feedback buttons and store logs in state"""
-        return gr.update(visible=True), gr.update(visible=False), logs
+
 
     def submit_feedback_okay(logs_data):
         """Handle 'okay' feedback submission"""
@@ -593,7 +582,7 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
         """Handle 'not okay' feedback submission"""
         return submit_feedback("not_okay", logs_data)
     
-    def handle_feedback(logs_data):
+    def show_feedback(logs_data):
         """Handle feedback display with proper output format"""
         if logs_data is None:
             return (
@@ -668,43 +657,10 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
             None  # no need to store query
         )
     
-    # async def handle_chat_flow(warning_active, query, chatbot, sources, reports, subtype, year, client_ip, session_id):
-    #     """Handle chat flow with hard stop for warnings"""
-    #     # Check if any filters are selected
-    #     no_filters = (not reports) and (not sources) and (not subtype) and (not year)
-        
-    #     if warning_active:  # Only check warning_active, not no_filters
-    #         # If warning is active, return unchanged components
-    #         return (
-    #             chatbot,  # unchanged chatbot
-    #             "",  # empty sources
-    #             None,  # no feedback state
-    #             session_id  # keep session
-    #         )
-        
-    #     # Include start_chat functionality here
-    #     history = chatbot + [(query, None)]
-    #     history = [tuple(x) for x in history]
-        
-    #     # Proceed with chat
-    #     async for update in chat(query, history, sources, reports, subtype, year, client_ip, session_id):
-    #         # The last update will be returned
-    #         chatbot_update, sources_update, feedback_update, session_update = update
-        
-    #     return (
-    #         chatbot_update,
-    #         sources_update,
-    #         feedback_update,
-    #         session_update
-    #     )
-    
     async def handle_chat_flow(warning_active, query, chatbot, sources, reports, subtype, year, client_ip, session_id):
-        """Handle chat flow with hard stop for warnings"""
-        # Check if any filters are selected
-        no_filters = (not reports) and (not sources) and (not subtype) and (not year)
-        
-        if warning_active:  # Only check warning_active, not no_filters
-            # If warning is active, yield unchanged components instead of returning
+        """Handle chat flow with warning check and chat processing"""
+        if warning_active or query is None:  
+            # Either warning is active or query was stopped by filter check
             yield (
                 chatbot,  # unchanged chatbot
                 "",  # empty sources
@@ -721,50 +677,80 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
         async for update in chat(query, history, sources, reports, subtype, year, client_ip, session_id):
             yield update
     
-    #-------------------- Gradio voodoo -------------------------
+    #-------------------- Gradio Handlers -------------------------
     
-    # Update the event handlers
-    # (textbox
-    #     .submit(get_client_ip_handler, [textbox], [client_ip], api_name="get_ip_textbox")
-    #     .then(start_chat, [textbox, chatbot], [textbox, tabs, chatbot], queue=False, api_name="start_chat_textbox")
-    #     .then(chat, 
-    #         [textbox, chatbot, dropdown_sources, dropdown_reports, dropdown_category, dropdown_year, client_ip, session_id], 
-    #         [chatbot, sources_textbox, feedback_state, session_id], 
-    #         queue=True, concurrency_limit=8, api_name="chat_textbox")
-    #     .then(show_feedback, [feedback_state], [feedback_row, feedback_thanks, feedback_state], api_name="show_feedback_textbox")
-    #     .then(finish_chat, None, [textbox], api_name="finish_chat_textbox"))
-
+    # Hanlders: Text input from Textbox
     (textbox
         .submit(
             check_filters,
             [textbox, dropdown_sources, dropdown_reports, dropdown_category, dropdown_year],
-            [warning_state, warning_row, textbox, pending_query]
+            [warning_state, warning_row, textbox, pending_query],
+            api_name="submit_textbox"
         )
         .then(
             get_client_ip_handler,
             [textbox],
             [client_ip],
-            show_progress=False
+            show_progress=False,
+            api_name="get_client_ip_textbox"
         )
         .then(
             handle_chat_flow,
             [warning_state, textbox, chatbot, dropdown_sources, dropdown_reports, dropdown_category, dropdown_year, client_ip, session_id],
             [chatbot, sources_textbox, feedback_state, session_id],
-            queue=True  # Changed from streaming=True
+            queue=True,
+            api_name="handle_chat_flow_textbox"
         )
         .then(
-            handle_feedback,
+            show_feedback,
             [feedback_state],
-            [feedback_row, feedback_thanks, feedback_state]
+            [feedback_row, feedback_thanks, feedback_state],
+            api_name="show_feedback_textbox"
         )
         .then(
             finish_chat,
             None,
-            [textbox]
+            [textbox],
+            api_name="finish_chat_textbox"
         ))
+    
+    # Hanlders: Text input from Examples (same chain as textbox)
+    examples_hidden.change(
+        lambda x: x,  # just get the example string and send it through the chain
+        inputs=examples_hidden,
+        outputs=textbox,
+        api_name="submit_examples"
+        ).then(
+            check_filters,
+            [textbox, dropdown_sources, dropdown_reports, dropdown_category, dropdown_year],
+            [warning_state, warning_row, textbox, pending_query],
+            api_name="check_filters_examples"
+        ).then(
+            get_client_ip_handler,
+            [textbox],
+            [client_ip],
+            show_progress=False,
+            api_name="get_client_ip_examples"
+        ).then( 
+            handle_chat_flow,
+            [warning_state, textbox, chatbot, dropdown_sources, dropdown_reports, dropdown_category, dropdown_year, client_ip, session_id],
+            [chatbot, sources_textbox, feedback_state, session_id],
+            queue=True,
+            api_name="handle_chat_flow_examples"
+        ).then(
+            show_feedback,
+            [feedback_state],
+            [feedback_row, feedback_thanks, feedback_state],
+            api_name="show_feedback_examples"
+        ).then(
+            finish_chat,
+            None,
+            [textbox],
+            api_name="finish_chat_examples"
+        )
         
 
-    # Add handlers for the warning buttons
+    # Handlers for the warning buttons
     proceed_btn.click(
         lambda query: (
             False,  # warning state
@@ -775,7 +761,7 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
         pending_query,
         [warning_state, warning_row, textbox, pending_query]
     ).then(
-        lambda: False,  # Force warning_state to False
+        lambda: False,  
         None,
         warning_state
     ).then(
@@ -786,9 +772,9 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
         handle_chat_flow,
         [warning_state, textbox, chatbot, dropdown_sources, dropdown_reports, dropdown_category, dropdown_year, client_ip, session_id],
         [chatbot, sources_textbox, feedback_state, session_id],
-        queue=True  # Changed from streaming=True
+        queue=True  
     ).then(
-        handle_feedback,
+        show_feedback,
         [feedback_state],
         [feedback_row, feedback_thanks, feedback_state]
     ).then(
@@ -808,15 +794,6 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
         [warning_state, warning_row, textbox, pending_query]
     )
 
-    (examples_hidden
-        .change(start_chat, [examples_hidden, chatbot], [textbox, tabs, chatbot], queue=False, api_name="start_chat_examples")
-        .then(get_client_ip_handler, [examples_hidden], [client_ip], api_name="get_ip_examples")
-        .then(chat, 
-            [examples_hidden, chatbot, dropdown_sources, dropdown_reports, dropdown_category, dropdown_year, client_ip, session_id], 
-            [chatbot, sources_textbox, feedback_state, session_id], 
-            concurrency_limit=8, api_name="chat_examples")
-        .then(show_feedback, [feedback_state], [feedback_row, feedback_thanks, feedback_state], api_name="show_feedback_examples")
-        .then(finish_chat, None, [textbox], api_name="finish_chat_examples"))
 
     demo.queue()