From 5149f08de7b93889209436c7b7f6044daf56f7a4 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Wed, 13 Mar 2024 18:57:18 +0100
Subject: [PATCH] working

---
 rowers/dataprep.py                        | 111 +++++++++++-----------
 rowers/datautils.py                       |  16 ++--
 rowers/models.py                          |  21 ++--
 rowers/rowing-workout-metrics.proto       |  49 ----------
 rowers/rowing_workout_metrics.proto       |  49 ----------
 rowers/rowing_workout_metrics_pb2.py      |   8 +-
 rowers/rowing_workout_metrics_pb2_grpc.py |  65 ++++---------
 rowers/tests/testdata/testdata.tcx.gz     | Bin 4000 -> 4002 bytes
 rowers/utils.py                           |   6 +-
 9 files changed, 97 insertions(+), 228 deletions(-)
 delete mode 100644 rowers/rowing-workout-metrics.proto
 delete mode 100644 rowers/rowing_workout_metrics.proto

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index d05ec634..26684810 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -502,8 +502,28 @@ def calculate_goldmedalstandard(rower, workout, recurrance=True):
 
 
 def setcp(workout, background=False, recurrance=True):
-    filename = 'media/cpdata_{id}.parquet.gz'.format(id=workout.id)
+    try:
+        filename = 'media/cpdata_{id}.parquet.gz'.format(id=workout.id)
+        df = pd.read_parquet(filename)
 
+        if not df.empty:
+            # check dts
+            tarr = datautils.getlogarr(4000)
+            if df['delta'][0] in tarr:
+                return(df, df['delta'], df['cp'])
+    except:
+        pass
+
+    strokesdf = getsmallrowdata_db(
+        ['power', 'workoutid', 'time'], ids=[workout.id])
+
+    if strokesdf.empty:
+        return pd.DataFrame({'delta': [], 'cp': []}), pd.Series(dtype='float'), pd.Series(dtype='float')
+    
+    totaltime = strokesdf['time'].max()
+    maxt = totaltime/1000.
+    logarr = datautils.getlogarr(maxt)
+    
     csvfilename = workout.csvfilename
     # check what the real file name is
     if os.path.exists(csvfilename):
@@ -514,80 +534,53 @@ def setcp(workout, background=False, recurrance=True):
         csvfile = csvfilename+'.gz'
     else:  # pragma: no cover
         return pd.DataFrame({'delta': [], 'cp': []}), pd.Series(dtype='float'), pd.Series(dtype='float')
+    csvfile = os.path.abspath(csvfile)
 
-    strokesdf = getsmallrowdata_db(
-        ['power', 'workoutid', 'time'], ids=[workout.id])
 
