Update app.py

app.py

@@ -111,7 +111,7 @@ class SessionManager:
 # Initialize session manager
 session_manager = SessionManager()
     
-async def chat(query,history,sources,reports,subtype,year, client_ip=None, session_id = None, request:gr.Request = None):
+async def chat(query,history,sources,reports,subtype, client_ip=None, session_id = None, request:gr.Request = None):
     """taking a query and a message history, use a pipeline (reformulation, retriever, answering) 
        to yield a tuple of:(messages in gradio format/messages in langchain format, source documents)
     """
@@ -131,7 +131,7 @@ async def chat(query,history,sources,reports,subtype,year, client_ip=None, sessi
     print(f"sources:{sources}")
     print(f"reports:{reports}")
     print(f"subtype:{subtype}")
-    print(f"year:{year}")
+    #print(f"year:{year}")
     docs_html = ""
     output_query = ""
 
@@ -140,7 +140,7 @@ async def chat(query,history,sources,reports,subtype,year, client_ip=None, sessi
 
     ##------------------------------get context---------------------------------------------- 
     context_retrieved = get_context(vectorstore=vectorstore,query=query,reports=reports,
-                                                sources=sources,subtype=subtype,year=year)
+                                                sources=sources,subtype=subtype)
     context_retrieved_formatted = "||".join(doc.page_content for doc in context_retrieved)
     context_retrieved_lst = [doc.page_content for doc in context_retrieved]
     
@@ -189,8 +189,8 @@ async def chat(query,history,sources,reports,subtype,year, client_ip=None, sessi
         # "system_prompt": SYSTEM_PROMPT, #REMOVED FOR TESTING
         # "sources": sources, #REMOVED FOR TESTING
         # "reports": reports, #REMOVED FOR TESTING
-        # "subtype": subtype, #REMOVED FOR TESTING
-        "year": year,
+        "subtype": subtype, #REMOVED FOR TESTING
+        #"year": year,
         "question": query,
         "retriever": model_config.get('retriever','MODEL'),
         "endpoint_type": model_config.get('reader','TYPE'),
@@ -350,7 +350,7 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
                         
                         #----- First level filter for selecting Report source/category ----------
                         dropdown_sources = gr.Dropdown(
-                            ["Consolidated","Ministry, Department, Agency and Projects","Local Government","Value for Money","Thematic"],
+                            ["Consolidated","Ministry, Department, Agency","Projects","Hospital","Local Government","Value for Money","Thematic"],
                             label="Select Report Category",
                             value="Consolidated",
                             interactive=True,
@@ -359,8 +359,9 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
                         #------ second level filter for selecting subtype within the report category selected above
                         dropdown_category = gr.Dropdown(
                             new_files["Consolidated"],
-                            value = new_files["Consolidated"],
-                            label = "Filter for Sub-Type",
+                            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 ----------------
@@ -369,12 +370,12 @@ with gr.Blocks(title="Audit Q&A", css= "style.css", theme=theme,elem_id = "main-
                         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=['2023'],
-                            interactive=True,
+                        #dropdown_year = gr.Dropdown(
+                        #    ['2018','2019','2020','2021','2022','2023'],
+                        #    label="Filter for year",
+                        #    multiselect=True,
+                        #    value=['2023'],
+                        #    interactive=True,
                         )
                         gr.Markdown("-------------------------------------------------------------------------")
                         #---------------- Another way to select reports across category and sub-type ------------