03131510howLongAgo

models_processing/model_tf/tf_bp_pre.py

@@ -65,6 +65,9 @@ def model_prediction_bp():
             pre_data = pre_data[['dateTime', 'farm_id', args['target'], args['model_name'], 'dq']]
             pre_data = pre_data.melt(id_vars=['dateTime', 'farm_id', args['target']], var_name='model', value_name='power_forecast')
             res_cols = ['dateTime', 'power_forecast', 'farm_id', args['target'], 'model']
+            if 'howLongAgo' in args:
+                pre_data['howLongAgo'] = int(args['howLongAgo'])
+                res_cols += ['howLongAgo']
         else:
             pre_data['cdq'] = args.get('cdq', 1)
             pre_data['dq'] = args.get('dq', 1)

models_processing/model_tf/tf_cnn_pre.py

@@ -65,6 +65,9 @@ def model_prediction_bp():
             pre_data = pre_data[['dateTime', 'farm_id', args['target'], args['model_name'], 'dq']]
             pre_data = pre_data.melt(id_vars=['dateTime', 'farm_id', args['target']], var_name='model', value_name='power_forecast')
             res_cols = ['dateTime', 'power_forecast', 'farm_id', args['target'], 'model']
+            if 'howLongAgo' in args:
+                pre_data['howLongAgo'] = int(args['howLongAgo'])
+                res_cols += ['howLongAgo']
         else:
             pre_data['cdq'] = args.get('cdq', 1)
             pre_data['dq'] = args.get('dq', 1)

models_processing/model_tf/tf_lstm_pre.py

@@ -64,6 +64,9 @@ def model_prediction_bp():
             pre_data = pre_data[['dateTime', 'farm_id', args['target'], args['model_name'], 'dq']]
             pre_data = pre_data.melt(id_vars=['dateTime', 'farm_id', args['target']], var_name='model', value_name='power_forecast')
             res_cols = ['dateTime', 'power_forecast', 'farm_id', args['target'], 'model']
+            if 'howLongAgo' in args:
+                pre_data['howLongAgo'] = int(args['howLongAgo'])
+                res_cols += ['howLongAgo']
         else:
             pre_data['cdq'] = args.get('cdq', 1)
             pre_data['dq'] = args.get('dq', 1)