fix edamam api

api/edamam_api.py

@@ -20,6 +20,73 @@ from typing import List
 # my_edamam_app_id = read_json_to_dict(file_path=f"{CURRENT_DIR}/api_key.json")['edamam_app_id']
 # my_edamam_app_key = read_json_to_dict(file_path=f"{CURRENT_DIR}/api_key.json")['edamam_app_key']
 
+DietChoices = [
+    None,
+    "balanced",
+    "high-fiber",
+    "high-protein",
+    "low-carb",
+    "low-fat",
+    "low-sodium"]
+HealthChoices = [
+    None,
+    "alcohol-cocktail",
+    "alcohol-free",
+    "celery-free",
+    "crustacean-free",
+    "dairy-free",
+    "DASH",
+    "egg-free",
+    "fish-free",
+    "fodmap-free",
+    "gluten-free",
+    "immuno-supportive",
+    "keto-friendly",
+    "kidney-friendly",
+    "kosher",
+    "low-fat-abs",
+    "low-potassium",
+    "low-sugar",
+    "lupine-free",
+    "Mediterranean",
+    "mollusk-free",
+    "mustard-free",
+    "no-oil-added",
+    "paleo",
+    "peanut-free",
+    "pescatarian",
+    "pork-free",
+    "red-meat-free",
+    "sesame-free",
+    "shellfish-free",
+    "soy-free",
+    "sugar-conscious",
+    "sulfite-free",
+    "tree-nut-free",
+    "vegan",
+    "vegetarian",
+    "wheat-free"]
+CuisineTypeChoices = [
+    None,
+    "American",
+    "Asian",
+    "British",
+    "Caribbean",
+    "Central Europe",
+    "Chinese",
+    "Eastern Europe",
+    "French",
+    "Indian",
+    "Italian",
+    "Japanese",
+    "Kosher",
+    "Mediterranean",
+    "Mexican",
+    "Middle Eastern",
+    "Nordic",
+    "South American",
+    "South East Asian"]
+
 @dataclass
 class Recipe:
     name: str

api/spoonacular_api.py

@@ -2,22 +2,20 @@ import requests
 import json
 import os
 
-CURRENT_DIR = os.path.dirname(os.path.realpath(__file__))
-
-"""Read key json file"""
-def read_json_to_dict(file_path) -> dict:
-    try:
-        with open(file_path, 'r') as file:
-            data = json.load(file)
-            return data
-    except FileNotFoundError:
-        print("File not found at the specified path.")
-        return {}
-    except json.JSONDecodeError:
-        print("Error decoding JSON file.")
-        return {}    
+"""Read private api key from json file"""
+# CURRENT_DIR = os.path.dirname(os.path.realpath(__file__))
+# def read_json_to_dict(file_path) -> dict:
+#     try:
+#         with open(file_path, 'r') as file:
+#             data = json.load(file)
+#             return data
+#     except FileNotFoundError:
+#         print("File not found at the specified path.")
+#         return {}
+#     except json.JSONDecodeError:
+#         print("Error decoding JSON file.")
+#         return {}    
 # my_spoonacular_api_key = read_json_to_dict(file_path=f"{CURRENT_DIR}/api_key.json")['spoonacular_api_key']
-my_spoonacular_api_key = ""
 
 def get_recipes_by_macronutrients(spoonacular_api_key: str, calories: int, protein_grams: int, carbs_grams: int, fat_grams: int, nb_recipes: int) -> list:
     if not spoonacular_api_key:

app.py

@@ -1,9 +1,10 @@
 import gradio as gr
 import api.edamam_api as edamam_api
+from typing import List
 
-def separate_text_to_string_list(input_text) -> list:
+def make_string_list(input_text, separate=',') -> list:
     if input_text:
-        input_list = input_text.split(',')
+        input_list = input_text.split(separate)
         output_list = [string.strip() for string in input_list if string.strip()]
         return output_list
     else:
@@ -16,9 +17,9 @@ def search_recipes(
         protein_calories: int,
         carbs_calories: int,
         fat_calories: int,
-        diet: str | None,
-        health: str | None,
-        cuisine_type: str | None,
+        diet: List[str] | None,
+        health: List[str] | None,
+        cuisine_type: List[str] | None,
         excluded: str | None,
         nb_recipes: int
     ) -> str:
@@ -29,10 +30,10 @@ def search_recipes(
             protein_calories=protein_calories,
             carbs_calories=carbs_calories,
             fat_calories=fat_calories,
-            diet=separate_text_to_string_list(diet),
-            health=separate_text_to_string_list(health),
-            cuisine_type=separate_text_to_string_list(cuisine_type),
-            excluded=separate_text_to_string_list(excluded),
+            diet=diet,
+            health=health,
+            cuisine_type=cuisine_type,
+            excluded=make_string_list(excluded),
             nb_recipes=nb_recipes
         )        
         
@@ -41,20 +42,21 @@ def search_recipes(
             recipes_text += "\n"
             recipes_text += edamam_api.print2string_recipe(recipe)
         return recipes_text
-
+     
 inputs = [
     gr.Textbox(label="Edamam app id"),
     gr.Textbox(label="Edamam app key"),
 
-    gr.Number(value=600, label="Calorie need (+/-50cal)"),
+    gr.Number(value=600, label="Calorie need"),
     gr.Number(value=150, label="Protein need in calories"),
     gr.Number(value=300, label="Carbs need in calories"),
     gr.Number(value=150, label="Fat need in calories"),
 
-    gr.Textbox(value="", label="Diet (enter items separated by commas)"),
-    gr.Textbox(value="", label="Health (enter items separated by commas)"),
-    gr.Textbox(value="Asian", label="Cuisine type (enter items separated by commas)"),
-    gr.Textbox(value="noodles", label="Excluded (enter items separated by commas)"),
+    gr.Dropdown(choices=edamam_api.DietChoices, multiselect=True, label="Diet"),
+    gr.Dropdown(choices=edamam_api.HealthChoices, multiselect=True, label="Health"),
+    gr.Dropdown(choices=edamam_api.CuisineTypeChoices, multiselect=True, label="Cuisine type"),
+
+    gr.Textbox(value="noodles", label="Excluded (enter items separated by commas)", elem_id="textbox_id"),
 
     gr.Number(value=20, label="Number of recipes"),
 
@@ -62,15 +64,7 @@ inputs = [
 
 output = gr.Textbox(label="Result")
 
-title = "GET YOUR RECIPES"
-description = "Let's find the best recipes adapted to your calorie, protein, carbs, and fat needs"
-examples = [["your-edamam-app-id",
-             "your-edamam-app-key",
-             "600", "150", "300", "150",
-             "balanced, high-fiber, high-protein, low-carb, low-fat, low-sodium",
-             "alcohol-cocktail, alcohol-free, celery-free, crustacean-free, dairy-free",
-             "American, Asian, British, Caribbean, Central Europe",
-             "rice, egg"
-             ]]
+title = "Get Your Recipes"
+description = "Let's find the best recipes adapted to your needs"
 
-gr.Interface(search_recipes, inputs, output, title=title, description=description, examples=examples).launch(share=False)
+gr.Interface(search_recipes, inputs, output, title=title, description=description, css="#textbox_id textarea {color: red}").launch(share=False)