Add an alternative for st-tags

.gitignore

@@ -1 +1,4 @@
 __pycache__/
+.idea
+.DS_Store
+.DS_store

config.json

@@ -1 +1,207 @@
-{"first_100": ["allspice", "almond extract", "applesauce", "avocado", "balsamic vinegar", "basil", "bay leaf", "beets", "bread crumbs", "bread flour", "buns", "catsup", "cayenne", "cherry tomatoes", "chicken breasts", "chives", "chocolate cake", "coconut milk", "cold butter", "cold milk", "cooking oil", "cornstarch", "crab meat", "crackers", "cream of chicken soup", "cream of tartar", "cumin", "cumin seeds", "curry powder", "egg yolk", "extra-virgin olive oil", "feta cheese", "flaked coconut", "flat leaf parsley", "flour tortillas", "fresh chives", "fresh cilantro", "fresh mint", "fresh oregano", "fresh rosemary", "frozen strawberries", "gingerroot", "green olives", "ground allspice", "ground chuck", "ground coriander", "ground cumin", "ground pork", "ground red pepper", "hamburger", "hazelnuts", "heavy cream", "heavy whipping cream", "hot pepper", "italian dressing", "lean ground beef", "lemon juice", "lemon pepper", "marjoram", "miracle", "noodles", "nuts", "oatmeal", "oats", "oleo", "olive oil", "onion salt", "onions", "orange", "paprika", "parmesan cheese", "parsley", "pasta", "peaches", "pecans", "pork sausage", "pork tenderloin", "poultry seasoning", "powdered sugar", "pumpkin", "red potatoes", "red wine vinegar", "rosemary", "salmon", "scallion", "sesame oil", "shell", "stalks celery", "tabasco sauce", "tarragon", "tomatoes", "unsalted butter", "vanilla wafers", "vegetables", "warm water", "whipping cream", "white wine vinegar", "whole wheat flour", "yellow squash", "yogurt"], "next_100": ["active dry yeast", "almonds", "apple", "apple cider", "apple cider vinegar", "avocados", "baby spinach", "bay leaves", "bean sprouts", "beef", "beef broth", "broccoli", "cabbage", "capers", "cashews", "celery", "celery salt", "cherries", "cherry pie filling", "chicken", "chicken broth", "chicken stock", "chickpeas", "chili sauce", "chocolate", "cinnamon", "cloves", "corn", "cottage cheese", "cranberry sauce", "egg noodles", "egg yolks", "extra virgin olive oil", "freshly ground pepper", "garlic powder", "golden raisins", "graham cracker crust", "graham crackers", "green peppers", "ground black pepper", "ground nutmeg", "ground pepper", "ground turmeric", "kosher salt", "lemon rind", "mango", "mint", "mustard", "nutmeg", "orange juice", "orange zest", "oregano", "peanut butter", "peas", "pecan halves", "pepperoni", "pine nuts", "pinto beans", "pizza sauce", "plain yogurt", "potatoes", "raisins", "red", "red bell peppers", "red pepper", "red peppers", "rhubarb", "ricotta cheese", "salad oil", "sauce", "scallions", "sesame seeds", "sherry", "shredded cheese", "skinless", "soda", "soy sauce", "spinach", "strawberries", "sugar", "sweet onion", "sweet potatoes", "swiss cheese", "t", "tomato", "tomato paste", "tomato soup", "tuna", "vanilla bean", "vanilla ice cream", "vanilla pudding", "vegetable broth", "vegetable oil", "vegetable shortening", "whipped cream", "white onion", "white sugar", "yellow cake", "yellow cornmeal", "zucchini"]}
+{
+  "model_name_or_path": "/Users/m3hrdadfi/Projects/HF/hfflax/hub/t5-recipe-generation",
+  "first_100": [
+    "allspice",
+    "almond extract",
+    "applesauce",
+    "avocado",
+    "balsamic vinegar",
+    "basil",
+    "bay leaf",
+    "beets",
+    "bread crumbs",
+    "bread flour",
+    "buns",
+    "catsup",
+    "cayenne",
+    "cherry tomatoes",
+    "chicken breasts",
+    "chives",
+    "chocolate cake",
+    "coconut milk",
+    "cold butter",
+    "cold milk",
+    "cooking oil",
+    "cornstarch",
+    "crab meat",
+    "crackers",
+    "cream of chicken soup",
+    "cream of tartar",
+    "cumin",
+    "cumin seeds",
+    "curry powder",
+    "egg yolk",
+    "extra-virgin olive oil",
+    "feta cheese",
+    "flaked coconut",
+    "flat leaf parsley",
+    "flour tortillas",
+    "fresh chives",
+    "fresh cilantro",
+    "fresh mint",
+    "fresh oregano",
+    "fresh rosemary",
+    "frozen strawberries",
+    "gingerroot",
+    "green olives",
+    "ground allspice",
+    "ground chuck",
+    "ground coriander",
+    "ground cumin",
+    "ground pork",
+    "ground red pepper",
+    "hamburger",
+    "hazelnuts",
+    "heavy cream",
+    "heavy whipping cream",
+    "hot pepper",
+    "italian dressing",
+    "lean ground beef",
+    "lemon juice",
+    "lemon pepper",
+    "marjoram",
+    "miracle",
+    "noodles",
+    "nuts",
+    "oatmeal",
+    "oats",
+    "oleo",
+    "olive oil",
+    "onion salt",
+    "onions",
+    "orange",
+    "paprika",
+    "parmesan cheese",
+    "parsley",
+    "pasta",
+    "peaches",
+    "pecans",
+    "pork sausage",
+    "pork tenderloin",
+    "poultry seasoning",
+    "powdered sugar",
+    "pumpkin",
+    "red potatoes",
+    "red wine vinegar",
+    "rosemary",
+    "salmon",
+    "scallion",
+    "sesame oil",
+    "shell",
+    "stalks celery",
+    "tabasco sauce",
+    "tarragon",
+    "tomatoes",
+    "unsalted butter",
+    "vanilla wafers",
+    "vegetables",
+    "warm water",
+    "whipping cream",
+    "white wine vinegar",
+    "whole wheat flour",
+    "yellow squash",
+    "yogurt"
+  ],
+  "next_100": [
+    "active dry yeast",
+    "almonds",
+    "apple",
+    "apple cider",
+    "apple cider vinegar",
+    "avocados",
+    "baby spinach",
+    "bay leaves",
+    "bean sprouts",
+    "beef",
+    "beef broth",
+    "broccoli",
+    "cabbage",
+    "capers",
+    "cashews",
+    "celery",
+    "celery salt",
+    "cherries",
+    "cherry pie filling",
+    "chicken",
+    "chicken broth",
+    "chicken stock",
+    "chickpeas",
+    "chili sauce",
+    "chocolate",
+    "cinnamon",
+    "cloves",
+    "corn",
+    "cottage cheese",
+    "cranberry sauce",
+    "egg noodles",
+    "egg yolks",
+    "extra virgin olive oil",
+    "freshly ground pepper",
+    "garlic powder",
+    "golden raisins",
+    "graham cracker crust",
+    "graham crackers",
+    "green peppers",
+    "ground black pepper",
+    "ground nutmeg",
+    "ground pepper",
+    "ground turmeric",
+    "kosher salt",
+    "lemon rind",
+    "mango",
+    "mint",
+    "mustard",
+    "nutmeg",
+    "orange juice",
+    "orange zest",
+    "oregano",
+    "peanut butter",
+    "peas",
+    "pecan halves",
+    "pepperoni",
+    "pine nuts",
+    "pinto beans",
+    "pizza sauce",
+    "plain yogurt",
+    "potatoes",
+    "raisins",
+    "red",
+    "red bell peppers",
+    "red pepper",
+    "red peppers",
+    "rhubarb",
+    "ricotta cheese",
+    "salad oil",
+    "sauce",
+    "scallions",
+    "sesame seeds",
+    "sherry",
+    "shredded cheese",
+    "skinless",
+    "soda",
+    "soy sauce",
+    "spinach",
+    "strawberries",
+    "sugar",
+    "sweet onion",
+    "sweet potatoes",
+    "swiss cheese",
+    "t",
+    "tomato",
+    "tomato paste",
+    "tomato soup",
+    "tuna",
+    "vanilla bean",
+    "vanilla ice cream",
+    "vanilla pudding",
+    "vegetable broth",
+    "vegetable oil",
+    "vegetable shortening",
+    "whipped cream",
+    "white onion",
+    "white sugar",
+    "yellow cake",
+    "yellow cornmeal",
+    "zucchini"
+  ]
+}

