Skip to content

Fix api #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lillykml wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix api #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aac3f92
Upload data into the db - final version
lillykml Sep 2, 2021
1c818f4
Merge branch 'master' of github.com:csseries/cookit_frontend
lillykml Sep 2, 2021
34eaea6
Fixed joining of recognized ingredients by the model and additional i…
lillykml Sep 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,13 @@
filtered_ingredients = [ingr for ingr in ingredients if ingr in INGREDIENTS]
ingredients_selected = st.multiselect("We found these ingredients (delete any you don't want to use)",
filtered_ingredients, default=filtered_ingredients)
ingredients_selected_formatted = ", ".join(ingredients_selected)

must_haves = st.multiselect('You can add more ingredients', INGREDIENTS)
must_haves_formatted = ", ".join(must_haves)
additional_ingredients = st.multiselect('You can add more ingredients', INGREDIENTS)

# Join recognized and additional ingredients together
for element in ingredients_selected:
additional_ingredients.append(element)
final_ingredients = ", ".join(additional_ingredients)

exclusions = st.multiselect("Anything you really don't like?", INGREDIENTS)
exclusions_formatted = ", ".join(exclusions)
Expand All @@ -63,8 +66,7 @@
diet = []

if st.button('get recipes'):
recipes = get_recipes(f"{ingredients_selected_formatted}, {must_haves_formatted}",
exclusions, cuisines_formatted, diet)
recipes = get_recipes(final_ingredients, exclusions, cuisines_formatted, diet)

if len(recipes) > 0:
show_recipes(recipes, 3)
Expand Down
3 changes: 2 additions & 1 deletion cookit_frontend/recipes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ def get_recipes(ingredients, exclusions, cuisine, diet):
# The number of results to skip (between 0 and 900).
# This is a bit risky in cases where less recipes were found than the offset value;
# --> the API is then returning no recipes.
"offset": offset}
#"offset": offset
Copy link
Collaborator

@kickermeister kickermeister Sep 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added this for good reasons: to get (hopefully) different results every time the user is clicking the button. Without the offset, the user will always see the same recipes when no options are changed.

}

response = requests.get(BASE_URI, params)
print(params)
Expand Down
Loading