resolve conflicts

app.py

@@ -25,7 +25,7 @@ from utils import (
     pure_comma_separation
 )
 
-np.random.seed(42)
+# np.random.seed(42)
 
 
 class TextGeneration:
@@ -33,15 +33,24 @@ class TextGeneration:
         self.debug = False
         self.dummy_output = {
             'directions': [
-                'peel the potato and slice thinly.',
-                'place in a microwave safe dish.',
-                'cover with plastic wrap and microwave on high for 5 minutes.',
-                'remove from the microwave and sprinkle with cheese.',
-                'return to the microwave for 1 minute or until cheese is melted.',
-                'return to the microwave for 1 minute or until cheese is melted. return to the microwave for 1 minute or until cheese is melted.'
-                'return to the microwave for 1 minute or until cheese is melted.',
-                'return to the microwave for 1 minute or until cheese is melted.',
-                'return to the microwave for 1 minute or until cheese is melted.',
+                "for the dough",
+                "in a small bowl, combine the warm water and yeast.",
+                "let it sit for 5 minutes.",
+                "add the flour, salt, and olive oil.",
+                "mix well and knead until the dough is smooth and elastic.",
+                "cover the dough with a damp towel and let it rise for about 1 hour.",
+                "for the filling",
+                "heat a large skillet over medium high heat.",
+                "cook the beef and onion until the beef is browned and the onion is translucent. browned and the onion is translucent.",
+                "drain off any excess grease.",
+                "stir in the pepper and salt and black pepper to taste.",
+                "remove from the heat and set aside.",
+                "preheat the oven to 425 degrees f.",
+                "roll out the dough on a lightly floured surface into a 12 inch circle.",
+                "spread the beef mixture over the dough, leaving a 1 inch border.",
+                "top with the feta, parsley, and lemon juice.",
+                "bake for 20 minutes or until the crust is golden brown.",
+                "cut into wedges and serve.",
             ],
             'ingredients': [
                 '1 potato',
@@ -129,7 +138,7 @@ class TextGeneration:
         )
         # Ingredients
         im_editable.text(
-            (100, 1050),
+            (100, 1000),
             "Ingredients",
             (61, 61, 70),
             font=self.fonts["body_bold"],
@@ -138,33 +147,40 @@ class TextGeneration:
         ingredients = [textwrap.fill(item, 30).replace("\n", "\n   ") for item in ingredients]
 
         im_editable.text(
-            (100, 1130),
+            (100, 1080),
             "\n".join([f"{self.point} {item}" for item in ingredients]),
             (61, 61, 70),
             font=self.fonts["body"],
         )
         # Directions
         im_editable.text(
-            (700, 1050),
+            (700, 1000),
             "Directions",
             (61, 61, 70),
             font=self.fonts["body_bold"],
         )
         directions = recipe["directions"]
-        directions_col1 = [textwrap.fill(item, 30).replace("\n", "\n   ") for item in directions[:self.list_division]]
-        directions_col2 = [textwrap.fill(item, 30).replace("\n", "\n   ") for item in directions[self.list_division:]]
+        directions = [textwrap.fill(item, 80).replace("\n", "\n   ") for item in directions]
         im_editable.text(
-            (700, 1130),
-            "\n".join([f"{i + 1}. {item}" for i, item in enumerate(directions_col1)]).strip(),
-            (61, 61, 70),
-            font=self.fonts["body"],
-        )
-        im_editable.text(
-            (1300, 1130),
-            "\n".join([f"{i + 1 + self.list_division}. {item}" for i, item in enumerate(directions_col2)]).strip(),
+            (700, 1080),
+            "\n".join([f"{i + 1}. {item}" for i, item in enumerate(directions)]).strip(),
             (61, 61, 70),
             font=self.fonts["body"],
         )
+        # directions_col1 = [textwrap.fill(item, 30).replace("\n", "\n   ") for item in directions[:self.list_division]]
+        # directions_col2 = [textwrap.fill(item, 30).replace("\n", "\n   ") for item in directions[self.list_division:]]
+        # im_editable.text(
+        #     (700, 1130),
+        #     "\n".join([f"{i + 1}. {item}" for i, item in enumerate(directions_col1)]).strip(),
+        #     (61, 61, 70),
+        #     font=self.fonts["body"],
+        # )
+        # im_editable.text(
+        #     (1300, 1130),
+        #     "\n".join([f"{i + 1 + self.list_division}. {item}" for i, item in enumerate(directions_col2)]).strip(),
+        #     (61, 61, 70),
+        #     font=self.fonts["body"],
+        # )
         return frame
 
     def generate(self, items, generation_kwargs):
@@ -224,8 +240,11 @@ def main():
         initial_sidebar_state="expanded"
     )
     generator = load_text_generator()
-    if 'get_random_frame' not in st.session_state:
-        st.session_state.get_random_frame = generator.frames[0]
+    if hasattr(st, "session_state"):
+        if 'get_random_frame' not in st.session_state:
+            st.session_state.get_random_frame = generator.frames[0]
+    else:
+        get_random_frame = generator.frames[0]
 
     local_css("asset/css/style.css")
 
@@ -269,7 +288,11 @@ def main():
         unsafe_allow_html=True
     )
     if recipe_button:
