Add an env var flag to recreate AMLS Environment (#230)

celaus · web-flow · commit 1d2d7733608b · 2020-03-16T13:28:34.000-07:00
diff --git a/.env.example b/.env.example
@@ -48,3 +48,6 @@ RUN_EVALUATION = 'true'
 
 # Set to true cancels the Azure ML pipeline run when evaluation criteria are not met.
 ALLOW_RUN_CANCEL = 'true'
+
+# Flag to allow rebuilding the AML Environment after it was built for the first time. This enables dependency updates from conda_dependencies.yaml.
+AML_REBUILD_ENVIRONMENT = 'false'
diff --git a/.pipelines/diabetes_regression-variables-template.yml b/.pipelines/diabetes_regression-variables-template.yml
@@ -66,4 +66,9 @@ variables:
     # For debugging deployment issues. Specify a build id with the MODEL_BUILD_ID pipeline variable at queue time
     # to skip training and deploy a model registered by a previous build.
   - name: modelbuildid
-    value: $[coalesce(variables['MODEL_BUILD_ID'], variables['Build.BuildId'])]
+    value: $[coalesce(variables['MODEL_BUILD_ID'], variables['Build.BuildId'])]
+
+  
+  # Flag to allow rebuilding the AML Environment after it was built for the first time. This enables dependency updates from conda_dependencies.yaml.
+  # - name: AML_REBUILD_ENVIRONMENT
+  #  value: "false"
diff --git a/ml_service/pipelines/diabetes_regression_build_train_pipeline.py b/ml_service/pipelines/diabetes_regression_build_train_pipeline.py
@@ -33,8 +33,7 @@ def main():
 
     # Create a reusable Azure ML environment
     environment = get_environment(
-        aml_workspace, e.aml_env_name, create_new=False)  # NOQA: E501
-
+        aml_workspace, e.aml_env_name, create_new=e.rebuild_env)  #
     run_config = RunConfiguration()
     run_config.environment = environment
 
diff --git a/ml_service/pipelines/diabetes_regression_build_train_pipeline_with_r.py b/ml_service/pipelines/diabetes_regression_build_train_pipeline_with_r.py
@@ -31,7 +31,7 @@ def main():
     # Make sure to include `r-essentials'
     #   in diabetes_regression/conda_dependencies.yml
     environment = get_environment(
-        aml_workspace, e.aml_env_name, create_new=False)  # NOQA: E501
+        aml_workspace, e.aml_env_name, create_new=e.rebuild_env)  # NOQA: E501
     run_config = RunConfiguration()
     run_config.environment = environment
 
diff --git a/ml_service/util/env_variables.py b/ml_service/util/env_variables.py
@@ -46,6 +46,8 @@ def __init__(self):
         self._allow_run_cancel = os.environ.get(
             "ALLOW_RUN_CANCEL", "true")
         self._aml_env_name = os.environ.get("AML_ENV_NAME")
+        self._rebuild_env = os.environ.get("AML_REBUILD_ENVIRONMENT",
+                                           "false").lower().strip() == "true"
 
     @property
     def workspace_name(self):
@@ -166,3 +168,7 @@ def allow_run_cancel(self):
     @property
     def aml_env_name(self):
         return self._aml_env_name
+
+    @property
+    def rebuild_env(self):
+        return self._rebuild_env
