Update app.py

app.py

@@ -34,6 +34,25 @@ mode = st.toggle(label="MART")
 if 'ind' not in st.session_state:
     st.session_state.ind = []
 
+
+def spinner(txt):return st.spinner(txt)
+
+def columns(n):
+    return st.columns(n)
+
+def text_area(txt,value,placeholder):
+    return st.text_area(txt,value=value,placeholder=placeholder)
+
+def number_input(txt,min_value,max_value,value,step):return st.number_input(txt,min_value=min_value,max_value=max_value,value=value,step=step)
+
+def button(txt,on_click,type,disabled=False,use_container_width=False,kwargs=None):
+    return st.button(label=txt,on_click=on_click,disabled=disabled,type=type,use_container_width=use_container_width,kwargs=kwargs)
+
+def container(border,height):
+    return st.container(border=border,height=height)
+
+def selectbox(txt,options,key=None):return st.selectbox(txt,options=options,key=key)
+def expander(txt):return st.expander(txt)
 @st.cache_resource(show_spinner=False)
 def pygwalerapp(df):
     return StreamlitRenderer(df)
@@ -48,9 +67,9 @@ def get_recommendations(user_description, count_vectorizer, count_matrix):
     cosine_similarities = cosine_similarity(user_vector, count_matrix).flatten()
     similar_indices = cosine_similarities.argsort()[::-1]
     return similar_indices
-@st.cache_resource(show_spinner=False)
+@st.experimental_fragment
 def show_recipe(recipe):
-    with st.spinner("HANG TIGHT, RECIPE INCOMING..."):
+    with spinner("HANG TIGHT, RECIPE INCOMING..."):
         name_and_dis = f'# {recipe["name"]}\n\n'
         name_and_dis += f'{recipe["description"]}\n\n'
         ingredients = '## Ingredients:\n'
@@ -59,21 +78,22 @@ def show_recipe(recipe):
             instructions += f"{instruction['step_number']}. {instruction['instruction']}\n"
 
         st.write(name_and_dis)
-        col01, col02 = st.columns(2)
+        col01, col02 = columns(2)
         with col01:
-            cont = st.container(border=True, height=500)
-            cont.write(ingredients)
-            for j, i in enumerate(recipe["ingredients"]):
-                ind = get_recommendations(i['name'], cv, vectors)
-                st.session_state.ind.append(ind[:5].tolist())
-                cont.selectbox(i['name'],
-                               options=items_dict.iloc[ind][
-                                   "PRODUCT_NAME"].values,
-                               key=f"selectbox_{j}_{i['name']}{random.random() * 100}")
+            cont = container(border=True, height=500)
+            with cont:
+                st.write(ingredients)
+                for j, i in enumerate(recipe["ingredients"]):
+                    ind = get_recommendations(i['name'], cv, vectors)
+                    st.session_state.ind.append(ind[:5].tolist())
+                    selectbox(i['name'],
+                                   options=items_dict.iloc[ind][
+                                       "PRODUCT_NAME"].values,
+                                   key=f"selectbox_{j}_{i['name']}{random.random() * 100}")
         with col02:
-            cont = st.container(border=True, height=500)
-            cont.write(instructions)
-@st.cache_resource(show_spinner=False)
+            cont = container(border=True, height=500)
+            with cont:st.write(instructions)
+@st.experimental_fragment
 def cooking():
     client = InferenceClient("mistralai/Mixtral-8x7B-Instruct-v0.1")
 
@@ -120,7 +140,7 @@ def cooking():
         return prompt
 
     def generate_recipe(user_inputs):
-        with st.spinner('Building the perfect recipe...'):
+        with spinner('Building the perfect recipe...'):
             prompt = create_detailed_prompt(user_inputs['user_direction'], user_inputs['exclusions'],
                                             user_inputs['serving_size'], user_inputs['difficulty'])
 
@@ -200,15 +220,15 @@ def cooking():
         st.session_state.recipe = None
 
     st.title("Let's get cooking")
-    col1, col2 = st.columns(2)
+    col1, col2 = columns(2)
     with col1:
