not working

2019-12-19 12:44:07 +01:00
parent 724720aa39
commit 921e58eef7
5 changed files with 292 additions and 19 deletions
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -3203,6 +3203,7 @@ class WorkoutForm(ModelForm):
 # Used for the rowing physics calculations
 class AdvancedWorkoutForm(ModelForm):
    quick_calc = forms.BooleanField(initial=True,required=False)
+    go_service = forms.BooleanField(initial=False,required=False,label='Experimental')

    class Meta:
        model = Workout
--- a/rowers/otw_power_calculator_pb2.py
+++ b/rowers/otw_power_calculator_pb2.py
@@ -0,0 +1,175 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: otw-power-calculator.proto
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='otw-power-calculator.proto',
+  package='otw_power_calculator',
+  syntax='proto3',
+  serialized_options=None,
+  serialized_pb=_b('\n\x1aotw-power-calculator.proto\x12\x14otw_power_calculator\"\x97\x01\n\x13WorkoutPowerRequest\x12\x10\n\x08\x66ilename\x18\x01 \x01(\t\x12\x10\n\x08\x62oattype\x18\x02 \x01(\t\x12\x10\n\x08\x63rewmass\x18\x03 \x01(\x01\x12\x15\n\rpowermeasured\x18\x04 \x01(\x08\x12\x13\n\x0bprogressurl\x18\x05 \x01(\t\x12\x0e\n\x06secret\x18\x06 \x01(\t\x12\x0e\n\x06silent\x18\x07 \x01(\x08\"#\n\x11\x43\x61lculationResult\x12\x0e\n\x06result\x18\x01 \x01(\x05\x32j\n\x05Power\x12\x61\n\tCalcPower\x12).otw_power_calculator.WorkoutPowerRequest\x1a\'.otw_power_calculator.CalculationResult\"\x00\x62\x06proto3')
+)
+
+
+
+
+_WORKOUTPOWERREQUEST = _descriptor.Descriptor(
+  name='WorkoutPowerRequest',
+  full_name='otw_power_calculator.WorkoutPowerRequest',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='filename', full_name='otw_power_calculator.WorkoutPowerRequest.filename', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='boattype', full_name='otw_power_calculator.WorkoutPowerRequest.boattype', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='crewmass', full_name='otw_power_calculator.WorkoutPowerRequest.crewmass', index=2,
+      number=3, type=1, cpp_type=5, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='powermeasured', full_name='otw_power_calculator.WorkoutPowerRequest.powermeasured', index=3,
+      number=4, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='progressurl', full_name='otw_power_calculator.WorkoutPowerRequest.progressurl', index=4,
+      number=5, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='secret', full_name='otw_power_calculator.WorkoutPowerRequest.secret', index=5,
+      number=6, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='silent', full_name='otw_power_calculator.WorkoutPowerRequest.silent', index=6,
+      number=7, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=53,
+  serialized_end=204,
+)
+
+
+_CALCULATIONRESULT = _descriptor.Descriptor(
+  name='CalculationResult',
+  full_name='otw_power_calculator.CalculationResult',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='result', full_name='otw_power_calculator.CalculationResult.result', index=0,
+      number=1, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=206,
+  serialized_end=241,
+)
+
+DESCRIPTOR.message_types_by_name['WorkoutPowerRequest'] = _WORKOUTPOWERREQUEST
+DESCRIPTOR.message_types_by_name['CalculationResult'] = _CALCULATIONRESULT
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+WorkoutPowerRequest = _reflection.GeneratedProtocolMessageType('WorkoutPowerRequest', (_message.Message,), {
+  'DESCRIPTOR' : _WORKOUTPOWERREQUEST,
+  '__module__' : 'otw_power_calculator_pb2'
+  # @@protoc_insertion_point(class_scope:otw_power_calculator.WorkoutPowerRequest)
+  })
+_sym_db.RegisterMessage(WorkoutPowerRequest)
+
+CalculationResult = _reflection.GeneratedProtocolMessageType('CalculationResult', (_message.Message,), {
+  'DESCRIPTOR' : _CALCULATIONRESULT,
+  '__module__' : 'otw_power_calculator_pb2'
+  # @@protoc_insertion_point(class_scope:otw_power_calculator.CalculationResult)
+  })
+_sym_db.RegisterMessage(CalculationResult)
+
+
+
+_POWER = _descriptor.ServiceDescriptor(
+  name='Power',
+  full_name='otw_power_calculator.Power',
+  file=DESCRIPTOR,
+  index=0,
+  serialized_options=None,
+  serialized_start=243,
+  serialized_end=349,
+  methods=[
+  _descriptor.MethodDescriptor(
+    name='CalcPower',
+    full_name='otw_power_calculator.Power.CalcPower',
+    index=0,
+    containing_service=None,
+    input_type=_WORKOUTPOWERREQUEST,
+    output_type=_CALCULATIONRESULT,
+    serialized_options=None,
+  ),
+])
+_sym_db.RegisterServiceDescriptor(_POWER)
+
+DESCRIPTOR.services_by_name['Power'] = _POWER
+
+# @@protoc_insertion_point(module_scope)
--- a/rowers/otw_power_calculator_pb2_grpc.py
+++ b/rowers/otw_power_calculator_pb2_grpc.py
@@ -0,0 +1,46 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+import grpc
+
+import rowers.otw_power_calculator_pb2 as otw__power__calculator__pb2
+
+
+class PowerStub(object):
+  """Power service definition
+  """
+
+  def __init__(self, channel):
+    """Constructor.
+
+    Args:
+      channel: A grpc.Channel.
+    """
+    self.CalcPower = channel.unary_unary(
+        '/otw_power_calculator.Power/CalcPower',
+        request_serializer=otw__power__calculator__pb2.WorkoutPowerRequest.SerializeToString,
+        response_deserializer=otw__power__calculator__pb2.CalculationResult.FromString,
+        )
+
+
+class PowerServicer(object):
+  """Power service definition
+  """
+
+  def CalcPower(self, request, context):
+    # missing associated documentation comment in .proto file
+    pass
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+
+def add_PowerServicer_to_server(servicer, server):
+  rpc_method_handlers = {
+      'CalcPower': grpc.unary_unary_rpc_method_handler(
+          servicer.CalcPower,
+          request_deserializer=otw__power__calculator__pb2.WorkoutPowerRequest.FromString,
+          response_serializer=otw__power__calculator__pb2.CalculationResult.SerializeToString,
+      ),
+  }
+  generic_handler = grpc.method_handlers_generic_handler(
+      'otw_power_calculator.Power', rpc_method_handlers)
+  server.add_generic_rpc_handlers((generic_handler,))
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -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,
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -2624,6 +2624,7 @@ def workout_otwsetpower_view(request,id=0,message="",successmessage=""):

        if form.is_valid():
            quick_calc = form.cleaned_data['quick_calc']
+            go_service = form.cleaned_data['go_service']
            boattype = form.cleaned_data['boattype']
            weightvalue = form.cleaned_data['weightvalue']
            w.boattype = boattype
@@ -2669,6 +2670,7 @@ def workout_otwsetpower_view(request,id=0,message="",successmessage=""):
                          ps=[r.p0,r.p1,r.p2,r.p3],
                          ratio=r.cpratio,
                          quick_calc = quick_calc,
+                          go_service=go_service,
                          emailbounced = r.emailbounced
            )