Update app.py

app.py

@@ -8,6 +8,7 @@ from llama_index.embeddings.huggingface import HuggingFaceEmbedding
 import torch
 from llama_index.core import (
     VectorStoreIndex,
+    MetadataFilters,
     Document,
     Settings,
 )
@@ -88,17 +89,6 @@ Settings.embed_model = HuggingFaceEmbedding(model_name="sentence-transformers/al
 #)
 vector_store = ChromaVectorStore(chroma_collection=collection)
 index = VectorStoreIndex.from_vector_store(vector_store, embed_model=Settings.embed_model)
-query_engine = index.as_query_engine(
-    similarity_top_k=3,
-    vector_store_query_mode="default",
-#    filters=MetadataFilters(
-#        filters=[
-#            ExactMatchFilter(key="state", value=cs),
-#        ]
-#    ),
-    alpha=None,
-    doc_ids=None,
-)
 chat_engine = index.as_chat_engine(chat_mode="condense_question", verbose=True)
 
 def upload_file(filepath):
@@ -140,14 +130,26 @@ def rag(input_text, history, jezik, file):
 #        metadatas=[{"state": "s0", "next": "s0", "used": False, "source": 'None', "page": -1, "lang": jezik } for i in range(len(documents)) ]
 #    )
 ##    else:
-    query_results = collection.query(
-        query_texts = [ input_text ],
-        n_results = max_results,
-        where = { "lang": jezik },
-        #where = { "$and": [ {"lang": jezik}, {"page": { "$nin": [ -1 ]}}]},
-        #where = { "$and": [ {"$and": [ { "$or": [ {"state": self.cs },  { "page": { "$nin": [ -1 ] } } ] } , { "used": False } ] } ,
-        #        {"lang": jezik } ] },
+###    query_results = collection.query(
+    query_engine = index.as_query_engine(
+        similarity_top_k=3,
+        vector_store_query_mode="default",
+        filters=MetadataFilters(
+            filters=[
+                 ExactMatchFilter(key="lang", value=jezik),
+            ]
+        ),
+        alpha=None,
+        doc_ids=None,
     )
+    #query_results = index.query(
+    #    query_texts = [ input_text ],
+    #    n_results = max_results,
+    #    where = { "lang": jezik },
+    #    #where = { "$and": [ {"lang": jezik}, {"page": { "$nin": [ -1 ]}}]},
+    #    #where = { "$and": [ {"$and": [ { "$or": [ {"state": self.cs },  { "page": { "$nin": [ -1 ] } } ] } , { "used": False } ] } ,
+    #    #        {"lang": jezik } ] },
+    #)
     o_jezik = "N/A"
     match jezik:
         case 'hrvatski':
@@ -167,8 +169,8 @@ def rag(input_text, history, jezik, file):
             Settings.llm.system_prompt = system_sr + "Call centar telefon je 12755 za Crnu Goru, 0800 31111 za BIH, 070 700 700 u Sloveniji, 19900 u Srbiji, 095 1000 444 za hrvatske korisnike. Odgovori na jeziku istom kao i u postavljenom pitanju ili problemu korisnika."
 #        if (o_jezik!='N/A'):
 #            input_text += " - odgovori " + o_jezik + "."
-#        return query_engine.query(input_text)
-    response = chat_engine.chat(input_text).response
+        response = query_engine.query(input_text)
+#    response = chat_engine.chat(input_text).response
     return response
 # Interface
 # gr.Textbox(label="Pitanje:", lines=6),