-        st.session_state.user_direction = st.text_area(
+        st.session_state.user_direction = text_area(
             "What do you want to cook? Describe anything - a dish, cuisine, event, or vibe.",
             value=st.session_state.user_direction,
             placeholder="quick snack, asian style bowl with either noodles or rice, something italian",
         )
     with col2:
-        st.session_state.serving_size = st.number_input(
+        st.session_state.serving_size = number_input(
             "How many servings would you like to cook?",
             min_value=1,
             max_value=100,
@@ -267,11 +287,11 @@ def cooking():
 
     button_cols_submit = st.columns([1, 1, 4])
     with button_cols_submit[0]:
-        st.button(label='Submit', on_click=generate_recipe, kwargs=dict(user_inputs=user_inputs),
+        button(txt='Submit', on_click=generate_recipe, kwargs=dict(user_inputs=user_inputs),
                   type="primary",
                   use_container_width=True)
     with button_cols_submit[1]:
-        st.button(label='Reset', on_click=clear_inputs, type="secondary", use_container_width=True)
+        button(txt='Reset', on_click=clear_inputs, type="secondary", use_container_width=True)
     with button_cols_submit[2]:
         st.empty()
 
@@ -305,14 +325,14 @@ def cooking():
             disable_button = False
         button_cols_save = st.columns([1, 1, 4])
         with button_cols_save[0]:
-            st.button("Save Recipe", on_click=save_recipe, disabled=disable_button, type="primary")
+            button("Save Recipe", on_click=save_recipe, disabled=disable_button, type="primary")
         with button_cols_save[1]:
             st.empty()
         with button_cols_save[2]:
             st.empty()
         if st.session_state.recipe_saved == True:
             st.success("Recipe Saved!")
-@st.cache_resource(show_spinner=False)
+@st.experimental_fragment
 def rsaved():
     st.title("Saved Recipes")
     def load_saved_recipes_from_pickle(directory_path):
@@ -346,7 +366,7 @@ def rsaved():
         elif user_sort == 'Random':
             recipes.sort(key=lambda x: x['file'])
     with cols[0]:
-        user_search = st.selectbox("Search Recipes", [""] + [recipe['name'] for recipe in recipes])
+        user_search = selectbox("Search Recipes", [""] + [recipe['name'] for recipe in recipes])
     st.write("")  # just some space
 
     if user_search != "":
@@ -356,15 +376,15 @@ def rsaved():
             show_recipe(filtered_recipes[0])
         else:
             st.write("No recipe found.")
-@st.cache_resource(show_spinner=False)
+@st.experimental_fragment
 def mart():
     st.markdown("# :eyes: PEOPLE SEARCHING FOR...")
     print(st.session_state.ind)
     flattened_indices = list(set(index for sublist in st.session_state.ind for index in sublist))
     df = items_dict.iloc[flattened_indices]
     if st.session_state.ind != []:
-        with st.spinner("LET'S SEE, WHAT PEOPLE WANT..."):
-            cont1 = st.container(border=True, height=500)
+        with spinner("LET'S SEE, WHAT PEOPLE WANT..."):
+            cont1 = container(border=True, height=500)
             with cont1:
                 wc = wordcloud.WordCloud(width=1000, height=320, background_color='white').generate(
                     ' '.join(df['CATEGORY']))
@@ -376,8 +396,8 @@ def mart():
 
                 st.pyplot(fig, use_container_width=True)
 
-            with st.container(border=True, height=500):
-                col1, col2 = st.columns(2)
+            with container(border=True, height=500):
+                col1, col2 = columns(2)
                 with col1:
                     st.markdown('## DEMAND AS PER CATEGORY')
                     with plt.style.context('Solarize_Light2'):
@@ -392,13 +412,13 @@ def mart():
                         fig1.update_traces(text=df['AVAILABILITY'], textposition='outside')
                         st.plotly_chart(fig1, use_container_width=True)
 
-            with st.container(border=True, height=620):
+            with container(border=True, height=620):
                 st.markdown('## :deciduous_tree: Hierarchical view of demand using TreeMap')
                 fig4 = px.treemap(df, path=['CATEGORY', 'AVAILABILITY','PRODUCT'],color='AVAILABILITY')
                 fig4.update_layout(height=550)
                 st.plotly_chart(fig4, use_container_width=True,scrolling=False)
 
-            with st.container(border=True, height=500):
+            with container(border=True, height=500):
                 fig = px.bar(df,
                              y='CATEGORY',
                              x='BREADCRUMBS',
@@ -409,11 +429,14 @@ def mart():
                              )
                 st.plotly_chart(fig, use_container_width=True)
             # st.markdown("## :desktop_computer: DO YOUR OWN RESEARCH...")
-            with st.expander("## :desktop_computer: LOOKING FOR SOMETHING ELSE..."):
+            with expander("## :desktop_computer: LOOKING FOR SOMETHING ELSE..."):
                 pygwalerapp(df).explorer()
 # Initialize the inference client for the Mixtral model
+@st.experimental_fragment
+def tabs():
+    return st.tabs(['COOK','SAVED'])
 if not mode:
-    cook, saved = st.tabs(['COOK', 'SAVED'])
+    cook, saved = tabs()
     with cook:
         cooking()
     with saved: