filters warning implemented

app.py

@@ -391,14 +391,16 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
                         dropdown_sources = gr.Dropdown(
                             ["Consolidated","Ministry, Department, Agency and Projects","Local Government","Value for Money","Thematic"],
                             label="Select Report Category",
-                            value="Consolidated",
+                            value=None,
+                            # value="Consolidated",
                             interactive=True,
                         )
 
                         #------ second level filter for selecting subtype within the report category selected above
                         dropdown_category = gr.Dropdown(
                             new_files["Consolidated"],
-                            value = new_files["Consolidated"],
+                            value=None,
+                            # value = new_files["Consolidated"],
                             label = "Filter for Sub-Type",
                             interactive=True)
 
@@ -412,7 +414,8 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
                             ['2018','2019','2020','2021','2022','2023'],
                             label="Filter for year",
                             multiselect=True,
-                            value=['2023'],
+                            value=None,
+                            # value=['2023'],
                             interactive=True,
                         )
                         gr.Markdown("-------------------------------------------------------------------------")
@@ -421,7 +424,8 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
                         new_report_list,
                         label="Or select specific reports",
                         multiselect=True,
-                        value=[],
+                        value=None,
+                        # value=[],
                         interactive=True,)
 
                     ############### tab for Question selection ###############
@@ -589,6 +593,20 @@ 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):
+        """Handle feedback display with proper output format"""
+        if logs_data is None:
+            return (
+                gr.update(visible=False),  # feedback_row
+                gr.update(visible=False),  # feedback_thanks
+                None  # feedback_state
+            )
+        return (
+            gr.update(visible=True),  # feedback_row
+            gr.update(visible=False),  # feedback_thanks
+            logs_data  # feedback_state
+        )
+    
     okay_btn.click(
         submit_feedback_okay,
         [feedback_state],
@@ -606,24 +624,164 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
     # Add these state components at the top level of the Blocks
     session_id = gr.State(None)
     client_ip = gr.State(None)
+
     
     @demo.load(api_name="get_client_ip")
     def get_client_ip_handler(dummy_input="", request: gr.Request = None):
         """Handler for getting client IP in Gradio context"""
         return get_client_ip(request)
     
+    #-------------------- Filter Warning -------------------------
+    warning_state = gr.State(False)
+    pending_query = gr.State(None)
+
+    with gr.Row(visible=False) as warning_row:
+        gr.Markdown("**No report filter selected. Are you sure you want to proceed?**")
+        with gr.Row():
+            proceed_btn = gr.Button("Proceed")
+            cancel_btn = gr.Button("Cancel")
+    
+    def show_warning():
+        """Show warning popup when no filters selected"""
+        return gr.update(visible=True)
+
+    def hide_warning():
+        """Hide warning popup"""
+        return gr.update(visible=False)
+
+    def check_filters(textbox_value, sources, reports, subtype, year):
+        """Check if any filters are selected"""
+        no_filters = (not reports) and (not sources) and (not subtype) and (not year)
+        if no_filters:
+            # If no filters, show warning and stop chain
+            return (
+                True,  # warning state
+                gr.update(visible=True),  # warning row visibility
+                None,  # textbox value (None stops the chain)
+                textbox_value  # store the query
+            )
+        # If filters exist, proceed normally
+        return (
+            False,
+            gr.update(visible=False),
+            textbox_value,  # keep the original value
+            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
+        )
+    
     #-------------------- Gradio voodoo -------------------------
     
     # 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"))
+    
     (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"))
+        .submit(
+            check_filters,
+            [textbox, dropdown_sources, dropdown_reports, dropdown_category, dropdown_year],
+            [warning_state, warning_row, textbox, pending_query]
+        )
+        .then(
+            get_client_ip_handler,
+            [textbox],
+            [client_ip],
+            show_progress=False
+        )
+        .then(  # Remove start_chat from here
+            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]
+        )
+        .then(
+            handle_feedback,
+            [feedback_state],
+            [feedback_row, feedback_thanks, feedback_state]
+        )
+        .then(
+            finish_chat,
+            None,
+            [textbox]
+        ))
+        
+
+    # Add handlers for the warning buttons
+    proceed_btn.click(
+        lambda query: (
+            False,  # warning state
+            gr.update(visible=False),  # warning row
+            gr.update(value=query if query else "", interactive=True),  # restore query
+            None  # clear pending query
+        ),
+        pending_query,
+        [warning_state, warning_row, textbox, pending_query]
+    ).then(
+        lambda: False,  # Force warning_state to False
+        None,
+        warning_state
+    ).then(
+        get_client_ip_handler,
+        [textbox],
+        [client_ip]
+    ).then(  # Remove start_chat call and let handle_chat_flow handle the history update
+        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]
+    ).then(
+        handle_feedback,
+        [feedback_state],
+        [feedback_row, feedback_thanks, feedback_state]
+    ).then(
+        finish_chat,
+        None,
+        [textbox]
+    )
+
+    cancel_btn.click(
+        lambda: (
+            False,
+            gr.update(visible=False),
+            gr.update(value="", interactive=True),
+            None
+        ),
+        None,
+        [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")