Update doc_searcher.py

doc_searcher.py

@@ -1,5 +1,5 @@
 from qdrant_client import QdrantClient
-from qdrant_client.models import Filter, FieldCondition, MatchValue
+from qdrant_client.models import Filter, FieldCondition, MatchValue, MatchText
 from fastembed import SparseTextEmbedding, LateInteractionTextEmbedding
 from qdrant_client import QdrantClient, models
 from sentence_transformers import SentenceTransformer
@@ -25,16 +25,14 @@ class DocSearcher:
                     using=DENSE_MODEL,
                     limit=100
                 ),
-                # models.Prefetch(
-                #     query=models.SparseVector(**sparse_query.as_object()),
-                #     using=SPARSE_MODEL,
-                #     limit=100
-                # )
+                models.Prefetch(
+                    query=models.SparseVector(**sparse_query.as_object()),
+                    using=SPARSE_MODEL,
+                    limit=100
+                )
         ]
 
-        if type == 2:
-            filter = None
-        elif type == 1 and law_type is not None:
+        if type == 0 and law_type is not None:
             filter = Filter(
                 must=[
                     FieldCondition(
@@ -42,23 +40,23 @@ class DocSearcher:
                         match=MatchValue(value=type)
                     ),
                     FieldCondition(
-                        key="vrsta_akta",
-                        match=MatchValue(value=law_type)
+                        key="naziv_suda",
+                        match=MatchText(text=law_type)
                     ),
-                ],
-                must_not=[
-                    FieldCondition(key="status", match=MatchValue(value="Nevažeći")),
                 ]
             )
-        else:
+        elif type == 0:
             filter = Filter(
                 must=[
                     FieldCondition(
                         key="tip_dokumenta",
                         match=MatchValue(value=type)
-                    ),
+                    )
                 ]
             )
+        else:
+            return []
+            
         search_result = self.qdrant_client.query_points(
             collection_name= self.collection_name,
             query_filter=filter,