Update custom_utils.py

custom_utils.py

@@ -55,9 +55,9 @@ def rag_retrieval_advanced(openai_api_key,
     # 2)  Weighted average review, sorted in descending order
 
     additional_stages = [
-        get_average_review_and_review_count_stage(),
-        get_weighting_stage(),
-        get_sorting_stage()
+        get_stage_average_review_and_review_count(),
+        get_stage_weighting(),
+        get_stage_sorting()
     ]
     
     retrieval_result = vector_search_advanced(
@@ -139,7 +139,7 @@ def vector_search_naive(openai_api_key,
         }
     }
 
-    pipeline = [vector_search_stage, get_project_fields_stage()]
+    pipeline = [vector_search_stage, get_stage_include_fields()]
 
     return invoke_search(db, collection, pipeline)
 
@@ -172,24 +172,20 @@ def vector_search_advanced(openai_api_key,
         }
     }
   
-    pipeline = [vector_search_and_filter_stage, get_project_fields_stage()] + additional_stages
+    pipeline = [vector_search_and_filter_stage, get_stage_include_fields()] + additional_stages
 
     return invoke_search(db, collection, pipeline)
 
-def get_remove_fields_stage():
+def get_stage_exclude_fields():
     return {
         "$unset": "description_embedding"
     }
     
-def get_project_fields_stage():
+def get_stage_include_fields():
     return {
         "$project": {
-            "_id": 1, 
             "id": 1, 
             "listing_url": 1, 
-            "scrape_id": 1, 
-            "last_scraped": 1, 
-            "source": 1, 
             "name": 1, 
             "description": 1, 
             "neighborhood_overview": 1, 
@@ -240,7 +236,6 @@ def get_project_fields_stage():
             "availability_60": 1, 
             "availability_90": 1, 
             "availability_365": 1, 
-            "calendar_last_scraped": 1, 
             "number_of_reviews": 1, 
             "number_of_reviews_ltm": 1, 
             "number_of_reviews_l30d": 1, 
@@ -263,7 +258,7 @@ def get_project_fields_stage():
         }
     }
 
-def get_filter_result_stage():
+def get_stage_filter_result():
     return {
         "$match": {
             "accommodates": { "$eq": 2},
@@ -271,7 +266,7 @@ def get_filter_result_stage():
         }
     }
 
-def get_average_review_and_review_count_stage():
+def get_stage_average_review_and_review_count():
     return {
         "$addFields": {
             "averageReview": {
@@ -294,7 +289,7 @@ def get_average_review_and_review_count_stage():
         }
     }
 
-def get_weighting_stage():
+def get_stage_weighting():
     return {
         "$addFields": {
             "weightedAverageReview": {
@@ -306,7 +301,7 @@ def get_weighting_stage():
         }
     }
 
-def get_sorting_stage():
+def get_stage_sorting():
     return {
         "$sort": {"weightedAverageReview": -1}
     }