yolo

app/app.py

@@ -49,10 +49,22 @@ TEMPORARY_WINE_RECOMMENDATION_FORM_INFO = {}
 dashboard_layout =  html.Div([
     # dcc.Link('About this project', href='/wiki'),
     html.H1(children='Wineyards around the world', style={'textAlign':'center'}),
-    html.H1(children='Country', style={'textAlign':'center'}),
-    dcc.Dropdown(wine_country, wine_country[-1], id='dropdown-wc'),
-    html.H1(children='Region', style={'textAlign':'center'}),
-    dcc.Dropdown(['all'],'all', id='dropdown-wr'),
+    
+    html.Div(
+        [
+            html.Div(
+                [
+                    html.H4(children='Country', style={'textAlign':'center'}),
+                    dcc.Dropdown(wine_country, wine_country[-1], id='dropdown-wc'),
+                ], className='six columns',
+            ),
+            html.Div(
+                [
+                    html.H4(children='Region', style={'textAlign':'center'}),
+                    dcc.Dropdown(['all'],'all', id='dropdown-wr'),
+                ], className='six columns',
+            )
+    ], className='row'),
     dcc.Graph(id='world-map-fig'),
 
     
@@ -61,9 +73,9 @@ dashboard_layout =  html.Div([
         [
             html.Div(
                 [
-                    html.H1(children='Wine Recommender', style={'textAlign':'center'}),
+                    html.H4(children='Wine Recommender', style={'textAlign':'center'}),
                     dcc.Dropdown(wine_list, wine_list[0], id='dropdown-selection'),
-                    html.H1(id='wine-recommendation', style={'textAlign':'center'}),
+                    html.P(id='wine-recommendation', style={'textAlign':'center'}),
                 ], className='six columns',
             ),
             html.Div(
@@ -74,19 +86,19 @@ dashboard_layout =  html.Div([
     ], className='row'),
     
     
-    html.H1(children="Wine Recommender based on users' feedback", style={'textAlign':'center'}),
+    html.H4(children="Wine Recommender based on users' feedback", style={'textAlign':'center'}),
     html.Div(
         [
             html.Div(
                 [
                     dcc.Dropdown(user_ids, user_ids[0], id='dropdown-selection-user'),
-                    html.H4(id='wine-recommendation-from-user', style={'textAlign':'center'}),
+                    html.P(id='wine-recommendation-from-user', style={'textAlign':'center'}),
                 ], className='six columns',
             ),
             
             html.Div(
                 [   
-                    html.H4(children='Data Example', style={'textAlign':'left'}),
+                    html.P(children='Data Example', style={'textAlign':'left'}),
                     dash_table.DataTable(
                         data=raw_ratings.to_dict('records'),
                         columns=[{'id': c, 'name': c} for c in raw_ratings.columns]
@@ -96,13 +108,13 @@ dashboard_layout =  html.Div([
     ], className='row'),
     
     
-    html.H1(children="Wine Preferences Form", style={'textAlign':'center'}),
+    html.H4(children="Wine Preferences Form", style={'textAlign':'center'}),
     html.Div(
         [
             html.Div(
                 [
                     #Dropdown for wine name
-                    dcc.Dropdown(wine_list, wine_list[0], id='dropdown-selection'),
+                    dcc.Dropdown(wine_list, wine_list[0], id='dropdown-selection-wine-form'),
                     dcc.Input(id='input-wine-rating', type='number', placeholder='Enter wine rating', min=1, max=5),
                 ], className='six columns',
             ),
@@ -125,17 +137,15 @@ dashboard_layout =  html.Div([
     Input('recommend-wine-from-form-reset', 'n_clicks'),
 )
 def reset_form(n_clicks):
-    print(n_clicks)
     if n_clicks > 0:
         TEMPORARY_WINE_RECOMMENDATION_FORM_INFO.clear()
         return 0
-    
 
 @app.callback(
     Output('recommended-wine-rating-info', 'children'),
     Output('submit-button', 'n_clicks'),
     Input('submit-button', 'n_clicks'),
-    Input('dropdown-selection', 'value'),
+    Input('dropdown-selection-wine-form', 'value'),
     Input('input-wine-rating', 'value'),
 )
 def update_output(n_clicks, wine_name, rating):
@@ -164,11 +174,6 @@ def recommend_wine_from_form(n_clicks):
     return '', 0
 
 
-
-
-
-
-
 @app.callback(
     Output('dropdown-wr', 'options'),
     Input('dropdown-wc', 'value')
@@ -220,31 +225,32 @@ def display_page(pathname):
         return '404'
     # You could also return a 404 "URL not found" page here
 
-
 @app.callback(
     Output('wine-recommendation', 'children'),
+    Input('dropdown-selection', 'value')
+)
+def update_recommendation(value):
+    if value:
+        recommended_wines = core.get_top_5_similar_wines(value, wine_similarity_df)[1:]
+        return f"Based on ´{value}´, we recommend: "+"; ".join(recommended_wines)
+    return ''
+
+
+
+
+@app.callback(
     Output('world-map-fig', 'figure'),
     Output('wine-recommendation-from-user', 'children'),
-    Input('dropdown-selection', 'value'),
     Input('dropdown-wr', 'value'),
     Input('dropdown-wc', 'value'),
     Input('dropdown-selection-user', 'value')
 )
-def update_graph(value,wr,wc, user_value):
-    ### Wine Recommendation ###
-    recommended_wines = None
-    if value:
-        recommended_wines = core.get_top_5_similar_wines(value, wine_similarity_df)[1:]
-        recommended_wines = f"Based on ´{value}´, we recommend: "+"; ".join(recommended_wines)
-
-
+def update_graph(wr,wc, user_value):
     ## Wine Recommendation from users feedback
 
     wine_recommendation_from_user = core.recommend_wine_from_users(user_rating_df, user_value, 3)
     wine_recommendation_from_user = f"Based on user information, we recommend: "+"; ".join(wine_recommendation_from_user)
 
-
-
     ### World Map of wineyards ###
 
     geo_df = pd.read_csv('data/processed_wineyards.csv')
@@ -274,7 +280,7 @@ def update_graph(value,wr,wc, user_value):
     
 
 
-    return recommended_wines, world_map_fig, wine_recommendation_from_user
+    return world_map_fig, wine_recommendation_from_user
 
 
 if __name__ == "__main__":

app/dashboard.ipynb

@@ -2,14 +2,14 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 12,
    "metadata": {},
    "outputs": [
     {
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "/var/folders/b4/lwfgccm95kqd2skcwvrt2fr00000gn/T/ipykernel_36332/1038910995.py:82: FutureWarning:\n",
+      "/var/folders/b4/lwfgccm95kqd2skcwvrt2fr00000gn/T/ipykernel_36332/1794122908.py:94: FutureWarning:\n",
       "\n",
       "Series.__getitem__ treating keys as positions is deprecated. In a future version, integer keys will always be treated as labels (consistent with DataFrame behavior). To access a value by position, use `ser.iloc[pos]`\n",
       "\n"
@@ -30,7 +30,7 @@
        "        "
       ],
       "text/plain": [
-       "<IPython.lib.display.IFrame at 0x2ad7f79a0>"
+       "<IPython.lib.display.IFrame at 0x2ae513e50>"
       ]
      },
      "metadata": {},
@@ -48,33 +48,6 @@
       "See the caveats in the documentation: https://pandas.pydata.org/pandas-docs/stable/user_guide/indexing.html#returning-a-view-versus-a-copy\n",
       "\n"
      ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Sup Azevedo\n"
-     ]
-    },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "/Users/ruimelo/Documents/GitHub/eda/app/core.py:21: SettingWithCopyWarning:\n",
-      "\n",
-      "\n",
-      "A value is trying to be set on a copy of a slice from a DataFrame\n",
-      "\n",
-      "See the caveats in the documentation: https://pandas.pydata.org/pandas-docs/stable/user_guide/indexing.html#returning-a-view-versus-a-copy\n",
-      "\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Sup Aura\n"
-     ]
     }
    ],
    "source": [
@@ -129,10 +102,22 @@
     "dashboard_layout =  html.Div([\n",
     "    # dcc.Link('About this project', href='/wiki'),\n",
     "    html.H1(children='Wineyards around the world', style={'textAlign':'center'}),\n",
-    "    html.H1(children='Country', style={'textAlign':'center'}),\n",
-    "    dcc.Dropdown(wine_country, wine_country[-1], id='dropdown-wc'),\n",
-    "    html.H1(children='Region', style={'textAlign':'center'}),\n",
-    "    dcc.Dropdown(['all'],'all', id='dropdown-wr'),\n",
+    "    \n",
+    "    html.Div(\n",
+    "        [\n",
+    "            html.Div(\n",
+    "                [\n",
+    "                    html.H4(children='Country', style={'textAlign':'center'}),\n",
+    "                    dcc.Dropdown(wine_country, wine_country[-1], id='dropdown-wc'),\n",
+    "                ], className='six columns',\n",
+    "            ),\n",
+    "            html.Div(\n",
+    "                [\n",
+    "                    html.H4(children='Region', style={'textAlign':'center'}),\n",
+    "                    dcc.Dropdown(['all'],'all', id='dropdown-wr'),\n",
+    "                ], className='six columns',\n",
+    "            )\n",
+    "    ], className='row'),\n",
     "    dcc.Graph(id='world-map-fig'),\n",
     "\n",
     "    \n",
@@ -141,9 +126,9 @@
     "        [\n",
     "            html.Div(\n",
     "                [\n",
-    "                    html.H1(children='Wine Recommender', style={'textAlign':'center'}),\n",
+    "                    html.H4(children='Wine Recommender', style={'textAlign':'center'}),\n",
     "                    dcc.Dropdown(wine_list, wine_list[0], id='dropdown-selection'),\n",
-    "                    html.H1(id='wine-recommendation', style={'textAlign':'center'}),\n",
+    "                    html.P(id='wine-recommendation', style={'textAlign':'center'}),\n",
     "                ], className='six columns',\n",
     "            ),\n",
     "            html.Div(\n",
@@ -154,19 +139,19 @@
     "    ], className='row'),\n",
     "    \n",
     "    \n",
-    "    html.H1(children=\"Wine Recommender based on users' feedback\", style={'textAlign':'center'}),\n",
+    "    html.H4(children=\"Wine Recommender based on users' feedback\", style={'textAlign':'center'}),\n",
     "    html.Div(\n",
     "        [\n",
     "            html.Div(\n",
     "                [\n",
     "                    dcc.Dropdown(user_ids, user_ids[0], id='dropdown-selection-user'),\n",
-    "                    html.H4(id='wine-recommendation-from-user', style={'textAlign':'center'}),\n",
+    "                    html.P(id='wine-recommendation-from-user', style={'textAlign':'center'}),\n",
     "                ], className='six columns',\n",
     "            ),\n",
     "            \n",
     "            html.Div(\n",
     "                [   \n",
-    "                    html.H4(children='Data Example', style={'textAlign':'left'}),\n",
+    "                    html.P(children='Data Example', style={'textAlign':'left'}),\n",
     "                    dash_table.DataTable(\n",
     "                        data=raw_ratings.to_dict('records'),\n",
     "                        columns=[{'id': c, 'name': c} for c in raw_ratings.columns]\n",
@@ -176,7 +161,7 @@
     "    ], className='row'),\n",
     "    \n",
     "    \n",
-    "    html.H1(children=\"Wine Preferences Form\", style={'textAlign':'center'}),\n",
+    "    html.H4(children=\"Wine Preferences Form\", style={'textAlign':'center'}),\n",
     "    html.Div(\n",
     "        [\n",
     "            html.Div(\n",