refactor

app.py

@@ -42,30 +42,10 @@ def get_recipe_data(recipe_url):
 
     return instructions, ingredients, recipe_title
 
-def get_ingredient_data(ingredients):
+def get_data(data):
     nlp = spacy.load("en_core_web_sm")
 
-    doc = ner(ingredients)
-    
-    ingredients_list = []
-
-    for item in doc:
-        if item[1] == 'INGREDIENT':
-            item_lemma = ' ' .join([tok.lemma_ for tok in nlp(item[0])])
-            if item_lemma not in ingredients_list:
-                ingredients_list.append(item_lemma)
-
-    ingredients_out = ""
-
-    for i in range(len(ingredients_list)):
-        ingredients_out += f'{i+1}. {ingredients_list[i]} \n'
-
-    return ingredients_out
-
-def get_instruction_data(instructions):
-    nlp = spacy.load("en_core_web_sm")
-
-    doc = ner(instructions)
+    doc = ner(data)
     
     ingredients_list = []
 
@@ -86,7 +66,13 @@ def final_ingredients(inst_ingredients_list, ingr_ingredients_list):
     instructions_guess = [re.sub(r'[0-9]+', '', item)[2:-1] for item in inst_ingredients_list.split('\n')if len(item) > 3]
     ingredients_guess = [re.sub(r'[0-9]+', '', item)[2:-1] for item in ingr_ingredients_list.split('\n')if len(item) > 3]
 
-    final_guess_list = [item for item in instructions_guess if item in ingredients_guess]
+    final_guess_list = []
+
+    for ingr_item in ingredients_guess:
+        for inst_item in instructions_guess:
+            if inst_item in ingr_item and ingr_item not in final_guess_list:
+                final_guess_list.append(ingr_item)
+    
 
     final_guess = ""
 
@@ -122,8 +108,8 @@ with gr.Blocks() as demo:
 
 
     recipe_btn.click(fn=get_recipe_data, inputs=recipe_link, outputs=[instructions, ingredients, recipe_title])
-    ingredient_btn.click(fn=get_ingredient_data, inputs=[ingredients], outputs=[ingr_ingredients_list])
-    ingredient_btn.click(fn=get_instruction_data, inputs=[instructions], outputs=[inst_ingredients_list])
+    ingredient_btn.click(fn=get_data, inputs=[ingredients], outputs=[ingr_ingredients_list])
+    ingredient_btn.click(fn=get_data, inputs=[instructions], outputs=[inst_ingredients_list])
     final_btn.click(fn=final_ingredients, inputs=[inst_ingredients_list, ingr_ingredients_list], outputs=[final_ingredients_list])
 
 demo.launch()