changes in the add trainingjob POST

Change-Id: I3aeaeb5e0e9af8e1d4da334afcc3dbc3ff1582ba
Signed-off-by: rajdeep11 <rajdeep.sin@samsung.com>

diff --git a/trainingmgr/db/trainingjob_db.py b/trainingmgr/db/trainingjob_db.py
index bff0d6c..548612d 100644 (file)
--- a/trainingmgr/db/trainingjob_db.py
+++ b/trainingmgr/db/trainingjob_db.py
@@ -20,7 +20,7 @@ import datetime
 import re
 import json
 from trainingmgr.common.exceptions_utls import DBException
-from trainingmgr.models import db, TrainingJob, FeatureGroup
+from trainingmgr.models import db, TrainingJob, TrainingJobStatus
 from trainingmgr.constants.steps import Steps
 from trainingmgr.constants.states import States
 from sqlalchemy.sql import func
@@ -51,8 +51,6 @@ def add_update_trainingjob(trainingjob, adding):
         # trainingjob.datalake_source = json.dumps({"datalake_source": datalake_source_dic}) 
         trainingjob.creation_time = datetime.datetime.utcnow()
         trainingjob.updation_time = trainingjob.creation_time
-        run_id = "No data available"
-        trainingjob.run_id = run_id
         steps_state = {
             Steps.DATA_EXTRACTION.name: States.NOT_STARTED.name,
             Steps.DATA_EXTRACTION_AND_TRAINING.name: States.NOT_STARTED.name,
@@ -60,9 +58,10 @@ def add_update_trainingjob(trainingjob, adding):
             Steps.TRAINING_AND_TRAINED_MODEL.name: States.NOT_STARTED.name,
             Steps.TRAINED_MODEL.name: States.NOT_STARTED.name
         }
-        trainingjob.steps_state=json.dumps(steps_state)
-        trainingjob.model_url = "No data available."
-        trainingjob.notification_url = "No data available."
+        training_job_status = TrainingJobStatus(states= json.dumps(steps_state))
+        db.session.add(training_job_status)
+        db.session.commit()     #to get the steps_state id
+
         trainingjob.deletion_in_progress = False
         trainingjob.version = 1
         
@@ -78,6 +77,7 @@ def add_update_trainingjob(trainingjob, adding):
                     setattr(trainingjob_max_version, attr, getattr(trainingjob, attr))
 
         else:
+            trainingjob.steps_state_id = training_job_status.id
             db.session.add(trainingjob)
         db.session.commit()
 

diff --git a/trainingmgr/trainingmgr_main.py b/trainingmgr/trainingmgr_main.py
index 018ccd0..8251f4a 100644 (file)
--- a/trainingmgr/trainingmgr_main.py
+++ b/trainingmgr/trainingmgr_main.py
@@ -605,7 +605,7 @@ def pipeline_notification():
                                                         States.FINISHED.name)
                 notification_rapp(trainingjob_info, TRAININGMGR_CONFIG_OBJ)
                 # upload to the mme
-                is_mme= trainingjob_info.is_mme
+                is_mme = getField(trainingjob_info.training_config, "is_mme")
                 if is_mme:   
                     model_name=trainingjob_info.model_name #model_name
                     file=MM_SDK.get_model_zip(trainingjob_name, str(version))