Merge pull request #279 from usc-isi-i2/development

Development
usc-isi-i2 · Jul 22, 2019 · dc1e693 · dc1e693
2 parents 2cce3d7 + 75c8ac3
commit dc1e693
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/python/dsbox/controller/config.py b/python/dsbox/controller/config.py
@@ -197,8 +197,8 @@ def _load_d3m_environment(self, ta2ta3_mode: bool):
                 self.problem_schema = os.environ['D3MPROBLEMPATH']
             else:
                 print('D3MPROBLEMPATH environment variable not defined.')
-        self.datamart_nyu_url = os.environ.get('DATAMART_NYU_URL', default='')
-        self.datamart_isi_url = os.environ.get('DATAMART_ISI_URL', default='')
+        self.datamart_nyu_url = os.environ.get('DATAMART_URL_NYU', default='')
+        self.datamart_isi_url = os.environ.get('DATAMART_URL_ISI', default='')
 
     def _load_dsbox(self):
         self._load_logging()

diff --git a/python/dsbox/controller/controller.py b/python/dsbox/controller/controller.py
@@ -648,7 +648,8 @@ def do_data_augmentation_rest_api(self, input_all_dataset: Dataset) -> Dataset:
         import datamart_nyu
         import datamart
         augment_times = 0
-        datamart_unit = datamart_nyu.RESTDatamart()
+
+        datamart_unit = datamart_nyu.RESTDatamart(connection_url=self.config.datamart_nyu_url)
 
         # if self.all_dataset.metadata.query(())['id'].startswith("DA_medical_malpractice"):
             # pass
@@ -1748,8 +1749,7 @@ def _save_dataset(self, dataset_list: typing.List[Dataset], save_dir: pathlib.Pa
                 else:
                     dataset.save((dataset_dir / "datasetDoc.json").as_uri())
         except Exception:
-            # self._logger.debug("Failed to save dataset splits", exc_info=True)
-            pass
+            logger.debug("Failed to save dataset splits", exc_info=True)
 
     # Methods used by TA3