Merge remote-tracking branch 'refs/remotes/origin/master'

Author: am9zZWY

engine/rank.py

@@ -82,6 +82,7 @@ def bm25(
         for word, score in sim_list
         if score > 0.7 and word not in query
     ]
+    sim_count = len(sim_weight_list)
 
     # Search terms to look up tf and idf for
     search_terms = set(query).union(set(map(lambda x: x[0], sim_weight_list)))
@@ -158,7 +159,7 @@ def bm25(
 
             score += (
                 weight
-                / 3
+                / sim_count
                 * (
                     idf_val
                     * (tf_val * (k1 + 1))

engine/similarity.py

@@ -3,6 +3,14 @@
 
 model = None
 
+try:
+    model = gensim.models.KeyedVectors.load("./glove-wiki-gigaword-100.model")
+except FileNotFoundError:
+    print("Model not found, downloading...")
+    model = api.load("glove-wiki-gigaword-100")
+    model.save("glove-wiki-gigaword-100.model")
+    print("Model downloaded and saved")
+
 
 def most_similar(word: str, topn=7) -> list:
     """Uses GloVe embeddings to find the most similar words to the given word.
@@ -16,16 +24,7 @@ def most_similar(word: str, topn=7) -> list:
     """
 
     global model
-    if model is None:
-        try:
-            model = gensim.models.KeyedVectors.load("./glove-wiki-gigaword-100.model")
-        except FileNotFoundError:
-            print("Model not found, downloading...")
-            model = api.load("glove-wiki-gigaword-100")
-            model.save("glove-wiki-gigaword-100.model")
-            print("Model downloaded and saved")
     try:
-
         most_sim = model.most_similar(word, topn=topn)
         # print(f"Most similar words to {word}: {most_sim}")
         return most_sim