From 96a7991766d991ac33c2748a0229c7a5cbd9a729 Mon Sep 17 00:00:00 2001
From: arifiorino <arifiorino@gmail.com>
Date: Wed, 19 Feb 2020 03:00:44 +0000
Subject: [PATCH] Bug fixes

---
 server/website/website/tasks/async_tasks.py    | 8 +++++---
 server/website/website/tasks/periodic_tasks.py | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/server/website/website/tasks/async_tasks.py b/server/website/website/tasks/async_tasks.py
index 22cf3d1..18eecf0 100644
--- a/server/website/website/tasks/async_tasks.py
+++ b/server/website/website/tasks/async_tasks.py
@@ -11,6 +11,7 @@ import gpflow
 import time
 from pyDOE import lhs
 from scipy.stats import uniform
+from pytz import timezone
 
 from celery import shared_task, Task
 from celery.utils.log import get_task_logger
@@ -28,7 +29,8 @@ from analysis.gpr.predict import gpflow_predict
 from analysis.preprocessing import Bin, DummyEncoder
 from analysis.constraints import ParamConstraintHelper
 from django.utils.datetime_safe import datetime
-from website.models import PipelineData, PipelineRun, Result, Workload, SessionKnob, MetricCatalog
+from website.models import (PipelineData, PipelineRun, Result, Workload, SessionKnob,
+                            MetricCatalog, ExecutionTime)
 from website import db
 from website.types import PipelineTaskType, AlgorithmType, VarType
 from website.utils import DataUtil, JSONUtil
@@ -801,7 +803,7 @@ def configuration_recommendation(recommendation_input):
     LOG.debug('%s: Finished selecting the next config.\n\ndata=%s\n',
               AlgorithmType.name(algorithm), JSONUtil.dumps(conf_map_res, pprint=True))
 
-    save_execution_time(start_ts, "configuration_recommendation", Result.objects.get(pk=result_id))
+    save_execution_time(start_ts, "configuration_recommendation", newest_result)
     return conf_map_res
 
 
@@ -996,5 +998,5 @@ def map_workload(map_workload_input):
     LOG.debug('%s: Finished mapping the workload.\n\ndata=%s\n',
               AlgorithmType.name(algorithm), JSONUtil.dumps(target_data, pprint=True))
 
-    save_execution_time(start_ts, "map_workload", Result.objects.get(pk=result_id))
+    save_execution_time(start_ts, "map_workload", newest_result)
     return target_data, algorithm
diff --git a/server/website/website/tasks/periodic_tasks.py b/server/website/website/tasks/periodic_tasks.py
index 572c9dd..0bc2dd0 100644
--- a/server/website/website/tasks/periodic_tasks.py
+++ b/server/website/website/tasks/periodic_tasks.py
@@ -6,6 +6,7 @@
 import copy
 import numpy as np
 import time
+from pytz import timezone
 
 from celery import shared_task
 from celery.utils.log import get_task_logger
@@ -19,7 +20,7 @@ from analysis.preprocessing import (Bin, get_shuffle_indices,
                                     DummyEncoder,
                                     consolidate_columnlabels)
 from django.utils.datetime_safe import datetime
-from website.models import PipelineData, PipelineRun, Result, Workload
+from website.models import PipelineData, PipelineRun, Result, Workload, ExecutionTime
 from website.settings import ENABLE_DUMMY_ENCODER, TIME_ZONE
 from website.types import PipelineTaskType, WorkloadStatusType
 from website.utils import DataUtil, JSONUtil