Update app.py

app.py

@@ -147,6 +147,32 @@ async def chat(query,history,sources,reports,subtype, client_ip=None, session_id
                                                 sources=sources,subtype=subtype)
     end_time = time.time()
     print("Time for retriever:",end_time - start_time)
+
+    # WARNING FOR NO CONTEXT: Check if any paragraphs were retrieved, add warning if none found
+    # We use this in the Gradio UI below (displays in the chat dialogue box)
+    if not context_retrieved or len(context_retrieved) == 0:
+        warning_message = "⚠️ **No relevant information was found in the audit reports pertaining your query.** Please try rephrasing your question or selecting different report filters."
+        history[-1] = (query, warning_message)
+        # Update logs with the warning instead of answer
+        logs_data = {
+            "record_id": str(uuid4()),
+            "session_id": session_id,
+            "session_duration_seconds": session_duration,
+            "client_location": session_data['location_info'],
+            "platform": session_data['platform_info'],
+            "year": year,
+            "question": query,
+            "retriever": model_config.get('retriever','MODEL'),
+            "endpoint_type": model_config.get('reader','TYPE'),
+            "reader": model_config.get('reader','NVIDIA_MODEL'),
+            "answer": warning_message,
+            "no_results": True  # Flag to indicate no results were found
+        }
+        yield [tuple(x) for x in history], "", logs_data, session_id
+        # Save log for the warning response
+        save_logs(scheduler, JSON_DATASET_PATH, logs_data)
+        return
+        
     context_retrieved_formatted = "||".join(doc.page_content for doc in context_retrieved)
     context_retrieved_lst = [doc.page_content for doc in context_retrieved]
     
@@ -245,6 +271,7 @@ async def chat(query,history,sources,reports,subtype, client_ip=None, session_id
                 answer_yet += token
                 parsed_answer = parse_output_llm_with_sources(answer_yet)
                 history[-1] = (query, parsed_answer)
+                # update logs_data with current answer
                 logs_data["answer"] = parsed_answer
                 yield [tuple(x) for x in history], docs_html, logs_data, session_id
         end_time = time.time()
@@ -416,7 +443,7 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
                                 label = "Filter for Sub-Type",
                                 interactive=True)
 
-                            #----------- update the secodn level filter abse don values from first level ----------------
+                            #----------- update the second level filter based on values from first level ----------------
                             def rs_change(rs):
                                 if rs:  # Only update choices if a value is selected
                                     return gr.update(choices=new_files[rs], value=None)  # Set value to None (no preselection)
@@ -649,9 +676,19 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
                 
                 
 
-    def show_feedback(logs):
-        """Show feedback buttons and store logs in state"""
-        return gr.update(visible=True), gr.update(visible=False), logs 
+    def show_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
+        )
 
     def submit_feedback_okay(logs_data):
         """Handle 'okay' feedback submission"""
@@ -683,30 +720,260 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
     def get_client_ip_handler(dummy_input="", request: gr.Request = None):
         """Handler for getting client IP in Gradio context"""
         return get_client_ip(request)
-    
 
-    #-------------------- Gradio voodoo -------------------------
+        #-------------------- No Filters Set Warning -------------------------
+    # Warn users when no filters are selected
+    warning_state = gr.State(False)
+    pending_query = gr.State(None)
+
+    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)
+
+    # Logic needs to be changed to accomodate default filter values (currently I have them all set to None)
+    def check_filters(check_status, textbox_value, sources, reports, subtype):
+        """Check if any filters are selected"""
+        # If a previous check failed, don't continue with this check
+        if check_status is not None:
+            return (
+                check_status,  # keep current check status
+                False,  # keep warning state unchanged
+                gr.update(visible=False),  # keep warning row visibility unchanged
+                textbox_value,  # keep the textbox value
+                None  # no need to store query
+            )
+        
+        no_filters = (not reports) and (not sources) and (not subtype)
+        if no_filters:
+            # If no filters, show warning and set status
+            return (
+                "filter",  # check status - no filters selected
+                True,  # warning state
+                gr.update(visible=True),  # warning row visibility
+                gr.update(value=""),  # clear textbox
+                textbox_value  # store the query
+            )
+        # If filters exist, proceed normally
+        return (
+            None,  # no check failed
+            False,  # normal state
+            gr.update(visible=False),  # hide warning
+            textbox_value,  # keep the original value
+            None  # no need to store query
+        )
     
