Dropdown selection logic refactor

app.py

@@ -414,48 +414,100 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
                             gr.Markdown("""<div class="question-tooltip">?
                                 <div class="tooltip-content">Select the audit reports that you want to analyse directly or browse through categories and select reports</div>
                             </div>""", elem_id="reports-tooltip")
-
                         
-                        #----- First level filter for selecting Report source/category ----------
-                        dropdown_sources = gr.Dropdown(
-                            ["Consolidated","Ministry, Department, Agency and Projects","Local Government","Value for Money","Thematic"],
-                            label="Select Report Category",
-                            value=None,
-                            # value="Consolidated",
-                            interactive=True,
+                        #---------------- SELECTION METHOD - RADIO BUTTON ------------
+                        search_method = gr.Radio(
+                            choices=["Search by Report Name", "Search by Filters"],
+                            label="Choose search method",
+                            value="Search by Report Name",
                         )
+                        
+                        #---------------- SELECT BY REPORT NAME SECTION ------------
+                        with gr.Group(visible=True) as report_name_section:
+                            # Get default report value from config if present
+                            default_report = model_config.get('app', 'dropdown_default', fallback=None)
+                            # Check if it actually exists in the master list
+                            default_report_value = [default_report] if default_report in new_report_list else None
+                            
+                            dropdown_reports = gr.Dropdown(
+                                new_report_list,
+                                label="Select one or more reports (scroll or type to search)",
+                                multiselect=True,
+                                value=default_report_value,
+                                interactive=True,
+                            )
+                        
+                        #---------------- SELECT BY FILTERS SECTION ------------
+                        with gr.Group(visible=False) as filters_section:
+                            #----- First level filter for selecting Report source/category ----------
+                            dropdown_sources = gr.Dropdown(
+                                ["Consolidated","Ministry, Department, Agency and Projects","Local Government","Value for Money","Thematic"],
+                                label="Select Report Category",
+                                value=None,
+                                interactive=True,
+                            )
 
-                        #------ second level filter for selecting subtype within the report category selected above
-                        dropdown_category = gr.Dropdown(
-                            new_files["Consolidated"],
-                            value=None,
-                            # value = new_files["Consolidated"],
-                            label = "Filter for Sub-Type",
-                            interactive=True)
-
-                        #----------- update the secodn level filter abse don values from first level ----------------
-                        def rs_change(rs):
-                            return gr.update(choices=new_files[rs], value=new_files[rs])
-                        dropdown_sources.change(fn=rs_change, inputs=[dropdown_sources], outputs=[dropdown_category])
-
-                        #--------- Select the years for reports -------------------------------------
-                        dropdown_year = gr.Dropdown(
-                            ['2018','2019','2020','2021','2022','2023'],
-                            label="Filter for year",
-                            multiselect=True,
-                            value=None,
-                            # value=['2023'],
-                            interactive=True,
+                            #------ second level filter for selecting subtype within the report category selected above
+                            dropdown_category = gr.Dropdown(
+                                [],  # Start with empty choices
+                                value=None,
+                                label = "Filter for Sub-Type",
+                                interactive=True)
+
+                            #----------- 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)
+                                else:
+                                    return gr.update(choices=[], value=None)  # Empty choices if nothing selected
+                            dropdown_sources.change(fn=rs_change, inputs=[dropdown_sources], outputs=[dropdown_category])
+
+                            #--------- Select the years for reports -------------------------------------
+                            dropdown_year = gr.Dropdown(
+                                ['2018','2019','2020','2021','2022','2023'],
+                                label="Filter for year",
+                                multiselect=True,
+                                value=None,
+                                interactive=True,
+                            )
+                        
+                        # Toggle visibility based on search method
+                        def toggle_search_method(method):
+                            """Note - this function removes the default value from report search when toggled"""
+                            if method == "Search by Report Name":
+                                # Show report selection, hide filters, and clear filter values
+                                return (
+                                    gr.update(visible=True),  # report_name_section
+                                    gr.update(visible=False),  # filters_section
+                                    gr.update(value=None),    # dropdown_sources
+                                    gr.update(value=None),    # dropdown_category
+                                    gr.update(value=None),    # dropdown_year
+                                    gr.update()               # dropdown_reports
+                                )
+                            else:  # "Search by Filters"
+                                # Show filters, hide report selection, and clear report values
+                                return (
+                                    gr.update(visible=False), # report_name_section 
+                                    gr.update(visible=True),  # filters_section
+                                    gr.update(),              # dropdown_sources
+                                    gr.update(),              # dropdown_category
+                                    gr.update(),              # dropdown_year
+                                    gr.update(value=[])       # dropdown_reports
+                                )
+                        
+                        # Pass to the event handler
+                        search_method.change(
+                            fn=toggle_search_method,
+                            inputs=[search_method],
+                            outputs=[
+                                report_name_section, 
+                                filters_section,
+                                dropdown_sources,
+                                dropdown_category, 
+                                dropdown_year,
+                                dropdown_reports
+                            ]
                         )
-                        gr.Markdown("-------------------------------------------------------------------------")
-                        #---------------- Another way to select reports across category and sub-type ------------
-                        dropdown_reports = gr.Dropdown(
-                        new_report_list,
-                        label="Or select specific reports",
-                        multiselect=True,
-                        value=None,
-                        # value=[],
-                        interactive=True,)
 
                     ############### tab for Question selection ###############
                     with gr.TabItem("Examples",elem_id = "tab-examples",id = 0):
@@ -875,6 +927,7 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
         [textbox]
     )
 
+    # Cancel button for no filters
     cancel_btn.click(
         lambda: (
             None,  # reset check status

model_params.cfg

@@ -14,3 +14,4 @@ NVIDIA_ENDPOINT = https://huggingface.co/api/integrations/dgx/v1
 MAX_TOKENS = 64
 [app]
 repo_id = mtyrrell/spaces_log
+dropdown_default = Consolidted Report ,Report of the Auditor General 2023

style.css

@@ -584,3 +584,6 @@ span.chatbot > p > img{
 
 
 
+
+
+