Merge branch with cwd fix and updates to version and push script

CHANGELOG.org

@@ -21,6 +21,7 @@
      - Moved each version of an experiment to be executed in a separate sub-process
      - Fixed bug with scheme and windows path for mlflow
      - Fixed bug with cli not completely migrated to using process abstraction
+     - Ensured change to cwd when using api.get_experiment and exposed dataloader to the returned experiment
 ** 2.0.a.3 [2019-07-16]
    - Several methods from the base classes are not required to be implemented. They are:
      - Experiment.setup_model

mlpipeline/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.0.a.4.post.18"
+__version__ = "2.0.a.4.post.19"
 
 from mlpipeline.utils._utils import (Versions,
                                      log,

mlpipeline/api.py

@@ -46,24 +46,28 @@ def mlpipeline_execute_exeperiment(file_path,
 
 
 # TODO: Need to track the root of the project, or this becomes kind of ridiculous.
-def get_experiment(file_path, experiment_dir, version_name, mlflow_tracking_uri=None):
+def get_experiment(file_path, experiment_dir, version_name, mlflow_tracking_uri=None, load_dataloader=False):
     cwd = os.getcwd()
-    experiment_dir = os.path.abspath(experiment_dir)
-    file_path = os.path.relpath(os.path.abspath(file_path), experiment_dir)
-    print(f"Setting root directory to: {experiment_dir}")
-    print(f"Loading experiment: {file_path}")
-    os.chdir(experiment_dir)
-    experiment = _load_file_as_module(file_path).EXPERIMENT
-    experiment.name = os.path.relpath(file_path, experiment_dir)
-    version_spec = experiment.versions.get_version(version_name)
-    experiment_dir, _ = _get_experiment_dir(experiment.name.split(".")[-2],
-                                            version_spec,
-                                            None)
-    # if mlflow_tracking_uri is None:
-    #     run_id = None
-    # else:
-    #     run_id = _get_mlflow_run_id(mlflow_tracking_uri, experiment, False, version_name)
-    experiment._current_version = version_spec
-    experiment._experiment_dir = None
-    os.chdir(cwd)
+    try:
+        experiment_dir = os.path.abspath(experiment_dir)
+        file_path = os.path.relpath(os.path.abspath(file_path), experiment_dir)
+        print(f"Setting root directory to: {experiment_dir}")
+        print(f"Loading experiment: {file_path}")
+        os.chdir(experiment_dir)
+        experiment = _load_file_as_module(file_path).EXPERIMENT
+        experiment.name = os.path.relpath(file_path, experiment_dir)
+        version_spec = experiment.versions.get_version(version_name)
+        experiment_dir, _ = _get_experiment_dir(experiment.name.split(".")[-2],
+                                                version_spec,
+                                                None)
+        # if mlflow_tracking_uri is None:
+        #     run_id = None
+        # else:
+        #     run_id = _get_mlflow_run_id(mlflow_tracking_uri, experiment, False, version_name)
+        experiment._current_version = version_spec
+        experiment._experiment_dir = None
+        if load_dataloader:
+            experiment._dataloader = version_spec.dataloader()
+    finally:
+        os.chdir(cwd)
     return experiment  # , experiment_dir, run_id

push_release.sh

@@ -1,4 +1,4 @@
 rm -rf build
 rm -rf dist
-python setup.py sdist bdist_wheel
+python setup.py sdist bdist
 twine upload dist/*