Update recipe_recommendation/src/candidate.py

recipe_recommendation/src/candidate.py

@@ -22,68 +22,69 @@ def extract_user_parents(user_ingredients):
     return user_parents
 
 
-# def hard_filter(recipe, user_profile):
-#     diet = user_profile.get("diet", {}).get("vegetarian_type", "").lower()
-#     if diet == "vegan" and not recipe.get("is_vegan_safe", True):
-#         return False
-#     if diet in ["vegetarian", "flexible_vegetarian"] and not recipe.get("is_vegetarian_safe", True):
-#         return False
-#     return True
-
-def hard_filter(recipe: dict, user_profile: dict) -> bool:
-    """
-    Apply hard filters to determine whether a recipe matches the user's dietary profile.
-    
-    Args:
-        recipe (dict): Recipe data containing attributes like 'calories', 'protein', 'is_vegan_safe', etc.
-        user_profile (dict): User preferences including diet type, nutritional goals, and disliked ingredients.
-    
-    Returns:
-        bool: True if the recipe passes all hard filters, False otherwise.
-    """
-    
-    # --- Dietary filter ---
+def hard_filter(recipe, user_profile):
     diet = user_profile.get("diet", {}).get("vegetarian_type", "").lower()
     if diet == "vegan" and not recipe.get("is_vegan_safe", True):
         return False
     if diet in ["vegetarian", "flexible_vegetarian"] and not recipe.get("is_vegetarian_safe", True):
         return False
+    return True
+
+# harder filter
+# def hard_filter(recipe: dict, user_profile: dict) -> bool:
+#     """
+#     Apply hard filters to determine whether a recipe matches the user's dietary profile.
     
-    # --- Nutritional goal filter ---
-    nutritional_goals = user_profile.get("nutritional_goals", {})
+#     Args:
+#         recipe (dict): Recipe data containing attributes like 'calories', 'protein', 'is_vegan_safe', etc.
+#         user_profile (dict): User preferences including diet type, nutritional goals, and disliked ingredients.
     
-    # Calorie range filter
-    cal_range = nutritional_goals.get("calories", {})
-    cal_min = cal_range.get("min", 0)
-    cal_max = cal_range.get("max", 9999)
-    recipe_calories = recipe.get("calories", 0)
+#     Returns:
+#         bool: True if the recipe passes all hard filters, False otherwise.
+#     """
     
-    if not (cal_min <= recipe_calories <= cal_max):
-        return False
+#     # --- Dietary filter ---
+#     diet = user_profile.get("diet", {}).get("vegetarian_type", "").lower()
+#     if diet == "vegan" and not recipe.get("is_vegan_safe", True):
+#         return False
+#     if diet in ["vegetarian", "flexible_vegetarian"] and not recipe.get("is_vegetarian_safe", True):
+#         return False
     
-    # Protein range filter
-    protein_range = nutritional_goals.get("protein", {})
-    pro_min = protein_range.get("min", 0)
-    pro_max = protein_range.get("max", 999)
-    recipe_protein = recipe.get("protein", 0)
+#     # --- Nutritional goal filter ---
+#     nutritional_goals = user_profile.get("nutritional_goals", {})
     
-    if not (pro_min <= recipe_protein <= pro_max):
-        return False
+#     # Calorie range filter
+#     cal_range = nutritional_goals.get("calories", {})
+#     cal_min = cal_range.get("min", 0)
+#     cal_max = cal_range.get("max", 9999)
+#     recipe_calories = recipe.get("calories", 0)
     
-    # --- Disliked main ingredients filter ---
-    disliked_main = set(user_profile.get("other_preferences", {}).get("disliked_main", []))
-    if disliked_main:
-        recipe_main = recipe.get("main_parent", set())
-        if isinstance(recipe_main, list):
-            recipe_main = set(recipe_main)
-        elif not isinstance(recipe_main, set):
-            recipe_main = set()
+#     if not (cal_min <= recipe_calories <= cal_max):
+#         return False
+    
+#     # Protein range filter
+#     protein_range = nutritional_goals.get("protein", {})
+#     pro_min = protein_range.get("min", 0)
+#     pro_max = protein_range.get("max", 999)
+#     recipe_protein = recipe.get("protein", 0)
+    
+#     if not (pro_min <= recipe_protein <= pro_max):
+#         return False
+    
+#     # --- Disliked main ingredients filter ---
+#     disliked_main = set(user_profile.get("other_preferences", {}).get("disliked_main", []))
+#     if disliked_main:
+#         recipe_main = recipe.get("main_parent", set())
+#         if isinstance(recipe_main, list):
+#             recipe_main = set(recipe_main)
+#         elif not isinstance(recipe_main, set):
+#             recipe_main = set()
         
-        # Exclude if any main ingredient is in the disliked list
-        if recipe_main & disliked_main:
-            return False
+#         # Exclude if any main ingredient is in the disliked list
+#         if recipe_main & disliked_main:
+#             return False
     
-    return True
+#     return True