sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'feature/autoqueue' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2017-10-31 14:54:41 +01:00
parent 092d24d9b2 0ecd8c588d
commit 41f348a70d
5 changed files with 151 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rowers/dataprepnodjango.py
+1 -2
View File
@@ -472,7 +472,7 @@ def delete_strokedata(id,debug=False):
engine.dispose()
def update_strokedata(id,df,debug=False):
delete_strokedata(id)
delete_strokedata(id,debug=debug)
if debug:
print "updating ",id
rowdata = dataprep(df,id=id,bands=True,barchart=True,otwpower=True,
@@ -935,7 +935,6 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
# write data if id given
if id != 0:
data['workoutid'] = id
if debug:
engine = create_engine(database_url_debug, echo=False)
else:
rowers/tasks.py
+47 -23
View File
@@ -30,7 +30,7 @@ from rowers.dataprepnodjango import (
)
from django.core.mail import send_mail, EmailMessage
from django.db.utils import OperationalError
import datautils
import utils
@@ -50,7 +50,7 @@ def handle_new_workout_from_file(r, f2,
workouttype='rower',
title='Workout',
makeprivate=False,
notes=''):
notes='',debug=False):
return new_workout_from_file(r, f2, workouttype,
title, makeprivate, notes)
@@ -92,7 +92,8 @@ def handle_updatedps(useremail, workoutids, debug=False):
@app.task
def handle_sendemail_breakthrough(workoutid, useremail,
userfirstname, userlastname,
btvalues=pd.DataFrame().to_json()):
btvalues=pd.DataFrame().to_json(),
debug=False):
# send email with attachment
subject = "A breakthrough workout on rowsandall.com"
@@ -151,7 +152,8 @@ def handle_sendemail_breakthrough(workoutid, useremail,
@app.task
def handle_sendemail_hard(workoutid, useremail,
userfirstname, userlastname,
btvalues=pd.DataFrame().to_json()):
btvalues=pd.DataFrame().to_json(),
debug=False):
# send email with attachment
subject = "That was a pretty hard workout on rowsandall.com"
@@ -183,7 +185,8 @@ def handle_sendemail_hard(workoutid, useremail,
# send email to me when an unrecognized file is uploaded
@app.task
def handle_sendemail_unrecognized(unrecognizedfile, useremail):
def handle_sendemail_unrecognized(unrecognizedfile, useremail,
debug=False):
# send email with attachment
fullemail = 'roosendaalsander@gmail.com'
@@ -215,7 +218,8 @@ def handle_sendemail_unrecognized(unrecognizedfile, useremail):
# send email to owner when an unrecognized file is uploaded
@app.task
def handle_sendemail_unrecognizedowner(useremail, userfirstname):
def handle_sendemail_unrecognizedowner(useremail, userfirstname,
debug=False):
# send email with attachment
fullemail = useremail
@@ -246,7 +250,7 @@ def handle_sendemail_unrecognizedowner(useremail, userfirstname):
# Send email with TCX attachment
@app.task
def handle_sendemailtcx(first_name, last_name, email, tcxfile):
def handle_sendemailtcx(first_name, last_name, email, tcxfile,debug=False):
# send email with attachment
fullemail = first_name + " " + last_name + " " + "<" + email + ">"
@@ -269,7 +273,7 @@ def handle_sendemailtcx(first_name, last_name, email, tcxfile):
@app.task
def handle_zip_file(emailfrom, subject, file):
def handle_zip_file(emailfrom, subject, file,debug=False):
message = "... zip processing ... "
email = EmailMessage(subject, message,
emailfrom,
@@ -283,7 +287,7 @@ def handle_zip_file(emailfrom, subject, file):
@app.task
def handle_sendemailcsv(first_name, last_name, email, csvfile):
def handle_sendemailcsv(first_name, last_name, email, csvfile,debug=False):
# send email with attachment
fullemail = first_name + " " + last_name + " " + "<" + email + ">"
@@ -365,7 +369,9 @@ def handle_otwsetpower(f1, boattype, weightvalue,
totaltime = totaltime + rowdata.df.ix[0, ' ElapsedTime (sec)']
except KeyError:
pass
df = getsmallrowdata_db(['power', 'workoutid', 'time'], ids=[workoutid])
df = getsmallrowdata_db(
['power', 'workoutid', 'time'], ids=[workoutid],
debug=debug)
thesecs = totaltime
maxt = 1.05 * thesecs
logarr = datautils.getlogarr(maxt)
@@ -376,9 +382,13 @@ def handle_otwsetpower(f1, boattype, weightvalue,
res, btvalues, res2 = utils.isbreakthrough(
delta, cpvalues, ps[0], ps[1], ps[2], ps[3], ratio)
if res:
handle_sendemail_breakthrough(workoutid, email,
try:
handle_sendemail_breakthrough(
workoutid, email,
first_name,
last_name, btvalues=btvalues.to_json())
except:
pass
# send email
fullemail = first_name + " " + last_name + " " + "<" + email + ">"
@@ -394,9 +404,12 @@ def handle_otwsetpower(f1, boattype, weightvalue,
message += "Please report any bugs/inconsistencies/unexpected results at rowsandall.slack.com or by reply to this email.\n\n"
message += "Best Regards, The Rowsandall Physics Department."
try:
send_mail(subject, message,
'Rowsandall Physics Department <info@rowsandall.com>',
[fullemail])
except:
return 0
return 1
@@ -440,7 +453,8 @@ def handle_updatecp(rower_id,workoutids,debug=False,table='cpdata'):
return 1
@app.task
def handle_makeplot(f1, f2, t, hrdata, plotnr, imagename):
def handle_makeplot(f1, f2, t, hrdata, plotnr, imagename,
debug=False):
hrmax = hrdata['hrmax']
hrut2 = hrdata['hrut2']
@@ -512,7 +526,8 @@ def handle_makeplot(f1, f2, t, hrdata, plotnr, imagename):
@app.task
def handle_sendemail_invite(email, name, code, teamname, manager):
def handle_sendemail_invite(email, name, code, teamname, manager,
debug=False):
fullemail = name + ' <' + email + '>'
subject = 'Invitation to join team ' + teamname
message = 'Dear ' + name + ',\n\n'
@@ -553,7 +568,8 @@ def handle_sendemailnewresponse(first_name, last_name,
commenter_first_name,
commenter_last_name,
comment,
workoutname, workoutid, commentid):
workoutname, workoutid, commentid,
debug=False):
fullemail = first_name + ' ' + last_name + ' <' + email + '>'
subject = 'New comment on workout ' + workoutname
message = 'Dear ' + first_name + ',\n\n'
@@ -587,7 +603,8 @@ def handle_sendemailnewcomment(first_name,
commenter_first_name,
commenter_last_name,
comment, workoutname,
workoutid):
workoutid,
debug=False):
fullemail = first_name + ' ' + last_name + ' <' + email + '>'
subject = 'New comment on workout ' + workoutname
message = 'Dear ' + first_name + ',\n\n'
@@ -610,7 +627,8 @@ def handle_sendemailnewcomment(first_name,
@app.task
def handle_sendemail_request(email, name, code, teamname, requestor, id):
def handle_sendemail_request(email, name, code, teamname, requestor, id,
debug=False):
fullemail = name + ' <' + email + '>'
subject = 'Request to join team ' + teamname
message = 'Dear ' + name + ',\n\n'
@@ -634,7 +652,8 @@ def handle_sendemail_request(email, name, code, teamname, requestor, id):
@app.task
def handle_sendemail_request_accept(email, name, teamname, managername):
def handle_sendemail_request_accept(email, name, teamname, managername,
debug=False):
fullemail = name + ' <' + email + '>'
subject = 'Welcome to ' + teamname
message = 'Dear ' + name + ',\n\n'
@@ -654,7 +673,8 @@ def handle_sendemail_request_accept(email, name, teamname, managername):
@app.task
def handle_sendemail_request_reject(email, name, teamname, managername):
def handle_sendemail_request_reject(email, name, teamname, managername,
debug=False):
fullemail = name + ' <' + email + '>'
subject = 'Your application to ' + teamname + ' was rejected'
message = 'Dear ' + name + ',\n\n'
@@ -675,7 +695,8 @@ def handle_sendemail_request_reject(email, name, teamname, managername):
@app.task
def handle_sendemail_member_dropped(email, name, teamname, managername):
def handle_sendemail_member_dropped(email, name, teamname, managername,
debug=False):
fullemail = name + ' <' + email + '>'
subject = 'You were removed from ' + teamname
message = 'Dear ' + name + ',\n\n'
@@ -696,7 +717,8 @@ def handle_sendemail_member_dropped(email, name, teamname, managername):
@app.task
def handle_sendemail_team_removed(email, name, teamname, managername):
def handle_sendemail_team_removed(email, name, teamname, managername,
debug=False):
fullemail = name + ' <' + email + '>'
subject = 'Team ' + teamname + ' was deleted'
message = 'Dear ' + name + ',\n\n'
@@ -718,7 +740,8 @@ def handle_sendemail_team_removed(email, name, teamname, managername):
@app.task
def handle_sendemail_invite_reject(email, name, teamname, managername):
def handle_sendemail_invite_reject(email, name, teamname, managername,
debug=False):
fullemail = managername + ' <' + email + '>'
subject = 'Your invitation to ' + name + ' was rejected'
message = 'Dear ' + managername + ',\n\n'
@@ -739,7 +762,8 @@ def handle_sendemail_invite_reject(email, name, teamname, managername):
@app.task
def handle_sendemail_invite_accept(email, name, teamname, managername):
def handle_sendemail_invite_accept(email, name, teamname, managername,
debug=False):
fullemail = managername + ' <' + email + '>'
subject = 'Your invitation to ' + name + ' was accepted'
message = 'Dear ' + managername + ',\n\n'
@@ -756,5 +780,5 @@ def handle_sendemail_invite_accept(email, name, teamname, managername):
# Another simple task for debugging purposes
def add2(x, y):
def add2(x, y,debug=False):
return x + y
rowers/teams.py
+16 -34
View File
@@ -9,6 +9,7 @@ from django.db import IntegrityError
import uuid
from django.conf import settings
from utils import myqueue
import django_rq
queue = django_rq.get_queue('default')
@@ -289,10 +290,8 @@ def send_invite_email(id):
teamname = invitation.team.name
manager = invitation.team.manager.first_name+' '+invitation.team.manager.last_name
if settings.DEBUG:
res = handle_sendemail_invite.delay(email,name,code,teamname,manager)
else:
res = queuehigh.enqueue(handle_sendemail_invite,
res = myqueue(queuehigh,
handle_sendemail_invite,
email,name,code,teamname,manager)
return (1,'Invitation email sent')
@@ -303,10 +302,8 @@ def send_team_delete_mail(t,rower):
email = u.email
name = u.first_name+' '+u.last_name
manager = t.manager.first_name+' '+t.manager.last_name
if settings.DEBUG:
res = handle_sendemail_team_removed.delay(email,name,teamname,manager)
else:
res = queuehigh.enqueue(handle_sendemail_team_removed,
res = myqueue(queuehigh,
handle_sendemail_team_removed,
email,name,teamname,manager)
return (1,'Team delete email sent')
@@ -319,10 +316,7 @@ def send_email_member_dropped(teamid,rower):
name = u.first_name+' '+u.last_name
manager = t.manager.first_name+' '+t.manager.last_name
if settings.DEBUG:
res = handle_sendemail_member_dropped.delay(email,name,teamname,manager)
else:
res = queuehigh.enqueue(handle_sendemail_member_dropped,
res = myqueue(queuehigh,handle_sendemail_member_dropped,
email,name,teamname,manager)
return (1,'Member dropped email sent')
@@ -334,11 +328,8 @@ def send_request_accept_email(rekwest):
teamname = rekwest.team.name
name = rekwest.user.first_name+' '+rekwest.user.last_name
manager = rekwest.team.manager.first_name+' '+rekwest.team.manager.last_name
if settings.DEBUG:
res = handle_sendemail_request_accept.delay(email,name,teamname,manager)
else:
res = queuehigh.enqueue(handle_sendemail_request_accept,
res = myqueue(queuehigh,
handle_sendemail_request_accept,
email,name,teamname,manager)
return (1,'Invitation email sent')
@@ -351,10 +342,8 @@ def send_request_reject_email(rekwest):
name = rekwest.user.first_name+' '+rekwest.user.last_name
manager = rekwest.team.manager.first_name+' '+rekwest.team.manager.last_name
if settings.DEBUG:
res = handle_sendemail_request_reject.delay(email,name,teamname,manager)
else:
res = queuehigh.enqueue(handle_sendemail_request_reject,
res = myqueue(queuehigh,
handle_sendemail_request_reject,
email,name,teamname,manager)
return (1,'Invitation email sent')
@@ -371,10 +360,8 @@ def send_invite_reject_email(invitation):
teamname = invitation.team.name
manager = invitation.team.manager.first_name+' '+invitation.team.manager.last_name
if settings.DEBUG:
res = handle_sendemail_invite_reject.delay(email,name,teamname,manager)
else:
res = queuehigh.enqueue(handle_sendemail_invite_reject,
res = myqueue(queuehigh,
handle_sendemail_invite_reject,
email,name,teamname,manager)
return (1,'Invitation email sent')
@@ -391,10 +378,8 @@ def send_invite_accept_email(invitation):
teamname = invitation.team.name
manager = invitation.team.manager.first_name+' '+invitation.team.manager.last_name
if settings.DEBUG:
res = handle_sendemail_invite_accept.delay(email,name,teamname,manager)
else:
res = queuehigh.enqueue(handle_sendemail_invite_accept,
res = myqueue(queuehigh,
handle_sendemail_invite_accept,
email,name,teamname,manager)
return (1,'Invitation email sent')
@@ -409,11 +394,8 @@ def send_request_email(rekwest):
teamname = rekwest.team.name
requestor = rekwest.user.first_name+' '+rekwest.user.last_name
if settings.DEBUG:
res = handle_sendemail_request.delay(email,name,code,teamname,
requestor,id)
else:
res = queuehigh.enqueue(handle_sendemail_request,
res = myqueue(queuehigh,
handle_sendemail_request,
email,name,code,teamname,requestor,id)
return (1,'Invitation email sent')
rowers/utils.py
+14 -1
View File
@@ -2,6 +2,8 @@ import math
import numpy as np
import pandas as pd
import colorsys
from django.conf import settings
lbstoN = 4.44822
@@ -100,7 +102,7 @@ def range_to_color_hex(groupcols,palette='monochrome_blue'):
try:
plt = palettes[palette]
except KeyErro:
except KeyError:
plt = palettes['monochrome_blue']
rgb = [colorsys.hsv_to_rgb((plt[0]+plt[1]*x)/360.,
@@ -214,3 +216,14 @@ def isbreakthrough(delta,cpvalues,p0,p1,p2,p3,ratio):
return res>1,btdf,res2>1
def myqueue(queue,function,*args,**kwargs):
if settings.DEBUG:
kwargs['debug'] = True
print kwargs
job = function.delay(*args,**kwargs)
else:
job = queue.enqueue(function,*args,**kwargs)
return job
rowers/views.py
+20 -86
View File
@@ -188,7 +188,7 @@ def remove_asynctask(request,id):
request.session['async_tasks'] = newtasks
def get_job_result(jobid):
if settings.DEBUG:
if settings.EBUG:
result = celery_result.AsyncResult(jobid).result
else:
running_job_ids = rq_registry.get_job_ids()
@@ -476,7 +476,7 @@ def splitstdata(lijst):
from utils import (
geo_distance,serialize_list,deserialize_list,uniqify,
str2bool,range_to_color_hex,absolute
str2bool,range_to_color_hex,absolute,myqueue
)
import datautils
@@ -1298,7 +1298,6 @@ def workout_tcxemail_view(request,id=0):
except Workout.DoesNotExist:
raise Http404("Workout doesn't exist")
if (checkworkoutuser(request.user,w)):
try:
tcxfile,tcxmessg = stravastuff.createstravaworkoutdata(w,dozip=False)
if tcxfile == 0:
message = "Something went wrong (TCX export) "+tcxmessg
@@ -1308,15 +1307,12 @@ def workout_tcxemail_view(request,id=0):
'id':str(w.id),
})
return HttpResponseRedirect(url)
if settings.DEBUG and tcxfile:
res = handle_sendemailtcx.delay(r.user.first_name,
if tcxfile:
res = myqueue(queuehigh,handle_sendemailtcx,
r.user.first_name,
r.user.last_name,
r.user.email,tcxfile)
elif tcxfile:
res = queuehigh.enqueue(handle_sendemailtcx,r.user.first_name,
r.user.last_name,
r.user.email,tcxfile)
r.user.email,
tcxfile)
successmessage = "The TCX file was sent to you per email"
messages.info(request,successmessage)
@@ -1324,19 +1320,6 @@ def workout_tcxemail_view(request,id=0):
kwargs = {
'id':str(w.id),
})
except:
successmessage = ""
message = "Something went wrong (TCX export) "+str(sys.exc_info()[0])
with open("media/c2errors.log","a") as errorlog:
errorstring = str(sys.exc_info()[0])
timestr = strftime("%Y%m%d-%H%M%S")
errorlog.write(timestr+errorstring+"\r\n")
messages.error(request,message)
url = reverse(workout_export_view,
kwargs = {
'id':str(w.id),
})
response = HttpResponseRedirect(url)
@@ -1366,15 +1349,11 @@ def workout_gpxemail_view(request,id=0):
row = rdata(filename)
gpxfilename = filename[:-4]+'.gpx'
row.exporttogpx(gpxfilename)
if settings.DEBUG:
res = handle_sendemailtcx.delay(r.user.first_name,
res = myqueue(queuehigh,handle_sendemailtcx,
r.user.first_name,
r.user.last_name,
r.user.email,gpxfilename)
else:
res = queuehigh.enqueue(handle_sendemailtcx,r.user.first_name,
r.user.last_name,
r.user.email,gpxfilename)
successmessage = "The GPX file was sent to you per email"
messages.info(request,successmessage)
@@ -1407,13 +1386,7 @@ def workout_csvemail_view(request,id=0):
raise Http404("Workout doesn't exist")
if (checkworkoutuser(request.user,w)):
csvfile = w.csvfilename
if settings.DEBUG:
res = handle_sendemailcsv.delay(r.user.first_name,
r.user.last_name,
r.user.email,csvfile)
else:
res = queuehigh.enqueue(handle_sendemailcsv,r.user.first_name,
res = myqueue(queuehigh,handle_sendemailcsv,r.user.first_name,
r.user.last_name,
r.user.email,csvfile)
@@ -1447,14 +1420,7 @@ def workout_csvtoadmin_view(request,id=0):
raise Http404("Workout doesn't exist")
csvfile = w.csvfilename
if settings.DEBUG:
res = handle_sendemailcsv.delay(
'Sander',
'Roosendaal',
'roosendaalsander@gmail.com',csvfile)
else:
res = queuehigh.enqueue(
res = myqueue(queuehigh,
handle_sendemailcsv,
'Sander',
'Roosendaal',
@@ -2579,11 +2545,7 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False):
@login_required()
def workout_test_task_view(request,id=0):
row = Workout.objects.get(id=id)
if settings.DEBUG:
res = addcomment2.delay(request.user.id,row.id)
else:
#res = queuehigh.enqueue(addcomment2,request.user.id,row.id)
res = queuehigh.enqueue(addcomment2,request.user.id,row.id)
res = myqueue(queuehigh,addcomment2,request.user.id,row.id)
url = reverse(workout_edit_view,
@@ -5663,14 +5625,8 @@ def workout_otwsetpower_view(request,id=0,message="",successmessage=""):
last_name = u.last_name
emailaddress = u.email
if settings.DEBUG:
job = handle_otwsetpower.delay(f1,boattype,weightvalue,
first_name,last_name,
emailaddress,id,debug=True,
ps=[r.p0,r.p1,r.p2,r.p3],
ratio=r.cpratio)
else:
job = queuelow.enqueue(handle_otwsetpower,f1,boattype,
job = myqueue(queuelow,
handle_otwsetpower,f1,boattype,
weightvalue,
first_name,last_name,emailaddress,id,
ps=[r.p0,r.p1,r.p2,r.p3],
@@ -6964,18 +6920,8 @@ def workout_comment_view(request,id=0):
if request.user != r.user:
a_messages.info(r.user,message)
if settings.DEBUG and request.user != r.user:
res = handle_sendemailnewcomment.delay(r.user.first_name,
r.user.last_name,
r.user.email,
request.user.first_name,
request.user.last_name,
comment,w.name,
w.id)
elif request.user != r.user:
res = queuehigh.enqueue(handle_sendemailnewcomment,r.user.first_name,
res = myqueue(queuehigh,
handle_sendemailnewcomment,r.user.first_name,
r.user.last_name,
r.user.email,
request.user.first_name,
@@ -6985,18 +6931,9 @@ def workout_comment_view(request,id=0):
commenters = {oc.user for oc in comments if oc.notification}
for u in commenters:
a_messages.info(u,message)
if settings.DEBUG and u != request.user and u != r.user:
res = handle_sendemailnewresponse.delay(u.first_name,
u.last_name,
u.email,
request.user.first_name,
request.user.last_name,
comment,
w.name,
w.id,
c.id)
elif u != request.user and u != r.user:
res = queuelow.enqueue(handle_sendemailnewresponse,
if u != request.user and u != r.user:
res = myqueue(queuelow,
handle_sendemailnewresponse,
u.first_name,
u.last_name,
u.email,
@@ -9654,10 +9591,7 @@ def rower_calcdps_view(request):
r = getrower(request.user)
ws = [(w.id,w.csvfilename) for w in Workout.objects.filter(user=r)]
if settings.DEBUG:
res = handle_updatedps.delay(r.user.email,ws,debug=True)
else:
queue.enqueue(handle_updatedps,r.user.email,ws,debug=False)
res = myqueue(queue,handle_updatedps,r.user.email,ws,debug=False)
messages.info(request,"Your workouts are being updated in the background. You will receive email when this is done.")