requirements.txt

@@ -1,5 +1,4 @@
-# streamlit==0.84.1
-streamlit==0.82.0
+streamlit==0.84.1
 transformers==4.8.2
 torch==1.9.0
 streamlit-tags==1.2.6

server.py

@@ -1,5 +1,5 @@
 from transformers import AutoTokenizer, AutoModelForSeq2SeqLM, pipeline
-from datetime import datetime as dt  
+from datetime import datetime as dt
 import streamlit as st
 from streamlit_tags import st_tags
 import beam_search
@@ -12,63 +12,84 @@ with open("config.json") as f:
 
 st.set_page_config(layout="wide")
 
+
 @st.cache(allow_output_mutation=True)
 def load_model():
-    tokenizer = AutoTokenizer.from_pretrained("flax-community/t5-recipe-generation")
-    model = AutoModelForSeq2SeqLM.from_pretrained("flax-community/t5-recipe-generation")
+    tokenizer = AutoTokenizer.from_pretrained(cfg["model_name_or_path"])
+    model = AutoModelForSeq2SeqLM.from_pretrained(cfg["model_name_or_path"])
     generator = pipeline("text2text-generation", model=model, tokenizer=tokenizer)
     return generator, tokenizer
 
+
 def sampling_changed(obj):
     print(obj)