-    # Update the event handlers
+    async def handle_chat_flow(check_status, warning_active, short_query_warning_active, query, chatbot, sources, reports, subtype, client_ip, session_id):
+        """Handle chat flow with explicit check for status"""
+        # Don't proceed if any check failed or query is None
+        if check_status is not None or warning_active or short_query_warning_active or query is None or query == "":
+            yield (
+                chatbot,  # unchanged chatbot
+                "",  # empty sources
+                None,  # no feedback state
+                session_id  # keep session
+            )
+            return  # Exit the generator
+        
+        # Include start_chat functionality here
+        history = chatbot + [(query, None)]
+        history = [tuple(x) for x in history]
+        
+        # Proceed with chat and yield each update
+        async for update in chat(query, history, sources, reports, subtype, client_ip, session_id):
+            yield update
+
+    #-------------------- Short Query Warning -------------------------
+    # Warn users when query is too short (less than 4 words)
+    short_query_warning_state = gr.State(False)
+    check_status = gr.State(None)
+
+    def check_query_length(textbox_value):
+        """Check if query has at least 4 words"""
+        if textbox_value and len(textbox_value.split()) < 3:
+            # If query is too short, show warning and set status
+            return (
+                "short",  # check status - this query is too short
+                True,  # short query warning state
+                gr.update(visible=True),  # short query warning row visibility
+                gr.update(value=""),  # clear textbox 
+                textbox_value  # store the query
+            )
+        # If query is long enough, proceed normally
+        return (
+            None,  # no check failed
+            False,  # normal state
+            gr.update(visible=False),  # hide warning
+            gr.update(value=textbox_value),  # keep the textbox value
+            None  # no need to store query
+        )
+
+
+    #-------------------- Gradio Handlers -------------------------
+
+    # Hanlders: Text input from 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, 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"))
-
-    (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,  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"))
+        .submit(
+            check_query_length,
+            [textbox],
+            [check_status, short_query_warning_state, short_query_warning_row, textbox, pending_query],
+            api_name="check_query_length_textbox"
+        )
+        .then(
+            check_filters,
+            [check_status, textbox, dropdown_sources, dropdown_reports, dropdown_category],
+            [check_status, warning_state, warning_row, textbox, pending_query],
+            api_name="submit_textbox",
+            show_progress=False
+        )
+        .then(
+            get_client_ip_handler,
+            [textbox],
+            [client_ip],
+            show_progress=False,
+            api_name="get_client_ip_textbox"
+        )
+        .then(
+            handle_chat_flow,
+            [check_status, warning_state, short_query_warning_state, textbox, chatbot, dropdown_sources, dropdown_reports, dropdown_category, client_ip, session_id],
+            [chatbot, sources_textbox, feedback_state, session_id],
+            queue=True,
+            api_name="handle_chat_flow_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 Examples (same chain as textbox)
+    examples_hidden.change(
+        lambda x: x,
+        inputs=examples_hidden,
+        outputs=textbox,
+        api_name="submit_examples"
+        ).then(
+            check_query_length,
+            [textbox],
+            [check_status, short_query_warning_state, short_query_warning_row, textbox, pending_query],
+            api_name="check_query_length_examples"
+        ).then(
+            check_filters,
+            [check_status, textbox, dropdown_sources, dropdown_reports, dropdown_category],
+            [check_status, warning_state, warning_row, textbox, pending_query],
+            api_name="check_filters_examples",
+            show_progress=False
+        ).then(
+            get_client_ip_handler,
+            [textbox],
+            [client_ip],
+            show_progress=False,
+            api_name="get_client_ip_examples"
+        ).then( 
+            handle_chat_flow,
+            [check_status, warning_state, short_query_warning_state, textbox, chatbot, dropdown_sources, dropdown_reports, dropdown_category, 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"
+        )
+        
+
+    # Handlers for the warning buttons
+    proceed_btn.click(
+        lambda query: (
+            None,  # reset check status
+            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,
+        [check_status, warning_state, warning_row, textbox, pending_query]
+    ).then(
+        get_client_ip_handler,
+        [textbox],
+        [client_ip]
+    ).then(
+        handle_chat_flow,
+        [check_status, warning_state, short_query_warning_state, textbox, chatbot, dropdown_sources, dropdown_reports, dropdown_category, client_ip, session_id],
+        [chatbot, sources_textbox, feedback_state, session_id],
+        queue=True  
+    ).then(
+        show_feedback,
+        [feedback_state],
+        [feedback_row, feedback_thanks, feedback_state]
+    ).then(
+        finish_chat,
+        None,
+        [textbox]
+    )
+
+    # Cancel button for no filters
+    cancel_btn.click(
+        lambda: (
+            None,  # reset check status
+            False,  # warning state
+            gr.update(visible=False),  # warning row
+            gr.update(value="", interactive=True),  # clear textbox
+            None  # clear pending query
+        ),
+        None,
+        [check_status, warning_state, warning_row, textbox, pending_query]
+    )
+
+    # short query warning OK button
+    short_query_proceed_btn.click(
+        lambda query: (
+            None,  # reset check status
+            False,  # short query warning state
+            gr.update(visible=False),  # short query warning row
+            gr.update(value=query if query else "", interactive=True),  # restore query
+            None  # clear pending query
+        ),
+        pending_query,
+        [check_status, short_query_warning_state, short_query_warning_row, textbox, pending_query]
+    )
+
+    
+    #(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, 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"))
+
+    #(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,  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()