Add dietary restrictions functionality

blacklists.py

@@ -0,0 +1,7 @@
+
+
+vegitarian = ['beef', 'chicken', 'turkey', 'pork', 'fish', 'salmon', 
+              'steak', 'tuna', 'crab', 'lobster', 'bacon', 'ham', 'scallops',
+              'mussles', 'bologna']
+
+kosher = ['pork', 'crab', 'lobster', 'bacon', 'ham', 'scallops', 'mussles', 'bologna']

foodnet.py

@@ -16,6 +16,21 @@ from concurrent.futures import ProcessPoolExecutor
 import matplotlib.pyplot as plt
 import streamlit as st
 import argparse
+import logging
+from pyunsplash import PyUnsplash
+import blacklists
+api_key = 'hzcKZ0e4we95wSd8_ip2zTB3m2DrOMWehAxrYjqjwg0'
+
+# instantiate PyUnsplash object
+py_un = PyUnsplash(api_key=api_key)
+
+# pyunsplash logger defaults to level logging.ERROR
+# If you need to change that, use getLogger/setLevel
+# on the module logger, like this:
+logging.getLogger("pyunsplash").setLevel(logging.DEBUG)
+
+# TODO: 
+# Image search: Option 1 -> google image search api || Option 2 -> open ai clip search
 from PIL import Image
 
 
@@ -239,7 +254,7 @@ st.set_page_config(page_title="FoodNet", page_icon = "🍔", layout = "centered"
 ## Sidebar ##
 add_selectbox = st.sidebar.selectbox("Pages", ("FoodNet Recommender", "Food Donation Resources", "Contact Team"))
 
-model, yum = load_model('fastfood.pth')
+model, yum = load_model()
 
 if add_selectbox == "FoodNet Recommender":
     st.title("FoodNet 🍔")
@@ -251,28 +266,80 @@ if add_selectbox == "FoodNet Recommender":
     ## Slider ##
     st.slider("Number of recommendations to show", min_value=1, max_value=100, value=5, step=1, key='top_n')
 
+    ## Show Images ## 
+    # search = py_un.search(type_="photos", query="cookie")
+    # py_un.photos(type_="single", photo_id='l0_kVknpO2g')
+
+    # st.image(search)
+    ## Images
+    # for leftover in st.session_state.leftovers:
+    #   search = py_un.search(type_='photos', query=leftover)
+    #   for photo in search.entries:
+    #       # print(photo.id, photo.link_download)
+    #     st.image(photo.link_download, caption=leftover, width=200)
+    #     break
+    # (f"![Alt Text]({search.link_next})")
+
     ## Get food recommendation ##
     ingredients_no_space = [x.replace(' ','_') for x in st.session_state.get('leftovers')]
     out = recommend_ingredients(yum, ingredients_no_space, n=st.session_state.top_n)
     names = [o[0] for o in out]
     probs = [o[1] for o in out]
 
-    if 'probs' not in st.session_state:
-        st.session_state['probs'] = False
+    # if 'probs' not in st.session_state:
+    #     st.session_state['probs'] = False
     
-    if st.session_state.probs:
-        st.table(data=out)
-    else:
-        st.table(data=names)
+    # if st.session_state.probs:
+    #     st.table(data=out)
+    # else:
+    #     st.table(data=names)
         
-    st.checkbox(label="Show model scores", value=False, key="probs")
-    ## Plot Results ##
-    st.checkbox(label="Show results bar chart", value=False, key="plot")
-    if st.session_state.plot:
-        fig = plot_results(names, probs, st.session_state.top_n)
+    # st.checkbox(label="Show model scores", value=False, key="probs")
+    # ## Plot Results ##
+    # st.checkbox(label="Show results bar chart", value=False, key="plot")
+    # if st.session_state.plot:
+    #     fig = plot_results(names, probs, st.session_state.top_n)
+
+    #     ## Show Plot ##
+    #     st.pyplot(fig)
+    st.selectbox(label="Dietary Resriction", options=('None', 'Kosher', 'Vegitarian'), key="diet")
+    if st.session_state.diet != 'None':
+      if st.session_state.diet == 'Vegitarian':
+        out = [o for o in out if not any(ignore in o[0] for ignore in blacklists.vegitarian)]
+      if st.session_state.diet == "Kosher": 
+        out = [o for o in out if not any(ignore in o[0] for ignore in blacklists.kosher)]
+      names = [o[0] for o in out]
+      probs = [o[1] for o in out]
+
+    col1, col2, col3 = st.columns(3)
+
+    # st.checkbox(label="Show model score", value=False, key="probs")
+    # if st.session_state.probs:
+    #   col1.table(data=out)
+    # else:
+    #   col1.table(data=names)
+    
+    for i, name in enumerate(names): 
+      search = py_un.search(type_='photos', query=name)
+      for photo in search.entries:
+        col_id = i%3
+        if col_id == 0:
+          col1.image(photo.link_download, caption=name, use_column_width=True)
+        elif col_id == 1:
+          col2.image(photo.link_download, caption=name, use_column_width=True)
+        elif col_id == 2: 
+          col3.image(photo.link_download, caption=name, use_column_width=True)
+          # print(photo.id, photo.link_download)
+        
+        break
 
-        ## Show Plot ##
-        st.pyplot(fig)
+    ## Plot Results ##
+    # st.checkbox(label="Show model bar chart", value=False, key="plot")
+    # if st.session_state.plot:
+    #   fig = plot_results(names, probs, st.session_state.top_n)
+      
+    #   ## Show Plot ## 
+    #   col2.pyplot(fig)
 
 elif add_selectbox == "Food Donation Resources":
     st.title('Food Donation Resources')
@@ -326,7 +393,10 @@ if add_selectbox == "Contact Team":
     col1, mid, col2 = st.columns([20, 2, 10])
     with col1:
         st.write('Pronouns: he/him/his')
+        st.write('Research/career interests: Robotics, AI')
         st.write('Favorite Food: Deep Dish Pizza')
+        st.write('A painfully boring fact: Am a middle child')
+        st.write('Hobbies: Golf, Traveling, Games')
         st.write('Email: mfogelso@andrew.cmu.edu')
     with col2:
         st.image('https://images.squarespace-cdn.com/content/v1/562661f3e4b0ae7c10f0a2cc/1590528961389-2142HA48O7LRZ9FWGP0F/about_image.jpg?format=2500w', width=300)
@@ -353,4 +423,4 @@ if add_selectbox == "Contact Team":
         st.write('Hobbies: photography')
         st.write('Email: shihaoxu@andrew.cmu.edu')
     with col2:
-        st.image('https://scontent-ort2-1.xx.fbcdn.net/v/t39.30808-6/261420667_131245119324840_3342182275866550937_n.jpg?_nc_cat=100&ccb=1-5&_nc_sid=730e14&_nc_ohc=IP7khn2w6cwAX_wC85x&_nc_ht=scontent-ort2-1.xx&oh=063c2b6b0ed5e9fc10adb2c391c471cf&oe=61AA72C1', width=300)
+        st.image('https://scontent-ort2-1.xx.fbcdn.net/v/t39.30808-6/261420667_131245119324840_3342182275866550937_n.jpg?_nc_cat=100&ccb=1-5&_nc_sid=730e14&_nc_ohc=IP7khn2w6cwAX_wC85x&_nc_ht=scontent-ort2-1.xx&oh=063c2b6b0ed5e9fc10adb2c391c471cf&oe=61AA72C1', width=300)