-    
+
 
 with st.spinner('Loading model...'):
     generator, tokenizer = load_model()
 # st.image("images/chef-transformer.png", width=400)
-st.header("Chef transformers (flax-community)")
-st.markdown("This demo uses [t5 trained on recipe-nlg](https://huggingface.co/flax-community/t5-recipe-generation) to generate recipe from a given set of ingredients")
-img = st.sidebar.image("images/chef-transformer.png", width=200)
+st.header("Chef Transformer 👩‍🍳 / 👨‍🍳")
+st.markdown(
+    "This demo uses [T5 trained on recipe-nlg](https://huggingface.co/flax-community/t5-recipe-generation) "
+    "to generate recipe from a given set of ingredients"
+)
+img = st.sidebar.image("images/chef-transformer-transparent.png", width=310)
 add_text_sidebar = st.sidebar.title("Popular recipes:")
 add_text_sidebar = st.sidebar.text("Recipe preset(example#1)")
 add_text_sidebar = st.sidebar.text("Recipe preset(example#2)")
 
 add_text_sidebar = st.sidebar.title("Mode:")
-sampling_mode = st.sidebar.selectbox("select a Mode", index=0, options=["Beam Search", "Top-k Sampling"])
-
+sampling_mode = st.sidebar.selectbox("select a Mode", index=0, options=["Top Sampling", "Beam Search"])
 
-original_keywords = st.multiselect("Choose ingredients",
+original_keywords = st.multiselect(
+    "Choose ingredients",
     cfg["first_100"],
     ["parmesan cheese", "fresh oregano", "basil", "whole wheat flour"]
 )
 
-st.write("Add custom ingredients here:")
-custom_keywords = st_tags(
-    label="",
-    text='Press enter to add more',
-    value=['salt'],
-    suggestions=["z"],
-    maxtags = 15,
-    key='1')
+
+# st.write("Add custom ingredients here:")
+# custom_keywords = st_tags(
+#     label="",
+#     text='Press enter to add more',
+#     value=['salt'],
+#     suggestions=["z"],
+#     maxtags=15,
+#     key='1')
+
+def custom_keywords_on_change():
+    pass
+
+
+custom_keywords = st.text_input(
+    'Add custom ingredients here (separated by `,`): ',
+    ", ".join(["salt", "pepper"]),
+    key="custom_keywords",
+    on_change=custom_keywords_on_change,
+    max_chars=1000)
+custom_keywords = list(set([x.strip() for x in custom_keywords.strip().split(',') if len(x.strip()) > 0]))
+
 all_ingredients = []
 all_ingredients.extend(original_keywords)
 all_ingredients.extend(custom_keywords)
 all_ingredients = ", ".join(all_ingredients)
-st.markdown("**Generate recipe for:** "+all_ingredients)
-
+st.markdown("**Generate recipe for:** " + all_ingredients)
 
 submit = st.button('Get Recipe!')
 if submit:
     with st.spinner('Generating recipe...'):
         if sampling_mode == "Beam Search":
-            generated = generator(all_ingredients, return_tensors=True, return_text=False, **beam_search.generate_kwargs)
+            generated = generator(all_ingredients, return_tensors=True, return_text=False,
+                                  **beam_search.generate_kwargs)
             outputs = beam_search.post_generator(generated, tokenizer)
         elif sampling_mode == "Top-k Sampling":
-            generated = generator(all_ingredients, return_tensors=True, return_text=False, **top_sampling.generate_kwargs)
+            generated = generator(all_ingredients, return_tensors=True, return_text=False,
+                                  **top_sampling.generate_kwargs)
             outputs = top_sampling.post_generator(generated, tokenizer)
     output = outputs[0]
+    output['title'] = " ".join([w.capitalize() for w in output['title'].split()])
     markdown_output = ""
-    markdown_output += f"## {output['title'].capitalize()}\n"
+    markdown_output += f"## {output['title']}\n"
     markdown_output += f"#### Ingredients:\n"
     for o in output["ingredients"]:
         markdown_output += f"- {o}\n"
@@ -76,5 +97,3 @@ if submit:
     for o in output["directions"]:
         markdown_output += f"- {o}\n"
     st.markdown(markdown_output)
-    st.balloons()
-