From ef7ef7a0ecc2c997e464de9df9610e4ede0b5473 Mon Sep 17 00:00:00 2001 From: Ben Cohen Date: Sun, 28 Jul 2019 16:10:18 -0400 Subject: styles --- app.py | 9 ++++++--- utils.py | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app.py b/app.py index d04a6ba..cab272b 100644 --- a/app.py +++ b/app.py @@ -3,7 +3,7 @@ from flask import render_template from flask import redirect from flask import request from flask import url_for -from utils import get_closest, translate_to_attr +from utils import get_closest, translate_to_attr, get_style_preds import json import random import re @@ -45,6 +45,9 @@ def get_beer_details(brewery_id, beer_id): 'Juicy', 'Light', 'Thin', 'Spicy', 'Dry', 'Fruity', 'Herbal', 'Salty'] similar_beers = get_closest(full_id) + + style_map = get_style_preds(full_id) + similar_beer_objects = [] for item in similar_beers: item_result, item_brewer = beer_lookup(item) @@ -60,10 +63,10 @@ def get_beer_details(brewery_id, beer_id): attr_beer_objects.append(BeerInfo(item[0], item_brewer, item_result)) return render_template('beerpage.jinja2', beer_data=beerinfo, attrs=attrs, similar_beers=similar_beer_objects, attr=attr, - direction=direction, attr_beers=attr_beer_objects) + direction=direction, attr_beers=attr_beer_objects, style_preds=similar_beers) return render_template('beerpage.jinja2', beer_data=beerinfo, attrs=attrs, - similar_beers=similar_beer_objects) + similar_beers=similar_beer_objects, style_preds=similar_beers) def beer_lookup(brewery_id, beer_id=None): diff --git a/utils.py b/utils.py index bfa92f9..12e2312 100644 --- a/utils.py +++ b/utils.py @@ -315,4 +315,5 @@ def get_style_preds(beer_id): ret[num_to_style[idx]] = score ret = normalize(ret) - return ret \ No newline at end of file + + return [{'name': x, 'score': y} for x, y in ret.items()] \ No newline at end of file -- cgit v1.2.3