Skip to content

Commit

Permalink
fixed bugs for new user recommendation
Browse files Browse the repository at this point in the history
  • Loading branch information
@17sushmita
17sushmita committed Jul 21, 2020
1 parent 82579ee commit a7091ac
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 42 deletions.
13 changes: 7 additions & 6 deletions shop/products/recommender.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ def content_based_filtering(product_id):
products=pd.read_sql_query("SELECT * from addproduct WHERE subcategory_id="+str(subcategory), con)
else:
products=pd.read_sql_query("SELECT * from addproduct WHERE category_id="+str(category), con)
print(products['id'])
'''
specs=pd.read_sql_query("SELECT product_id,spec_id from specsvalues where category_id="+str(category),con)
sp=specs.groupby('product_id')['spec_id'].apply(list).to_frame()
Expand Down Expand Up @@ -65,8 +64,13 @@ def most_viewed(user_id):
most_viewed_subcategory=events['subcategory_id'].value_counts().index
if len(most_viewed_subcategory)>5:
most_viewed_subcategories=most_viewed_subcategory[:5]
most_viewed_category=events['category_id'].value_counts().index[0]
#print(most_viewed_items,most_viewed_subcategory,most_viewed_category)
else:
most_viewed_subcategories=None
most_viewed_category=events['category_id'].value_counts().index
if len(most_viewed_category)>0:
most_viewed_category=most_viewed_category[0]
else:
most_viewed_category=None
return most_viewed_items,most_viewed_subcategory,most_viewed_category


Expand All @@ -87,19 +91,16 @@ def search_query(query,thresh=0.1):
products=pd.merge(products,spec_list,on="id")
x = products.loc[:, products.columns != 'id'].to_string(header=False,index=False,index_names=False).lower().split('\n')
df=pd.DataFrame({'id':products['id'],'product':x})
print(df)
vectorizer = TfidfVectorizer()
X = vectorizer.fit_transform(df['product'])
query_vec = vectorizer.transform([query.lower()])
results = cosine_similarity(X,query_vec).reshape((-1,))
idx, = np.where(results > thresh)
sorted_idx= idx[np.argsort(results[idx])][::-1]
print(sorted_idx)
con.close()
product_list=[]
for i in sorted_idx:
product_list.append(df.loc[i,'id'])
print(product_list)

return product_list

38 changes: 2 additions & 36 deletions shop/products/routes.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ def home():
top_products=[]
top_brands=[]
top_categories=[]
if 'logged_in' in session:

if 'logged_in' in session and len(most_viewed(session['uid'])[0])>0:
recommended_items=[]
for i in recommended_items_by_itemviewed(most_viewed(session['uid'])[0]):
recommended_items.append(Addproduct.query.get_or_404(i))
Expand All @@ -36,7 +37,6 @@ def home():
for i in hot_categories:
top_categories.append(Subcategories.query.get_or_404(i))
lengths=(len(top_products),len(top_categories),len(top_brands))
print(top_products,top_brands,top_categories)
return render_template('products/home.html',brands=brands(),categories=categories(),Subcategories=Subcategories,Category=Category,top_products=top_products,top_brands=top_brands,top_categories=top_categories,lengths=lengths,recommended_items=recommended_items)

@app.route('/products')
Expand All @@ -49,8 +49,6 @@ def products():
def result():
searchword = request.args.get('q')
products_id=search_query(searchword)
print(Addproduct.query.get_or_404(5))
print(products_id)
rec=[]
for p in products_id:
rec.append(Addproduct.query.get_or_404(int(p)))
Expand All @@ -65,9 +63,7 @@ def single_page(id):
for s in spec_values:
spec=Specs.query.get_or_404(s.spec_id).name
specs.append(spec)
print(specs)
recommendations=content_based_filtering(id).index
print(recommendations)
rec=[]
for p in recommendations:
if p!=id:
Expand All @@ -76,7 +72,6 @@ def single_page(id):

if 'logged_in' in session:
event=Events(customer_id=session['uid'],event='view',product_id=product.id)
print('view : ',product,session['uid'],session['s_name'])
db.session.add(event)
db.session.commit()
return render_template('products/single_page.html',product=product,brands=brands(),categories=categories(),specs=specs,Subcategories=Subcategories,x=rec)
Expand Down Expand Up @@ -148,7 +143,6 @@ def deletebrand(id):
for sp in spec_values:
db.session.delete(sp)
db.session.commit()
print(p)
db.session.delete(p)
db.session.commit()
db.session.delete(brand)
Expand Down Expand Up @@ -200,10 +194,8 @@ def deletecat(id):
db.session.delete(e)
specs=Specs.query.filter_by(category_id=id).all()
for s in specs:
print(s)
spec_values=Specsvalues.query.filter_by(spec_id=s.id).all()
for sp in spec_values:
print(sp)
db.session.delete(sp)
db.session.delete(s)
sub=Subcategories.query.filter_by(category_id=id).all()
Expand Down Expand Up @@ -249,7 +241,6 @@ def updatespec(id):
return redirect(url_for('login'))
updatespec = Specs.query.get_or_404(id)
spec = request.form.get('specs')
print('spec: ',spec)
if request.method =="POST":
updatespec.name = spec
flash(f'The specification {updatespec.name} was changed to {spec}','success')
Expand All @@ -275,22 +266,6 @@ def deletespec(id):
flash(f"The brand {spec.name} can't be deleted from your database","warning")
return redirect(url_for('specs'))

'''
@app.route('/spec-options')
def spec_options():
print('ggvjh')
getcat=request.args.get('category')
print(getcat)
specs = Specs.query.filter_by(category_id=getcat).all()
print(getid)
#print(jsonify({'specs':specs}))
spec_list=[]
for i in specs:
spec_list.append({'id':i.id,'name':i.name})
return jsonify(spec_list)
#return render_template('products/addproduct.html',spec_list=spec_list)
'''
################################################


Expand All @@ -317,7 +292,6 @@ def updatesub(id):
return redirect(url_for('login'))
updatesub = Subcategories.query.get_or_404(id)
sub = request.form.get('sub')
print('sub: ',sub)
if request.method =="POST":
updatesub.name = sub
flash(f'The Subcategory {updatesub.name} was changed to {sub}','success')
Expand All @@ -330,7 +304,6 @@ def updatesub(id):
@app.route('/deletesub/<int:id>', methods=['GET','POST'])
def deletesub(id):
sub = Subcategories.query.get_or_404(id)
print(sub.name)
if request.method=="POST":
db.session.delete(sub)
flash(f"The subcategory {sub.name} was deleted from your database","success")
Expand All @@ -343,9 +316,7 @@ def deletesub(id):

@app.route('/sub-options')
def spec_options():
print('subcategories')
getcat=request.args.get('category')
print(getcat)
sub = Subcategories.query.filter_by(category_id=getcat).all()
specs = Specs.query.filter_by(category_id=getcat).all()
spec_list=[]
Expand All @@ -354,14 +325,12 @@ def spec_options():
sub_list=[]
for i in sub:
sub_list.append({'id':i.id,'name':i.name})
print(sub_list)
return jsonify({'sub_list':sub_list,'spec_list':spec_list})

########################################################

@app.route('/addproduct', methods=['GET','POST'])
def addproduct():
print('yooooooooooo')
form = Addproducts(request.form)
brands = Brand.query.all()
categories = Category.query.all()
Expand All @@ -376,7 +345,6 @@ def addproduct():
category = request.form.get('category')
specs = request.form.getlist('specs')
sub = request.form.get('sub')
print(sub)
image_1 = photos.save(request.files.get('image_1'), name=secrets.token_hex(10) + ".")
image_2 = photos.save(request.files.get('image_2'), name=secrets.token_hex(10) + ".")
image_3 = photos.save(request.files.get('image_3'), name=secrets.token_hex(10) + ".")
Expand Down Expand Up @@ -408,12 +376,10 @@ def updateproduct(id):
categories = Category.query.all()
brand = request.form.get('brand')
category = request.form.get('category')
print(category,brand)
subcategories=Subcategories
sub = request.form.get('sub')

spec_values= Specsvalues.query.filter_by(product_id=id).all()
print(spec_values)
specs= Specs.query.filter_by(category_id=product.category_id).all()

if request.method =="POST":
Expand Down

0 comments on commit a7091ac

Please sign in to comment.