Update backend/models/recommender/rec.py

backend/models/recommender/rec.py

@@ -127,26 +127,21 @@ def recs_essentials(vector = None, name = None):
 def makeup_recommendation(skin_tone, skin_type):
     result = []
     dff = pd.DataFrame()
-
-    foundation = makeup[(makeup['skin tone'] == skin_tone) & (makeup['skin type'] == skin_type) & (makeup['label'] == 'foundation')].head(2)
-    concealer = makeup[(makeup['skin tone'] == skin_tone) & (makeup['skin type'] == skin_type) & (makeup['label'] == 'concealer')].head(2)
-    primer = makeup[(makeup['skin tone'] == skin_tone) & (makeup['skin type'] == skin_type) & (makeup['label'] == 'primer')].head(2)
     
-    # Concatenate the DataFrames
-    dff = pd.concat([dff, foundation, concealer, primer])
-
-    # Handle the case where no items are found
-    if dff.empty:
-        print(f"No makeup items found for skin tone: {skin_tone}, skin type: {skin_type}")
-        return []
-
-    # Shuffle the rows randomly
+    # Concatenate all makeup categories into a single DataFrame
+    dff = pd.concat([
+        makeup[(makeup['skin tone'] == skin_tone) & (makeup['skin type'] == skin_type) & (makeup['label'] == 'foundation')].head(2),
+        makeup[(makeup['skin tone'] == skin_tone) & (makeup['skin type'] == skin_type) & (makeup['label'] == 'concealer')].head(2),
+        makeup[(makeup['skin tone'] == skin_tone) & (makeup['skin type'] == skin_type) & (makeup['label'] == 'primer')].head(2)
+    ])
+    
+    # Shuffle the DataFrame rows
     dff = dff.sample(frac=1).reset_index(drop=True)
-
-    # Extract relevant columns and convert to list of dictionaries
-    data = dff[['brand', 'name', 'price', 'url', 'skin type', 'skin tone']].to_dict('split')['data']
     
-    # Wrap each entry in the result using wrap_makeup
+    # Extract relevant columns and convert to dictionary
+    data = dff[['brand', 'name', 'price', 'url', 'img', 'skin type', 'skin tone']].to_dict('split')['data']
+    
+    # Wrap the makeup items into the result list
     for element in data:
         result.append(wrap_makeup(element))
     
@@ -154,4 +149,3 @@ def makeup_recommendation(skin_tone, skin_type):
 
 
 
-