-    protos = grpc.protos("rowing_workout_metrics.proto")
-    services = grpc.services("rowing_workout_metrics.proto")
-    req = protos.CPRequest(
-        filename = csvfile,
-        filetype = "CSV",
-        tarr = datautils.getlogarr(1.05*strokesdf['time'].max())
-    )
-    response = services.GetCP(req, "localhost:50052", insecure=True)
-    delta = response.delta
-    cpvalues = response.power
+    with grpc.insecure_channel(
+        target='localhost:50052',
+        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:  # pragma: no cover
+            dologging('metrics.log','grpc channel time out in setcp')
+            return pd.DataFrame({'delta': [], 'cp': []}), pd.Series(dtype='float'), pd.Series(dtype='float')
+
+        stub = metrics_pb2_grpc.MetricsStub(channel)
+        req = metrics_pb2.CPRequest(filename = csvfile, filetype = "CSV", tarr = logarr)
+
+        try:
+            response = stub.GetCP(req, timeout=60)
+        except Exception as e:
+            dologging('metrics.log', traceback.format_exc())
+            return pd.DataFrame({'delta': [], 'cp': []}), pd.Series(dtype='float'), pd.Series(dtype='float')
+
+    delta = pd.Series(np.array(response.delta))
+    cpvalues = pd.Series(np.array(response.power))
     powermean = response.avgpower
 
+    
+
     df = pd.DataFrame({
         'delta': delta,
         'cp': cpvalues,
         'id': workout.id,
     })
+
     df.to_parquet(filename, engine='fastparquet', compression='GZIP')
+
     if recurrance:
         goldmedalstandard, goldmedalduration = calculate_goldmedalstandard(
             workout.user, workout)
         workout.goldmedalstandard = goldmedalstandard
         workout.goldmedalduration = goldmedalduration
         workout.save()
+
     return df, delta, cpvalues
     
-            
-
-    try:
-        if strokesdf['power'].std() == 0:
-            return pd.DataFrame(), pd.Series(dtype='float'), pd.Series(dtype='float')
-    except (KeyError, TypeError):
-        return pd.DataFrame(), pd.Series(dtype='float'), pd.Series(dtype='float')
-
-    if background:  # pragma: no cover
-        _ = myqueue(queuelow, handle_setcp, strokesdf, filename, workout.id)
-        return pd.DataFrame({'delta': [], 'cp': []}), pd.Series(dtype='float'), pd.Series(dtype='float')
-
-    if not strokesdf.empty:
-        totaltime = strokesdf['time'].max()
-        try:
-            powermean = strokesdf['power'].mean()
-        except KeyError:  # pragma: no cover
-            powermean = 0
-
-        if powermean != 0:
-            thesecs = totaltime
-            maxt = 1.05 * thesecs
-
-            if maxt > 0:
-                logarr = datautils.getlogarr(maxt)
-                dfgrouped = strokesdf.groupby(['workoutid'])
-                delta, cpvalues, avgpower = datautils.getcp(dfgrouped, logarr)
-
-                df = pd.DataFrame({
-                    'delta': delta,
-                    'cp': cpvalues,
-                    'id': workout.id,
-                })
-                df.to_parquet(filename, engine='fastparquet',
-                              compression='GZIP')
-                if recurrance:
-                    goldmedalstandard, goldmedalduration = calculate_goldmedalstandard(
-                        workout.user, workout)
-                    workout.goldmedalstandard = goldmedalstandard
-                    workout.goldmedalduration = goldmedalduration
-                    workout.save()
-                return df, delta, cpvalues
-
-    return pd.DataFrame({'delta': [], 'cp': []}), pd.Series(dtype='float'), pd.Series(dtype='float')
 
 
 def update_wps(r, types, mode='water', asynchron=True):
@@ -723,6 +716,7 @@ def join_workouts(r, ids, title='Joined Workout',
 def fetchcp_new(rower, workouts):
 
     data = []
+
     for workout in workouts:
         cpfile = 'media/cpdata_{id}.parquet.gz'.format(id=workout.id)
         try:
@@ -743,12 +737,15 @@ def fetchcp_new(rower, workouts):
     if len(data) > 1:
         df = pd.concat(data, axis=0)
 
+
     try:
         df = df[df['cp'] == df.groupby(['delta'])['cp'].transform('max')]
     except KeyError:  # pragma: no cover
         return pd.Series(dtype='float'), pd.Series(dtype='float'), 0, pd.Series(dtype='float'), pd.Series(dtype='float')
 
     df = df.sort_values(['delta']).reset_index()
+    df = df[df['cp']>20]
+
 
     return df['delta'], df['cp'], 0, df['workout'], df['url']
 
diff --git a/rowers/datautils.py b/rowers/datautils.py
index fcebd334..cb17a357 100644
--- a/rowers/datautils.py
+++ b/rowers/datautils.py
@@ -123,18 +123,18 @@ def cpfit(powerdf, fraclimit=0.0001, nmax=1000):
 
 
 def getlogarr(maxt):
-    maxlog10 = np.log10(maxt-5)
+    dtmin = 10
+    maxlog10 = np.log10(maxt)
     # print(maxlog10,round(maxlog10))
-    aantal = 10*round(maxlog10)
+    aantal = 40
     logarr = np.arange(aantal+1)/10.
+    vs = 10.**logarr
+    
 
     res = []
-    for la in logarr:
-        try:
-            v = 5+int(10.**(la))
-        except ValueError:  # pragma: no cover
-            v = 0
-        res.append(v)
+    for v in vs:
+        if v > dtmin and v<maxt:
+            res.append(int(v))
 
     logarr = pd.Series(res, dtype='float')
     logarr.drop_duplicates(keep='first', inplace=True)
diff --git a/rowers/models.py b/rowers/models.py
index a05e0be3..23503c71 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -1823,15 +1823,18 @@ class InstantPlan(models.Model):
         authorizationstring = 'Bearer '+settings.WORKOUTS_FIT_TOKEN
         url = settings.WORKOUTS_FIT_URL+"/trainingplan/"
         headers = {'Authorization': authorizationstring}
-        response = requests.post(url=url, headers=headers, data=yamltext)
-        if response.status_code == 200:
-            data = response.json()
-            self.yaml.name = data['filename']
-            self.uuid = data['ID']
-            self.name = data['name']
-            self.description = data['description']
-            self.duration = data['duration']
-            self.yaml = None
+        try:
+            response = requests.post(url=url, headers=headers, data=yamltext)
+            if response.status_code == 200:
+                data = response.json()
+                self.yaml.name = data['filename']
+                self.uuid = data['ID']
+                self.name = data['name']
+                self.description = data['description']
+                self.duration = data['duration']
+                self.yaml = None
+        except:
+            pass
         super(InstantPlan, self).save(*args, **kwargs)
 
 
diff --git a/rowers/rowing-workout-metrics.proto b/rowers/rowing-workout-metrics.proto
deleted file mode 100644
index 2992b397..00000000
--- a/rowers/rowing-workout-metrics.proto
+++ /dev/null
@@ -1,49 +0,0 @@
-syntax = "proto3";
-
-package rowing_workout_metrics;
-option go_package = "./rowing-workout-metrics";
-
-// OTW-metrics service definition
-service Metrics {
-  rpc CalcMetrics (WorkoutMetricsRequest) returns (WorkoutMetricsResponse);
-};
-
-// GetCP service definition
-service CP {
-  rpc GetCP (CPRequest) returns (CPResponse);
-}
-
-// WorkoutMetricsRequest message
-message WorkoutMetricsRequest {
-  string filename = 1;
-  string sex = 2;
-  double ftp = 3;
-  double hrftp = 4;
-  double hrmax = 5;
-  double hrmin = 6;
-
-};
-
-// WorkoutMetricsReponse message
-message WorkoutMetricsResponse {
-  double tss = 1;
-  double normp = 2;
-  double trimp = 3;
-  double hrtss = 4;
-  double normv = 5;
-  double normw = 6;
-};
-
-// CPRequest message
-message CPRequest {
-  string filename = 1; 
-  string filetype = 2; // CSV or Parquet
-  repeated double tarr = 3;
-}
-
-message CPResponse {
-  repeated double delta = 1;
-  repeated double power = 2;
-  double avgpower = 3;
-  
-}
\ No newline at end of file
diff --git a/rowers/rowing_workout_metrics.proto b/rowers/rowing_workout_metrics.proto
deleted file mode 100644
index 2992b397..00000000
--- a/rowers/rowing_workout_metrics.proto
+++ /dev/null
@@ -1,49 +0,0 @@
-syntax = "proto3";
-
-package rowing_workout_metrics;
-option go_package = "./rowing-workout-metrics";
-
-// OTW-metrics service definition
-service Metrics {
-  rpc CalcMetrics (WorkoutMetricsRequest) returns (WorkoutMetricsResponse);
-};
-
-// GetCP service definition
-service CP {
-  rpc GetCP (CPRequest) returns (CPResponse);
-}
-
-// WorkoutMetricsRequest message
-message WorkoutMetricsRequest {
-  string filename = 1;
-  string sex = 2;
-  double ftp = 3;
-  double hrftp = 4;
-  double hrmax = 5;
-  double hrmin = 6;
-
-};
-
-// WorkoutMetricsReponse message
-message WorkoutMetricsResponse {
-  double tss = 1;
-  double normp = 2;
-  double trimp = 3;
-  double hrtss = 4;
-  double normv = 5;
-  double normw = 6;
-};
-
-// CPRequest message
-message CPRequest {
-  string filename = 1; 
-  string filetype = 2; // CSV or Parquet
-  repeated double tarr = 3;
-}
-
-message CPResponse {
-  repeated double delta = 1;
-  repeated double power = 2;
-  double avgpower = 3;
-  
-}
\ No newline at end of file
diff --git a/rowers/rowing_workout_metrics_pb2.py b/rowers/rowing_workout_metrics_pb2.py
index 6a4554b2..9fafbc46 100644
--- a/rowers/rowing_workout_metrics_pb2.py
+++ b/rowers/rowing_workout_metrics_pb2.py
@@ -14,7 +14,7 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1crowing-workout-metrics.proto\x12\x16rowing_workout_metrics\"p\n\x15WorkoutMetricsRequest\x12\x10\n\x08\x66ilename\x18\x01 \x01(\t\x12\x0b\n\x03sex\x18\x02 \x01(\t\x12\x0b\n\x03\x66tp\x18\x03 \x01(\x01\x12\r\n\x05hrftp\x18\x04 \x01(\x01\x12\r\n\x05hrmax\x18\x05 \x01(\x01\x12\r\n\x05hrmin\x18\x06 \x01(\x01\"p\n\x16WorkoutMetricsResponse\x12\x0b\n\x03tss\x18\x01 \x01(\x01\x12\r\n\x05normp\x18\x02 \x01(\x01\x12\r\n\x05trimp\x18\x03 \x01(\x01\x12\r\n\x05hrtss\x18\x04 \x01(\x01\x12\r\n\x05normv\x18\x05 \x01(\x01\x12\r\n\x05normw\x18\x06 \x01(\x01\"=\n\tCPRequest\x12\x10\n\x08\x66ilename\x18\x01 \x01(\t\x12\x10\n\x08\x66iletype\x18\x02 \x01(\t\x12\x0c\n\x04tarr\x18\x03 \x03(\x01\"<\n\nCPResponse\x12\r\n\x05\x64\x65lta\x18\x01 \x03(\x01\x12\r\n\x05power\x18\x02 \x03(\x01\x12\x10\n\x08\x61vgpower\x18\x03 \x01(\x01\x32w\n\x07Metrics\x12l\n\x0b\x43\x61lcMetrics\x12-.rowing_workout_metrics.WorkoutMetricsRequest\x1a..rowing_workout_metrics.WorkoutMetricsResponse2T\n\x02\x43P\x12N\n\x05GetCP\x12!.rowing_workout_metrics.CPRequest\x1a\".rowing_workout_metrics.CPResponseB\x1aZ\x18./rowing-workout-metricsb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1crowing-workout-metrics.proto\x12\x16rowing_workout_metrics\"p\n\x15WorkoutMetricsRequest\x12\x10\n\x08\x66ilename\x18\x01 \x01(\t\x12\x0b\n\x03sex\x18\x02 \x01(\t\x12\x0b\n\x03\x66tp\x18\x03 \x01(\x01\x12\r\n\x05hrftp\x18\x04 \x01(\x01\x12\r\n\x05hrmax\x18\x05 \x01(\x01\x12\r\n\x05hrmin\x18\x06 \x01(\x01\"p\n\x16WorkoutMetricsResponse\x12\x0b\n\x03tss\x18\x01 \x01(\x01\x12\r\n\x05normp\x18\x02 \x01(\x01\x12\r\n\x05trimp\x18\x03 \x01(\x01\x12\r\n\x05hrtss\x18\x04 \x01(\x01\x12\r\n\x05normv\x18\x05 \x01(\x01\x12\r\n\x05normw\x18\x06 \x01(\x01\"=\n\tCPRequest\x12\x10\n\x08\x66ilename\x18\x01 \x01(\t\x12\x10\n\x08\x66iletype\x18\x02 \x01(\t\x12\x0c\n\x04tarr\x18\x03 \x03(\x01\"<\n\nCPResponse\x12\r\n\x05\x64\x65lta\x18\x01 \x03(\x01\x12\r\n\x05power\x18\x02 \x03(\x01\x12\x10\n\x08\x61vgpower\x18\x03 \x01(\x01\x32\xc7\x01\n\x07Metrics\x12l\n\x0b\x43\x61lcMetrics\x12-.rowing_workout_metrics.WorkoutMetricsRequest\x1a..rowing_workout_metrics.WorkoutMetricsResponse\x12N\n\x05GetCP\x12!.rowing_workout_metrics.CPRequest\x1a\".rowing_workout_metrics.CPResponseB\x1aZ\x18./rowing-workout-metricsb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -30,8 +30,6 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_CPREQUEST']._serialized_end=345
   _globals['_CPRESPONSE']._serialized_start=347
   _globals['_CPRESPONSE']._serialized_end=407
-  _globals['_METRICS']._serialized_start=409
-  _globals['_METRICS']._serialized_end=528
-  _globals['_CP']._serialized_start=530
-  _globals['_CP']._serialized_end=614
+  _globals['_METRICS']._serialized_start=410
+  _globals['_METRICS']._serialized_end=609
 # @@protoc_insertion_point(module_scope)
diff --git a/rowers/rowing_workout_metrics_pb2_grpc.py b/rowers/rowing_workout_metrics_pb2_grpc.py
index 2f5a91d7..4785255b 100644
--- a/rowers/rowing_workout_metrics_pb2_grpc.py
+++ b/rowers/rowing_workout_metrics_pb2_grpc.py
@@ -20,6 +20,11 @@ class MetricsStub(object):
                 request_serializer=rowing__workout__metrics__pb2.WorkoutMetricsRequest.SerializeToString,
                 response_deserializer=rowing__workout__metrics__pb2.WorkoutMetricsResponse.FromString,
                 )
+        self.GetCP = channel.unary_unary(
+                '/rowing_workout_metrics.Metrics/GetCP',
+                request_serializer=rowing__workout__metrics__pb2.CPRequest.SerializeToString,
+                response_deserializer=rowing__workout__metrics__pb2.CPResponse.FromString,
+                )
 
 
 class MetricsServicer(object):
@@ -32,6 +37,12 @@ class MetricsServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def GetCP(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
 
 def add_MetricsServicer_to_server(servicer, server):
     rpc_method_handlers = {
@@ -40,6 +51,11 @@ def add_MetricsServicer_to_server(servicer, server):
                     request_deserializer=rowing__workout__metrics__pb2.WorkoutMetricsRequest.FromString,
                     response_serializer=rowing__workout__metrics__pb2.WorkoutMetricsResponse.SerializeToString,
             ),
+            'GetCP': grpc.unary_unary_rpc_method_handler(
+                    servicer.GetCP,
+                    request_deserializer=rowing__workout__metrics__pb2.CPRequest.FromString,
+                    response_serializer=rowing__workout__metrics__pb2.CPResponse.SerializeToString,
+            ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
             'rowing_workout_metrics.Metrics', rpc_method_handlers)
@@ -68,53 +84,6 @@ class Metrics(object):
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
-
-class CPStub(object):
-    """GetCP service definition
-    """
-
-    def __init__(self, channel):
-        """Constructor.
-
-        Args:
-            channel: A grpc.Channel.
-        """
-        self.GetCP = channel.unary_unary(
-                '/rowing_workout_metrics.CP/GetCP',
-                request_serializer=rowing__workout__metrics__pb2.CPRequest.SerializeToString,
-                response_deserializer=rowing__workout__metrics__pb2.CPResponse.FromString,
-                )
-
-
-class CPServicer(object):
-    """GetCP service definition
-    """
-
-    def GetCP(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-
-def add_CPServicer_to_server(servicer, server):
-    rpc_method_handlers = {
-            'GetCP': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetCP,
-                    request_deserializer=rowing__workout__metrics__pb2.CPRequest.FromString,
-                    response_serializer=rowing__workout__metrics__pb2.CPResponse.SerializeToString,
-            ),
-    }
-    generic_handler = grpc.method_handlers_generic_handler(
-            'rowing_workout_metrics.CP', rpc_method_handlers)
-    server.add_generic_rpc_handlers((generic_handler,))
-
-
- # This class is part of an EXPERIMENTAL API.
-class CP(object):
-    """GetCP service definition
-    """
-
     @staticmethod
     def GetCP(request,
             target,
@@ -126,7 +95,7 @@ class CP(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/rowing_workout_metrics.CP/GetCP',
+        return grpc.experimental.unary_unary(request, target, '/rowing_workout_metrics.Metrics/GetCP',
             rowing__workout__metrics__pb2.CPRequest.SerializeToString,
             rowing__workout__metrics__pb2.CPResponse.FromString,
             options, channel_credentials,
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 41219d8855b45ea65b83040560a6a760f9deb700..535be5e4fee14e1b277b24a9782a1fab52345728 100644
GIT binary patch
literal 4002
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
Iio}2c00)vf`2YX_

literal 4000
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
GfB^s+y%|XW

diff --git a/rowers/utils.py b/rowers/utils.py
index bf71456b..34f808ea 100644
--- a/rowers/utils.py
+++ b/rowers/utils.py
@@ -347,9 +347,9 @@ def isbreakthrough(delta, cpvalues, p0, p1, p2, p3, ratio):
 
     pwr *= ratio
 
-    delta = delta.values.astype(int)
-    cpvalues = cpvalues.values.astype(int)
-    pwr = pwr.astype(int)
+    delta = delta.astype(int, errors='ignore').values
+    cpvalues = cpvalues.astype(int, errors='ignore').values
+    pwr = pwr.astype(int, errors='ignore').values
 
     res = np.sum(cpvalues > pwr+1)
     res2 = np.sum(cpvalues > pwr2+1)