change report selection

app.py

@@ -362,28 +362,123 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
                     with gr.Tab("Reports",elem_id = "tab-config",id = 2):
                         gr.Markdown("Reminder: To get better results select the specific report/reports")
 
+                        #---------------- SELECTION METHOD - RADIO BUTTON ------------
+                        search_method = gr.Radio(
+                            choices=["Search by Report Name", "Search by Filters"],
+                            label="""Choose search method <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>""",
+                            info= """This is test"""
+                            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,
+                            )
                         
                         #----- First level filter for selecting Report source/category ----------
-                        dropdown_sources = gr.Dropdown(
-                            ["Consolidated","Ministry, Department and Agency","Project","Hospital","Local Government","Value for Money","Thematic"],
-                            label="Select Report Category",
-                            value="Consolidated",
-                            interactive=True,
-                        )
+
+                        #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(
+                                [],  # Start with empty choices
+                                value=None,
+                                label = "Filter for Sub-Type",
+                                interactive=True)
+                            
+                        #dropdown_sources = gr.Dropdown(
+                        #    ["Consolidated","Ministry, Department and Agency","Project","Hospital","Local Government","Value for Money","Thematic"],
+                        #    label="Select Report Category",
+                        #    value="Consolidated",
+                        #    interactive=True,
+                        #)
 
                         #------ second level filter for selecting subtype within the report category selected above
-                        dropdown_category = gr.Dropdown(
-                            new_files["Consolidated"],
-                            multiselect = True,                        
-                            value = new_files["Consolidated"][0],
-                            label = "Filter for Sub-reports",
-                            interactive=True)
+                        #dropdown_category = gr.Dropdown(
+                        #    new_files["Consolidated"],
+                        #    multiselect = True,                        
+                        #    value = new_files["Consolidated"][0],
+                        #    label = "Filter for Sub-reports",
+                        #    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])
 
+
+                        # 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
+                            ]
+                        )
+
                         #--------- Select the years for reports -------------------------------------
                         #dropdown_year = gr.Dropdown(
                         #    ['2018','2019','2020','2021','2022','2023'],
@@ -392,14 +487,14 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
                         #    value=['2023'],
                         #    interactive=True,
                         #)
-                        gr.Markdown("-------------------------------------------------------------------------")
+                        #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=[],
-                        interactive=True,)
+                        #dropdown_reports = gr.Dropdown(
+                        #new_report_list,
+                        #label="Or select specific reports",
+                        #multiselect=True,
+                        #value=[],
+                        #interactive=True,)
 
                     ############### tab for Question selection ###############
                     with gr.TabItem("Examples",elem_id = "tab-examples",id = 0):