Update app.py

app.py

@@ -32,13 +32,30 @@ try:
             ingredients = [ing.strip().lower() for ing in recipe['ingredients'].split(',')]
             all_ingredients.update(ingredients)
     
-    # Convert to a list for easier processing
-    VALID_INGREDIENTS = list(all_ingredients)
+    # Expand ingredient variants
+    INGREDIENT_VARIANTS = {}
+    for ing in all_ingredients:
+        # Add singular and plural variants
+        singular = ing.rstrip('s')
+        plural = ing + 's'
+        INGREDIENT_VARIANTS[singular] = [singular, plural]
+        INGREDIENT_VARIANTS[plural] = [singular, plural]
+    
+    # Combine with direct mappings for common ingredients
+    INGREDIENT_VARIANTS.update({
+        'potato': ['potato', 'potatoes'],
+        'tomato': ['tomato', 'tomatoes'],
+        'onion': ['onion', 'onions'],
+        'spinach': ['spinach', 'spinaches'],
+        'chicken': ['chicken'],
+        'turmeric': ['turmeric'],
+        'cumin': ['cumin']
+    })
 except Exception as e:
     print(f"Error loading dataset: {e}")
-    VALID_INGREDIENTS = []
+    INGREDIENT_VARIANTS = {}
 
-# Input validation function (now using dataset ingredients)
+# Input validation function
 def validate_ingredients(ingredients):
     if not ingredients or ingredients.strip() == "":
         return "Invalid"
@@ -46,15 +63,25 @@ def validate_ingredients(ingredients):
     # Split and clean input ingredients
     input_ingredients = [ing.strip().lower() for ing in ingredients.split(',')]
     
-    # Check if all input ingredients are in valid ingredients list
-    invalid_ingredients = [ing for ing in input_ingredients if ing not in VALID_INGREDIENTS]
+    # Check if all input ingredients have a valid variant
+    valid_matches = []
+    for ing in input_ingredients:
+        matched = False
+        for key, variants in INGREDIENT_VARIANTS.items():
+            if ing in variants:
+                valid_matches.append(ing)
+                matched = True
+                break
+        if not matched:
+            print(f"No match found for ingredient: {ing}")
     
-    if not invalid_ingredients:
+    # If all ingredients have a match, return Valid
+    if len(valid_matches) == len(input_ingredients):
         return "Valid"
     else:
         return "Invalid"
 
-# Recipe generation function (using dataset for inspiration)
+# Recipe generation function
 def generate_recipe(ingredients):
     # Split and clean input ingredients
     input_ingredients = [ing.strip().lower() for ing in ingredients.split(',')]
@@ -65,8 +92,11 @@ def generate_recipe(ingredients):
         if 'ingredients' in recipe and 'instructions' in recipe:
             recipe_ingredients = [ing.strip().lower() for ing in recipe['ingredients'].split(',')]
             
-            # Check if most input ingredients are in the recipe
-            match_count = sum(1 for ing in input_ingredients if ing in recipe_ingredients)
+            # Check if input ingredients are in the recipe
+            match_count = sum(1 for ing in input_ingredients 
+                               for recipe_ing in recipe_ingredients 
+                               if any(variant in recipe_ing for variant in INGREDIENT_VARIANTS.get(ing, [ing])))
+            
             if match_count > 0:
                 matching_recipes.append({
                     'title': recipe.get('title', 'Untitled Recipe'),
@@ -76,7 +106,8 @@ def generate_recipe(ingredients):
     
     # If matching recipes found, select one
     if matching_recipes:
-        selected_recipe = matching_recipes[0]  # Could randomize selection if desired
+        # Choose first matching recipe (could randomize)
+        selected_recipe = matching_recipes[0]
         
         # Format the recipe output
         recipe_output = f"Recipe: {selected_recipe['title']}\n\n"
@@ -101,7 +132,7 @@ def suggest_recipes(ingredients):
         return "Please enter ingredients before submitting."
     
     validation_result = validate_ingredients(ingredients)
-    if "Valid" in validation_result:  # More flexible check for "Valid" in response
+    if "Valid" in validation_result:
         return generate_recipe(ingredients)
     else:
         return "I'm sorry, but I can't process this request due to invalid ingredients. Please provide valid Indian cooking ingredients!"