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

working, not tested asynchronous OTE ranking

Browse Source
This commit is contained in:
Sander Roosendaal
2017-10-26 16:39:02 +02:00
parent 704d7a9128
commit 0e185f9c2f
8 changed files with 104 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
rowers/dataprepnodjango.py
View File

@@ -548,14 +548,30 @@ def read_df_sql(id,debug=False):
engine.dispose()
return df
def deletecpdata_sql(rower_id,debug=False):
def getcpdata_sql(rower_id,table='cpdata',debug=False):
if debug:
engine = create_engine(database_url_debug, echo=False)
else:
engine = create_engine(database_url, echo=False)
query = sa.text('DELETE from cpdata WHERE user={rower_id};'.format(
rower_id=rower_id
query = sa.text('SELECT * from {table} WHERE user={rower_id};'.format(
rower_id=rower_id,
table=table,
))
connection = engine.raw_connection()
df = pd.read_sql_query(query, engine)
return df
def deletecpdata_sql(rower_id,table='cpdata',debug=False):
if debug:
engine = create_engine(database_url_debug, echo=False)
else:
engine = create_engine(database_url, echo=False)
query = sa.text('DELETE from {table} WHERE user={rower_id};'.format(
rower_id=rower_id,
table=table,
))
with engine.connect() as conn, conn.begin():
try:
@@ -567,8 +583,8 @@ def deletecpdata_sql(rower_id,debug=False):
def updatecpdata_sql(rower_id,delta,cp,debug=False):
deletecpdata_sql(rower_id,debug=debug)
def updatecpdata_sql(rower_id,delta,cp,table='cpdata',distance=pd.Series([]),debug=False):
deletecpdata_sql(rower_id,table=table,debug=debug)
df = pd.DataFrame(
{
'delta':delta,
@@ -577,17 +593,22 @@ def updatecpdata_sql(rower_id,delta,cp,debug=False):
}
)
if not distance.empty:
df['distance'] = distance
if debug:
engine = create_engine(database_url_debug, echo=False)
else:
engine = create_engine(database_url, echo=False)
with engine.connect() as conn, conn.begin():
df.to_sql('cpdata', engine, if_exists='append', index=False)
df.to_sql(table, engine, if_exists='append', index=False)
conn.close()
engine.dispose()
def smalldataprep(therows,xparam,yparam1,yparam2):