Update app.py

app.py

@@ -2,7 +2,6 @@ import gradio as gr
 import requests
 from transformers import pipeline
 
-
 # Initialize translation models
 translate_to_english = pipeline("translation", model="Helsinki-NLP/opus-mt-et-en")
 translate_to_estonian = pipeline("translation", model="Helsinki-NLP/opus-mt-en-et")
@@ -10,6 +9,8 @@ translate_to_estonian = pipeline("translation", model="Helsinki-NLP/opus-mt-en-e
 # Spoonacular API settings
 API_KEY = '0bf3de98d2654cb28f139df9fedb7db2'
 SPOONACULAR_URL = "https://api.spoonacular.com/recipes/findByIngredients"
+RECIPE_INFO_URL = "https://api.spoonacular.com/recipes/{}/information"
+RECIPE_SEARCH_URL = "https://api.spoonacular.com/recipes/complexSearch"
 
 def translate_text(input_text, direction='et-en'):
     """Translate text between Estonian and English."""
@@ -19,7 +20,7 @@ def translate_text(input_text, direction='et-en'):
         result = translate_to_estonian(input_text)
     return result[0]['translation_text']
 
-def find_recipes(ingredient, calories, wheat_content):
+def find_recipes(ingredient, calories, gluten_content):
     """Find recipes based on the ingredient and dietary preferences."""
     # Translate ingredient to English
     ingredient_en = translate_text(ingredient, direction='et-en')
@@ -29,50 +30,90 @@ def find_recipes(ingredient, calories, wheat_content):
         "Madal kalorsus": "Low",
         "Kõrge kalorsus": "High"
     }
