From dce5d0a49cc21d54be858eb84dea5083c8bf8201 Mon Sep 17 00:00:00 2001
From: David Tesar <davete@microsoft.com>
Date: Mon, 25 Nov 2019 22:31:22 -0800
Subject: [PATCH] Add code comments

---
 .pipelines/azdo-ci-build-train.yml         | 2 ++
 code/evaluate/evaluate_model.py            | 3 ++-
 code/register/register_model.py            | 3 ++-
 ml_service/pipelines/run_train_pipeline.py | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.pipelines/azdo-ci-build-train.yml b/.pipelines/azdo-ci-build-train.yml
index 1e729357..d1d92d74 100644
--- a/.pipelines/azdo-ci-build-train.yml
+++ b/.pipelines/azdo-ci-build-train.yml
@@ -47,8 +47,10 @@ stages:
     steps:
     - script: |
         python $(Build.SourcesDirectory)/ml_service/pipelines/run_train_pipeline.py
+        # Set AMLPIPELINEID variable for next AML Pipeline task in next job
         source $(Build.SourcesDirectory)/tmp.sh
         echo "##vso[task.setvariable variable=AMLPIPELINEID;isOutput=true]$AMLPIPELINE_ID"
+        rm $(Build.SourcesDirectory)/tmp.sh
       name: 'getpipelineid'
       displayName: 'Get Pipeline ID'
       env:
diff --git a/code/evaluate/evaluate_model.py b/code/evaluate/evaluate_model.py
index 3cce1fb2..2c01c1e0 100644
--- a/code/evaluate/evaluate_model.py
+++ b/code/evaluate/evaluate_model.py
@@ -46,6 +46,8 @@
     app_id = os.environ.get('SP_APP_ID')
     app_secret = os.environ.get('SP_APP_SECRET')
     build_id = os.environ.get('BUILD_BUILDID')
+    # run_id useful to query previous runs
+    run_id = "57fee47f-5ae8-441c-bc0c-d4c371f32d70"
     service_principal = ServicePrincipalAuthentication(
         tenant_id=tenant_id,
         service_principal_id=app_id,
@@ -59,7 +61,6 @@
     )
     ws = aml_workspace
     exp = Experiment(ws, experiment_name)
-    run_id = "57fee47f-5ae8-441c-bc0c-d4c371f32d70"
 else:
     sys.path.append(os.path.abspath("./util"))  # NOQA: E402
     from model_helper import get_model_by_tag
diff --git a/code/register/register_model.py b/code/register/register_model.py
index a1b95696..bdef3600 100644
--- a/code/register/register_model.py
+++ b/code/register/register_model.py
@@ -50,6 +50,8 @@ def main():
         app_id = os.environ.get('SP_APP_ID')
         app_secret = os.environ.get('SP_APP_SECRET')
         build_id = os.environ.get('BUILD_BUILDID')
+        # run_id useful to query previous runs
+        run_id = "bd184a18-2ac8-4951-8e78-e290bef3b012"
         service_principal = ServicePrincipalAuthentication(
             tenant_id=tenant_id,
             service_principal_id=app_id,
@@ -63,7 +65,6 @@ def main():
         )
         ws = aml_workspace
         exp = Experiment(ws, experiment_name)
-        run_id = "bd184a18-2ac8-4951-8e78-e290bef3b012"
     else:
         sys.path.append(os.path.abspath("./util"))  # NOQA: E402
         from model_helper import get_model_by_tag
diff --git a/ml_service/pipelines/run_train_pipeline.py b/ml_service/pipelines/run_train_pipeline.py
index e5c12454..06abfd4d 100644
--- a/ml_service/pipelines/run_train_pipeline.py
+++ b/ml_service/pipelines/run_train_pipeline.py
@@ -45,8 +45,8 @@ def main():
         savePIDcmd = 'echo "export AMLPIPELINE_ID=$amlpipeline_id" >tmp.sh'
         os.system(savePIDcmd)
 
-        # Set this to True for local development or
-        # if not using Azure DevOps pipeline execution task
+        # Set this to True for local development or if NOT
+        # using Azure DevOps Azure ML agentless pipeline execution task
         skip_train_execution = True
         if(skip_train_execution is False):
             pipeline_parameters = {"model_name": e.model_name}