-        st.session_state.get_random_frame = generator.frames[random.randint(0, len(generator.frames)) - 1]
+        if hasattr(st, "session_state"):
+            st.session_state.get_random_frame = generator.frames[random.randint(0, len(generator.frames)) - 1]
+        else:
+            get_random_frame = generator.frames[random.randint(0, len(generator.frames)) - 1]
+
         entered_items.markdown("**Generate recipe for:** " + items)
         with st.spinner("Generating recipe..."):
 
@@ -292,7 +315,11 @@ def main():
 
                 with r1:
                     # st.write(st.session_state.get_random_frame)
-                    recipe_post = generator.generate_frame(generated_recipe, st.session_state.get_random_frame)
+                    if hasattr(st, "session_state"):
+                        recipe_post = generator.generate_frame(generated_recipe, st.session_state.get_random_frame)
+                    else:
+                        recipe_post = generator.generate_frame(generated_recipe, get_random_frame)
+
                     st.image(
                         recipe_post,
                         # width=500,
@@ -311,9 +338,9 @@ def main():
                             " ".join([f'<li>{item}</li>' for item in ingredients]),
                             "</ul>",
                             "<h3>Directions</h3>",
-                            "<ul class='ingredients-list'>",
+                            "<ol class='ingredients-list'>",
                             " ".join([f'<li>{item}</li>' for item in directions]),
-                            "</ul>",
+                            "</ol>",
                             "</div>"
                         ]),
                         unsafe_allow_html=True

examples.py

@@ -1,3 +1,10 @@
 EXAMPLES = {
     "Chocolate Baklava": "phyllo dough, unsalted butter, walnuts, cinnamon, water, honey, melted chocolate",
+    "Ghormeh Sabzi (Persian Herb Stew)": "beef, oil, onion, tomatoes, turmeric powder, limes, water, salt, pepper, red beans, herb",
+    "Kotlet, Persian Cutlet": "beef, potatoes, eggs, onion, flour, turmeric powder, oil, salt, pepper",
+    "Persian Chicken Stew (Fesenjan)": "walnut pieces, onion, boneless skinless chicken thighs, pomegranate molasses, orange juice, chicken stock, cinnamon, salt, pepper, oil",
+    "Pide (Turkish Flatbread)": "water, dry active yeast, flour, salt, olive oil, ground beef, onion, pepper, salt, feta cheese, parsley, lemon",
+    "Korean Pork Chops": "pork chops, soy sauce, honey, garlic, sesame oil, fresh ginger root, sweet chili sauce, olive oil",
+    "Italian Pasta Salad": "rotini pasta, broccoli florets, parmesan cheese, red pepper, onions, black olives",
+    "Authentic German Jägerschnitzel (Hunter Schnitzel with Mushroom Gravy)": "oil, boneless pork chops, salt, pepper, flour, eggs, breadcrumbs, gravy, parsley"
 }

