Merge pull request #139 from andrewm4894/sql-optimize-timestamp

Optimize SQL a little more

metrics/defaults/defaults.yaml

@@ -20,8 +20,10 @@ model_configs:
       contamination: 0.01
 model_combination_method: 'mean' # method to combine model scores, 'mean', 'min' or 'max'.
 train_max_n: 2500 # max number of observations for training a model.
+train_metric_timestamp_max_days_ago: 30
 train_min_n: 14 # min number of observations for training a model.
 score_max_n: 25 # max n to pull for scoring to avoid pulling more than needed.
+score_metric_timestamp_max_days_ago: 7
 preprocess_params:
   diff_n: 1 # 1 will use diff, 0 will use raw metric values.
   smooth_n: 3 # how much smoothing to apply in preprocessing.

metrics/defaults/sql/score.sql

@@ -18,6 +18,8 @@ where
   metric_batch = '{{ metric_batch }}'
   and
   metric_type in ('metric', 'score')
+  and
+  metric_timestamp >= date('now', '-{{ score_metric_timestamp_max_days_ago }} day')
   {% if score_exclude_metrics is defined %}
   and
   -- Exclude the specified metrics

metrics/defaults/sql/train.sql

@@ -16,6 +16,8 @@ where
   metric_batch = '{{ metric_batch }}'
   and
   metric_type = 'metric'
+  and
+  metric_timestamp >= date('now', '-{{ train_metric_timestamp_max_days_ago }} day')
   {% if train_exclude_metrics is defined %}
   and
   -- Exclude the specified metrics