add check for existing columns

Author: asavinov

scripts/predict.py

@@ -66,7 +66,7 @@ def main(config_file):
     algorithms = App.config.get("algorithms")
 
     # Select necessary features and label
-    out_columns = ['timestamp', 'open', 'high', 'low', 'close', 'volume', 'close_time']
+    out_columns = [time_column, 'open', 'high', 'low', 'close', 'volume', 'close_time']
     out_columns = [x for x in out_columns if x in df.columns]
     labels_present = set(labels).issubset(df.columns)
     if labels_present:

scripts/signals.py

@@ -96,7 +96,8 @@ def main(config_file):
     #
     # Choose columns to stored
     #
-    out_columns = ["timestamp", "open", "high", "low", "close"]  # Source data
+    out_columns = [time_column, "open", "high", "low", "close"]  # Source data
+    out_columns = [x for x in out_columns if x in df.columns]
     out_columns.extend(App.config.get('labels'))  # True labels
     out_columns.extend(all_features)
 

scripts/train.py

@@ -74,7 +74,7 @@ def main(config_file):
     algorithms = App.config.get("algorithms")
 
     # Select necessary features and labels
-    out_columns = ['timestamp', 'open', 'high', 'low', 'close', 'volume', 'close_time']
+    out_columns = [time_column, 'open', 'high', 'low', 'close', 'volume', 'close_time']
     out_columns = [x for x in out_columns if x in df.columns]
     all_features = train_features + labels
     df = df[out_columns + [x for x in all_features if x not in out_columns]]