-    wheat_map = {
-        "Sisaldab nisu": "Contains",
-        "Nisuvaba": "Free of"
+    gluten_map = {
+        "Sisaldab gluteeni": "Contains",
+        "Gluteenivaba": "Free of"
     }
     
-    calories_en = calories_map.get(calories, "")
-    wheat_en = wheat_map.get(wheat_content, "")
-    
-    params = {
-        "ingredients": ingredient_en,
-        "apiKey": API_KEY
+    # Search for recipes that include the specific ingredient
+    search_params = {
+        "apiKey": API_KEY,
+        "query": ingredient_en,
+        "includeIngredients": ingredient_en,
+        "number": 5,  # Fetch multiple recipes to increase chances
     }
     
-    response = requests.get(SPOONACULAR_URL, params=params)
+    # Add diet filters
+    if gluten_content == "Gluteenivaba":
+        search_params["intolerances"] = "Gluten"
+    
+    response = requests.get(RECIPE_SEARCH_URL, params=search_params)
     
     if response.status_code == 200:
-        recipes = response.json()
+        recipes = response.json().get('results', [])
         
         if not recipes:
             return "Ühtegi retsepti ei leitud.", ""
         
-        # Select the first recipe for demonstration
-        recipe = recipes[0]
-        
-        # Prepare recipe details
-        recipe_name_en = recipe['title']
-        recipe_name_et = translate_text(recipe_name_en, direction='en-et')
-        recipe_link = f"https://spoonacular.com/recipes/{recipe['id']}-{recipe_name_en.replace(' ', '-')}"
-        
-        # Translate ingredients to Estonian
-        missed_ingredients_en = ', '.join([ingredient['name'] for ingredient in recipe['missedIngredients']])
-        missed_ingredients_et = translate_text(missed_ingredients_en, direction='en-et')
-        
-        # Create a recipe description
-        recipe_description = (
-            f"Retsept: {recipe_name_et}\n\n"
-            f"Link: {recipe_link}\n\n"
-            f"Koostisosad: {missed_ingredients_et}\n\n"
-            f"Kalorsus: {calories}\n"
-            f"Nisusisaldus: {wheat_content}\n\n"
-            f"Valmistamise juhised: [Link to instructions]"
-        )
+        # Try to find a suitable recipe
+        for recipe in recipes:
+            # Get detailed recipe information
+            recipe_info_response = requests.get(
+                RECIPE_INFO_URL.format(recipe['id']),
+                params={
+                    "apiKey": API_KEY,
+                    "includeNutrition": True
+                }
+            )
+            
+            if recipe_info_response.status_code == 200:
+                recipe_info = recipe_info_response.json()
+                
+                # Verify ingredient is in the recipe
+                ingredients_list = recipe_info.get('extendedIngredients', [])
+                ingredient_names = [ing['name'].lower() for ing in ingredients_list]
+                
+                # Check if the main ingredient is in the recipe
+                if any(ingredient_en.lower() in name for name in ingredient_names):
+                    # Translate recipe title
+                    recipe_name_en = recipe_info['title']
+                    recipe_name_et = translate_text(recipe_name_en, direction='en-et')
+                    
+                    # Create recipe link
+                    recipe_link = recipe_info.get('sourceUrl', 'Link pole saadaval')
+                    
+                    # Translate ingredients to Estonian
+                    ingredients_list = [f"- {ingredient['original']}" for ingredient in ingredients_list]
+                    ingredients_en = '\n'.join(ingredients_list)
+                    ingredients_et = translate_text(ingredients_en, direction='en-et')
+                    
+                    # Translate instructions
+                    instructions_en = recipe_info.get('instructions', 'Instructions not available')
+                    instructions_et = translate_text(instructions_en, direction='en-et')
+                    
+                    # Calculate calories per serving
+                    nutrition = recipe_info.get('nutrition', {})
+                    calories_per_serving = nutrition.get('calories', 'N/A')
+                    
+                    # Create a detailed recipe description
+                    recipe_description = (
+                        f"🍽️ RETSEPT: {recipe_name_et}\n\n"
+                        f"🥘 Põhikoostisosa: {ingredient}\n\n"
+                        f"⏲️ Valmistamisaeg: {recipe_info.get('readyInMinutes', 'N/A')} minutit\n"
+                        f"👥 Portsjonite arv: {recipe_info.get('servings', 'N/A')}\n\n"
+                        f"📝 KOOSTISOSAD:\n{ingredients_et}\n\n"
+                        f"👩‍🍳 VALMISTAMISE JUHISED:\n{instructions_et}\n\n"
+                        f"ℹ️ LISAINFO:\n"
+                        f"Kalorsus: {calories}\n"
+                        f"Gluteenisisaldus: {gluten_content}\n"
+                        f"Kalorid portsjoni kohta: {calories_per_serving}\n\n"
+                        f"🔗 Originaalretsept: {recipe_link}"
+                    )
+                    
+                    return recipe_description, recipe_link
         
-        return recipe_description, recipe_link
+        # If no recipe found with the exact ingredient
+        return "Kahjuks ei leitud retsepti täpse koostisosaga.", ""
     else:
         return "Viga retseptide toomisel.", ""
 
@@ -91,24 +132,24 @@ iface = gr.Interface(
             type="value"
         ),
         gr.Dropdown(
-            choices=["Sisaldab nisu", "Nisuvaba"], 
-            label="Nisusisaldus",
+            choices=["Sisaldab gluteeni", "Gluteenivaba"], 
+            label="Gluteenisisaldus",
             type="value"
         )
     ],
     outputs=[
-        gr.Textbox(lines=15, label="Genereeritud Retsept"),
+        gr.Textbox(lines=20, label="Genereeritud Retsept"),
         gr.Textbox(lines=1, label="Retsepti Link")
     ],
     title="🍳 Nutikas Retsepti Generaator",
     description=(
-        "Sisestage koostisosa, valige kalorsus ja nisusisaldus. "
+        "Sisestage koostisosa, valige kalorsus ja gluteenisisaldus. "
         "Saate personaalse retsepti!"
     ),
     examples=[
-        ["lõhe", "Madal kalorsus", "Nisuvaba"],
-        ["šokolaadikook", "Kõrge kalorsus", "Sisaldab nisu"],
-        ["kartul", "Madal kalorsus", "Nisuvaba"]
+        ["lõhe", "Madal kalorsus", "Gluteenivaba"],
+        ["šokolaadikook", "Kõrge kalorsus", "Sisaldab gluteeni"],
+        ["kartul", "Madal kalorsus", "Gluteenivaba"]
     ],
     theme="default"
 )