change filter and get_context for filter

app.py

@@ -17,10 +17,9 @@ except Exception as e:
 
 def retrieve(
     query: str, 
-    reports_filter: str = "", 
-    sources_filter: str = "", 
-    subtype_filter: str = "", 
-    year_filter: str = ""
+    collection_name: str =None,
+    top_level_filter: str = None,
+    top_level_filter_value:str|list = None
 ) -> list:
     """
     Retrieve semantically similar documents from the vector database for MCP clients.
@@ -35,20 +34,12 @@ def retrieve(
     Returns:
         list: List of dictionaries containing document content, metadata, and scores
     """
-    # Parse filter inputs (convert empty strings to None or lists)
-    reports = [r.strip() for r in reports_filter.split(",") if r.strip()] if reports_filter else []
-    sources = sources_filter.strip() if sources_filter else None
-    subtype = subtype_filter.strip() if subtype_filter else None
-    year = [y.strip() for y in year_filter.split(",") if y.strip()] if year_filter else None
+
     
     # Call retriever function and return raw results
     results = get_context(
         vectorstore=vectorstore,
         query=query,
-        reports=reports,
-        sources=sources,
-        subtype=subtype,
-        year=year
     )
     
     return results
@@ -105,7 +96,7 @@ with gr.Blocks() as ui:
     # UI event handler
     submit_btn.click(
         fn=retrieve,
-        inputs=[query_input, reports_input, sources_input, subtype_input, year_input],
+        inputs=[query_input],
         outputs=output,
         api_name="retrieve"
     )

utils/retriever.py

@@ -70,10 +70,7 @@ def get_vectorstore() -> VectorStoreInterface:
     return vectorstore
 
 def create_filter(
-    reports: List[str] = None,
-    sources: str = None,
-    subtype: str = None,
-    year: List[str] = None
+    filter_metadata:list[Dict] = None,
 ) -> Optional[rest.Filter]:
     """
     Create a Qdrant filter based on metadata criteria.
@@ -87,50 +84,27 @@ def create_filter(
     Returns:
         Qdrant Filter object or None if no filters specified
     """
-    if not any([reports, sources, subtype, year]):
+    if filter_metadata == None:
         return None
     
     conditions = []
-    
-    if reports and len(reports) > 0:
-        logging.info(f"Defining filter for reports: {reports}")
-        conditions.append(
-            rest.FieldCondition(
-                key="metadata.filename",
-                match=rest.MatchAny(any=reports)
-            )
-        )
-    else:
-        if sources:
-            logging.info(f"Defining filter for sources: {sources}")
-            conditions.append(
-                rest.FieldCondition(
-                    key="metadata.source",
-                    match=rest.MatchValue(value=sources)
-                )
-            )
-        
-        if subtype:
-            logging.info(f"Defining filter for subtype: {subtype}")
-            conditions.append(
-                rest.FieldCondition(
-                    key="metadata.subtype",
-                    match=rest.MatchValue(value=subtype)
+    logging.info(f"Defining filters for {filter_metadata}")
+    for condition in filter_metadata:
+        for key, val in condition:
+            if isinstance(val, str):
+                conditions.append(rest.FieldCondition(
+                key=f"metadata.{key}",
+                match=rest.MatchValue(value=val)
                 )
             )
-        
-        if year and len(year) > 0:
-            logging.info(f"Defining filter for years: {year}")
-            conditions.append(
-                rest.FieldCondition(
-                    key="metadata.year",
-                    match=rest.MatchAny(any=year)
-                )
+            else:
+                conditions.append(
+            rest.FieldCondition(
+                key=f"metadata.{key}",
+                match=rest.MatchAny(any=val)
             )
-    
-    if conditions:
-        return rest.Filter(must=conditions)
-    return None
+    return conditions
+
 
 def rerank_documents(query: str, documents: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
     """
@@ -193,10 +167,8 @@ def rerank_documents(query: str, documents: List[Dict[str, Any]]) -> List[Dict[s
 def get_context(
     vectorstore: VectorStoreInterface,
     query: str,
-    reports: List[str] = None,
-    sources: str = None,
-    subtype: str = None,
-    year: List[str] = None
+    collection_name: str = None,
+    filter_metadata = None,
 ) -> List[Dict[str, Any]]:
     """
     Retrieve semantically similar documents from the vector database with optional reranking.
@@ -231,12 +203,12 @@ def get_context(
         #              with_payload=True)
         # filter support for QdrantVectorStore
         #if isinstance(vectorstore, QdrantVectorStore):
-        #    filter_obj = create_filter(reports, sources, subtype, year)
-        #    if filter_obj:
-        #        search_kwargs["filter"] = filter_obj
+            filter_obj = create_filter(filter_metadata)
+            if filter_obj:
+                search_kwargs["filter"] = filter_obj
         
         # Perform initial retrieval
-        retrieved_docs = vectorstore.search(query, top_k)
+        retrieved_docs = vectorstore.search(query, top_k, **search_kwargs)
         
         logging.info(f"Retrieved {len(retrieved_docs)} documents for query: {query[:50]}...")