not working
This commit is contained in:
@@ -35,6 +35,10 @@ from matplotlib.backends.backend_agg import FigureCanvas
|
||||
import matplotlib.pyplot as plt
|
||||
from matplotlib import path
|
||||
|
||||
import grpc
|
||||
import rowers.otw_power_calculator_pb2 as calculator_pb2
|
||||
import rowers.otw_power_calculator_pb2_grpc as calculator_pb2_grpc
|
||||
|
||||
from rowsandall_app.settings import SITE_URL
|
||||
from rowsandall_app.settings_dev import SITE_URL as SITE_URL_DEV
|
||||
from rowsandall_app.settings import PROGRESS_CACHE_SECRET
|
||||
@@ -1517,32 +1521,36 @@ def handle_otwsetpower(self,f1, boattype, weightvalue,
|
||||
else:
|
||||
usetable = False
|
||||
|
||||
if 'go_service' in kwargs:
|
||||
goservice = kwargs['go_service']
|
||||
print('Setting goservice to ', goservice)
|
||||
else:
|
||||
goservice = False
|
||||
|
||||
kwargs['jobid'] = job_id
|
||||
|
||||
|
||||
try:
|
||||
rowdata = rdata(csvfile=f1)
|
||||
except IOError:
|
||||
try:
|
||||
rowdata = rdata(csvfile=f1 + '.csv')
|
||||
except IOError:
|
||||
rowdata = rdata(csvfile=f1 + '.gz')
|
||||
|
||||
weightvalue = float(weightvalue)
|
||||
|
||||
# check what the real file name is
|
||||
if os.path.exists(f1):
|
||||
csvfile = f1
|
||||
elif os.path.exists(f1+'.csv'):
|
||||
csvfile = f1+'.csv'
|
||||
elif os.path.exists(f1+'.gz'):
|
||||
csvfile = f1+'.gz'
|
||||
|
||||
csvfile = os.path.abspath(csvfile)
|
||||
print('csvfile ',csvfile)
|
||||
|
||||
# do something with boat type
|
||||
boatfile = {
|
||||
'1x': 'static/rigging/1x.txt',
|
||||
'2x': 'static/rigging/2x.txt',
|
||||
'2-': 'static/rigging/2-.txt',
|
||||
'4x': 'static/rigging/4x.txt',
|
||||
'4-': 'static/rigging/4-.txt',
|
||||
'8+': 'static/rigging/8+.txt',
|
||||
}
|
||||
try:
|
||||
rg = rowingdata.getrigging(boatfile[boattype])
|
||||
except KeyError:
|
||||
rg = rowingdata.getrigging('static/rigging/1x.txt')
|
||||
rowdata = rdata(csvfile)
|
||||
except IOError:
|
||||
try:
|
||||
rowdata = rdata(csvfile)
|
||||
except IOError:
|
||||
rowdata = rdata(csvfile)
|
||||
|
||||
# do calculation, but do not overwrite NK Empower Power data
|
||||
powermeasured = False
|
||||
@@ -1563,10 +1571,51 @@ def handle_otwsetpower(self,f1, boattype, weightvalue,
|
||||
progressurl += "/rowers/record-progress/"
|
||||
progressurl += job_id+'/'
|
||||
|
||||
if goservice:
|
||||
# do something (this should return from go service)
|
||||
with grpc.insecure_channel(
|
||||
target='localhost:50051',
|
||||
options=[('grpc.lb_policy_name', 'pick_first'),
|
||||
('grpc.enable_retries', 0), ('grpc.keepalive_timeout_ms',
|
||||
10000)]
|
||||
) as channel:
|
||||
try:
|
||||
grpc.channel_ready_future(channel).result(timeout=10)
|
||||
except grpc.FutureTimeoutError:
|
||||
return 0
|
||||
else:
|
||||
stub = calculator_pb2_grpc.PowerStub(channel)
|
||||
response = stub.CalcPower(calculator_pb2.WorkoutPowerRequest(
|
||||
filename = csvfile,
|
||||
boattype = boattype,
|
||||
crewmass = weightvalue,
|
||||
powermeasured = powermeasured,
|
||||
progressurl = progressurl,
|
||||
secret = secret,
|
||||
silent = False,
|
||||
),timeout=600)
|
||||
return response.result
|
||||
|
||||
|
||||
|
||||
boatfile = {
|
||||
'1x': 'static/rigging/1x.txt',
|
||||
'2x': 'static/rigging/2x.txt',
|
||||
'2-': 'static/rigging/2-.txt',
|
||||
'4x': 'static/rigging/4x.txt',
|
||||
'4-': 'static/rigging/4-.txt',
|
||||
'8+': 'static/rigging/8+.txt',
|
||||
}
|
||||
try:
|
||||
rg = rowingdata.getrigging(boatfile[boattype])
|
||||
except KeyError:
|
||||
rg = rowingdata.getrigging('static/rigging/1x.txt')
|
||||
|
||||
# determine cache file name
|
||||
physics_cache = 'media/'+str(boattype)+'_'+str(int(weightvalue))
|
||||
|
||||
|
||||
|
||||
rowdata.otw_setpower(skiprows=5, mc=weightvalue, rg=rg,
|
||||
powermeasured=powermeasured,
|
||||
progressurl=progressurl,
|
||||
|
||||
Reference in New Issue
Block a user