add meal type

api/edamam_api.py

@@ -91,40 +91,71 @@ MealTypeChoices = [
     "Lunch",
     "Snack",
     "Teatime"]
+ParamQueryString = [
+    {"param": 'calories', "param_query_string": 'calories'},
+    {"param": 'protein', "param_query_string": 'nutrients[PROCNT]'},
+    {"param": 'carbs', "param_query_string": 'nutrients[CHOCDF.net]'},
+    {"param": 'fat', "param_query_string": 'nutrients[FAT]'},
+    {"param": 'added_sugar', "param_query_string": 'nutrients[SUGAR.added]'},
+    {"param": 'sodium', "param_query_string": 'nutrients[NA]'},
+    {"param": 'saturated_fat', "param_query_string": 'nutrients[FASAT]'},
+    {"param": 'fiber', "param_query_string": 'nutrients[FIBTG]'},
+]
 
 @dataclass
 class Recipe:
     name: str
     cuisine_type: list
     calories: int
-    protein_grams: int
-    carbs_grams: int
-    fat_grams: int
+    protein_g: int
+    carbs_g: int
+    fat_g: int
     servings: int
     ingredients: list
     edamam_url: str
     source_url: str
 
+def get_param_query_string(param, param_query_string_list) -> str:
+    for item in param_query_string_list:
+        if item['param'] == param:
+            return item['param_query_string']
+    return ""
+
+def update_params(params, param_to_update, min_val, max_val):
+    param_query_string = get_param_query_string(param_to_update, ParamQueryString)
+    if not bool(param_query_string):
+        print("Error: could not update params")
+        return
+    if min_val!=None and max_val==None:
+        params.update({param_query_string: f"{str(min_val)}+"})
+    if min_val==None and max_val!=None:
+        params.update({param_query_string: f"{str(max_val)}"})
+    if min_val!=None and max_val!=None:
+        params.update({param_query_string: f"{str(min_val)}-{str(max_val)}"})
+
 def get_recipes(
         edamam_app_id: str,
         edamam_app_key: str,
-        calories_min: float,
-        calories_max: float,
-        protein_percent: float,
-        carbs_percent: float,
-        fat_percent: float,
-        query: str | None,
-        excluded: List[str] | None,
+        calories_min: float | None = None,
+        calories_max: float | None = None,
+        protein_min_g: float | None = None,
+        protein_max_g: float | None = None,
+        carbs_min_g: float | None = None,
+        carbs_max_g: float | None = None,
+        fat_min_g: float | None = None,
+        fat_max_g: float | None = None,
+        included: str | None = None,
+        excluded: List[str] | None = None,
+        added_sugar_min_g: float | None = None,
+        added_sugar_max_g: float | None = None,
+        sodium_min_mg: float | None = None,
+        sodium_max_mg: float | None = None,
+        saturated_fat_min_g: float | None = None,
+        saturated_fat_max_g: float | None = None,
+        fiber_min_g: float | None = None,
+        fiber_max_g: float | None = None,
         cuisine_type: List[str] | None = None,
         meal_type: List[str] | None = None,
-        sugar_min_grams: float | None = None,
-        sugar_max_grams: float | None = None,
-        sodium_min_grams: float | None = None,
-        sodium_max_grams: float | None = None,
-        saturated_fat_min_grams: float | None = None,
-        saturated_fat_max_grams: float | None = None,
-        fiber_min_grams: float | None = None,
-        fiber_max_grams: float | None = None,
         diet: List[str] | None = None,
         health: List[str] | None = None,
         nb_recipes: int = 1,
@@ -133,23 +164,12 @@ def get_recipes(
     if not edamam_app_id or not edamam_app_key:
         return []
     
-    """Compute macronutrients in grams from percent"""
-    protein_min_grams = round(protein_percent * calories_min / 100.0 / 4.0)
-    protein_max_grams = round(protein_percent * calories_max / 100.0 / 4.0)
-    carbs_min_grams = round(carbs_percent * calories_min / 100.0 / 4.0)
-    carbs_max_grams = round(carbs_percent * calories_max / 100.0 / 4.0)
-    fat_min_grams = round(fat_percent * calories_min / 100.0 / 9.0)
-    fat_max_grams = round(fat_percent * calories_max / 100.0 / 9.0)
-    
     params = {
         'type': 'any',
         'app_id': edamam_app_id,
         'app_key': edamam_app_key,
         'calories':  f"{str(calories_min)}-{str(calories_max)}",
-        'nutrients[PROCNT]': f"{str(protein_min_grams)}-{str(protein_max_grams)}",
-        'nutrients[CHOCDF]': f"{str(carbs_min_grams)}-{str(carbs_max_grams)}",
-        'nutrients[FAT]': f"{str(fat_min_grams)}-{str(fat_max_grams)}",
-        'q': query,
+        'q': included,
         'excluded': excluded,
         'diet': diet,
         'health': health,
@@ -157,41 +177,14 @@ def get_recipes(
         'mealType': meal_type,
     }
 
-    """Sugar"""
-    if sugar_min_grams!=None and sugar_max_grams==None:
-        params.update({'nutrient[SUGAR]': f"{str(sugar_min_grams)}+"})
-    if sugar_min_grams==None and sugar_max_grams!=None:
-        params.update({'nutrient[SUGAR]': f"{str(sugar_max_grams)}"})
-    if sugar_min_grams!=None and sugar_max_grams!=None:
-        params.update({'nutrient[SUGAR]': f"{str(sugar_min_grams)}-{str(sugar_max_grams)}"})
-
-    """Sodium"""
-    if sodium_min_grams!=None and sodium_max_grams==None:
-        sodium_min_milligrams = sodium_min_grams * 1000.0
-        params.update({'nutrient[NA]': f"{str(sodium_min_milligrams)}+"})
-    if sodium_min_grams==None and sodium_max_grams!=None:
-        sodium_max_milligrams = sodium_max_grams * 1000.0
-        params.update({'nutrient[NA]': f"{str(sodium_max_milligrams)}"})
-    if sodium_min_grams!=None and sodium_max_grams!=None:
-        sodium_min_milligrams = sodium_min_grams * 1000.0
-        sodium_max_milligrams = sodium_max_grams * 1000.0
-        params.update({'nutrient[NA]': f"{str(sodium_min_milligrams)}-{str(sodium_max_milligrams)}"})
-
-    """Saturated fat"""
-    if saturated_fat_min_grams!=None and saturated_fat_max_grams==None:
-        params.update({'nutrient[FASAT]': f"{str(saturated_fat_min_grams)}+"})
-    if saturated_fat_min_grams==None and saturated_fat_max_grams!=None:
-        params.update({'nutrient[FASAT]': f"{str(saturated_fat_max_grams)}"})
-    if saturated_fat_min_grams!=None and saturated_fat_max_grams!=None:
-        params.update({'nutrient[FASAT]': f"{str(saturated_fat_min_grams)}-{str(saturated_fat_max_grams)}"})
-
-    """Fiber"""
-    if fiber_min_grams!=None and fiber_max_grams==None:
-        params.update({'nutrient[FIBTG]': f"{str(fiber_min_grams)}+"})
-    if fiber_min_grams==None and fiber_max_grams!=None:
-        params.update({'nutrient[FIBTG]': f"{str(fiber_max_grams)}"})
-    if fiber_min_grams!=None and fiber_max_grams!=None:
-        params.update({'nutrient[FIBTG]': f"{str(fiber_min_grams)}-{str(fiber_max_grams)}"})
+    update_params(params, 'calories', calories_min, calories_max)
+    update_params(params, 'protein', protein_min_g, protein_max_g)
+    update_params(params, 'carbs', carbs_min_g, carbs_max_g)
+    update_params(params, 'fat', fat_min_g, fat_max_g)
+    update_params(params, 'added_sugar', added_sugar_min_g, added_sugar_max_g)
+    update_params(params, 'sodium', sodium_min_mg, sodium_max_mg)
+    update_params(params, 'saturated_fat', saturated_fat_min_g, saturated_fat_max_g)
+    update_params(params, 'fiber', fiber_min_g, fiber_max_g)
 
     """Get raw recipes from edamam"""
     response = requests.get(url='https://api.edamam.com/api/recipes/v2', params=params)
@@ -210,9 +203,9 @@ def get_recipes(
                             name=recipe['label'],
                             cuisine_type=recipe['cuisineType'],                         
                             calories=round(recipe['totalNutrients']['ENERC_KCAL']['quantity']/servings),
-                            protein_grams=round(recipe['totalNutrients']['PROCNT']['quantity']/servings),
-                            carbs_grams=round(recipe['totalNutrients']['CHOCDF']['quantity']/servings),
-                            fat_grams=round(recipe['totalNutrients']['FAT']['quantity']/servings),
+                            protein_g=round(recipe['totalNutrients']['PROCNT']['quantity']/servings),
+                            carbs_g=round(recipe['totalNutrients']['CHOCDF']['quantity']/servings),
+                            fat_g=round(recipe['totalNutrients']['FAT']['quantity']/servings),
                             servings=servings,
                             ingredients=recipe['ingredientLines'],
                             edamam_url=recipe['shareAs'],
@@ -234,10 +227,10 @@ def print2string_recipe(recipe: Recipe) -> str:
     if recipe:
         string += f"********\n"
         string += f"Recipe: {recipe.name}\n"       
-        string += f"Calories: {recipe.calories}\n"
-        string += f"Protein: {recipe.protein_grams}g\n"
-        string += f"Carbs: {recipe.carbs_grams}g\n"
-        string += f"Fat: {recipe.fat_grams}g\n"
+        string += f"Calories: {recipe.calories}kcal\n"
+        string += f"Protein: {recipe.protein_g}g\n"
+        string += f"Carbs: {recipe.carbs_g}g\n"
+        string += f"Fat: {recipe.fat_g}g\n"
         string += f"Ingredients for {recipe.servings} servings:\n"
         for ingredient in recipe.ingredients:
             string += f"- {ingredient}\n"
@@ -255,21 +248,40 @@ if __name__ == "__main__":
     else:
         edamam_app_id = input('Enter your edamam app id: ')
         edamam_app_key = input('Enter your edamam app key: ')
+
+    """Compute macronutrients in grams from percent"""
+    calories = 700
+    protein_min_percent = 10
+    protein_max_percent = 35
+    carbs_min_percent = 45
+    carbs_max_percent = 65
+    fat_min_percent = 10
+    fat_max_percent = 25
+
+    calories_div_100_div_4 = calories / 100.0 / 4.0
+    calories_div_100_div_9 = calories / 100.0 / 9.0
+    protein_min_g = round(protein_min_percent * calories_div_100_div_4)
+    protein_max_g = round(protein_max_percent * calories_div_100_div_4)
+    carbs_min_g = round(carbs_min_percent * calories_div_100_div_4)
+    carbs_max_g = round(carbs_max_percent * calories_div_100_div_4)
+    fat_min_g = round(fat_min_percent * calories_div_100_div_9)
+    fat_max_g = round(fat_max_percent * calories_div_100_div_9)
     
     recipes = get_recipes(
         edamam_app_id=edamam_app_id,
         edamam_app_key=edamam_app_key,
-        calories_min=500,
-        calories_max=700,
-        protein_percent=30,
-        carbs_percent=20,
-        fat_percent=50,
-        query="chicken",
+        calories_min=None,
+        calories_max=calories,
+        protein_min_g=protein_min_g,
+        protein_max_g=protein_max_g,
+        carbs_min_g=carbs_min_g,
+        carbs_max_g=carbs_max_g,
+        fat_min_g=fat_min_g,
+        fat_max_g=fat_max_g,
+        included="chicken",
         excluded=["sesame"],
-        cuisine_type=[],
-        nb_recipes=3,
-    )
-
+        nb_recipes=5)
+    
     for recipe in recipes:
         print()
         print(print2string_recipe(recipe))

app.py

@@ -15,51 +15,69 @@ def search_recipes(
         edamam_app_key: str,
         calories_min: float,
         calories_max: float,
-        protein_percent: float,
-        carbs_percent: float,
-        fat_percent: float,
+        protein_min_percent: float,
+        protein_max_percent: float,
+        carbs_min_percent: float,
+        carbs_max_percent: float,
+        fat_min_percent: float,
+        fat_max_percent: float,
         included: str | None,
         excluded: str | None,
-        cuisine_type: List[str] | None,
-        meal_type: List[str] | None,
-        sugar_min_grams: float | None = None,
-        sugar_max_grams: float | None = None,
-        sodium_min_grams: float | None = None,
-        sodium_max_grams: float | None = None,
-        saturated_fat_min_grams: float | None = None,
-        saturated_fat_max_grams: float | None = None,
-        fiber_min_grams: float | None = None,
-        fiber_max_grams: float | None = None,
+        sugar_min_g: float | None = None,
+        sugar_max_g: float | None = None,
+        sodium_min_mg: float | None = None,
+        sodium_max_mg: float | None = None,
+        saturated_fat_min_g: float | None = None,
+        saturated_fat_max_g: float | None = None,
+        fiber_min_g: float | None = None,
+        fiber_max_g: float | None = None,
+        cuisine_type: List[str] | None = None,
+        meal_type: List[str] | None = None,
         nb_recipes: int = 1
     ) -> str:
-        recipes = edamam_api.get_recipes(
-            edamam_app_id=edamam_app_id,
-            edamam_app_key=edamam_app_key,
-            calories_min=calories_min,
-            calories_max=calories_max,
-            protein_percent=protein_percent,
-            carbs_percent=carbs_percent,
-            fat_percent=fat_percent,
-            query=included,
-            excluded=make_string_list(excluded),
-            cuisine_type=cuisine_type,
-            meal_type=meal_type,
-            sugar_min_grams=sugar_min_grams,
-            sugar_max_grams=sugar_max_grams,
-            sodium_min_grams=sodium_min_grams,
-            sodium_max_grams=sodium_max_grams,
-            saturated_fat_min_grams=saturated_fat_min_grams,
-            saturated_fat_max_grams=saturated_fat_max_grams,
-            fiber_min_grams=fiber_min_grams,
-            fiber_max_grams=fiber_max_grams,
-            nb_recipes=nb_recipes
-        )        
-        
-        recipes_text = f""
-        for recipe in recipes:
-            recipes_text += "\n"
-            recipes_text += edamam_api.print2string_recipe(recipe)
-        return recipes_text
+    
+    """Compute macronutrients in grams from percent"""
+    calories = calories_max
+    calories_div_100_div_4 = calories / 100.0 / 4.0
+    calories_div_100_div_9 = calories / 100.0 / 9.0
+    protein_min_g = round(protein_min_percent * calories_div_100_div_4)
+    protein_max_g = round(protein_max_percent * calories_div_100_div_4)
+    carbs_min_g = round(carbs_min_percent * calories_div_100_div_4)
+    carbs_max_g = round(carbs_max_percent * calories_div_100_div_4)
+    fat_min_g = round(fat_min_percent * calories_div_100_div_9)
+    fat_max_g = round(fat_max_percent * calories_div_100_div_9)
+    
+    recipes = edamam_api.get_recipes(
+        edamam_app_id=edamam_app_id,
+        edamam_app_key=edamam_app_key,
+        calories_min=calories_min,
+        calories_max=calories_max,
+        protein_min_g=protein_min_g,
+        protein_max_g=protein_max_g,
+        carbs_min_g=carbs_min_g,
+        carbs_max_g=carbs_max_g,
+        fat_min_g=fat_min_g,
+        fat_max_g=fat_max_g,
+        included=included,
+        excluded=make_string_list(excluded),
+        added_sugar_min_g=sugar_min_g,
+        added_sugar_max_g=sugar_max_g,
+        sodium_min_mg=sodium_min_mg,
+        sodium_max_mg=sodium_max_mg,
+        saturated_fat_min_g=saturated_fat_min_g,
+        saturated_fat_max_g=saturated_fat_max_g,
+        fiber_min_g=fiber_min_g,
+        fiber_max_g=fiber_max_g,
+        cuisine_type=cuisine_type,
+        meal_type=meal_type,
+        nb_recipes=nb_recipes
+    )        
+    
+    recipes_text = f""
+    for recipe in recipes:
+        recipes_text += "\n"
+        recipes_text += edamam_api.print2string_recipe(recipe)
+    return recipes_text
      
 with gr.Blocks(title="Get Your Recipes") as demo:
 
@@ -69,12 +87,25 @@ with gr.Blocks(title="Get Your Recipes") as demo:
                 app_id = gr.Textbox(label="Edamam app id")
                 app_key = gr.Textbox(label="Edamam app key")
             with gr.Row():
-                calories_min = gr.Number(value=500, label="Calorie need MIN")
-                calories_max = gr.Number(value=700, label="Calorie need MAX")
+                calories_min = gr.Number(value=500, label="Calories min")
+                calories_max = gr.Number(value=700, label="Calories max")
+                protein_min_percent = gr.Slider(minimum=0, maximum=100, value=10, step=1, label="Protein min (%)")
+                protein_max_percent = gr.Slider(minimum=0, maximum=100, value=35, step=1, label="Protein max (%)")
             with gr.Row():
-                protein_percent = gr.Slider(minimum=0, maximum=100, value=40, step=1, label="Protein need (%)")
-                carbs_percent = gr.Slider(minimum=0, maximum=100, value=25, step=1, label="Carbs need (%)")
-                fat_percent = gr.Slider(minimum=0, maximum=100, value=35, step=1, label="Fat need (%)")
+                carbs_min_percent = gr.Slider(minimum=0, maximum=100, value=45, step=1, label="Carbs min (%)")
+                carbs_max_percent = gr.Slider(minimum=0, maximum=100, value=65, step=1, label="Carbs max (%)")
+                fat_min_percent = gr.Slider(minimum=0, maximum=100, value=10, step=1, label="Fat min (%)")
+                fat_max_percent = gr.Slider(minimum=0, maximum=100, value=25, step=1, label="Fat max (%)")
+            with gr.Row():
+                added_sugar_min_g = gr.Number(value=lambda: None, label="Added sugar min (g)")
+                added_sugar_max_g = gr.Number(value=lambda: None, label="Added sugar max (g)")
+                sodium_min_mg = gr.Number(value=lambda: None, label="Sodium min (mg)")
+                sodium_max_mg = gr.Number(value=lambda: None, label="Sodium max (mg)")
+            with gr.Row():
+                saturated_fat_min_g = gr.Number(value=lambda: None, label="Saturated fat min (g)")
+                saturated_fat_max_g = gr.Number(value=lambda: None, label="Saturated fat max (g)")
+                fiber_min_g = gr.Number(value=lambda: None, label="Fiber min (g)")
+                fiber_max_g = gr.Number(value=lambda: None, label="Fiber max (g)")
             with gr.Row():
                 included = gr.Textbox(value="chicken", label="Included ingredients (enter items separated by commas)")
                 excluded = gr.Textbox(value="sesame", label="Excluded ingredients (enter items separated by commas)")
@@ -82,18 +113,6 @@ with gr.Blocks(title="Get Your Recipes") as demo:
                 cuisine_type = gr.Dropdown(choices=edamam_api.CuisineTypeChoices, multiselect=True, label="Cuisine type")
                 meal_type = gr.Dropdown(choices=edamam_api.MealTypeChoices, multiselect=True, label="Meal type")
 
-            with gr.Row():
-                sugar_min_grams = gr.Number(value=lambda: None, label="Sugar MIN (g)")
-                sugar_max_grams = gr.Number(value=lambda: None, label="Sugar MAX (g)")
-                sodium_min_grams = gr.Number(value=lambda: None, label="Sodium MIN (g)")
-                sodium_max_grams = gr.Number(value=lambda: None, label="Sodium MAX (g)")
-
-            with gr.Row():
-                saturated_fat_min_grams = gr.Number(value=lambda: None, label="Saturated fat MIN (g)")
-                saturated_fat_max_grams = gr.Number(value=lambda: None, label="Saturated fat MAX (g)")
-                fiber_min_grams = gr.Number(value=lambda: None, label="Fiber MIN (g)")
-                fiber_max_grams = gr.Number(value=lambda: None, label="Fiber MAX (g)")
-
             nb_recipes = gr.Number(value=1, label="Number of recipes")
 
             search_button = gr.Button("Search")
@@ -107,21 +126,24 @@ with gr.Blocks(title="Get Your Recipes") as demo:
                 app_key,
                 calories_min,
                 calories_max,
-                protein_percent,
-                carbs_percent,
-                fat_percent,
+                protein_min_percent,
+                protein_max_percent,
+                carbs_min_percent,
+                carbs_max_percent,
+                fat_min_percent,
+                fat_max_percent,
                 included,
                 excluded,
+                added_sugar_min_g,
+                added_sugar_max_g,
+                sodium_min_mg,
+                sodium_max_mg,
+                saturated_fat_min_g,
+                saturated_fat_max_g,
+                fiber_min_g,
+                fiber_max_g,
                 cuisine_type,
                 meal_type,
-                sugar_min_grams,
-                sugar_max_grams,
-                sodium_min_grams,
-                sodium_max_grams,
-                saturated_fat_min_grams,
-                saturated_fat_max_grams,
-                fiber_min_grams,
-                fiber_max_grams,
                 nb_recipes
                 ],
             outputs=result)