meta.py

@@ -15,9 +15,9 @@ Chef Giovanni.)</span></p>
 """.strip()
 PROMPT_BOX = "Add custom ingredients here (separated by `,`): "
 STORY = """
-Hello everyone, I am **Chef Transformer**, the owner of this restaurant. I was made by a group of [NLP Engineers](
-https://huggingface.co/flax-community/t5-recipe-generation#team-members) to oversee the recipe creations of my two prodigies: **Chef Scheherazade** and **Chef Giovanni**. Both of my students participated in my rigorous culinary program, [T5 fine-tune training](https://huggingface.co/flax-community/t5-recipe-generation), to learn how to prepare exquisite cuisines from a wide variety of ingredients.
-I've never been more proud of my students -- both can produce exceptional dishes but I regard Scheherazade as being *creative* while Giovanni is *meticulous*. If you give each of them the same ingredients, they'll each usually come up with something different.
+Hello everyone 👋, I am **Chef Transformer**, the owner of this restaurant. I was made by a group of [NLP Engineers](
+https://huggingface.co/flax-community/t5-recipe-generation#team-members) to train my two prodigy recipe creators: **Chef Scheherazade** and **Chef Giovanni**. Both of my students participated in my rigorous culinary program, [T5 fine-tune training](https://huggingface.co/flax-community/t5-recipe-generation), to learn how to prepare exquisite cuisines from a wide variety of ingredients. 
+I've never been more proud of my students -- both can produce exceptional dishes but I regard Scheherazade as being *creative* while Giovanni is *meticulous*. If you give each of them the same ingredients, they'll usually come up with something different.
 
 At the start of the program the chefs read cookbooks containing thousands of recipes of varying difficulties and from cultures all over the world. The NLP engineers helped guide the learning process so that the chefs could actually learn which ingredients work well together rather than just memorizing recipes.
 In fact, the main way I trained my chefs was by asking them to generate a title, a list of ingredients (including amounts!), and a list of directions after receiving just a simple list of food items. 
@@ -34,5 +34,5 @@ In fact, the main way I trained my chefs was by asking them to generate a title,
 * In the cookbooks (a.k.a dataset), the food items were referred to as NER.
 
 In the span of a week, my chefs went from spitting out nonsense to creating masterpieces. Their learning rate was exceptionally high and each batch of recipes was better than the last. In their final exam, they achieved [high scores](
-https://huggingface.co/flax-community/t5-recipe-generation#evaluation) in a standardized industry test and established this restaurant. Please tell your friends and family about us! We create each recipe with a smile on our faces 🤗
+https://huggingface.co/flax-community/t5-recipe-generation#evaluation) 💯 in a standardized industry test and established this restaurant 🍲. Please tell your friends and family about us! We create each recipe with a smile on our faces 🤗
 """.strip()

requirements.txt

@@ -1,4 +1,4 @@
-streamlit
+streamlit==0.84.1
 transformers
 torch
 Pillow

utils.py

@@ -35,8 +35,14 @@ def remote_css(css_url):
     st.markdown(f'<link href="{css_url}" rel="stylesheet">', unsafe_allow_html=True)
 
 
+def unique_list(seq):
+    seen = set()
+    seen_add = seen.add
+    return [x for x in seq if not (x in seen or seen_add(x))]
+
+
 def pure_comma_separation(list_str, return_list=True):
-    r = [item.strip() for item in list_str.split(",")]
+    r = unique_list([item.strip() for item in list_str.lower().split(",") if item.strip()])
     # r = list(set([x.strip() for x in list_str.strip().split(',') if len(x.strip()) > 0]))
     if return_list:
         return r