kolzchut-ragbot 1.1.2__py3-none-any.whl → 1.2.0__py3-none-any.whl

kolzchut_ragbot/engine.py

@@ -178,7 +178,7 @@ class Engine:
         all_docs_by_model = self.elastic_model.search(query_embeddings)
         all_docs = []
         ids_for_fusion = []
-        all_docs_and_scores = []
+        all_docs_and_scores = {}
 
         for key, values in all_docs_by_model.items():
             print(f"\nFound {len(values)} documents for model\n")
@@ -190,7 +190,7 @@ class Engine:
                 all_docs.append(doc)
                 scores_for_model.append({"doc": doc["_source"]["title"], "score": doc["_score"]})
             ids_for_fusion.append(model_ids)
-            all_docs_and_scores.append({f'{key}': scores_for_model})
+            all_docs_and_scores[f'{key}'] = scores_for_model
         print(f"\nFusing {len(ids_for_fusion)} results\n")
         fused_ids = self.reciprocal_rank_fusion(ids_for_fusion, k=top_k)
         top_k_documents = []
@@ -199,7 +199,7 @@ class Engine:
         for fused_id in fused_ids:
             for doc in all_docs:
                 if doc["_source"]["page_id"] == fused_id and doc["_source"]["title"] not in top_titles:
-                    top_k_documents.append({"doc":doc["_source"], "score":doc["_score"]})
+                    top_k_documents.append(doc["_source"])
                     top_titles.append(doc["_source"]["title"])
                     break
             if len(top_titles) >= top_k:

{kolzchut_ragbot-1.1.2.dist-info → kolzchut_ragbot-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: kolzchut-ragbot
-Version: 1.1.2
+Version: 1.2.0
 Summary: A search engine using machine learning models and Elasticsearch for advanced document retrieval.
 Home-page: https://github.com/shmuelrob/ragbot
 Author: Shmuel Robinov

{kolzchut_ragbot-1.1.2.dist-info → kolzchut_ragbot-1.2.0.dist-info}/RECORD

@@ -2,10 +2,10 @@ kolzchut_ragbot/Document.py,sha256=ySawnD06HA0zHjHp4Y_CPjMMZqLp8onaEgd1dGP5sbs,3
 kolzchut_ragbot/IntegrateService.py,sha256=CqB9vW6W5oj6Ig3crEa6hXqwro21z97UaG9ngxFTzYs,100
 kolzchut_ragbot/__init__.py,sha256=KKAc2xjCl5Aui2Cj0FWyvJ51nmnFv7MspLMqOYb-QHA,26
 kolzchut_ragbot/config.py,sha256=pcKVJVJ8P2YximjTrmVlrocHXSmzmNu_DFzNoPLa22E,138
-kolzchut_ragbot/engine.py,sha256=ofFzU2f5EfpGQV1CgrbzVvGajxbimJK1gwIZdM0wETE,10193
+kolzchut_ragbot/engine.py,sha256=V8WUWyqvBWbGt-rRRf8G6BEyD-4GjsmtJrxBb6aPon8,10154
 kolzchut_ragbot/llm_client.py,sha256=q_cUZq645P7i1PliYzpJRTWlsoSECVIhE-y9wU5eRtQ,352
 kolzchut_ragbot/model.py,sha256=H-p5KQRlauBWXqFqcikjDwK8pbRmnqpqwy35ZAc8hQI,6505
-kolzchut_ragbot-1.1.2.dist-info/METADATA,sha256=Iy3Z8S8WQRMi6n6_5rAImGbKpq899f6fyos1oRKaQZI,2023
-kolzchut_ragbot-1.1.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-kolzchut_ragbot-1.1.2.dist-info/top_level.txt,sha256=NTZoY4GGw3v_7jm0MgcdHw8simoZ78PsR7Meqmkgd_Q,16
-kolzchut_ragbot-1.1.2.dist-info/RECORD,,
+kolzchut_ragbot-1.2.0.dist-info/METADATA,sha256=UhrqAa1ueYN5OgprKaFJpX32sMlyIZ35J-t1SaPm38w,2023
+kolzchut_ragbot-1.2.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+kolzchut_ragbot-1.2.0.dist-info/top_level.txt,sha256=NTZoY4GGw3v_7jm0MgcdHw8simoZ78PsR7Meqmkgd_Q,16
+kolzchut_ragbot-1.2.0.dist-info/RECORD,,