Update app.py

app.py

@@ -105,17 +105,18 @@ async def chat(query,history,sources,reports,subtype,year):
 
     ##------------------------decide which collection to fetch------------------------------
     if len(reports) == 0:
-        print("selecting source:", sources)
-        vectorstore = vectorstores[sources]
+        vectorstore = vectorstores["allreports"]
     else:
-        print("selecting source:","allreports")
         vectorstore = vectorstores["allreports"]
 
     ###-------------------------------------Construct Filter------------------------------------
     if len(reports) == 0:
-        print("defining filter for source")
+        print("defining filter for:",sources,":",subtype,":",year)
         filter=rest.Filter(
-                must=[
+                must=[rest.FieldCondition(
+                        key="metadata.source",
+                        match=rest.MatchAny(value=sources)
+                    ),
                     rest.FieldCondition(
                         key="metadata.subtype",
                         match=rest.MatchValue(value=subtype)
@@ -123,9 +124,9 @@ async def chat(query,history,sources,reports,subtype,year):
                     rest.FieldCondition(
                         key="metadata.year",
                         match=rest.MatchAny(any=year)
-                    )])
+                    ),])
     else:
-        print("defining filter for allreports")
+        print("defining filter for allreports:",reports)
         filter=rest.Filter(
                 must=[
                     rest.FieldCondition(
@@ -139,7 +140,7 @@ async def chat(query,history,sources,reports,subtype,year):
     question_lst= [query]
     for question in question_lst:
         retriever = vectorstore.as_retriever(
-          search_type="similarity_score_threshold", search_kwargs={"score_threshold": 0.6, "k": 3, "filter":filter})
+          search_type="similarity_score_threshold", search_kwargs={"score_threshold": 0.6, "k": 5, "filter":filter})
         
         context_retrieved = retriever.invoke(question)
         print(len(context_retrieved))