Merge branch 'main' of https://huggingface.co/spaces/bziiit/VEGETALIS_AI_API into main

main.py

@@ -235,7 +235,7 @@ def generate_answer(user_input: UserInput):
 
         template_prompt = base_template
 
-        context = get_retreive_answer(enterprise_id, prompt, index, common_namespace)
+        context = get_retreive_answer(enterprise_id, prompt, index, common_namespace, user_id=user_input.user_id)
 
         #final_prompt_simplified = prompt_formatting(prompt,template,context)
         infos_added_to_kb = handle_calling_add_to_knowledge_base(prompt,enterprise_id,index,getattr(user_input,"marque",""),user_id=getattr(user_input,"user_id",""))

rag.py

@@ -110,7 +110,7 @@ def add_to_knowledge_base(enterprise_id,information,index,enterprise_name,user_i
         print(e)
         return False
    
-def get_retreive_answer(enterprise_id,prompt,index,common_id):
+def get_retreive_answer(enterprise_id,prompt,index,common_id,user_id=""):
     try:
         print("common_id ",common_id)
         
@@ -123,6 +123,7 @@ def get_retreive_answer(enterprise_id,prompt,index,common_id):
         )
 
         enterprise_context = retriever.invoke(prompt)
+        user_memory = retriever.invoke(prompt,filters={"user_id":user_id})
 
         if enterprise_context:
             print("found enterprise context")
@@ -149,7 +150,7 @@ def get_retreive_answer(enterprise_id,prompt,index,common_id):
             else:
                 print("no commun context")
 
-            response = enterprise_context + commun_context
+            response = user_memory + enterprise_context + commun_context
 
         else:
             response = retriever.invoke(prompt)